fix more compiler warnings (bb #273).

git-svn: trunk@4349

ChangeLog

@@ -1,3 +1,9 @@
+Thu Nov  6 23:46:07 EET 2008 (edwin)
+------------------------------------
+ * clamav-milter/clamav-milter.c, clamd/thrmgr.c, freshclam/dns.c,
+ libclamav/mspack.c, libclamav/pe.c: fix more compiler warnings (bb
+ #273).
+
 Thu Nov  6 21:46:47 CET 2008 (tk)
 ---------------------------------
   * docs/clamdoc.tex, docs/man/clamd.8.in: document nCOMMANDS (bb#1278)

clamav-milter/clamav-milter.c

@@ -1926,7 +1926,8 @@ main(int argc, char **argv)
 #else
 			int fds[3];
 			logg_file = NULL;
-			chdir("/");
+			if(chdir("/") < 0)
+				perror("/");
 			fds[0] = open("/dev/null", O_RDONLY);
 			fds[1] = open("/dev/null", O_WRONLY);
 			fds[2] = open("/dev/null", O_WRONLY);

clamd/thrmgr.c

@@ -168,9 +168,10 @@ int thrmgr_printstats(int f)
 		const char *state;
 		work_item_t *q;
 		struct timeval tv_now;
-		unsigned long umin=~0UL, umax=0, usum=0;
-		unsigned invalids=0, cnt=0;
+		long umin=~0UL, umax=0, usum=0;
+		int invalids=0;
 		struct task_desc *task;
+		cnt = 0;
 
 		if(!pool) {
 			mdprintf(f,"NULL\n\n");

freshclam/dns.c

@@ -45,8 +45,8 @@
 
 char *txtquery(const char *domain, unsigned int *ttl)
 {
-	unsigned char answer[PACKETSZ], host[128], *pt;
-	char *txt;
+	unsigned char answer[PACKETSZ], *pt;
+	char *txt, host[128];
 	int len, exp, cttl, size, txtlen, type, qtype;
 
 

libclamav/mspack.c

@@ -1286,7 +1286,7 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {
 	    }
 	    else {
 	      runsrc = rundest - match_offset;
-	      if(i > (int) lzx->window_size - window_posn)
+	      if(i > (int) (lzx->window_size - window_posn))
 	        i = lzx->window_size - window_posn;
 	      while (i-- > 0) *rundest++ = *runsrc++;
 	    }
@@ -1902,7 +1902,7 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
 	}
 	else {
 	  runsrc = rundest - match_offset;
-	  if(i > (int) qtm->window_size - window_posn)
+	  if(i > (int) (qtm->window_size - window_posn))
 	    i = qtm->window_size - window_posn;
 	  while (i-- > 0) *rundest++ = *runsrc++;
 	}

libclamav/pe.c

@@ -176,9 +176,9 @@ FSGSTUFF; \
     }
 
 
-#define CLI_UNPRESULTS(NAME,EXPR,GOOD,FREEME) CLI_UNPRESULTS_(NAME,NULL,EXPR,GOOD,FREEME)
+#define CLI_UNPRESULTS(NAME,EXPR,GOOD,FREEME) CLI_UNPRESULTS_(NAME,(void)0,EXPR,GOOD,FREEME)
 #define CLI_UNPRESULTSFSG1(NAME,EXPR,GOOD,FREEME) CLI_UNPRESULTS_(NAME,FSGCASE(NAME,free(sections)),EXPR,GOOD,FREEME)
-#define CLI_UNPRESULTSFSG2(NAME,EXPR,GOOD,FREEME) CLI_UNPRESULTS_(NAME,FSGCASE(NAME,NULL),EXPR,GOOD,FREEME)
+#define CLI_UNPRESULTSFSG2(NAME,EXPR,GOOD,FREEME) CLI_UNPRESULTS_(NAME,FSGCASE(NAME,(void)0),EXPR,GOOD,FREEME)
 
 struct offset_list {
     uint32_t offset;