Ticket #1513: 04-shutup-many-compiler-warnings.patch

src/fdevent.c

@@ -340 +340 @@
 }
 
 int fdevent_poll(fdevents *ev, int timeout_ms) {
-        if (ev->poll == NULL) SEGFAULT("ev->poll is %p", ev->poll);
+        if (ev->poll == NULL) SEGFAULT("ev->poll is %p", (void*) (intptr_t) ev->poll);
         return ev->poll(ev, timeout_ms);
 }
 
 int fdevent_get_revents(fdevents *ev, size_t event_count, fdevent_revents *revents) {
         size_t i;
 
-        if (ev->get_revents == NULL) SEGFAULT("ev->get_revents is %p", ev->get_revents);
+        if (ev->get_revents == NULL) SEGFAULT("ev->get_revents is %p", (void*) (intptr_t)  ev->get_revents);
 
         fdevent_revents_reset(revents);
 

src/fdevent_select.c

@@ -54 +54 @@
 static int fdevent_select_event_add(fdevents *ev, iosocket *sock, int events) {
         /* we should be protected by max-fds, but you never know */
 #ifndef _WIN32
-        u_int i;
         assert(sock->fd < FD_SETSIZE);
 #endif
 

src/http_auth.c

@@ -487 +487 @@
     /*
      * The password first, since that is what is most unknown
      */
-    MD5_Update(&ctx, pw, strlen(pw));
+    MD5_Update(&ctx, (const unsigned char*) pw, strlen(pw));
 
     /*
      * Then our magic string
      */
-    MD5_Update(&ctx, APR1_ID, strlen(APR1_ID));
+    MD5_Update(&ctx, (const unsigned char*) APR1_ID, strlen(APR1_ID));
 
     /*
      * Then the raw salt
      */
-    MD5_Update(&ctx, sp, sl);
+    MD5_Update(&ctx, (const unsigned char*) sp, sl);
 
     /*
      * Then just as many characters of the MD5(pw, salt, pw)
      */
     MD5_Init(&ctx1);
-    MD5_Update(&ctx1, pw, strlen(pw));
-    MD5_Update(&ctx1, sp, sl);
-    MD5_Update(&ctx1, pw, strlen(pw));
+    MD5_Update(&ctx1, (const unsigned char*) pw, strlen(pw));
+    MD5_Update(&ctx1, (const unsigned char*) sp, sl);
+    MD5_Update(&ctx1, (const unsigned char*) pw, strlen(pw));
     MD5_Final(final, &ctx1);
     for (pl = strlen(pw); pl > 0; pl -= APR_MD5_DIGESTSIZE) {
         MD5_Update(&ctx, final,
@@ -525 +525 @@
             MD5_Update(&ctx, final, 1);
         }
         else {
-            MD5_Update(&ctx, pw, 1);
+            MD5_Update(&ctx, (const unsigned char*) pw, 1);
         }
     }
 
@@ -547 +547 @@
     for (i = 0; i < 1000; i++) {
         MD5_Init(&ctx1);
         if (i & 1) {
-            MD5_Update(&ctx1, pw, strlen(pw));
+            MD5_Update(&ctx1, (const unsigned char*) pw, strlen(pw));
         }
         else {
             MD5_Update(&ctx1, final, APR_MD5_DIGESTSIZE);
         }
         if (i % 3) {
-            MD5_Update(&ctx1, sp, sl);
+            MD5_Update(&ctx1, (const unsigned char*) sp, sl);
         }
 
         if (i % 7) {
-            MD5_Update(&ctx1, pw, strlen(pw));
+            MD5_Update(&ctx1, (const unsigned char*) pw, strlen(pw));
         }
 
         if (i & 1) {
             MD5_Update(&ctx1, final, APR_MD5_DIGESTSIZE);
         }
         else {
-            MD5_Update(&ctx1, pw, strlen(pw));
+            MD5_Update(&ctx1, (const unsigned char*) pw, strlen(pw));
         }
         MD5_Final(final,&ctx1);
     }

src/lemon.c

@@ -11 +11 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 extern void qsort();
 extern double strtod();
@@ -976 +977 @@
 ** If either action is a SHIFT, then it must be apx.  This
 ** function won't work if apx->type==REDUCE and apy->type==SHIFT.
 */
-static int resolve_conflict(apx,apy,errsym)
+static int resolve_conflict(apx,apy)
 struct action *apx;
 struct action *apy;
-struct symbol *errsym;   /* The error symbol (if defined.  NULL otherwise) */
 {
   struct symbol *spx, *spy;
   int errcnt = 0;
@@ -1326 +1326 @@
 int argc;
 char **argv;
 {
+  ( (void) argc ); // UNUSED(argc)
   static int version = 0;
   static int rpflag = 0;
   static int basisflag = 0;
@@ -1651 +1652 @@
   }else if( op[j].type==OPT_FLAG ){
     *((int*)op[j].arg) = v;
   }else if( op[j].type==OPT_FFLAG ){
-    (*(void(*)())(op[j].arg))(v);
+    (*(void(*)())((intptr_t)op[j].arg))(v);
   }else{
     if( err ){
       fprintf(err,"%smissing argument on switch.\n",emsg);
@@ -1733 +1734 @@
         *(double*)(op[j].arg) = dv;
         break;
       case OPT_FDBL:
-        (*(void(*)())(op[j].arg))(dv);
+        (*(void(*)())((intptr_t)op[j].arg))(dv);
         break;
       case OPT_INT:
         *(int*)(op[j].arg) = lv;
         break;
       case OPT_FINT:
-        (*(void(*)())(op[j].arg))((int)lv);
+        (*(void(*)())((intptr_t)op[j].arg))((int)lv);
         break;
       case OPT_STR:
         *(char**)(op[j].arg) = sv;
         break;
       case OPT_FSTR:
-        (*(void(*)())(op[j].arg))(sv);
+        (*(void(*)())((intptr_t)op[j].arg))(sv);
         break;
     }
   }

src/lempar.c

@@ -210 +210 @@
 */
 const char *ParseTokenName(int tokenType){
 #ifndef NDEBUG
-  if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
+  if( tokenType>0 && ((unsigned int)tokenType)<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
     return yyTokenName[tokenType];
   }else{
     return "Unknown";
@@ -335 +335 @@
     return YY_NO_ACTION;
   }
   i += iLookAhead;
-  if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
+  if( i<0 || (unsigned int)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
 #ifdef YYFALLBACK
     int iFallback;            /* Fallback token */
     if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
@@ -378 +378 @@
     return YY_NO_ACTION;
   }
   i += iLookAhead;
-  if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
+  if( i<0 || (unsigned int)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
     return yy_default[stateno];
   }else{
     return yy_action[i];
@@ -456 +456 @@
   yymsp = &yypParser->yystack[yypParser->yyidx];
 #ifndef NDEBUG
   if( yyTraceFILE && yyruleno>=0
-        && yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
+        && (unsigned int) yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
     fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt,
       yyRuleName[yyruleno]);
   }
@@ -511 +511 @@
   int yymajor,                   /* The major type of the error token */
   YYMINORTYPE yyminor            /* The minor type of the error token */
 ){
+  ( (void) yymajor );
+  ( (void) yyminor );
   ParseARG_FETCH;
 #define TOKEN (yyminor.yy0)
 %%

src/log.c

@@ -321 +321 @@
                 l = vsnprintf(b->ptr, b->size, fmt, ap);
                 va_end(ap);
 
-                if (l > -1 && l < b->size) {
+                if (l > -1 && ((unsigned int) l) < b->size) {
                         b->used = l + 1;
 
                         break;

src/mod_sql_vhost_core.c

@@ -333 +333 @@
 
 #ifdef HAVE_GLIB_H
 static gboolean cached_vhost_remove_expired(gpointer _key, gpointer _val, gpointer data) {
-        buffer *key       = _key;
+//      buffer *key       = _key;
+        UNUSED(_key);
         cached_vhost *val = _val;
         server *srv       = data;
 

src/plugin.c

@@ -298 +298 @@
 
 #else
 #if 1
-                init = (int (*)(plugin *))dlsym(p->lib, srv->tmp_buf->ptr);
+                init = (int (*)(plugin *))(intptr_t)dlsym(p->lib, srv->tmp_buf->ptr);
 #else
                 *(void **)(&init) = dlsym(p->lib, srv->tmp_buf->ptr);
 #endif

src/server.c

@@ -113 +113 @@
         switch (sig) {
         case SIGTERM: 
                 srv_shutdown = 1; 
-                memcpy(&last_sigterm_info, si, sizeof(*si));
+                memcpy((siginfo_t*) &last_sigterm_info, si, sizeof(*si));
                 break;
         case SIGINT:
                 if (graceful_shutdown) {
@@ -122 +122 @@
                         graceful_shutdown = 1;
                 }
 
-                memcpy(&last_sigterm_info, si, sizeof(*si));
+                memcpy((siginfo_t*) &last_sigterm_info, si, sizeof(*si));
 
                 break;
         case SIGALRM: 
@@ -130 +130 @@
                 break;
         case SIGHUP: 
                 handle_sig_hup = 1; 
-                memcpy(&last_sighup_info, si, sizeof(*si));
+                memcpy((siginfo_t*) &last_sighup_info, si, sizeof(*si));
                 break;
         case SIGCHLD: 
                 break;
@@ -1036 +1036 @@
         int need_joblist_queue_thread = 0;
         GThread **stat_cache_threads;
         GThread **aio_write_threads = NULL;
+#ifdef USE_LINUX_AIO_SENDFILE
         GThread *linux_aio_read_thread_id = NULL;
+#endif
         GThread * joblist_queue_thread_id = NULL;
         GError *gerr = NULL;
 #endif

src/stat_cache.c

@@ -194 +194 @@
 
 #ifdef HAVE_GLIB_H
 gboolean stat_cache_free_hrfunc(gpointer _key, gpointer _value, gpointer _user_data) {
+        UNUSED(_user_data);
         stat_cache_entry *sce = _value;
         buffer *b = _key;
 
@@ -243 +244 @@
 #ifdef HAVE_SYS_INOTIFY_H
         case STAT_CACHE_ENGINE_INOTIFY:
                 return stat_cache_handle_fdevent_inotify(_srv, _fce, revent);
+#else
+        UNUSED(_fce);
+        UNUSED(revent);
 #endif
         default:
                 return HANDLER_GO_ON;
@@ -262 +266 @@
 #endif
 
 static int stat_cache_entry_is_current(server *srv, stat_cache_entry *sce) {
+        UNUSED(srv);
+        UNUSED(sce);
         return 1;
 }