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

+Thu Nov 10 19:28:40 CET 2005 (tk)

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

+  * libclamav/matcher.c, clamav.h: remove cl_scanbuff

+

 Thu Nov  3 23:04:20 CET 2005 (tk)

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

   * clamd: properly handle ReadTimeout in SESSION

@@ -187,8 +187,6 @@ struct cl_cvd {

 };

 /* file scanning */

-extern int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_engine *engine);

-

 extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options);

 extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options);

@@ -78,12 +78,12 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

     if(troot) {

 	if((partcnt = (int *) cli_calloc(troot->ac_partsigs + 1, sizeof(int))) == NULL) {

-	    cli_dbgmsg("cl_scanbuff(): unable to cli_calloc(%d, %d)\n", troot->ac_partsigs + 1, sizeof(int));

+	    cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", troot->ac_partsigs + 1, sizeof(int));

 	    return CL_EMEM;

 	}

 	if((partoff = (unsigned long int *) cli_calloc(troot->ac_partsigs + 1, sizeof(unsigned long int))) == NULL) {

-	    cli_dbgmsg("cl_scanbuff(): unable to cli_calloc(%d, %d)\n", troot->ac_partsigs + 1, sizeof(unsigned long int));

+	    cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", troot->ac_partsigs + 1, sizeof(unsigned long int));

 	    free(partcnt);

 	    return CL_EMEM;

 	}

@@ -99,12 +99,12 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

     }

     if((partcnt = (int *) cli_calloc(groot->ac_partsigs + 1, sizeof(int))) == NULL) {

-	cli_dbgmsg("cl_scanbuff(): unable to cli_calloc(%d, %d)\n", groot->ac_partsigs + 1, sizeof(int));

+	cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", groot->ac_partsigs + 1, sizeof(int));

 	return CL_EMEM;

     }

     if((partoff = (unsigned long int *) cli_calloc(groot->ac_partsigs + 1, sizeof(unsigned long int))) == NULL) {

-	cli_dbgmsg("cl_scanbuff(): unable to cli_calloc(%d, %d)\n", groot->ac_partsigs + 1, sizeof(unsigned long int));

+	cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", groot->ac_partsigs + 1, sizeof(unsigned long int));

 	free(partcnt);

 	return CL_EMEM;

     }

@@ -117,11 +117,6 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

     return ret;

 }

-int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_engine *engine)

-{

-    return cli_scanbuff(buffer, length, virname, engine, 0);

-}

-

 static struct cli_md5_node *cli_vermd5(const unsigned char *md5, const struct cl_engine *engine)

 {

 	struct cli_md5_node *pt;