Author: julianfoad
Date: Fri Mar 23 14:55:43 2018
New Revision: 1827574
URL: http://svn.apache.org/viewvc?rev=1827574&view=rev
Log:
Tweak the warning for issue 4722 "checksum fail during commit when
delta is 16K". A follow-up to r1826720 and r1827191.
* subversion/libsvn_fs_fs/cached_data.c
(rep_read_contents): Fix 'gettext' compatibility by moving the format
code macro outside the gettext macro. Use correct data type format
code. (Add punctuation too, for good measure.)
Modified:
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1827574&r1=1827573&r2=1827574&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Fri Mar 23 14:55:43
2018
@@ -2161,9 +2161,13 @@ rep_read_contents(void *baton,
present, i.e. if repository corruption has stored the wrong
expanded length. */
svn_error_t *err = svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Length mismatch while reading representation"
- " expected %" APR_OFF_T_FMT
- " got %" APR_OFF_T_FMT), rb->len, rb->off);
+ _("Length mismatch while reading representation:"
+ " expected %s,"
+ " got %s"),
+ apr_psprintf(rb->pool, "%" SVN_FILESIZE_T_FMT,
+ rb->len),
+ apr_psprintf(rb->pool, "%" SVN_FILESIZE_T_FMT,
+ rb->off));
rb->fs->warning(rb->fs->warning_baton, err);
svn_error_clear(err);
