@@ -1,3 +1,7 @@

+Mon Mar  5 21:06:37 CET 2007 (tk)

+---------------------------------

+  * sigtool: fix gcc -W* warnings

+

 Mon Mar  5 19:35:32 GMT 2007 (njh)

 ----------------------------------

   * libclamav/mbox.c:	Include the clamAV version in the HTTP request (based

@@ -417,19 +417,13 @@ void freecfg(struct cfgstruct *copt)

     return;

 }

-struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname)

+struct cfgstruct *cfgopt(struct cfgstruct *copt, const char *optname)

 {

-	struct cfgstruct *handler;

-

-    handler = (struct cfgstruct *) copt;

+    while(copt) {

+	if(copt->optname && !strcmp(copt->optname, optname))

+	    return copt;

-    while(1) {

-	if(handler) {

-	    if(handler->optname)

-		if(!strcmp(handler->optname, optname))

-		    return handler;

-	} else break;

-	handler = handler->next;

+	copt = copt->next;

     }

     return NULL;

@@ -54,7 +54,7 @@ struct cfgstruct {

 extern struct cfgoption cfg_options[];

 struct cfgstruct *getcfg(const char *cfgfile, int verbose);

-struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname);

+struct cfgstruct *cfgopt(struct cfgstruct *copt, const char *optname);

 void freecfg(struct cfgstruct *copt);

 #endif

@@ -101,9 +101,9 @@ static int md5sig(struct optstruct *opt, unsigned int mdb)

 		if((sb.st_mode & S_IFMT) == S_IFREG) {

 		    if((md5 = cli_md5file(filename))) {

 			if(mdb)

-			    mprintf("%d:%s:%s\n", sb.st_size, md5, filename);

+			    mprintf("%u:%s:%s\n", (unsigned int) sb.st_size, md5, filename);

 			else

-			    mprintf("%s:%d:%s\n", md5, sb.st_size, filename);

+			    mprintf("%s:%u:%s\n", md5, (unsigned int) sb.st_size, filename);

 			free(md5);

 		    } else {

 			mprintf("!md5sig: Can't generate MD5 checksum for %s\n", filename);

@@ -248,7 +248,7 @@ static char *getdsig(const char *host, const char *user, const char *data, unsig

 #ifdef HAVE_TERMIOS_H

 	if(tcsetattr(0, TCSAFLUSH, &old)) {

-	    mprintf("!getdsig: tcsetattr() failed\n", host);

+	    mprintf("!getdsig: tcsetattr() failed\n");

 	    memset(pass, 0, strlen(pass));

 	    return NULL;

 	}

@@ -330,7 +330,7 @@ static int writeinfo(const char *db, const char *header)

 	int i;

 	struct stat sb;

 	char file[32], *md5;

-	char *extlist[] = { "db", "fp", "hdb", "mdb", "ndb", "pdb", "rmd", "zmd", "sdb", "cfg", NULL };

+	const char *const extlist[] = { "db", "fp", "hdb", "mdb", "ndb", "pdb", "rmd", "zmd", "sdb", "cfg", NULL };

     snprintf(file, sizeof(file), "%s.info", db);

@@ -499,7 +499,8 @@ static int build(struct optstruct *opt)

 	unsigned int sigs = 0, oldsigs = 0, lines = 0, version, real_header, fl;

 	struct stat foo;

 	char buffer[FILEBUFF], *tarfile, *gzfile, header[513], smbuff[32],

-	     builder[32], *pt, *dbname, olddb[512], patch[32], broken[32];

+	     builder[32], *pt, olddb[512], patch[32], broken[32];

+	const char *dbname;

         struct cl_engine *engine = NULL;

 	FILE *tar, *cvd;

 	gzFile *gz;

@@ -677,7 +678,7 @@ static int build(struct optstruct *opt)

 	    return -1;

 	case 0:

 	    {

-		char *args[] = { "tar", "-cvf", NULL, "COPYING", "main.db",

+		const char *args[] = { "tar", "-cvf", NULL, "COPYING", "main.db",

 				 "daily.db", "main.hdb", "daily.hdb",

 				 "main.ndb", "daily.ndb", "main.sdb",

 				 "daily.sdb", "main.zmd", "daily.zmd",

@@ -1680,7 +1681,7 @@ static int makediff(struct optstruct *opt)

     return 0;

 }

-void help(void)

+static void help(void)

 {

     mprintf("\n");

     mprintf("             Clam AntiVirus: Signature Tool (sigtool)  "VERSION"\n");

@@ -36,13 +36,13 @@

 typedef struct mac_token_tag

 {

     unsigned char token;

-    const unsigned char *str;

+    const char *str;

 } mac_token_t;

 typedef struct mac_token2_tag

 {

     uint16_t token;

-    const unsigned char *str;

+    const char *str;

 } mac_token2_t;

@@ -789,8 +789,8 @@ static void print_hex_buff (unsigned char *start, unsigned char *end, int hex_ou

 static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 {

-    int i, j;

-    uint8_t s_length;

+    uint32_t i;

+    uint8_t s_length, j;

     uint16_t w_length, int_val;

     unsigned char *tmp_buff, *tmp_name, *line_start;

@@ -801,7 +801,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x65:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    print_hex_buff (line_start, buff + i + 2 + s_length, hex_output);

 	    printf ("\n%s", tmp_buff);

@@ -812,7 +812,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x69:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf (" %s", tmp_buff);

 	    free (tmp_buff);

@@ -821,7 +821,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x6a:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf (" \"%s\"", tmp_buff);

 	    free (tmp_buff);

@@ -830,7 +830,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x6b:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf (" '%s", tmp_buff);

 	    free (tmp_buff);

@@ -839,7 +839,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x6d:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf (" %s", tmp_buff);

 	    free (tmp_buff);

@@ -848,7 +848,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x70:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf ("REM%s", tmp_buff);

 	    free (tmp_buff);

@@ -857,7 +857,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x76:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf (" .%s", tmp_buff);

 	    free (tmp_buff);

@@ -866,7 +866,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	case 0x77:

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc (s_length + 1);

-	    strncpy (tmp_buff, buff + i + 2, s_length);

+	    strncpy ((char *) tmp_buff, (char *) (buff + i + 2), s_length);

 	    tmp_buff[s_length] = '\0';

 	    printf ("%s", tmp_buff);

 	    free (tmp_buff);

@@ -876,7 +876,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	    w_length = (uint16_t) (buff[i + 2] << 8) + buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc ((w_length * 2) + 1);

 	    memcpy (tmp_buff, buff + i + 3, w_length * 2);

-	    tmp_name = get_unicode_name (tmp_buff, w_length * 2);

+	    tmp_name = (unsigned char *) get_unicode_name ((char *) tmp_buff, w_length * 2);

 	    free (tmp_buff);

 	    printf ("\"%s\"", tmp_name);

 	    free (tmp_name);

@@ -887,7 +887,7 @@ static void wm_decode_macro (unsigned char *buff, uint32_t len, int hex_output)

 	    s_length = (uint8_t) buff[i + 1];

 	    tmp_buff = (unsigned char *) malloc ((s_length * 2) + 1);

 	    memcpy (tmp_buff, buff + i + 2, s_length * 2);

-	    tmp_name = get_unicode_name (tmp_buff, s_length * 2);

+	    tmp_name = (unsigned char *) get_unicode_name ((char *) tmp_buff, s_length * 2);

 	    free (tmp_buff);

 	    printf ("'%s", tmp_name);

 	    free (tmp_name);

@@ -1060,7 +1060,7 @@ int sigtool_vba_scandir (const char *dirname, int hex_output)

 	    if (!data) {

 		cli_dbgmsg ("WARNING: VBA project '%s' decompressed to NULL\n", vba_project->name[i]);

 	    } else {

-		data = (char *) realloc (data, data_len + 1);

+		data = (unsigned char *) realloc (data, data_len + 1);

 		data[data_len] = '\0';

 		printf ("%s", data);

 		free (data);

@@ -20,7 +20,6 @@

 #ifndef __VBA_H

 #define __VBA_H

-extern int hex_output;

 int sigtool_vba_scandir(const char *dirname, int hex_output);

 #endif