svn commit: r1920899 - in /subversion/branches/1.14.x: ./ STATUS subversion/svnadmin/svnadmin.c

Author: stsp
Date: Wed Sep 25 09:10:18 2024
New Revision: 1920899

URL: http://svn.apache.org/viewvc?rev=1920899&view=rev
Log:
On the 1.14.x branch, merge r1887710 from trunk.

 * r1887710
   Follow up to r1857624: Unbreak a msgid.
   Justification:
     Fixes this warning seen during 'release.py roll':
     ../svnadmin/svnadmin.c:2935: warning: Although being used in a format \
     string position, the msgid is not a valid C format string. Reason: The \
     string ends in the middle of a directive.
   Votes:
     +1: stsp, futatuki, dsahlberg

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1887710

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1920899&r1=1920898&r2=1920899&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Sep 25 09:10:18 2024
@@ -27,14 +27,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1887710
-   Follow up to r1857624: Unbreak a msgid.
-   Justification:
-     Fixes this warning seen during 'release.py roll':
-     ../svnadmin/svnadmin.c:2935: warning: Although being used in a format \
-     string position, the msgid is not a valid C format string. Reason: The \
-     string ends in the middle of a directive.
-   Votes:
-     +1: stsp, futatuki, dsahlberg
-

Modified: subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c?rev=1920899&r1=1920898&r2=1920899&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c Wed Sep 25 09:10:18 2024
@@ -2930,11 +2930,16 @@ subcommand_rev_size(apr_getopt_t *os, vo
   SVN_ERR(revision_size(&rev_size, svn_repos_fs(repos), revision, pool));
 
   if (opt_state->quiet)
-    SVN_ERR(svn_cmdline_printf(pool, "%"APR_OFF_T_FMT"\n", rev_size));
+    {
+      SVN_ERR(svn_cmdline_printf(pool, "%"APR_OFF_T_FMT"\n", rev_size));
+    }
   else
-    SVN_ERR(svn_cmdline_printf(pool, _("%12"APR_OFF_T_FMT" bytes in revision %ld\n"),
-                               rev_size, revision));
-
+    {
+      const char *rev_size_str = apr_psprintf(pool,
+                                              "%12" APR_INT64_T_FMT, rev_size);
+      SVN_ERR(svn_cmdline_printf(pool, _("%s bytes in revision %ld\n"),
+                                 rev_size_str, revision));
+    }
   return SVN_NO_ERROR;
 }