Remove compiler warnings.

Mongrel2 now compiles warning free on clang, and mostly warning free on
GCC with only a few bstring related issues.

Author: jsimmons

src/adt/dict.c

@@ -948,11 +948,13 @@ int dict_contains(dict_t *dict, dnode_t *node)
 
 static dnode_t *dnode_alloc(void *context)
 {
+    (void)(context); // unused
     return malloc(sizeof *dnode_alloc(NULL));
 }
 
 static void dnode_free(dnode_t *node, void *context)
 {
+    (void)(context); // unused
     free(node);
 }
 

src/adt/hash.c

@@ -747,11 +747,13 @@ int hash_isempty(hash_t *hash)
 
 static hnode_t *hnode_alloc(void *context)
 {
+    (void)(context); // unused
     return malloc(sizeof *hnode_alloc(NULL));
 }
 
 static void hnode_free(hnode_t *node, void *context)
 {
+    (void)(context); // unused
     free(node);
 }
 

src/bstr/bsafe.c

@@ -24,24 +24,24 @@ char * strcpy (char *dst, const char *src);
 char * strcat (char *dst, const char *src);
 
 char * strcpy (char *dst, const char *src) {
-	dst = dst;
-	src = src;
+    (void)(dst);
+    (void)(src);
 	fprintf (stderr, "bsafe error: strcpy() is not safe, use bstrcpy instead.\n");
 	if (bsafeShouldExit) exit (-1);
 	return NULL;
 }
 
 char * strcat (char *dst, const char *src) {
-	dst = dst;
-	src = src;
+    (void)(dst);
+    (void)(src);
 	fprintf (stderr, "bsafe error: strcat() is not safe, use bconcat instead.\n");
 	if (bsafeShouldExit) exit (-1);
 	return NULL;
 }
 
 #if !defined (__GNUC__) && (!defined(_MSC_VER) || (_MSC_VER <= 1310))
 char * (gets) (char * buf) {
-	buf = buf;
+    (void)(buf);
 	fprintf (stderr, "bsafe error: gets() is not safe, use bgets.\n");
 	if (bsafeShouldExit) exit (-1);
 	return NULL;
@@ -58,17 +58,17 @@ char * (gets) (char * buf) {
 // }
 
 char * (strncat) (char *dst, const char *src, size_t n) {
-	dst = dst;
-	src = src;
-	n = n;
+    (void)(dst);
+    (void)(src);
+    (void)(n);
 	fprintf (stderr, "bsafe error: strncat() is not safe, use bconcat then btrunc\n\tor cstr2tbstr, btrunc then bconcat instead.\n");
 	if (bsafeShouldExit) exit (-1);
 	return NULL;
 }
 
 char * (strtok) (char *s1, const char *s2) {
-	s1 = s1;
-	s2 = s2;
+    (void)(s1);
+    (void)(s2);
 	fprintf (stderr, "bsafe error: strtok() is not safe, use bsplit or bsplits instead.\n");
 	if (bsafeShouldExit) exit (-1);
 	return NULL;

src/bstr/bstraux.c

@@ -198,10 +198,10 @@ int i, l, c;
 }
 
 static size_t readNothing (void *buff, size_t elsize, size_t nelem, void *parm) {
-	buff = buff;
-	elsize = elsize;
-	nelem = nelem;
-	parm = parm;
+    (void)(buff);
+    (void)(elsize);
+    (void)(nelem);
+    (void)(parm);
 	return 0; /* Immediately indicate EOF. */
 }
 

src/dir.c

@@ -263,7 +263,7 @@ void FileRecord_destroy(FileRecord *file)
 
 static inline char *url_decode(const char *in, char *out)
 {
-  char *cur; /* will seek % in input */
+  const char *cur; /* will seek % in input */
   char d1; /* will contain candidate for 1st digit */
   char d2; /* will contain candidate for 2nd digit */
   char *res = out; /* just for convienience */

src/io.c

@@ -126,7 +126,7 @@ static ssize_t plain_stream_file(IOBuf *iob, int fd, off_t len)
     return -1;
 }
 
-static int ssl_fdsend_wrapper(void *p_iob, unsigned char *ubuffer, size_t len)
+static int ssl_fdsend_wrapper(void *p_iob, const unsigned char *ubuffer, size_t len)
 {
     IOBuf *iob = (IOBuf *) p_iob;
     return fdsend(iob->fd, (char *) ubuffer, len);
@@ -630,14 +630,13 @@ int IOBuf_stream(IOBuf *from, IOBuf *to, int total)
     int remain = total;
     int avail = 0;
     int rc = 0;
-    char *data = NULL;
 
     if(from->len > to->len) IOBuf_resize(to, from->len);
 
     while(remain > 0) {
         need = remain <= from->len ? remain : from->len;
 
-        data = IOBuf_read(from, need, &avail);
+        IOBuf_read(from, need, &avail);
         check_debug(avail > 0, "Nothing in read buffer.");
 
         rc = IOBuf_send_all(to, IOBuf_start(from), avail);

tests/bstr_tests.c

@@ -2055,7 +2055,7 @@ static int test23_aux_open (struct sbstr * sb, bstring b) {
 static int test23_aux_splitcb (void * parm, int ofs, const struct tagbstring * entry) {
     bstring b = (bstring) parm;
 
-    ofs = ofs;
+    (void)(ofs);
     if (b->slen > 0) bconchar (b, (char) '|');
     bconcat (b, entry);
     return 0;
@@ -2070,7 +2070,7 @@ struct tagBss {
 static int test23_aux_splitcbx (void * parm, int ofs, const struct tagbstring * entry) {
     struct tagBss * p = (struct tagBss *) parm;
 
-    ofs = ofs;
+    (void)(ofs);
     if (!p->first) {
         bconchar (p->b, (char) p->sc);
     } else p->first = 0;
@@ -3735,8 +3735,8 @@ int taskmain (int argc, char * argv[])
 
     int ret = 0;
 
-    argc = argc;
-    argv = argv;
+    (void)(argc);
+    (void)(argv);
 
     debug ("Direct case testing of bstring core functions");
 

tests/superpoll_tests.c

@@ -75,14 +75,12 @@ int nr_pending_tokens;
 
 void really_send_toke(struct token *toke)
 {
-	struct fdinfo *inf;
 	int *fds;
 	int fd;
 	int pipe_idx = nr_pipes - toke->thread - 1;
 
 	fds = pipefds[pipe_idx].fds;
 	fd = fds[WRITE];
-	inf = &fdinfo[fd];
 
 	debug("sending on pipe index %u, fd %d", pipe_idx, fd);
 

tools/m2sh/src/commands/running.c

@@ -33,11 +33,16 @@
  */
 
 #include <signal.h>
+
 #include <zmq.h>
+
 #include <tnetstrings.h>
 #include <tnetstrings_impl.h>
 #include <config/db.h>
 #include <handler.h>
+#include <pattern.h>
+#include <register.h>
+
 #include "../linenoise.h"
 #include "../commands.h"
 #include "../query_print.h"