summaryrefslogtreecommitdiff
path: root/support/httxt2dbm.c
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2010-10-06 10:05:22 +0000
committerGuenter Knauf <fuankg@apache.org>2010-10-06 10:05:22 +0000
commit39a167fb32bed6458fa20055c61fd71a523165b2 (patch)
tree2f57e1dbc5d89ef3b411d56c6493fba935ecccfc /support/httxt2dbm.c
parenta304385afa9b4254786206ce255752fca063c03d (diff)
downloadhttpd-39a167fb32bed6458fa20055c61fd71a523165b2.tar.gz
Renamed optarg -> opt_arg to avoid name clashes with system-own optarg;
removed leftover from IDE build times. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004962 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/httxt2dbm.c')
-rw-r--r--support/httxt2dbm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/support/httxt2dbm.c b/support/httxt2dbm.c
index efe493af55..8792f944b9 100644
--- a/support/httxt2dbm.c
+++ b/support/httxt2dbm.c
@@ -178,7 +178,7 @@ int main(int argc, const char *const argv[])
apr_pool_t *pool;
apr_status_t rv = APR_SUCCESS;
apr_getopt_t *opt;
- const char *optarg;
+ const char *opt_arg;
char ch;
apr_file_t *infile;
apr_dbm_t *outdbm;
@@ -213,7 +213,7 @@ int main(int argc, const char *const argv[])
return 1;
}
- while ((rv = apr_getopt(opt, "vf::i::o::", &ch, &optarg)) == APR_SUCCESS) {
+ while ((rv = apr_getopt(opt, "vf::i::o::", &ch, &opt_arg)) == APR_SUCCESS) {
switch (ch) {
case 'v':
if (verbose) {
@@ -229,7 +229,7 @@ int main(int argc, const char *const argv[])
usage();
return 1;
}
- format = apr_pstrdup(pool, optarg);
+ format = apr_pstrdup(pool, opt_arg);
break;
case 'i':
if (input) {
@@ -237,7 +237,7 @@ int main(int argc, const char *const argv[])
usage();
return 1;
}
- input = apr_pstrdup(pool, optarg);
+ input = apr_pstrdup(pool, opt_arg);
break;
case 'o':
if (output) {
@@ -245,7 +245,7 @@ int main(int argc, const char *const argv[])
usage();
return 1;
}
- output = apr_pstrdup(pool, optarg);
+ output = apr_pstrdup(pool, opt_arg);
break;
}
}