Author: ivan
Date: Wed Aug 3 11:43:43 2016
New Revision: 1755071
URL: http://svn.apache.org/viewvc?rev=1755071&view=rev
Log:
Fix diagnostic error message for files larger than sizeof(long int).
* subversion/libsvn_wc/wc_db_pristine.c
(pristine_install_txn): Use APR_OFF_T_FMT to format file size instead of
casting to long int.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1755071&r1=1755070&r2=1755071&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Wed Aug 3 11:43:43
2016
@@ -317,9 +317,10 @@ pristine_install_txn(svn_sqlite__db_t *s
{
return svn_error_createf(
SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- _("New pristine text '%s' has different size: %ld versus %ld"),
+ _("New pristine text '%s' has different size: %s versus %s"),
svn_checksum_to_cstring_display(sha1_checksum, scratch_pool),
- (long int)finfo1.size, (long int)finfo2.size);
+ apr_psprintf(scratch_pool, "%" APR_OFF_T_FMT, finfo1.size),
+ apr_psprintf(scratch_pool, "%" APR_OFF_T_FMT, finfo2.size));
}
}
#endif
