subversion/subversion-1.12.2-r1865987+...

36 lines
1.8 KiB
Diff

# ./pullrev.sh 1865987 1866588
http://svn.apache.org/viewvc?view=revision&revision=1865987
http://svn.apache.org/viewvc?view=revision&revision=1866588
--- subversion-1.12.2/subversion/libsvn_fs_fs/verify.c
+++ subversion-1.12.2/subversion/libsvn_fs_fs/verify.c
@@ -681,10 +681,10 @@
NULL,
_("p2l index entry for revision r%ld"
" at offset %s contains invalid item"
- " type %d"),
+ " type %u"),
start,
apr_off_t_toa(pool, offset),
- entry->type);
+ (unsigned int)entry->type);
/* There can be only one changes entry and that has a fixed type
* and item number. Its presence and parse-ability will be checked
@@ -694,11 +694,12 @@
return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
NULL,
_("p2l index entry for changes in"
- " revision r%ld is item %ld of type"
- " %d at offset %s"),
+ " revision r%ld is item"
+ " %"APR_UINT64_T_FMT
+ " of type %u at offset %s"),
entry->item.revision,
entry->item.number,
- entry->type,
+ (unsigned int)entry->type,
apr_off_t_toa(pool, offset));
/* Check contents. */