From: Joe Orton <jorton@apache.org>
Date: Fri, 12 Nov 2004 10:16:01 +0000 (+0000)
Subject: * modules/generators/mod_cgid.c (cgid_init): Fix GCC strict-aliasing
X-Git-Tag: 2.1.1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65153a5687f94a4550ea3597b35a62d8fc6e8c4b;p=apache

* modules/generators/mod_cgid.c (cgid_init): Fix GCC strict-aliasing
warning.


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

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 218d8dd142..43c0491e02 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -816,12 +816,13 @@ static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
     const char *userdata_key = "cgid_init";
     module **m;
     int ret = OK;
+    void *data;
 
     root_server = main_server;
     root_pool = p;
 
-    apr_pool_userdata_get((void **)&procnew, userdata_key, main_server->process->pool);
-    if (!procnew) {
+    apr_pool_userdata_get(&data, userdata_key, main_server->process->pool);
+    if (!data) {
         first_time = 1;
         procnew = apr_pcalloc(main_server->process->pool, sizeof(*procnew));
         procnew->pid = -1;
@@ -829,6 +830,9 @@ static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
         apr_pool_userdata_set((const void *)procnew, userdata_key,
                      apr_pool_cleanup_null, main_server->process->pool);
     }
+    else {
+        procnew = data;
+    }
 
     if (!first_time) {
         total_modules = 0;