From: Bradley Nicholes <bnicholes@apache.org>
Date: Mon, 19 Nov 2001 16:10:36 +0000 (+0000)
Subject: Changed a variable name to avoid a NetWare LibC global conflict.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f17b795d1a9b332c3fcc11ec57aefaa990c8310b;p=apache

Changed a variable name to avoid a NetWare LibC global conflict.
Submitted by: Pavel Novy [novy@feld.cvut.cz]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92035 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 82c6979859..15343f6e1f 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -904,7 +904,7 @@ void netware_rewrite_args(process_rec *process)
 {
     char *def_server_root;
     char optbuf[3];
-    const char *optarg;
+    const char *opt_arg;
     apr_getopt_t *opt;
     apr_array_header_t *mpm_new_argv;
 
@@ -946,14 +946,14 @@ void netware_rewrite_args(process_rec *process)
             optbuf[0] = '-';
             optbuf[2] = '\0';
             apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv);
-            while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &optarg) == APR_SUCCESS) {
+            while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &opt_arg) == APR_SUCCESS) {
                 switch (optbuf[1]) {
                 default:
                     *(const char **)apr_array_push(mpm_new_argv) =
                         apr_pstrdup(process->pool, optbuf);
 
-                    if (optarg) {
-                        *(const char **)apr_array_push(mpm_new_argv) = optarg;
+                    if (opt_arg) {
+                        *(const char **)apr_array_push(mpm_new_argv) = opt_arg;
                     }
                     break;
                 }