@@ -1,12 +1,16 @@

-Thu Feb  1 11:50:00 GMT 2007

+Thu Feb  1 12:42:56 GMT 2007 (njh)

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

+  * libclamav:	Remove some warnings from icc

+

+Thu Feb  1 11:50:00 GMT 2007 (njh)

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

   * libclamav/hashtab.c:	Fix compilation error on earlier OpenBSDs

-  		(patch from Edwin)

+		(patch from Edwin)

 Thu Feb  1 08:02:50 GMT 2007 (njh)

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

   * libclamav/entconv.c:	Fix compilation error on earlier OpenBSDs

-  		(patch from Edwin)

+		(patch from Edwin)

 Thu Feb  1 00:47:48 CET 2007 (tk)

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

@@ -52,7 +56,7 @@ Sun Jan 28 21:20:05 CET 2007 (tk)

 Sat Jan 27 13:54:35 CET 2007 (acab)

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

   * libclamav/pe.c: fix debug message logic, fixed handling of non aligned raw

-  		    data

+		    data

 Fri Jan 26 20:49:07 CET 2007 (acab)

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

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.60 2006/12/22 08:13:46 njh Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.61 2007/02/01 12:42:18 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -519,7 +519,7 @@ fileblobAddData(fileblob *fb, const unsigned char *data, size_t len)

 					*ctx->scanned += (unsigned long)len / CL_COUNT_PRECISION;

 				fb->bytes_scanned += (unsigned long)len;

-				if((len > 5) && (cli_scanbuff(data, (unsigned int)len, ctx->virname, ctx->engine, 0) == CL_VIRUS)) {

+				if((len > 5) && (cli_scanbuff(data, (unsigned int)len, ctx->virname, ctx->engine, CL_TYPE_UNKNOWN_DATA) == CL_VIRUS)) {

 					cli_dbgmsg("fileblobAddData: found %s\n", *ctx->virname);

 					fb->isInfected = 1;

 				}

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.372 2007/01/25 13:59:56 njh Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.373 2007/02/01 12:42:18 njh Exp $";

 #ifdef	_MSC_VER

 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */

@@ -1096,7 +1096,7 @@ save_text(cli_ctx *ctx, const char *dir, const char *start, size_t len)

 		 *	in this way. It gets the "filetype" wrong and then

 		 *	doesn't scan correctly

 		 */

-		if(cli_scanbuff((char *)p, len, ctx->virname, ctx->engine, 0) == CL_VIRUS) {

+		if(cli_scanbuff((char *)p, len, ctx->virname, ctx->engine, CL_TYPE_UNKNOWN_DATA) == CL_VIRUS) {

 			cli_dbgmsg("save_text: found %s\n", *ctx->virname);

 			return CL_VIRUS;

 		}