Author: breser
Date: Thu Aug 22 19:27:18 2013
New Revision: 1516544
URL: http://svn.apache.org/r1516544
Log:
Merge r1516429 from trunk:
* r1516429
Cast to ensure int size matches format specifier.
Justification:
If the error condition triggers the message could be bogus on 32-bit
platforms.
Votes:
+1: philip, danielsh, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1516429
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1516544&r1=1516543&r2=1516544&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Aug 22 19:27:18 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1516429
- Cast to ensure int size matches format specifier.
- Justification:
- If the error condition triggers the message could be bogus on 32-bit
- platforms.
- Votes:
- +1: philip, danielsh, rhuijben
-
* r1516271
svnwcsub: Fix creation of pid files.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1516544&r1=1516543&r2=1516544&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c Thu Aug 22
19:27:18 2013
@@ -3741,8 +3741,9 @@ parse_packed_revprops(svn_fs_t *fs,
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Revprop pack for revision r%ld"
" contains revprops for r%ld .. r%ld"),
- revprops->revision, first_rev,
- first_rev + count -1);
+ revprops->revision,
+ (svn_revnum_t)first_rev,
+ (svn_revnum_t)(first_rev + count -1));
/* Since start & end are in the same shard, it is enough to just test
* the FIRST_REV for being actually packed. That will also cover the
@@ -3751,7 +3752,7 @@ parse_packed_revprops(svn_fs_t *fs,
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Revprop pack for revision r%ld"
" starts at non-packed revisions r%ld"),
- revprops->revision, first_rev);
+ revprops->revision, (svn_revnum_t)first_rev);
/* make PACKED_REVPROPS point to the first char after the header.
* This is where the serialized revprops are. */
