File mod_qos-fix_warnings.patch of Package apache2-mod_qos

Overview Repositories Revisions Requests Users Attributes Meta

File mod_qos-fix_warnings.patch of Package apache2-mod_qos (Revision 3179671224173e2f1462455ee6f1e4a6)

Currently displaying revision 3179671224173e2f1462455ee6f1e4a6 , Show latest

--- apache2/mod_qos.c.orig	2009-06-11 21:02:42.000000000 +0200
+++ apache2/mod_qos.c	2009-07-17 20:18:56.000000000 +0200
@@ -48,6 +48,7 @@
 #include <time.h>
 #include <arpa/inet.h>
 #include <unistd.h>
+#include <stdint.h>
 
 /* mod_qos requires OpenSSL */
 #include <openssl/rand.h>
@@ -1058,7 +1059,7 @@
  */
 static void qos_destroy_act(qs_actable_t *act) {
   ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
-               QOS_LOG_PFX(001)"cleanup shared memory: %d bytes",
+               QOS_LOG_PFX(001)"cleanup shared memory: %zd bytes",
                act->size);
   act->child_init = 0;
   apr_global_mutex_destroy(act->lock);
@@ -1223,7 +1224,7 @@
     (max_ip * APR_ALIGN_DEFAULT(sizeof(qs_ip_entry_t))) +
     512;
   ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, 
-               QOS_LOG_PFX(000)"%s(%s), create shared memory (request control): %d bytes (r=%d,ip=%d)", 
+               QOS_LOG_PFX(000)"%s(%s), create shared memory (request control): %zd bytes (r=%d,ip=%d)", 
                s->server_hostname == NULL ? "-" : s->server_hostname,
                s->is_virtual ? "v" : "b", act->size, rule_entries, max_ip);
   /* use anonymous shm by default */
@@ -1241,7 +1242,7 @@
     char buf[MAX_STRING_LEN];
     apr_strerror(res, buf, sizeof(buf));
     ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, 
-                 QOS_LOG_PFX(002)"could not create r-shared memory: %s (%d bytes)", buf, act->size);
+                 QOS_LOG_PFX(002)"could not create r-shared memory: %s (%zd bytes)", buf, act->size);
     return res;
   }
   act->c = apr_shm_baseaddr_get(act->m);
@@ -2574,7 +2575,7 @@
   if(sconf->inctx_t && !sconf->inctx_t->exit) {
     apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT25 */
     apr_table_unset(sconf->inctx_t->table,
-                    apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                    apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
     apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT25 */
   }
 #endif
@@ -2671,7 +2672,7 @@
       if(sconf->inctx_t && !sconf->inctx_t->exit) {
         apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT22 */
         apr_table_setn(sconf->inctx_t->table,
-                       apr_psprintf(inctx->c->pool, "%d", (int)inctx),
+                       apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx),
                        (char *)inctx);
         apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT22 */
       }
@@ -3638,8 +3639,8 @@
   if(cconf == NULL) {
     int client_control = DECLINED;
     int connections = 0;
-    int net_connections;
-    int current;
+    int net_connections = 0;
+    int current = 0;
     char *msg = NULL;
     qos_srv_config *sconf = (qos_srv_config*)ap_get_module_config(c->base_server->module_config,
                                                                   &qos_module);
@@ -3829,7 +3830,7 @@
 #if APR_HAS_THREADS
           apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT26 */
           apr_table_unset(sconf->inctx_t->table,
-                          apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                          apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
           apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT26 */
 #endif
         } else {
@@ -3951,8 +3952,8 @@
 static int qos_header_parser(request_rec * r) {
   /* apply rules only to main request (avoid filtering of error documents) */
   if(ap_is_initial_req(r)) {
-    char *msg;
-    char *uid;
+    char *msg = NULL;
+    char *uid = NULL;
     int req_per_sec_block = 0;
     int kbytes_per_sec_block = 0;
     int status;
@@ -4273,7 +4274,7 @@
 #if APR_HAS_THREADS
     apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT28 */
     apr_table_unset(sconf->inctx_t->table,
-                    apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                    apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
     apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT28 */
 #endif
   }
@@ -4307,7 +4308,7 @@
     if(sconf->inctx_t && !sconf->inctx_t->exit) {
       apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT23 */
       apr_table_setn(sconf->inctx_t->table,
-                     apr_psprintf(inctx->c->pool, "%d", (int)inctx),
+                     apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx),
                      (char *)inctx);
       apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT23 */
     }
@@ -4323,7 +4324,7 @@
     if(sconf->inctx_t && !sconf->inctx_t->exit) {
       apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT24 */
       apr_table_unset(sconf->inctx_t->table,
-                      apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                      apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
       apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT24 */
     }
 #endif
@@ -4347,7 +4348,7 @@
 #if APR_HAS_THREADS
           apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT27 */
           apr_table_unset(sconf->inctx_t->table,
-                          apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                          apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
           apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT27 */
 #endif
         }
@@ -4428,7 +4429,7 @@
   if(APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
     apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT30 */
     apr_table_unset(sconf->inctx_t->table,
-                    apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                    apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
     apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT30 */
     inctx->status = QS_CONN_STATE_END;
     ap_remove_output_filter(f);
@@ -4454,7 +4455,7 @@
       if(sconf->inctx_t && !sconf->inctx_t->exit) {
         apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT29 */
         apr_table_setn(sconf->inctx_t->table,
-                       apr_psprintf(inctx->c->pool, "%d", (int)inctx),
+                       apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx),
                        (char *)inctx);
         apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT29 */
       }
@@ -4470,7 +4471,7 @@
     if(inctx) {
       apr_thread_mutex_lock(sconf->inctx_t->lock);     /* @CRT30 */
       apr_table_unset(sconf->inctx_t->table,
-                      apr_psprintf(inctx->c->pool, "%d", (int)inctx));
+                      apr_psprintf(inctx->c->pool, "%zd", (intptr_t)inctx));
       apr_thread_mutex_unlock(sconf->inctx_t->lock);   /* @CRT30 */
       inctx->status = QS_CONN_STATE_END;
     }

Places

File mod_qos-fix_warnings.patch of Package apache2-mod_qos (Revision 3179671224173e2f1462455ee6f1e4a6)

Places