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

+Tue Feb 13 22:34:40 CET 2007 (tk)

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

+  * libclamav: fix some debug messages

+

 Tue Feb 13 19:48:22 GMT 2007 (njh)

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

   * libclamav/mbox.c:	Fix BeOS link error

@@ -824,7 +824,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 	snprintf(filename, 1024, "%s/clamav-unchm.bin", dirname);

 	tmpfd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 	if (!tmpfd) {

-		cli_dbgmsg("open failed\n", filename);

+		cli_dbgmsg("open failed for %s\n", filename);

 		return FALSE;

 	}

@@ -110,7 +110,7 @@ int unfsg_133(char *source, char *dest, int ssize, int dsize, struct cli_exe_sec

     else 

       sections[i].vsz = lastsz;

-    cli_dbgmsg("FSG: .SECT%d RVA:%x VSize:%x ROffset: %x, RSize:% x\n", i, sections[i].rva, sections[i].vsz, sections[i].raw, sections[i].rsz);

+    cli_dbgmsg("FSG: .SECT%d RVA:%x VSize:%x ROffset: %x, RSize:%x\n", i, sections[i].rva, sections[i].vsz, sections[i].raw, sections[i].rsz);

   }

   if (!cli_rebuildpe(dest, sections, sectcount+1, base, ep, 0, 0, file)) {

@@ -222,7 +222,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct pe_

       /* Showtime!!! */

       cli_dbgmsg("Petite: Sections dump:\n");

       for (t = 0; t < j ; t++)

-	cli_dbgmsg("Petite: .SECT%d RVA:%x VSize:%x ROffset: %x, RSize:% x\n", t, usects[t].rva, usects[t].vsz, usects[t].raw, usects[t].rsz);

+	cli_dbgmsg("Petite: .SECT%d RVA:%x VSize:%x ROffset: %x, RSize:%x\n", t, usects[t].rva, usects[t].vsz, usects[t].raw, usects[t].rsz);

       if (! cli_rebuildpe(buf, usects, j, Imagebase, enc_ep, ResRva, ResSize, desc)) {

 	cli_dbgmsg("Petite: Rebuilding failed\n");

 	free(usects);

@@ -329,7 +329,7 @@ static int sis_extract_simple(int fd, char *mfile, uint32_t length, uint32_t off

 	}

 	if(close(desc) == -1) {

-	    cli_errmsg("SIS: sis_extract_simple: Can't close descriptor %d\n", filelen, fname);

+	    cli_errmsg("SIS: sis_extract_simple: Can't close descriptor %d\n", desc);

 	    free(subdir);

 	    free(fname);

 	    if(compressed)

@@ -139,7 +139,7 @@ static int jpeg_check_photoshop_8bim(int fd)

 	retval = cli_check_jpeg_exploit(fd);

 	if (retval == 1) {

-		cli_dbgmsg("Exploit found in thumbnail\n", retval);

+		cli_dbgmsg("Exploit found in thumbnail\n");

 	}

 	lseek(fd, offset+size, SEEK_SET);