httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r773594 - in /httpd/mod_fcgid/trunk/mod_fcgid: arch/unix/fcgid_proc_unix.c arch/unix/fcgid_proctbl_unix.c fcgid_bridge.c fcgid_conf.c
Date Mon, 11 May 2009 15:10:44 GMT
Author: trawick
Date: Mon May 11 15:10:43 2009
New Revision: 773594

URL: http://svn.apache.org/viewvc?rev=773594&view=rev
Log:
fix some gcc and SunStudio compile warnings, as well as another invalid format 
string (%zu) which wasn't reported

Modified:
    httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proc_unix.c
    httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proctbl_unix.c
    httpd/mod_fcgid/trunk/mod_fcgid/fcgid_bridge.c
    httpd/mod_fcgid/trunk/mod_fcgid/fcgid_conf.c

Modified: httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proc_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proc_unix.c?rev=773594&r1=773593&r2=773594&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proc_unix.c (original)
+++ httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proc_unix.c Mon May 11 15:10:43 2009
@@ -724,11 +724,13 @@
          e != APR_BRIGADE_SENTINEL(output_brigade);
          e = APR_BUCKET_NEXT(e)) {
         /* Read bucket */
+        apr_size_t len;
         if ((rv = apr_bucket_read(e, (const char **) &vec[nvec].iov_base,
-                                  &vec[nvec].iov_len,
+                                  &len,
                                   APR_BLOCK_READ)) != APR_SUCCESS)
             return rv;
 
+        vec[nvec].iov_len = len;
         if (nvec == (FCGID_VEC_COUNT - 1)) {
             /* It's time to write now */
             if ((rv =

Modified: httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proctbl_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proctbl_unix.c?rev=773594&r1=773593&r2=773594&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proctbl_unix.c (original)
+++ httpd/mod_fcgid/trunk/mod_fcgid/arch/unix/fcgid_proctbl_unix.c Mon May 11 15:10:43 2009
@@ -121,7 +121,7 @@
                              main_server->process->pconf)) != APR_SUCCESS)
     {
         ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
-                     "mod_fcgid: Can't create share memory for size %zu byte",
+                     "mod_fcgid: Can't create shared memory for size %" APR_SIZE_T_FMT "
bytes",
                      shmem_size);
         exit(1);
     }

Modified: httpd/mod_fcgid/trunk/mod_fcgid/fcgid_bridge.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/mod_fcgid/fcgid_bridge.c?rev=773594&r1=773593&r2=773594&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/mod_fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/mod_fcgid/fcgid_bridge.c Mon May 11 15:10:43 2009
@@ -564,7 +564,7 @@
             if (request_size > max_request_len) {
                 ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
                              main_server,
-                             "mod_fcgid: http request length %d > %d",
+                             "mod_fcgid: http request length %" APR_SIZE_T_FMT " > %"
APR_SIZE_T_FMT,
                              request_size, max_request_len);
                 return HTTP_INTERNAL_SERVER_ERROR;
             }

Modified: httpd/mod_fcgid/trunk/mod_fcgid/fcgid_conf.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/mod_fcgid/fcgid_conf.c?rev=773594&r1=773593&r2=773594&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/mod_fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/mod_fcgid/fcgid_conf.c Mon May 11 15:10:43 2009
@@ -785,7 +785,7 @@
     /* Sanity check */
     if (wrapperpath == NULL || extension == NULL
         || *extension != '.' || *(extension + 1) == '\0'
-        || strchr(extension, '/') || strchr(extension, '\\'))
+        || ap_strchr_c(extension, '/') || ap_strchr_c(extension, '\\'))
         return "Invalid wrapper file extension";
 
     /* Get wrapper_id base on wrapperpath */
@@ -833,7 +833,7 @@
     wrapper->inode = finfo.inode;
     wrapper->deviceid = finfo.device;
     wrapper->share_group_id = *wrapper_id;
-    *wrapper_id++;
+    (*wrapper_id)++;
 
     /* Add the node now */
     apr_hash_set(config->wrapper_info_hash, extension, strlen(extension),
@@ -844,7 +844,7 @@
 
 fcgid_wrapper_conf *get_wrapper_info(const char *cgipath, request_rec * r)
 {
-    char *extension;
+    const char *extension;
     fcgid_wrapper_conf *wrapper;
     fcgid_dir_conf *config =
         ap_get_module_config(r->per_dir_config, &fcgid_module);



Mime
View raw message