bb#1456

git-svn: trunk@4925

ChangeLog

@@ -1,3 +1,7 @@
+Wed Mar 11 19:02:27 CET 2009 (acab)
+-----------------------------------
+ * libclamav: downgrade (bb#1456)
+
 Tue Mar 10 20:53:28 EET 2009 (edwin)
 ------------------------------------
  * unit_tests/check_regex.c: add more ifdefs for old check version.

libclamav/binhex.c

@@ -194,7 +194,7 @@ cli_binhex(const char *dir, int desc)
 
 	if(binhexBegin(m) == NULL) {
 		messageDestroy(m);
-		cli_errmsg("No binhex line found\n");
+		cli_dbgmsg("No binhex line found\n");
 		return CL_EFORMAT;
 	}
 

libclamav/blob.c

@@ -505,7 +505,7 @@ fileblobPartialSet(fileblob *fb, const char *fullname, const char *arg)
 	fb->fp = fdopen(fb->fd, "wb");
 
 	if(fb->fp == NULL) {
-		cli_errmsg("fileblobSetFilename: fdopen failed (%s)\n", strerror(errno));
+		cli_errmsg("fileblobSetFilename: fdopen failed\n");
 		close(fb->fd);
 		return;
 	}
@@ -548,7 +548,7 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)
 	fb->fp = fdopen(fb->fd, "wb");
 
 	if(fb->fp == NULL) {
-		cli_errmsg("fileblobSetFilename: fdopen failed (%s)\n", strerror(errno));
+		cli_errmsg("fileblobSetFilename: fdopen failed\n");
 		close(fb->fd);
 		free(fullname);
 		return;
@@ -599,8 +599,8 @@ fileblobAddData(fileblob *fb, const unsigned char *data, size_t len)
 #endif
 
 		if(fwrite(data, len, 1, fb->fp) != 1) {
-			cli_errmsg("fileblobAddData: Can't write %lu bytes to temporary file %s: %s\n",
-				(unsigned long)len, fb->b.name, strerror(errno));
+			cli_errmsg("fileblobAddData: Can't write %lu bytes to temporary file %s\n",
+				(unsigned long)len, fb->b.name);
 			return -1;
 		}
 		fb->isNotEmpty = 1;

libclamav/message.c

@@ -1054,7 +1054,7 @@ messageMoveText(message *m, text *t, message *old_message)
 				u = next;
 
 				if(u == NULL) {
-					cli_errmsg("messageMoveText sanity check: t not within old_message\n");
+					cli_dbgmsg("messageMoveText sanity check: t not within old_message\n");
 					return -1;
 				}
 			}
@@ -1517,7 +1517,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy
 
 			newret = (*create)();
 			if(newret == NULL) {
-				cli_errmsg("Not all decoding algorithms were run\n");
+				cli_dbgmsg("Not all decoding algorithms were run\n");
 				return ret;
 			}
 			(*destroy)(ret);
@@ -1857,7 +1857,7 @@ messageToText(message *m)
 				}
 				continue;
 			case UUENCODE:
-				cli_errmsg("messageToText: Unexpected attempt to handle uuencoded file - report to http://bugs.clamav.net\n");
+				cli_warnmsg("messageToText: Unexpected attempt to handle uuencoded file - report to http://bugs.clamav.net\n");
 				if(first) {
 					if(last)
 						last->t_next = NULL;

libclamav/ole2_extract.c

@@ -420,7 +420,7 @@ static int32_t ole2_get_sbat_data_block(int fd, ole2_header_t *hdr, void *buff,
 	}
 	
 	if (hdr->sbat_root_start < 0) {
-		cli_errmsg("No root start block\n");
+		cli_dbgmsg("No root start block\n");
 		return FALSE;
 	}
 

libclamav/uuencode.c

@@ -70,7 +70,7 @@ cli_uuencode(const char *dir, int desc)
 	}
 	if(!isuuencodebegin(buffer)) {
 		fclose(fin);
-		cli_errmsg("Message is not in uuencoded format\n");
+		cli_dbgmsg("Message is not in uuencoded format\n");
 		return CL_EFORMAT;
 	}
 
@@ -85,7 +85,7 @@ cli_uuencode(const char *dir, int desc)
 	if(uudecodeFile(m, buffer, dir, fin) < 0) {
 		messageDestroy(m);
 		fclose(fin);
-		cli_errmsg("Message is not in uuencoded format\n");
+		cli_dbgmsg("Message is not in uuencoded format\n");
 		return CL_EFORMAT;
 	}
 	messageDestroy(m);