httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r227448 - /httpd/apreq/trunk/library/parser_multipart.c
Date Thu, 04 Aug 2005 19:08:32 GMT
Author: joes
Date: Thu Aug  4 12:08:29 2005
New Revision: 227448

URL: http://svn.apache.org/viewcvs?rev=227448&view=rev
Log:
Cleanup whitespace & line-wrap at 76.

Modified:
    httpd/apreq/trunk/library/parser_multipart.c

Modified: httpd/apreq/trunk/library/parser_multipart.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/parser_multipart.c?rev=227448&r1=227447&r2=227448&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser_multipart.c (original)
+++ httpd/apreq/trunk/library/parser_multipart.c Thu Aug  4 12:08:29 2005
@@ -155,7 +155,7 @@
             continue;
         }
         else if (off > 0) {
-            /* prior (partial) strncmp failed, 
+            /* prior (partial) strncmp failed,
              * so we can move previous buckets across
              * and retest buf against the full bdry.
              */
@@ -173,7 +173,7 @@
             if (match != NULL)
                 idx = match - buf;
             else {
-                idx = apreq_index(buf + len-blen, blen, bdry, blen, 
+                idx = apreq_index(buf + len-blen, blen, bdry, blen,
                                   APREQ_MATCH_PARTIAL);
                 if (idx >= 0)
                     idx += len-blen;
@@ -232,8 +232,10 @@
 
     ctx->status = MFD_INIT;
     ctx->pattern = apr_strmatch_precompile(pool, ctx->bdry, 1);
-    ctx->hdr_parser = apreq_parser_make(pool, ba, "", apreq_parse_headers,
-                                        brigade_limit, temp_dir, NULL, NULL);
+    ctx->hdr_parser = apreq_parser_make(pool, ba, "",
+                                        apreq_parse_headers,
+                                        brigade_limit,
+                                        temp_dir, NULL, NULL);
     ctx->info = NULL;
     ctx->bb = apr_brigade_create(pool, ba);
     ctx->in = apr_brigade_create(pool, ba);
@@ -313,7 +315,7 @@
         {
             if (ctx->info == NULL) {
                 ctx->info = apr_table_make(pool, APREQ_DEFAULT_NELTS);
-                /* flush out old header parser internal structs for reuse */
+                /* flush out header parser internal structs for reuse */
                 ctx->hdr_parser->ctx = NULL;
             }
             s = apreq_parser_run(ctx->hdr_parser, ctx->info, ctx->in);
@@ -338,7 +340,7 @@
              *
              *    body-part = MIME-part-header [CRLF *OCTET]
              *
-             *  So the CRLF we already matched in MFD_HEADER may have been 
+             *  So the CRLF we already matched in MFD_HEADER may have been
              *  part of the boundary string! Both Konqueror (v??) and 
              *  Mozilla-0.97 are known to emit such blocks.
              *
@@ -370,9 +372,9 @@
 
             cd = apr_table_get(ctx->info, "Content-Disposition");
 
-            /*  First check to see if must descend into a new multipart block.
-             *  If we do, create a new parser and pass control to it, running
-             *  the current-scope hooks on any reject data.
+            /*  First check to see if must descend into a new multipart
+             *  block.  If we do, create a new parser and pass control
+             *  to it.
              */
 
             ct = apr_table_get(ctx->info, "Content-Type");
@@ -387,7 +389,8 @@
                 next_ctx->param_name = "";
 
                 if (cd != NULL) {
-                    s = apreq_header_attribute(cd, "name", 4, &name, &nlen);
+                    s = apreq_header_attribute(cd, "name", 4,
+                                               &name, &nlen);
                     if (s == APR_SUCCESS) {
                         next_ctx->param_name 
                             = apr_pstrmemdup(pool, name, nlen);
@@ -430,8 +433,8 @@
                                              filename, flen);
                     apreq_param_tainted_on(param);
                     param->info = ctx->info;
-                    param->upload = apr_brigade_create(pool, 
-                                                       ctx->bb->bucket_alloc);
+                    param->upload
+                        = apr_brigade_create(pool, ctx->bb->bucket_alloc);
                     ctx->upload = param;
                     ctx->status = MFD_UPLOAD;
                     goto mfd_parse_brigade;
@@ -459,14 +462,14 @@
                                          filename, flen);
                 apreq_param_tainted_on(param);
                 param->info = ctx->info;
-                param->upload = apr_brigade_create(pool, 
+                param->upload = apr_brigade_create(pool,
                                                    ctx->bb->bucket_alloc);
                 ctx->upload = param;
                 ctx->status = MFD_UPLOAD;
                 goto mfd_parse_brigade;
             }
 
-            /* otherwise look for Content-ID in case it's multipart/mixed */
+            /* otherwise look for Content-ID in multipart/mixed case */
             else {
                 const char *cid = apr_table_get(ctx->info, "Content-ID");
                 apreq_param_t *param;
@@ -519,7 +522,8 @@
                 }
                 len = off;
                 param = apreq_param_make(pool, ctx->param_name, 
-                                         strlen(ctx->param_name), NULL, len);
+                                         strlen(ctx->param_name),
+                                         NULL, len);
                 apreq_param_tainted_on(param);
                 param->info = ctx->info;
 
@@ -567,7 +571,8 @@
                 }
                 apreq_brigade_setaside(ctx->bb, pool);
                 apreq_brigade_setaside(ctx->in, pool);
-                s = apreq_brigade_concat(pool, parser->temp_dir, parser->brigade_limit,

+                s = apreq_brigade_concat(pool, parser->temp_dir,
+                                         parser->brigade_limit, 
                                          param->upload, ctx->bb);
                 return (s == APR_SUCCESS) ? APR_INCOMPLETE : s;
 
@@ -583,7 +588,8 @@
                 }
                 apreq_value_table_add(&param->v, t);
                 apreq_brigade_setaside(ctx->bb, pool);
-                s = apreq_brigade_concat(pool, parser->temp_dir, parser->brigade_limit,
+                s = apreq_brigade_concat(pool, parser->temp_dir,
+                                         parser->brigade_limit,
                                          param->upload, ctx->bb);
 
                 if (s != APR_SUCCESS)



Mime
View raw message