httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Mon, 27 Aug 2001 10:23:12 GMT
trawick     01/08/27 03:23:11

  Modified:    server   request.c
  Log:
  fix some calls to apr_pool_userdata_get()
  
  (foo** just doesn't work the way we sometimes might want :( )
  
  Revision  Changes    Path
  1.36      +4 -4      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- request.c	2001/08/27 04:51:58	1.35
  +++ request.c	2001/08/27 10:23:11	1.36
  @@ -985,8 +985,8 @@
   	return OK;
       }
   
  -    apr_pool_userdata_get(&entry_uri, "ap_location_walk::last_uri", r->pool);
  -    apr_pool_userdata_get(&(void*)loc_done, "ap_location_walk::loc_done", r->pool);
  +    apr_pool_userdata_get((void **)&entry_uri, "ap_location_walk::last_uri", r->pool);
  +    apr_pool_userdata_get((void **)&loc_done, "ap_location_walk::loc_done", r->pool);
   
       /* If we have an ap_location_walk::last_uri that matches r->uri,
        * and the vhost's list of locations hasn't changed,
  @@ -1064,7 +1064,7 @@
            * with other walkers who reset to the vhost default, but we will
            * leave this escape in for simpler modules.
            */
  -        apr_pool_userdata_get(&per_uri_defaults, "ap_location_walk::dir_merged",
  +        apr_pool_userdata_get((void **)&per_uri_defaults, "ap_location_walk::dir_merged",
                                 r->pool);
           if (per_uri_defaults == r->per_dir_config)
               return OK;
  @@ -1072,7 +1072,7 @@
           /* Well, we will need our per_uri_defaults from the last location walk. 
            * after all.
            */
  -        apr_pool_userdata_get(&per_uri_defaults, "ap_location_walk::dir_conf",
  +        apr_pool_userdata_get((void **)&per_uri_defaults, "ap_location_walk::dir_conf",
                                 r->pool);
       }
   
  
  
  

Mime
View raw message