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

+Fri Mar 18 22:03:10 CET 2005 (tk)

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

+  * libclamav: fix compiler warnings

+

 Fri Mar 18 16:26:18 CET 2005 (tk)

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

   * libclamav: properly define NAME_MAX on non-compatible systems

@@ -122,7 +122,8 @@ struct cli_md5_node {

 };

 struct cli_meta_node {

-    int method, csize, size, encrypted, crc32, fileno, maxdepth;

+    int csize, size;

+    unsigned int crc32, fileno, method, encrypted, maxdepth;

     char *filename, *virname;

     struct cli_meta_node *next;

 };

@@ -151,15 +152,15 @@ struct cl_node {

 };

 struct cl_limits {

-    int maxreclevel; /* maximal recursion level */

-    int maxfiles; /* maximal number of files to be

-		   * scanned within an archive

-		   */

-    int maxratio; /* maximal compression ratio */

-    short archivememlim; /* limit memory usage for bzip2 (0/1) */

-    long int maxfilesize; /* files in an archive larger than

-			   * this value will not be scanned

-			   */

+    unsigned int maxreclevel; /* maximal recursion level */

+    unsigned int maxfiles; /* maximal number of files to be

+			    * scanned within an archive

+			    */

+    unsigned int maxratio; /* maximal compression ratio */

+    unsigned short archivememlim; /* limit memory usage for bzip2 (0/1) */

+    unsigned long int maxfilesize; /* files in an archive larger than

+				    * this limit will not be scanned

+				    */

 };

 struct cl_stat {

@@ -82,7 +82,7 @@ static int doubledl(char **scur, uint8_t *mydlptr, char *buffer, int buffersize)

 static int unfsg(char *source, char *dest, int ssize, int dsize, char **endsrc, char **enddst) {

   uint8_t mydl=0x80;

-  uint32_t backbytes, backsize, oldback;

+  uint32_t backbytes, backsize, oldback = 0;

   char *csrc = source, *cdst = dest;

   int oob, lostbit = 1;

@@ -227,7 +227,7 @@ void cli_ac_free(struct cl_node *root)

 	free(root->ac_root);

 }

-static int inline cli_findpos(const char *buffer, int offset, int length, const struct cli_ac_patt *pattern)

+inline static int cli_findpos(const char *buffer, int offset, int length, const struct cli_ac_patt *pattern)

 {

 	int bufferpos = offset + AC_MIN_LENGTH;

 	int postfixend = offset + length;

@@ -78,7 +78,7 @@ int cli_bm_addpatt(struct cl_node *root, struct cli_bm_patt *pattern)

 int cli_bm_init(struct cl_node *root)

 {

-	int i;

+	unsigned int i;

 	unsigned int size = DHASH(256, 256, 256);

@@ -102,7 +102,7 @@ int cli_bm_init(struct cl_node *root)

 void cli_bm_free(struct cl_node *root)

 {

 	struct cli_bm_patt *b1, *b2;

-	int i;

+	unsigned int i;

 	unsigned int size = DHASH(256, 256, 256);

@@ -130,7 +130,7 @@ void cli_bm_free(struct cl_node *root)

 int cli_bm_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, unsigned long int offset, unsigned short ftype, int fd)

 {

-	int i, j, shift, off, found = 0;

+	unsigned int i, j, shift, off, found = 0;

 	uint16_t idx;

 	struct cli_bm_patt *p;

 	const char *bp;

@@ -172,7 +172,7 @@ int cli_checkfp(int fd, const struct cl_node *root)

 	    if(fstat(fd, &sb))

 		return CL_EIO;

-	    if(sb.st_size != md5_node->size) {

+	    if((unsigned int) sb.st_size != md5_node->size) {

 		cli_warnmsg("Detected false positive MD5 match. Please report.\n");

 	    } else {

 		cli_dbgmsg("Eliminated false positive match (fp sig: %s)\n", md5_node->virname);

@@ -212,7 +212,7 @@ int cli_validatesig(unsigned short target, unsigned short ftype, const char *off

 	    return 0;

 	}

-	if(fileoff != off) {

+	if(fileoff != (unsigned long int) off) {

 	    cli_dbgmsg("Virus offset: %d, expected: %d (%s)\n", fileoff, off, virname);

 	    return 0;

 	}

@@ -347,7 +347,7 @@ int cli_scandesc(int desc, const char **virname, long int *scanned, const struct

 	    if(fstat(desc, &sb))

 		return CL_EIO;

-	    if(sb.st_size != md5_node->size) {

+	    if((unsigned int) sb.st_size != md5_node->size) {

 		cli_warnmsg("Detected false positive MD5 match. Please report.\n");

 	    } else {

 		if(virname)

@@ -70,7 +70,7 @@ static inline uint32_t EC32(uint32_t v)

 extern short cli_leavetemps_flag;

-static uint32_t cli_rawaddr(uint32_t rva, struct pe_image_section_hdr *shp, uint16_t nos)

+static uint32_t cli_rawaddr(uint32_t rva, struct pe_image_section_hdr *shp, uint16_t nos, unsigned int *err)

 {

 	int i, found = 0;

@@ -84,12 +84,15 @@ static uint32_t cli_rawaddr(uint32_t rva, struct pe_image_section_hdr *shp, uint

     if(!found) {

 	cli_dbgmsg("Can't calculate raw address from RVA 0x%x\n", rva);

-	return -1;

+	*err = 1;

+	return 0;

     }

+    *err = 0;

     return rva - EC32(shp[i].VirtualAddress) + EC32(shp[i].PointerToRawData);

 }

+/*

 static int cli_ddump(int desc, int offset, int size, const char *file)

 {

 	int pos, ndesc, bread, sum = 0;

@@ -141,8 +144,9 @@ static int cli_ddump(int desc, int offset, int size, const char *file)

     lseek(desc, pos, SEEK_SET);

     return 0;

 }

+*/

-int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	uint16_t e_magic; /* DOS signature ("MZ") */

 	uint16_t nsections;

@@ -154,10 +158,11 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	struct pe_image_section_hdr *section_hdr;

 	struct stat sb;

 	char sname[9], buff[4096], *tempfile;

-	int i, found, upx_success = 0, min = 0, max = 0, ret;

+	unsigned int i, found, upx_success = 0, min = 0, max = 0, err;

+	unsigned int ssize = 0, dsize = 0;

 	int (*upxfn)(char *, int , char *, int *, uint32_t, uint32_t, uint32_t) = NULL;

 	char *src = NULL, *dest = NULL;

-	int ssize = -1, dsize = -1, ndesc;

+	int ndesc, ret;

     if(read(desc, &e_magic, sizeof(e_magic)) != sizeof(e_magic)) {

@@ -410,7 +415,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	    cli_dbgmsg("Section's memory is executable\n");

 	cli_dbgmsg("------------------------------------\n");

-	if(EC32(section_hdr[i].PointerToRawData) + EC32(section_hdr[i].SizeOfRawData) > sb.st_size) {

+	if(EC32(section_hdr[i].PointerToRawData) + EC32(section_hdr[i].SizeOfRawData) > (unsigned long int) sb.st_size) {

 	    cli_dbgmsg("Possibly broken PE file - Section %d out of file (Offset@ %d, Rsize %d, Total filesize %d)\n", i, EC32(section_hdr[i].PointerToRawData), EC32(section_hdr[i].SizeOfRawData), sb.st_size);

 	    free(section_hdr);

 	    if(DETECT_BROKEN) {

@@ -434,7 +439,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

     }

-    if((ep = EC32(optional_hdr.AddressOfEntryPoint)) >= min && (ep = cli_rawaddr(EC32(optional_hdr.AddressOfEntryPoint), section_hdr, nsections)) == -1) {

+    if((ep = EC32(optional_hdr.AddressOfEntryPoint)) >= min && !(ep = cli_rawaddr(EC32(optional_hdr.AddressOfEntryPoint), section_hdr, nsections, &err)) && err) {

 	cli_dbgmsg("Possibly broken PE file\n");

 	free(section_hdr);

 	if(DETECT_BROKEN) {

@@ -471,7 +476,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

     /* try to find the first section with physical size == 0 */

     found = 0;

-    for(i = 0; i < nsections - 1; i++) {

+    for(i = 0; i < (unsigned int) nsections - 1; i++) {

 	if(!section_hdr[i].SizeOfRawData && section_hdr[i].VirtualSize && section_hdr[i + 1].SizeOfRawData && section_hdr[i + 1].VirtualSize) {

 	    found = 1;

 	    cli_dbgmsg("UPX/FSG: empty section found - assuming compression\n");

@@ -528,14 +533,14 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		}

 		lseek(desc, EC32(section_hdr[i + 1].PointerToRawData), SEEK_SET);

-		if(read(desc, src, ssize) != ssize) {

+		if((unsigned int) read(desc, src, ssize) != ssize) {

 		    cli_dbgmsg("Can't read raw data of section %d\n", i);

 		    free(section_hdr);

 		    free(src);

 		    return CL_EIO;

 		}

-		if((newedx - EC32(section_hdr[i + 1].VirtualAddress)) < 0 || ((dest = src + newedx - EC32(section_hdr[i + 1].VirtualAddress)) < src && dest >= src + EC32(section_hdr[i + 1].VirtualAddress) + EC32(section_hdr[i + 1].SizeOfRawData) - 4)) {

+		if(newedx < EC32(section_hdr[i + 1].VirtualAddress) || ((dest = src + newedx - EC32(section_hdr[i + 1].VirtualAddress)) < src && dest >= src + EC32(section_hdr[i + 1].VirtualAddress) + EC32(section_hdr[i + 1].SizeOfRawData) - 4)) {

 		    cli_dbgmsg("FSG: New ESP out of bounds\n");

 		    free(src);

 		    break;

@@ -624,7 +629,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		    return CL_CLEAN;

 		}

-		if((gp = cli_readint32(buff + 1) - EC32(optional_hdr.ImageBase)) >= EC32(section_hdr[i + 1].PointerToRawData) || gp < 0) {

+		if((gp = cli_readint32(buff + 1) - EC32(optional_hdr.ImageBase)) >= (int) EC32(section_hdr[i + 1].PointerToRawData) || gp < 0) {

 		    cli_dbgmsg("FSG: Support data out of padding area (vaddr: %d)\n", EC32(section_hdr[i].VirtualAddress));

 		    break;

 		}

@@ -632,7 +637,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		lseek(desc, gp, SEEK_SET);

 		gp = EC32(section_hdr[i + 1].PointerToRawData) - gp;

-		if(limits && limits->maxfilesize && gp > limits->maxfilesize) {

+		if(limits && limits->maxfilesize && (unsigned int) gp > limits->maxfilesize) {

 		    cli_dbgmsg("FSG: Buffer size exceeded (size: %d, max: %lu)\n", gp, limits->maxfilesize);

 		    free(section_hdr);

 		    return CL_CLEAN;

@@ -710,7 +715,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		}

 		lseek(desc, EC32(section_hdr[i + 1].PointerToRawData), SEEK_SET);

-		if(read(desc, src, ssize) != ssize) {

+		if((unsigned int) read(desc, src, ssize) != ssize) {

 		    cli_dbgmsg("Can't read raw data of section %d\n", i);

 		    free(section_hdr);

 		    free(sections);

@@ -834,7 +839,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		    return CL_CLEAN;

 		}

-		if(gp >= EC32(section_hdr[i + 1].PointerToRawData) || gp < 0) {

+		if(gp >= (int) EC32(section_hdr[i + 1].PointerToRawData) || gp < 0) {

 		    cli_dbgmsg("FSG: Support data out of padding area (newedi: %d, vaddr: %d)\n", newedi, EC32(section_hdr[i].VirtualAddress));

 		    break;

 		}

@@ -842,7 +847,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		lseek(desc, gp, SEEK_SET);

 		gp = EC32(section_hdr[i + 1].PointerToRawData) - gp;

-		if(limits && limits->maxfilesize && gp > limits->maxfilesize) {

+		if(limits && limits->maxfilesize && (unsigned int) gp > limits->maxfilesize) {

 		    cli_dbgmsg("FSG: Buffer size exceeded (size: %d, max: %lu)\n", gp, limits->maxfilesize);

 		    free(section_hdr);

 		    return CL_CLEAN;

@@ -901,7 +906,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		}

 		lseek(desc, EC32(section_hdr[i + 1].PointerToRawData), SEEK_SET);

-		if(read(desc, src, ssize) != ssize) {

+		if((unsigned int) read(desc, src, ssize) != ssize) {

 		    cli_dbgmsg("Can't read raw data of section %d\n", i);

 		    free(section_hdr);

 		    free(sections);

@@ -1027,7 +1032,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	    }

 	    lseek(desc, EC32(section_hdr[i + 1].PointerToRawData), SEEK_SET);

-	    if(read(desc, src, ssize) != ssize) {

+	    if((unsigned int) read(desc, src, ssize) != ssize) {

 		cli_dbgmsg("Can't read raw data of section %d\n", i);

 		free(section_hdr);

 		free(src);

@@ -1133,7 +1138,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 		return CL_EIO;

 	    }

-	    if(write(ndesc, dest, dsize) != dsize) {

+	    if((unsigned int) write(ndesc, dest, dsize) != dsize) {

 		cli_dbgmsg("UPX/FSG: Can't write %d bytes\n", dsize);

 		free(tempfile);

 		free(dest);

@@ -1176,8 +1181,8 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	return CL_EIO;

     }

-    if(buff[0] != '\xb8' || cli_readint32(buff + 1) != EC32(section_hdr[nsections - 1].VirtualAddress) + EC32(optional_hdr.ImageBase)) {

-	if(nsections < 2 || buff[0] != '\xb8' || cli_readint32(buff + 1) != EC32(section_hdr[nsections - 2].VirtualAddress) + EC32(optional_hdr.ImageBase))

+    if(buff[0] != '\xb8' || (uint32_t) cli_readint32(buff + 1) != EC32(section_hdr[nsections - 1].VirtualAddress) + EC32(optional_hdr.ImageBase)) {

+	if(nsections < 2 || buff[0] != '\xb8' || (uint32_t) cli_readint32(buff + 1) != EC32(section_hdr[nsections - 2].VirtualAddress) + EC32(optional_hdr.ImageBase))

 	    found = 0;

 	else

 	    found = 1;

@@ -1205,9 +1210,9 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	    for(i = 0 ; i < nsections; i++) {

 		if(section_hdr[i].SizeOfRawData) {

-			uint32_t offset = cli_rawaddr(EC32(section_hdr[i].VirtualAddress), section_hdr, nsections);

+			uint32_t offset = cli_rawaddr(EC32(section_hdr[i].VirtualAddress), section_hdr, nsections, &err);

-		    if(offset == -1 || lseek(desc, offset, SEEK_SET) == -1 || read(desc, dest + EC32(section_hdr[i].VirtualAddress) - min, EC32(section_hdr[i].SizeOfRawData)) != EC32(section_hdr[i].SizeOfRawData)) {

+		    if(err || lseek(desc, offset, SEEK_SET) == -1 || (unsigned int) read(desc, dest + EC32(section_hdr[i].VirtualAddress) - min, EC32(section_hdr[i].SizeOfRawData)) != EC32(section_hdr[i].SizeOfRawData)) {

 			free(section_hdr);

 			free(dest);

 			return CL_EIO;

@@ -1285,6 +1290,7 @@ int cli_peheader(int desc, struct cli_pe_info *peinfo)

 	struct pe_image_section_hdr *section_hdr;

 	struct stat sb;

 	int i;

+	unsigned int err;

     cli_dbgmsg("in cli_peheader\n");

@@ -1379,7 +1385,9 @@ int cli_peheader(int desc, struct cli_pe_info *peinfo)

 	peinfo->section[i].rsz = EC32(section_hdr[i].SizeOfRawData);

     }

-    if((peinfo->ep = cli_rawaddr(EC32(optional_hdr.AddressOfEntryPoint), section_hdr, peinfo->nsections)) == -1) {

+    peinfo->ep = cli_rawaddr(EC32(optional_hdr.AddressOfEntryPoint), section_hdr, peinfo->nsections, &err);

+

+    if(err) {

 	cli_dbgmsg("Possibly broken PE file\n");

 	free(section_hdr);

 	free(peinfo->section);

@@ -100,7 +100,7 @@ struct cli_pe_info {

     struct SECTION *section;

 };

-int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec);

+int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec);

 int cli_peheader(int desc, struct cli_pe_info *peinfo);

@@ -401,7 +401,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, int bufsz, struct pe_image

 	      backsize--;

 	    } while (backsize);

 	    backbytes^=0xffffffff;

-	    addsize += 1 + ( backbytes < check2 ) + ( backbytes < check1 );

+	    addsize += 1 + ( backbytes < (int) check2 ) + ( backbytes < (int) check1 );

 	    oldback = backbytes;

 	  } else {

 	    backsize = backbytes+1;

@@ -478,7 +478,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, int bufsz, struct pe_image

 	  if (test1 == test2) {

 	    irva = cli_readint32(ddst-grown+0x121-reloc);

 	    enc_ep = cli_readint32(ddst-grown+0x0f-reloc)^test1;

-	    mangled = (cli_readint32(ddst-grown+0x1c0-reloc) != 0x90909090); /* FIXME: Magic's too short??? */

+	    mangled = ((uint32_t) cli_readint32(ddst-grown+0x1c0-reloc) != 0x90909090); /* FIXME: Magic's too short??? */

 	    cli_dbgmsg("Petite: Encrypted EP: %x | Array of imports: %x\n",enc_ep, irva);

 	  }

 	  usects[j-1].rsz -= grown+reloc;

@@ -64,7 +64,8 @@ static int cli_ac_addsig(struct cl_node *root, const char *virname, const char *

 {

 	struct cli_ac_patt *new;

 	char *pt, *hex;

-	int virlen, ret, i, error = 0;

+	int virlen, ret, error = 0;

+	unsigned int i;

     if((new = (struct cli_ac_patt *) cli_calloc(1, sizeof(struct cli_ac_patt))) == NULL)

@@ -248,7 +249,8 @@ int cli_parse_add(struct cl_node *root, const char *virname, const char *hexsig,

 {

 	struct cli_bm_patt *bm_new;

 	char *pt, *hexcpy, *start, *n;

-	int ret, virlen, parts = 0, i, j, len, asterisk;

+	int ret, virlen, asterisk = 0;

+	unsigned int i, j, len, parts = 0;

 	int mindist = 0, maxdist = 0, error = 0;

@@ -108,7 +108,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #define MAX_MAIL_RECURSION  15

-static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec);

+static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec);

 #ifdef CL_THREAD_SAFE

@@ -119,10 +119,11 @@ static void cli_unlock_mutex(void *mtx)

 }

 #endif

-static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	FILE *tmp = NULL;

-	int files = 0, fd, ret = CL_CLEAN, afiles, encrypted;

+	int fd, ret = CL_CLEAN;

+	unsigned int files = 0, encrypted, afiles;

 	ArchiveList_struct *rarlist = NULL;

 	ArchiveList_struct *rarlist_head = NULL;

 	char *rar_data_ptr;

@@ -155,7 +156,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 	files++;

 	encrypted = rarlist->item.Flags & 0x04;

-	cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", rarlist->item.Name, rarlist->item.FileCRC, encrypted, rarlist->item.PackSize, rarlist->item.UnpSize, rarlist->item.Method, rarlist->item.PackSize ? (rarlist->item.UnpSize / rarlist->item.PackSize) : 0, limits ? limits->maxratio : -1);

+	cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", rarlist->item.Name, rarlist->item.FileCRC, encrypted, rarlist->item.PackSize, rarlist->item.UnpSize, rarlist->item.Method, rarlist->item.PackSize ? ((unsigned int) rarlist->item.UnpSize / (unsigned int) rarlist->item.PackSize) : 0, limits ? limits->maxratio : 0);

 	/* Scan metadata */

 	mdata = root->rar_mlist;

@@ -163,22 +164,22 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 	    if(mdata->encrypted != encrypted)

 		continue;

-	    if(mdata->crc32 && mdata->crc32 != rarlist->item.FileCRC)

+	    if(mdata->crc32 && (unsigned int) mdata->crc32 != rarlist->item.FileCRC)

 		continue;

-	    if(mdata->csize > 0 && mdata->csize != rarlist->item.PackSize)

+	    if(mdata->csize > 0 && (unsigned int) mdata->csize != rarlist->item.PackSize)

 		continue;

-	    if(mdata->size >= 0 && mdata->size != rarlist->item.UnpSize)

+	    if(mdata->size >= 0 && (unsigned int) mdata->size != rarlist->item.UnpSize)

 		continue;

-	    if(mdata->method >= 0 && mdata->method != rarlist->item.Method)

+	    if(mdata->method && mdata->method != rarlist->item.Method)

 		continue;

 	    if(mdata->fileno && mdata->fileno != files)

 		continue;

-	    if(mdata->maxdepth && *arec > mdata->maxdepth)

+	    if(mdata->maxdepth && arec > mdata->maxdepth)

 		continue;

 	    /* TODO add support for regex */

@@ -331,14 +332,15 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 }

 #ifdef HAVE_ZLIB_H

-static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	ZZIP_DIR *zdir;

 	ZZIP_DIRENT zdirent;

 	ZZIP_FILE *zfp;

 	FILE *tmp = NULL;

 	char *buff;

-	int fd, bytes, files = 0, ret = CL_CLEAN, encrypted;

+	int fd, bytes, ret = CL_CLEAN;

+	unsigned int files = 0, encrypted;

 	struct stat source;

 	struct cli_meta_node *mdata;

 	zzip_error_t err;

@@ -373,7 +375,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	encrypted = zdirent.d_flags;

-	cli_dbgmsg("Zip: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : -1);

+	cli_dbgmsg("Zip: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0);

 	if(!zdirent.st_size) {

 	    if(zdirent.d_crc32) {

@@ -391,7 +393,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	    if(mdata->encrypted != encrypted)

 		continue;

-	    if(mdata->crc32 && mdata->crc32 != zdirent.d_crc32)

+	    if(mdata->crc32 && mdata->crc32 != (unsigned int) zdirent.d_crc32)

 		continue;

 	    if(mdata->csize > 0 && mdata->csize != zdirent.d_csize)

@@ -400,13 +402,13 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	    if(mdata->size >= 0 && mdata->size != zdirent.st_size)

 		continue;

-	    if(mdata->method >= 0 && mdata->method != zdirent.d_compr)

+	    if(mdata->method && mdata->method != (unsigned int) zdirent.d_compr)

 		continue;

 	    if(mdata->fileno && mdata->fileno != files)

 		continue;

-	    if(mdata->maxdepth && *arec > mdata->maxdepth)

+	    if(mdata->maxdepth && arec > mdata->maxdepth)

 		continue;

 	    /* TODO add support for regex */

@@ -462,7 +464,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	}

 	if(limits) {

-	    if(limits->maxfilesize && (zdirent.st_size > limits->maxfilesize)) {

+	    if(limits->maxfilesize && ((unsigned int) zdirent.st_size > limits->maxfilesize)) {

 		cli_dbgmsg("Zip: %s: Size exceeded (%d, max: %ld)\n", zdirent.d_name, zdirent.st_size, limits->maxfilesize);

 		/* ret = CL_EMAXSIZE; */

 		if(BLOCKMAX) {

@@ -551,10 +553,10 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scangzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scangzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	int fd, bytes, ret = CL_CLEAN;

-	long int size = 0;

+	unsigned long int size = 0;

 	char *buff;

 	FILE *tmp = NULL;

 	gzFile gd;

@@ -627,11 +629,11 @@ static int cli_scangzip(int desc, const char **virname, long int *scanned, const

 #define BZ2_bzRead bzRead

 #endif

-static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	int fd, bytes, ret = CL_CLEAN, bzerror = 0;

 	short memlim = 0;

-	long int size = 0;

+	unsigned long int size = 0;

 	char *buff;

 	FILE *fs, *tmp = NULL;

 	BZFILE *bfd;

@@ -708,7 +710,7 @@ static int cli_scanbzip(int desc, const char **virname, long int *scanned, const

 }

 #endif

-static int cli_scanszdd(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanszdd(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	int fd, ret = CL_CLEAN;

 	FILE *tmp = NULL, *in;

@@ -751,7 +753,7 @@ static int cli_scanszdd(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scanmscab(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanmscab(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	struct mscab_decompressor *cabd = NULL;

 	struct mscabd_cabinet *base, *cab;

@@ -810,7 +812,7 @@ static int cli_scanmscab(int desc, const char **virname, long int *scanned, cons

     return ret;

 }

-static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	DIR *dd;

 	struct dirent *dent;

@@ -871,7 +873,7 @@ static int cli_scandir(const char *dirname, const char **virname, long int *scan

     return 0;

 }

-static int cli_vba_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_vba_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	int ret = CL_CLEAN, i, fd, data_len;

 	vba_project_t *vba_project;

@@ -1016,7 +1018,7 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

     return ret;

 }

-static int cli_scanhtml(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanhtml(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *tempname, fullname[1024];

 	int ret=CL_CLEAN, fd;

@@ -1089,7 +1091,7 @@ static int cli_scanhtml(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scanole2(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanole2(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *dir;

 	int ret = CL_CLEAN;

@@ -1124,7 +1126,7 @@ static int cli_scanole2(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scantar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scantar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *dir;

 	int ret = CL_CLEAN;

@@ -1151,7 +1153,7 @@ static int cli_scantar(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scanbinhex(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanbinhex(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *dir;

 	int ret = CL_CLEAN;

@@ -1179,7 +1181,7 @@ static int cli_scanbinhex(int desc, const char **virname, long int *scanned, con

     return ret;

 }

-static int cli_scanmschm(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanmschm(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *tempname;

 	int ret = CL_CLEAN;

@@ -1203,7 +1205,7 @@ static int cli_scanmschm(int desc, const char **virname, long int *scanned, cons

     return ret;

 }

-static int cli_scanscrenc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanscrenc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *tempname;

 	int ret = CL_CLEAN;

@@ -1226,7 +1228,7 @@ static int cli_scanscrenc(int desc, const char **virname, long int *scanned, con

     return ret;

 }

-static int cli_scanriff(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanriff(int desc, const char **virname)

 {

 	int ret = CL_CLEAN;

@@ -1238,13 +1240,13 @@ static int cli_scanriff(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char *dir;

 	int ret;

-    cli_dbgmsg("Starting cli_scanmail(), mrec == %d, arec == %d\n", *mrec, *arec);

+    cli_dbgmsg("Starting cli_scanmail(), mrec == %d, arec == %d\n", mrec, arec);

     /* generate the temporary directory */

     dir = cli_gentemp(NULL);

@@ -1273,7 +1275,7 @@ static int cli_scanmail(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	char magic[MAGIC_BUFFER_SIZE + 1];

 	int ret = CL_CLEAN, nret;

@@ -1294,8 +1296,8 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     }

     if(SCAN_ARCHIVE && limits && limits->maxreclevel)

-	if(*arec > limits->maxreclevel) {

-	    cli_dbgmsg("Archive recursion limit exceeded (arec == %d).\n", *arec);

+	if(arec > limits->maxreclevel) {

+	    cli_dbgmsg("Archive recursion limit exceeded (arec == %d).\n", arec);

 	    if(BLOCKMAX) {

 		*virname = "Archive.ExceededRecursionLimit";

 		return CL_VIRUS;

@@ -1304,8 +1306,8 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	}

     if(SCAN_MAIL)

-	if(*mrec > MAX_MAIL_RECURSION) {

-	    cli_dbgmsg("Mail recursion level exceeded (mrec == %d).\n", *mrec);

+	if(mrec > MAX_MAIL_RECURSION) {

+	    cli_dbgmsg("Mail recursion level exceeded (mrec == %d).\n", mrec);

 	    /* return CL_EMAXREC; */

 	    return CL_CLEAN;

 	}

@@ -1324,7 +1326,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     lseek(desc, 0, SEEK_SET);

     type = cli_filetype(magic, bread);

-    type == CL_TYPE_MAIL ? (*mrec)++ : (*arec)++;

+    type == CL_TYPE_MAIL ? mrec++ : arec++;

     switch(type) {

 	case CL_TYPE_RAR:

@@ -1389,7 +1391,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	    break;

 	case CL_TYPE_RIFF:

-	    ret = cli_scanriff(desc, virname, scanned, root, limits, options, arec, mrec);

+	    ret = cli_scanriff(desc, virname);

 	    break;

 	case CL_TYPE_DATA:

@@ -1408,7 +1410,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	    break;

     }

-    type == CL_TYPE_MAIL ? (*mrec)-- : (*arec)--;

+    type == CL_TYPE_MAIL ? mrec-- : arec--;

     if(type != CL_TYPE_DATA && ret != CL_VIRUS) { /* scan the raw file */

 	    int typerec;

@@ -1427,7 +1429,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	} else if(nret >= CL_TYPENO) {

 	    lseek(desc, 0, SEEK_SET);

-	    nret == CL_TYPE_MAIL ? (*mrec)++ : (*arec)++;

+	    nret == CL_TYPE_MAIL ? mrec++ : arec++;

 	    switch(nret) {

 		case CL_TYPE_HTML:

 		    if(SCAN_HTML)

@@ -1441,11 +1443,11 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 			    return CL_VIRUS;

 		    break;

 	    }

-	    nret == CL_TYPE_MAIL ? (*mrec)-- : (*arec)--;

+	    nret == CL_TYPE_MAIL ? mrec-- : arec--;

 	}

     }

-    (*arec)++;

+    arec++;

     lseek(desc, 0, SEEK_SET);

     switch(type) {

 	/* Due to performance reasons all executables were first scanned

@@ -1459,7 +1461,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	default:

 	    break;

     }

-    (*arec)--;

+    arec--;

     if(ret == CL_EFORMAT) {

 	cli_dbgmsg("Descriptor[%d]: %s\n", desc, cl_strerror(CL_EFORMAT));

@@ -1471,12 +1473,10 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options)

 {

-	int arec = 0, mrec = 0;

-

-    return cli_magic_scandesc(desc, virname, scanned, root, limits, options, &arec, &mrec);

+    return cli_magic_scandesc(desc, virname, scanned, root, limits, options, 0, 0);

 }

-static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

+static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

 {

 	int fd, ret;

@@ -21,6 +21,6 @@

 #include "clamav.h"

-int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec);

+int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec);

 #endif

@@ -131,7 +131,6 @@ char *cli_hex2str(const char *hex)

 int cli_hex2num(const char *hex)

 {

-	int numChars = 0;

 	int hexval, ret = 0, len, i;