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

+Wed Feb 28 01:14:19 CET 2007 (tk)

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

+  * libclamav: minor cleanup (bb#247)

+

 Tue Feb 27 23:25:46 CET 2007 (acab)

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

   * libclamav/petite.c: invalid read in valgrind (bb#369)

@@ -607,7 +607,7 @@ cli_rmdirs(const char *name)

 	if(strcmp(dent->d_name, "..") == 0)

 	    continue;

-	fname = cli_calloc(strlen(name) + strlen(dent->d_name) + 2, sizeof(char));

+	fname = cli_malloc(strlen(name) + strlen(dent->d_name) + 2, sizeof(char));

 	if(fname == NULL) {

 	    closedir(dd);

 	    return -1;

@@ -667,7 +667,7 @@ int cli_rmdirs(const char *dirname)

 #endif

 		{

 		    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

-			fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

+			fname = cli_malloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

 			if(!fname) {

 			    closedir(dd);

 			    return -1;

@@ -960,7 +960,7 @@ int cli_scandir(const char *dirname, cli_ctx *ctx)

 	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

-		    fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

+		    fname = cli_malloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

 		    if(!fname) {

 			closedir(dd);

 			return CL_EMEM;

@@ -1148,7 +1148,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)

 	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

-		    fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

+		    fname = cli_malloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

 		    if(!fname) {

 			ret = CL_EMEM;

 			break;