httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From max...@apache.org
Subject svn commit: r356073 - in /httpd/mod_mbox/trunk/module-2.0: mod_mbox.h mod_mbox_mime.c mod_mbox_out.c
Date Mon, 12 Dec 2005 00:17:32 GMT
Author: maxime
Date: Sun Dec 11 16:17:28 2005
New Revision: 356073

URL: http://svn.apache.org/viewcvs?rev=356073&view=rev
Log:
  * module-2.0/mod_mbox_mime.c
     Little optimizations on string length computations

  * module-2.0/mod_mbox.h, module-2.0/mod_mbox_out.c
     Make mod_mbox compile with latest Gcc and HTTPd trunk


Modified:
    httpd/mod_mbox/trunk/module-2.0/mod_mbox.h
    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.h
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/trunk/module-2.0/mod_mbox.h?rev=356073&r1=356072&r2=356073&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox.h (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox.h Sun Dec 11 16:17:28 2005
@@ -94,6 +94,7 @@
 (s ? ap_escape_uri(pool, s) : "")
 
 /* Handlers */
+int mbox_atom_handler(request_rec *r, mbox_cache_info *mli);
 int mbox_file_handler(request_rec *r);
 int mbox_index_handler(request_rec *r);
 int mbox_search_handler(request_rec *r);
@@ -120,6 +121,7 @@
 apr_size_t mbox_cte_decode_b64(char *src);
 apr_size_t mbox_cte_escape_html(apr_pool_t *p, const char *s,
 				apr_size_t len, char **body);
+char *mbox_cte_decode_rfc2047(apr_pool_t *p, char *src);
 char *mbox_cte_decode_header(apr_pool_t *p, char *src);
 
 /* MIME decoding functions */

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/trunk/module-2.0/mod_mbox_mime.c?rev=356073&r1=356072&r2=356073&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 Dec 11 16:17:28 2005
@@ -49,8 +49,8 @@
 
     /* If no Content-Type is given, we have to look for it. */
     if (!ct) {
-	tmp += strlen("Content-Type: ");
-	k = ap_strchr(tmp, ';');
+	tmp += sizeof("Content-Type: ") - 1;
+	k = strchr(tmp, ';');
 
 	/* Isolate the Content-Type string (between 'Content-Type: '
 	   and ';' or end of line */
@@ -75,7 +75,7 @@
 	/* If available, get MIME part name */
 	tmp = ap_strstr(body, "name=");
 	if (tmp && tmp < headers_bound) {
-	    tmp += strlen("name=");
+	    tmp += sizeof("name=") - 1;
 	    k = tmp;
 
 	    while (*k) {
@@ -105,7 +105,7 @@
     /* Check Content-Disposition if the match is within the headers */
     tmp = ap_strstr(body, "Content-Disposition: ");
     if (tmp && tmp < headers_bound) {
-	tmp += strlen("Content-Disposition: ");
+	tmp += sizeof("Content-Disposition: ") - 1;
 	k = tmp;
 
 	while (*k) {
@@ -129,7 +129,7 @@
       {
 	  tmp = ap_strstr(body, "Content-Transfer-Encoding: ");
 	  if (tmp && tmp < headers_bound) {
-	      tmp += strlen("Content-Transfer-Encoding: ");
+	      tmp += sizeof("Content-Transfer-Encoding: ") - 1;
 	      k = tmp;
 
 	      while (*k) {
@@ -177,7 +177,7 @@
 		return NULL;
 	    }
 
-	    tmp += strlen("boundary=\"");
+	    tmp += sizeof("boundary=\"") - 1;
 	    k = tmp;
 
 	    while (*k) {

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c?rev=356073&r1=356072&r2=356073&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 Dec 11 16:17:28 2005
@@ -19,6 +19,13 @@
 
 #include "mod_mbox.h"
 
+/* Define local prototypes, even if functions are declared before
+   they're called (avoid GCC warnings). */
+void display_atom_entry(request_rec *r, Message *m, const char* mboxfile,
+                        apr_pool_t *pool, apr_file_t *f);
+void mbox_static_message_nav(request_rec *r, char **context,
+			     char *baseURI, char *msgID);
+
 char *mbox_months[12][2] = {
     { "Jan", "January"  },
     { "Feb", "February" },



Mime
View raw message