httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1184836 - in /httpd/mod_mbox/trunk/module-2.0: mod-mbox-util.c mod_mbox_index.c mod_mbox_mime.c mod_mbox_out.c
Date Sun, 16 Oct 2011 14:44:17 GMT
Author: sf
Date: Sun Oct 16 14:44:16 2011
New Revision: 1184836

URL: http://svn.apache.org/viewvc?rev=1184836&view=rev
Log:
Fix some "value computed is not used" and "passing argument 1 of 'ap_strstr' discards
qualifiers from pointer target type" compiler warnings.

Modified:
    httpd/mod_mbox/trunk/module-2.0/mod-mbox-util.c
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_index.c
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c

Modified: httpd/mod_mbox/trunk/module-2.0/mod-mbox-util.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod-mbox-util.c?rev=1184836&r1=1184835&r2=1184836&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod-mbox-util.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod-mbox-util.c Sun Oct 16 14:44:16 2011
@@ -145,7 +145,7 @@ static int scan_dir(request_rec *r)
 
     while (apr_dir_read(&finfo, APR_FINFO_NAME, dir) == APR_SUCCESS) {
         if (apr_fnmatch("*.mbox", finfo.name, 0) == APR_SUCCESS &&
-            strstr(finfo.name, "incomplete") == NULL) {
+            ap_strstr_c(finfo.name, "incomplete") == NULL) {
             *(const char **) apr_array_push(files) =
                 apr_pstrdup(mpool, finfo.name);
         }
@@ -193,8 +193,7 @@ static int scan_dir(request_rec *r)
         domain = "";
     }
     else {
-        *domain = '\0';
-        *domain++;
+        *domain++ = '\0';
     }
 
     list = strchr(ml, ':');
@@ -203,8 +202,7 @@ static int scan_dir(request_rec *r)
                         "from '%s'" NL, ml);
         return EXIT_FAILURE;
     }
-    *list = '\0';
-    *list++;
+    *list++ = '\0';
 
     ml = strrchr(domain, '>');
 

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_index.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox_index.c?rev=1184836&r1=1184835&r2=1184836&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox_index.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox_index.c Sun Oct 16 14:44:16 2011
@@ -70,7 +70,7 @@ apr_array_header_t *mbox_fetch_boxes_lis
        count to our array */
     while (apr_dir_read(&finfo, APR_FINFO_NAME, dir) == APR_SUCCESS) {
         if ((apr_fnmatch("*.mbox", finfo.name, 0) == APR_SUCCESS) &&
-            (strstr(finfo.name, "incomplete") == NULL)) {
+            (ap_strstr_c(finfo.name, "incomplete") == NULL)) {
             fi = (mbox_file_t *) apr_array_push(files);
             fi->filename = apr_pstrdup(r->pool, finfo.name);
             mbox_cache_get_count(mli, &(fi->count), (char *) finfo.name);

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c?rev=1184836&r1=1184835&r2=1184836&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c Sun Oct 16 14:44:16 2011
@@ -82,7 +82,7 @@ mbox_mime_message_t *mbox_mime_decode_mu
                     *k = 0;
                     break;
                 }
-                *k++;
+                k++;
             }
         }
 
@@ -103,7 +103,7 @@ mbox_mime_message_t *mbox_mime_decode_mu
                     *k = 0;
                     break;
                 }
-                *k++;
+                k++;
             }
 
             /* Check for double quotes */
@@ -137,7 +137,7 @@ mbox_mime_message_t *mbox_mime_decode_mu
                 *k = 0;
                 break;
             }
-            *k++;
+            k++;
         }
 
         /* Copy the Content-Disposition and reset *k */
@@ -162,7 +162,7 @@ mbox_mime_message_t *mbox_mime_decode_mu
                     *k = 0;
                     break;
                 }
-                *k++;
+                k++;
             }
 
             /* Copy the Content-Disposition and reset *k */
@@ -210,7 +210,7 @@ mbox_mime_message_t *mbox_mime_decode_mu
                     *k = 0;
                     break;
                 }
-                *k++;
+                k++;
             }
 
             mail->boundary = apr_pstrdup(p, tmp);

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c?rev=1184836&r1=1184835&r2=1184836&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c Sun Oct 16 14:44:16 2011
@@ -60,7 +60,7 @@ static void display_atom_entry(request_r
         if (*c == '.') {
             *c = '-';
         }
-        *c++;
+        c++;
     }
 
     ap_rprintf(r, "<id>urn:uuid:%s</id>\n", uid);



Mime
View raw message