You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/05/09 12:25:46 UTC
svn commit: r1100943 - /subversion/trunk/subversion/libsvn_subr/svn_string.c
Author: danielsh
Date: Mon May 9 10:25:45 2011
New Revision: 1100943
URL: http://svn.apache.org/viewvc?rev=1100943&view=rev
Log:
Fix incorrect format strings.
Note: this un-marks the strings for translation.
* subversion/libsvn_subr/svn_string.c
(svn_cstring_strtoui64, svn_cstring_strtoi64):
Use the right apr_pvsprintf() format strings.
Modified:
subversion/trunk/subversion/libsvn_subr/svn_string.c
Modified: subversion/trunk/subversion/libsvn_subr/svn_string.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_string.c?rev=1100943&r1=1100942&r2=1100943&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_string.c Mon May 9 10:25:45 2011
@@ -730,8 +730,10 @@ svn_cstring_strtoui64(apr_uint64_t *n, c
str);
if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
val < 0 || (apr_uint64_t)val < minval || (apr_uint64_t)val > maxval)
+ /* ### Mark this for translation when gettext doesn't choke on macros. */
return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Number '%s' is out of range '[%llu, %llu]'"),
+ "Number '%s' is out of range "
+ "'[%" APR_UINT64_T_FMT ", %" APR_UINT64_T_FMT "]'",
str, minval, maxval);
*n = val;
return SVN_NO_ERROR;
@@ -772,8 +774,10 @@ svn_cstring_strtoi64(apr_int64_t *n, con
str);
if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
val < minval || val > maxval)
+ /* ### Mark this for translation when gettext doesn't choke on macros. */
return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Number '%s' is out of range '[%lld, %lld]'"),
+ "Number '%s' is out of range "
+ "'[%" APR_INT64_T_FMT ", %" APR_INT64_T_FMT "]'",
str, minval, maxval);
*n = val;
return SVN_NO_ERROR;