svn commit: r1653374 - /subversion/trunk/subversion/svnrdump/dump_editor.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Jan 20 21:27:42 2015
New Revision: 1653374

URL: http://svn.apache.org/r1653374
Log:
* subversion/svnrdump/dump_editor.c
  (dump_mkdir,
   close_file): Fix printf formats to match the arguments. The former was
    my recent mistake and caused a test failure on Windows; the latter is
    old and doesn't seem to have caused problems.

Modified:
    subversion/trunk/subversion/svnrdump/dump_editor.c

Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1653374&r1=1653373&r2=1653374&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Tue Jan 20 21:27:42 2015
@@ -470,7 +470,7 @@ dump_mkdir(struct dump_edit_baton *eb,
                             pool, pool));
   len = prop_content->len;
   svn_repos__dumpfile_header_pushf(headers, SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
-                                   "%" SVN_FILESIZE_T_FMT, len);
+                                   "%" APR_SIZE_T_FMT, len);
   SVN_ERR(svn_repos__dump_headers(eb->stream, headers, TRUE, pool));
   SVN_ERR(svn_stream_write(eb->stream, prop_content->data, &len));
 
@@ -1014,11 +1014,11 @@ close_file(void *file_baton,
   if (fb->dump_props)
     svn_repos__dumpfile_header_pushf(
       headers, SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
-      "%ld", (unsigned long)info->size + propstring->len);
+      "%lu", (unsigned long)(info->size + propstring->len));
   else if (fb->dump_text)
     svn_repos__dumpfile_header_pushf(
       headers, SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
-      "%ld", (unsigned long)info->size);
+      "%lu", (unsigned long)info->size);
 
   SVN_ERR(svn_repos__dump_headers(eb->stream, headers, TRUE, pool));