You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/05/12 10:39:03 UTC
svn commit: r1678894 - in /subversion/trunk/subversion:
include/private/svn_cmdline_private.h libsvn_subr/cmdline.c svn/svn.c
svnbench/svnbench.c svnmucc/svnmucc.c svnrdump/svnrdump.c svnsync/svnsync.c
Author: rhuijben
Date: Tue May 12 08:39:02 2015
New Revision: 1678894
URL: http://svn.apache.org/r1678894
Log:
Following up on r1678734, remove unneeded prefix from error message.
* subversion/include/private/svn_cmdline_private.h
* subversion/libsvn_subr/cmdline.c
(svn_cmdline__parse_trust_options): Remove unneeded argument and usage.
* subversion/svn/svn.c
* subversion/svnbench/svnbench.c
* subversion/svnmucc/svnmucc.c
* subversion/svnrdump/svnrdump.c
* subversion/svnsync/svnsync.c
(sub_main): Update caller.
Modified:
subversion/trunk/subversion/include/private/svn_cmdline_private.h
subversion/trunk/subversion/libsvn_subr/cmdline.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnbench/svnbench.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnsync/svnsync.c
Modified: subversion/trunk/subversion/include/private/svn_cmdline_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cmdline_private.h?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cmdline_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_cmdline_private.h Tue May 12 08:39:02 2015
@@ -224,8 +224,8 @@ svn_boolean_t
svn_cmdline__be_interactive(svn_boolean_t non_interactive,
svn_boolean_t force_interactive);
-/* Parses the argument value of '--trust-server-cert-failures' into the
- * expected booleans for passing to svn_cmdline_create_auth_baton2()
+/* Parses the argument value of '--trust-server-cert-failures' OPT_ARG into
+ * the expected booleans for passing to svn_cmdline_create_auth_baton2()
*
* @since New in 1.9.
*/
@@ -237,7 +237,6 @@ svn_cmdline__parse_trust_options(
svn_boolean_t *trust_server_cert_not_yet_valid,
svn_boolean_t *trust_server_cert_other_failure,
const char *opt_arg,
- const char *error_prefix,
apr_pool_t *scratch_pool);
#ifdef __cplusplus
Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Tue May 12 08:39:02 2015
@@ -1538,7 +1538,6 @@ svn_cmdline__parse_trust_options(
svn_boolean_t *trust_server_cert_not_yet_valid,
svn_boolean_t *trust_server_cert_other_failure,
const char *opt_arg,
- const char *error_prefix,
apr_pool_t *scratch_pool)
{
apr_array_header_t *failures;
@@ -1567,9 +1566,8 @@ svn_cmdline__parse_trust_options(
*trust_server_cert_other_failure = TRUE;
else
return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("%sUnknown value '%s' for %s.\n"
+ _("Unknown value '%s' for %s.\n"
"Supported values: %s"),
- error_prefix ? error_prefix : "",
value,
"--trust-server-cert-failures",
"unknown-ca, cn-mismatch, expired, "
Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue May 12 08:39:02 2015
@@ -2185,7 +2185,7 @@ sub_main(int *exit_code, int argc, const
&opt_state.trust_server_cert_expired,
&opt_state.trust_server_cert_not_yet_valid,
&opt_state.trust_server_cert_other_failure,
- utf8_opt_arg, "svn: ", pool));
+ utf8_opt_arg, pool));
break;
case opt_no_diff_added:
opt_state.diff.no_diff_added = TRUE;
Modified: subversion/trunk/subversion/svnbench/svnbench.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/svnbench.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/svnbench.c (original)
+++ subversion/trunk/subversion/svnbench/svnbench.c Tue May 12 08:39:02 2015
@@ -622,7 +622,7 @@ sub_main(int *exit_code, int argc, const
&opt_state.trust_server_cert_expired,
&opt_state.trust_server_cert_not_yet_valid,
&opt_state.trust_server_cert_other_failure,
- utf8_opt_arg, "svnbench: ", pool));
+ utf8_opt_arg, pool));
break;
case opt_config_dir:
{
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Tue May 12 08:39:02 2015
@@ -604,7 +604,7 @@ sub_main(int *exit_code, int argc, const
&trust_expired,
&trust_not_yet_valid,
&trust_other_failure,
- opt_arg, "svnmucc: ", pool));
+ opt_arg, pool));
break;
case config_dir_opt:
SVN_ERR(svn_utf_cstring_to_utf8(&config_dir, arg, pool));
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Tue May 12 08:39:02 2015
@@ -923,7 +923,7 @@ sub_main(int *exit_code, int argc, const
&trust_expired,
&trust_not_yet_valid,
&trust_other_failure,
- opt_arg, "svnrdump: ", pool));
+ opt_arg, pool));
break;
case opt_config_option:
if (!config_options)
Modified: subversion/trunk/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1678894&r1=1678893&r2=1678894&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/svnsync.c (original)
+++ subversion/trunk/subversion/svnsync/svnsync.c Tue May 12 08:39:02 2015
@@ -2005,7 +2005,7 @@ sub_main(int *exit_code, int argc, const
&opt_baton.trust_server_cert_expired,
&opt_baton.trust_server_cert_not_yet_valid,
&opt_baton.trust_server_cert_other_failure,
- opt_arg, "svnsync: ", pool));
+ opt_arg, pool));
break;
case svnsync_opt_no_auth_cache: