Shut up a few warnings and fix some typoes

git-svn: trunk@3214

ChangeLog

@@ -1,3 +1,7 @@
+Thu Sep 13 12:37:26 CEST 2007 (acab)
+------------------------------------
+  * libclamav: Shut up a few warnings and fix some typoes
+
 Wed Sep 12 13:36:37 BST 2007 (njh)
 ----------------------------------
   * libclamav:	More optimisations

libclamav/nsis/nulsft.c

@@ -36,6 +36,7 @@
 #include "nsis_zlib.h"
 #include "matcher.h"
 #include "scanners.h"
+#include "nulsft.h" /* SHUT UP GCC -Wextra */
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -468,11 +469,11 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {
 
 
 
-int cli_nsis_unpack(struct nsis_st *n, cli_ctx *ctx) {
+static int cli_nsis_unpack(struct nsis_st *n, cli_ctx *ctx) {
   return (n->fno) ? nsis_unpack_next(n, ctx) : nsis_headers(n, ctx);
 }
 
-void cli_nsis_free(struct nsis_st *n) {
+static void cli_nsis_free(struct nsis_st *n) {
   nsis_shutdown(n);
   if (n->solid && n->freeme) free(n->freeme);
 }

libclamav/pe.c

@@ -320,7 +320,6 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 	struct stat sb;
 	char sname[9], buff[4096], epbuff[4096], *tempfile;
 	uint32_t epsize;
-	unsigned char *ubuff;
 	ssize_t bytes;
 	unsigned int i, found, upx_success = 0, min = 0, max = 0, err;
 	unsigned int ssize = 0, dsize = 0, dll = 0, pe_plus = 0;
@@ -873,11 +872,11 @@ int cli_scanpe(int desc, cli_ctx *ctx)
     }
 
     /* Kriz */
-    if(SCAN_ALGO && (DCONF & PE_CONF_KRIZ) && epsize >= 200 && CLI_ISCONTAINED(exe_sections[nsections - 1].raw, exe_sections[nsections - 1].rsz, ep, 0x0fd2) && epbuff[1]=='\x9c' || epbuff[2]=='\x60') {
+    if(SCAN_ALGO && (DCONF & PE_CONF_KRIZ) && epsize >= 200 && CLI_ISCONTAINED(exe_sections[nsections - 1].raw, exe_sections[nsections - 1].rsz, ep, 0x0fd2) && epbuff[1]=='\x9c' && epbuff[2]=='\x60') {
 	enum {KZSTRASH,KZSCDELTA,KZSPDELTA,KZSGETSIZE,KZSXORPRFX,KZSXOR,KZSDDELTA,KZSLOOP,KZSTOP};
 	uint8_t kzs[] = {KZSTRASH,KZSCDELTA,KZSPDELTA,KZSGETSIZE,KZSTRASH,KZSXORPRFX,KZSXOR,KZSTRASH,KZSDDELTA,KZSTRASH,KZSLOOP,KZSTOP};
 	uint8_t *kzstate = kzs;
-	uint8_t *kzcode = epbuff + 3;
+	uint8_t *kzcode = (uint8_t *)epbuff + 3;
 	uint8_t kzdptr=0xff, kzdsize=0xff;
 	int kzlen = 197, kzinitlen=0xffff, kzxorlen=-1;
 	cli_dbgmsg("in kriz\n");
@@ -1124,7 +1123,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 	    }
 
 	    if((bytes = read(desc, src + dsize, exe_sections[i + 1].rsz)) != exe_sections[i + 1].rsz) {
-	        cli_dbgmsg("MEW: Can't read %d bytes [readed: %d]\n", exe_sections[i + 1].rsz, bytes);
+	        cli_dbgmsg("MEW: Can't read %d bytes [read: %d]\n", exe_sections[i + 1].rsz, bytes);
 		free(exe_sections);
 		free(src);
 		return CL_EIO;
@@ -1361,7 +1360,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)
 
 	int sectcnt = 0;
 	char *support;
-	uint32_t newesi, newedi, newebx, oldep, gp, t;
+	uint32_t newesi, newedi, oldep, gp, t;
 	struct cli_exe_section *sections;
 
 	ssize = exe_sections[i + 1].rsz;