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:02:49 UTC
svn commit: r1100937 - /subversion/trunk/subversion/libsvn_subr/svn_string.c
Author: danielsh
Date: Mon May 9 10:02:49 2011
New Revision: 1100937
URL: http://svn.apache.org/viewvc?rev=1100937&view=rev
Log:
* subversion/libsvn_subr/svn_string.c
(svn_cstring_strtoui64, svn_cstring_strtoi64):
Remove superfluous svn_error_return() wrappers.
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=1100937&r1=1100936&r2=1100937&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_string.c Mon May 9 10:02:49 2011
@@ -725,16 +725,14 @@ svn_cstring_strtoui64(apr_uint64_t *n, c
* ### APR needs a apr_strtoui64() function. */
val = apr_strtoi64(str, &endptr, base);
if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0')
- return svn_error_return(
- svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Could not convert '%s' into a number"),
- str));
+ return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ _("Could not convert '%s' into a number"),
+ str);
if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
val < 0 || (apr_uint64_t)val < minval || (apr_uint64_t)val > maxval)
- return svn_error_return(
- svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Number '%s' is out of range '[%llu, %llu]'"),
- str, minval, maxval));
+ return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ _("Number '%s' is out of range '[%llu, %llu]'"),
+ str, minval, maxval);
*n = val;
return SVN_NO_ERROR;
}
@@ -769,16 +767,14 @@ svn_cstring_strtoi64(apr_int64_t *n, con
val = apr_strtoi64(str, &endptr, base);
if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0')
- return svn_error_return(
- svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Could not convert '%s' into a number"),
- str));
+ return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ _("Could not convert '%s' into a number"),
+ str);
if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
val < minval || val > maxval)
- return svn_error_return(
- svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
- _("Number '%s' is out of range '[%lld, %lld]'"),
- str, minval, maxval));
+ return svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ _("Number '%s' is out of range '[%lld, %lld]'"),
+ str, minval, maxval);
*n = val;
return SVN_NO_ERROR;
}