You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/08 17:59:54 UTC
svn commit: r1068477 -
/subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Author: hwright
Date: Tue Feb 8 16:59:54 2011
New Revision: 1068477
URL: http://svn.apache.org/viewvc?rev=1068477&view=rev
Log:
* tools/dev/svnraisetreeconflict/main.c
(raise_tree_conflict): Use the correct int type to avoid a bit-length
warning.
Modified:
subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Modified: subversion/trunk/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnraisetreeconflict/main.c?rev=1068477&r1=1068476&r2=1068477&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/trunk/tools/dev/svnraisetreeconflict/main.c Tue Feb 8 16:59:54 2011
@@ -192,7 +192,7 @@ raise_tree_conflict(int argc, const char
const char *wc_path, *wc_abspath;
const char *repos_url1, *repos_url2, *path_in_repos1, *path_in_repos2;
int operation, action, reason;
- int peg_rev1, peg_rev2;
+ long peg_rev1, peg_rev2;
int kind, kind1, kind2;
if (argc != 13)
Re: svn commit: r1068477 - /subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Posted by Hyrum K Wright <hy...@hyrumwright.org>.
On Fri, Feb 11, 2011 at 3:27 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -0000:
>> Author: hwright
>> Date: Tue Feb 8 16:59:54 2011
>> New Revision: 1068477
>>
>> URL: http://svn.apache.org/viewvc?rev=1068477&view=rev
>> Log:
>> * tools/dev/svnraisetreeconflict/main.c
>> (raise_tree_conflict): Use the correct int type to avoid a bit-length
>> warning.
>
>> - int peg_rev1, peg_rev2;
>> + long peg_rev1, peg_rev2;
>
> svn_revnum_t ?
We don't use them as revnums. They values store the output of atol(),
which should be long. The names could perhaps be updated to reflect
that, but ENOCARE.
-Hyrum
Re: svn commit: r1068477 - /subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Posted by Hyrum K Wright <hy...@hyrumwright.org>.
On Fri, Feb 11, 2011 at 3:27 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -0000:
>> Author: hwright
>> Date: Tue Feb 8 16:59:54 2011
>> New Revision: 1068477
>>
>> URL: http://svn.apache.org/viewvc?rev=1068477&view=rev
>> Log:
>> * tools/dev/svnraisetreeconflict/main.c
>> (raise_tree_conflict): Use the correct int type to avoid a bit-length
>> warning.
>
>> - int peg_rev1, peg_rev2;
>> + long peg_rev1, peg_rev2;
>
> svn_revnum_t ?
We don't use them as revnums. They values store the output of atol(),
which should be long. The names could perhaps be updated to reflect
that, but ENOCARE.
-Hyrum
Re: svn commit: r1068477 -
/subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -0000:
> Author: hwright
> Date: Tue Feb 8 16:59:54 2011
> New Revision: 1068477
>
> URL: http://svn.apache.org/viewvc?rev=1068477&view=rev
> Log:
> * tools/dev/svnraisetreeconflict/main.c
> (raise_tree_conflict): Use the correct int type to avoid a bit-length
> warning.
> - int peg_rev1, peg_rev2;
> + long peg_rev1, peg_rev2;
svn_revnum_t ?
Re: svn commit: r1068477 -
/subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -0000:
> Author: hwright
> Date: Tue Feb 8 16:59:54 2011
> New Revision: 1068477
>
> URL: http://svn.apache.org/viewvc?rev=1068477&view=rev
> Log:
> * tools/dev/svnraisetreeconflict/main.c
> (raise_tree_conflict): Use the correct int type to avoid a bit-length
> warning.
> - int peg_rev1, peg_rev2;
> + long peg_rev1, peg_rev2;
svn_revnum_t ?