VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-03 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify reporting of the repeated argument error

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815448 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2009-09-15 18:59:52 +00:00
parent 709b23f2c5
commit 880de39ad7
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
support/htcacheclean.c
View File

@ -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) {