Author: danielsh
Date: Fri Apr 12 13:21:30 2013
New Revision: 1467261
URL: http://svn.apache.org/r1467261
Log:
Unignore some svn_error_t * returns, via tools/dev/warn-ignored-err.sh.
* subversion/libsvn_ra_serf/serf.c (load_config, svn_ra_serf__open),
* subversion/libsvn_subr/prompt.c (prompt),
* subversion/tests/libsvn_subr/auth-test.c (cleanup_callback):
Don't ignore errors.
* subversion/svn/svn.c
(sub_main): Explicitly clear or handle errors from svn_cl__help().
Modified:
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_subr/prompt.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1467261&r1=1467260&r2=1467261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Fri Apr 12 13:21:30 2013
@@ -219,10 +219,10 @@ load_config(svn_ra_serf__session_t *sess
svn_tristate_unknown));
/* Load the maximum number of parallel session connections. */
- svn_config_get_int64(config, &session->max_connections,
- SVN_CONFIG_SECTION_GLOBAL,
- SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
- SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS);
+ SVN_ERR(svn_config_get_int64(config, &session->max_connections,
+ SVN_CONFIG_SECTION_GLOBAL,
+ SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
+
SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS));
if (config)
server_group = svn_config_find_group(config,
@@ -276,9 +276,10 @@ load_config(svn_ra_serf__session_t *sess
/* Load the maximum number of parallel session connections,
overriding global values. */
- svn_config_get_int64(config, &session->max_connections,
- server_group,
SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
- session->max_connections);
+ SVN_ERR(svn_config_get_int64(config, &session->max_connections,
+ server_group,
+ SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS,
+ session->max_connections));
}
/* Don't allow the http-max-connections value to be larger than our
@@ -450,7 +451,7 @@ svn_ra_serf__open(svn_ra_session_t *sess
/* create the user agent string */
if (callbacks->get_client_string)
- callbacks->get_client_string(callback_baton, &client_string, pool);
+ SVN_ERR(callbacks->get_client_string(callback_baton, &client_string,
pool));
if (client_string)
serf_sess->useragent = apr_pstrcat(pool, USER_AGENT, " ",
Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=1467261&r1=1467260&r2=1467261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/prompt.c Fri Apr 12 13:21:30 2013
@@ -575,7 +575,7 @@ prompt(const char **result,
{
/* If terminal echo was turned off, make sure future output
to the terminal starts on a new line, as expected. */
- terminal_puts(APR_EOL_STR, terminal, pool);
+ SVN_ERR(terminal_puts(APR_EOL_STR, terminal, pool));
}
SVN_ERR(terminal_close(terminal));
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1467261&r1=1467260&r2=1467261&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Apr 12 13:21:30 2013
@@ -1765,7 +1765,7 @@ sub_main(int argc, const char *argv[], a
/* No args? Show usage. */
if (argc <= 1)
{
- svn_cl__help(NULL, NULL, pool);
+ SVN_INT_ERR(svn_cl__help(NULL, NULL, pool));
return EXIT_FAILURE;
}
@@ -1785,7 +1785,7 @@ sub_main(int argc, const char *argv[], a
break;
else if (apr_err)
{
- svn_cl__help(NULL, NULL, pool);
+ SVN_INT_ERR(svn_cl__help(NULL, NULL, pool));
return EXIT_FAILURE;
}
@@ -2331,7 +2331,7 @@ sub_main(int argc, const char *argv[], a
svn_error_clear
(svn_cmdline_fprintf(stderr, pool,
_("Subcommand argument required\n")));
- svn_cl__help(NULL, NULL, pool);
+ svn_error_clear(svn_cl__help(NULL, NULL, pool));
return EXIT_FAILURE;
}
}
@@ -2349,7 +2349,7 @@ sub_main(int argc, const char *argv[], a
(svn_cmdline_fprintf(stderr, pool,
_("Unknown subcommand: '%s'\n"),
first_arg_utf8));
- svn_cl__help(NULL, NULL, pool);
+ svn_error_clear(svn_cl__help(NULL, NULL, pool));
/* Be kind to people who try 'svn undo'. */
if (strcmp(first_arg_utf8, "undo") == 0)
@@ -2387,7 +2387,7 @@ sub_main(int argc, const char *argv[], a
subcommand, pool);
svn_opt_format_option(&optstr, badopt, FALSE, pool);
if (subcommand->name[0] == '-')
- svn_cl__help(NULL, NULL, pool);
+ svn_error_clear(svn_cl__help(NULL, NULL, pool));
else
svn_error_clear
(svn_cmdline_fprintf
Modified: subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/auth-test.c?rev=1467261&r1=1467260&r2=1467261&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/auth-test.c Fri Apr 12
13:21:30 2013
@@ -222,7 +222,7 @@ cleanup_callback(svn_boolean_t *delete_c
SVN_TEST_ASSERT(strcmp(cred_kind, SVN_AUTH_CRED_SIMPLE) == 0);
SVN_TEST_ASSERT(strcmp(realmstring, "<http://my.host> My realm") == 0);
- svn_auth_forget_credentials(b, cred_kind, realmstring, scratch_pool);
+ SVN_ERR(svn_auth_forget_credentials(b, cred_kind, realmstring,
scratch_pool));
*delete_cred = TRUE;
