diff options
| author | Jeff Trawick <trawick@apache.org> | 2009-09-15 20:59:52 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2009-09-15 20:59:52 +0200 |
| commit | 880de39ad71cf47f78f2571eade9efcad9c135e6 (patch) | |
| tree | cda6faacf2b58f2095e9123fcee14a0e1d1ae7c7 /support | |
| parent | defined apr_status_t rv one time at entry of ap_core_output_filter() instead of (diff) | |
| download | apache2-880de39ad71cf47f78f2571eade9efcad9c135e6.tar.xz apache2-880de39ad71cf47f78f2571eade9efcad9c135e6.zip | |
simplify reporting of the repeated argument error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815448 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
| -rw-r--r-- | support/htcacheclean.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/support/htcacheclean.c b/support/htcacheclean.c index 9d2a3a04f2..7ade7e8d69 100644 --- a/support/htcacheclean.c +++ b/support/htcacheclean.c @@ -750,6 +750,12 @@ static void usage(const char *error) } #undef NL +static void usage_repeated_arg(apr_pool_t *pool, char option) { + usage(apr_psprintf(pool, + "The option '%c' cannot be specified more than once", + option)); +} + /* * main */ @@ -812,42 +818,42 @@ int main(int argc, const char * const argv[]) switch (opt) { case 'i': if (intelligent) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } intelligent = 1; break; case 'D': if (dryrun) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } dryrun = 1; break; case 'n': if (benice) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } benice = 1; break; case 't': if (deldirs) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } deldirs = 1; break; case 'v': if (verbose) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } verbose = 1; break; case 'r': if (realclean) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } realclean = 1; deldirs = 1; @@ -855,7 +861,7 @@ int main(int argc, const char * const argv[]) case 'd': if (isdaemon) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } isdaemon = 1; repeat = apr_atoi64(arg); @@ -865,7 +871,7 @@ int main(int argc, const char * const argv[]) case 'l': if (limit_found) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } limit_found = 1; @@ -898,7 +904,7 @@ int main(int argc, const char * const argv[]) case 'p': if (proxypath) { - usage(apr_psprintf(pool, "The option '%c' cannot be specified more than once", (int)opt)); + usage_repeated_arg(pool, opt); } proxypath = apr_pstrdup(pool, arg); if ((status = apr_filepath_set(proxypath, pool)) != APR_SUCCESS) { |