svn commit: r733273 - in /httpd/apreq/trunk: CHANGES include/apreq_parser.h library/module_cgi.c library/parser.c module/apache2/handle.c

[joes]

Author: joes
Date: Sat Jan 10 06:03:42 2009
New Revision: 733273

URL: http://svn.apache.org/viewvc?rev=733273&view=rev
Log:
simplify

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/include/apreq_parser.h
    httpd/apreq/trunk/library/module_cgi.c
    httpd/apreq/trunk/library/parser.c
    httpd/apreq/trunk/module/apache2/handle.c

Modified: httpd/apreq/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=733273&r1=733272&r2=733273&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Sat Jan 10 06:03:42 2009
@@ -4,7 +4,8 @@
 
 @section v2_10 Changes with libapreq2-2.10 (under developement)
 
-- Clean up buggy apreq_hook_find_param().
+- C API [joes]
+  Clean up buggy apreq_hook_find_param().
 
 - Perl Glue Build [Philip M. Gollucci]
   config.status format changed format yet again in autoconf 2.62+.

Modified: httpd/apreq/trunk/include/apreq_parser.h
URL: 
http://svn.apache.org/viewvc/httpd/apreq/trunk/include/apreq_parser.h?rev=733273&r1=733272&r2=733273&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq_parser.h (original)
+++ httpd/apreq/trunk/include/apreq_parser.h Sat Jan 10 06:03:42 2009
@@ -272,7 +272,7 @@
 typedef struct apreq_hook_find_param_ctx_t {
     const char    *name;
     apreq_param_t *param;
-    apreq_hook_t **prev;
+    apreq_hook_t  *prev;
 } apreq_hook_find_param_ctx_t;
 
 

Modified: httpd/apreq/trunk/library/module_cgi.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/trunk/library/module_cgi.c?rev=733273&r1=733272&r2=733273&view=diff
==============================================================================
--- httpd/apreq/trunk/library/module_cgi.c (original)
+++ httpd/apreq/trunk/library/module_cgi.c Sat Jan 10 06:03:42 2009
@@ -480,7 +480,7 @@
         h->ctx = hook_ctx;
         hook_ctx->name = name;
         hook_ctx->param = NULL;
-        hook_ctx->prev = &req->parser->hook;
+        hook_ctx->prev = req->parser->hook;
 
         do {
             cgi_read(handle, APREQ_DEFAULT_READ_BLOCK_SIZE);

Modified: httpd/apreq/trunk/library/parser.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/trunk/library/parser.c?rev=733273&r1=733272&r2=733273&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser.c (original)
+++ httpd/apreq/trunk/library/parser.c Sat Jan 10 06:03:42 2009
@@ -350,7 +350,7 @@
     if (is_final && s == APR_SUCCESS
         && strcasecmp(ctx->name, param->v.name) == 0) {
         ctx->param = param;
-        ctx->prev[0]->next = hook->next;
+        ctx->prev->next = hook->next;
     }
     return s;
 }

Modified: httpd/apreq/trunk/module/apache2/handle.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/handle.c?rev=733273&r1=733272&r2=733273&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/handle.c (original)
+++ httpd/apreq/trunk/module/apache2/handle.c Sat Jan 10 06:03:42 2009
@@ -213,7 +213,7 @@
         h->ctx = hook_ctx;
         hook_ctx->name = name;
         hook_ctx->param = NULL;
-        hook_ctx->prev = &ctx->parser->hook;
+        hook_ctx->prev = ctx->parser->hook;
 
         do {
             apreq_filter_prefetch(f, APREQ_DEFAULT_READ_BLOCK_SIZE);