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

+Tue Aug  1 12:23:43 CEST 2006 (acab)

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

+  * libclamav: includes cleanup (big thanks njh!)

+

 Tue Aug  1 08:33:09 BST 2006 (njh)

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

   * clamav-milter:	Honour dont-scan-on-error if the database can't be

@@ -37,15 +37,9 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <stdlib.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <unistd.h>

-#include <string.h>

 #include "cltypes.h"

-#include "pe.h"

 #include "rebuildpe.h"

 #include "others.h"

 #include "packlibs.h"

@@ -48,11 +48,7 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <stdlib.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <unistd.h>

 #include <string.h>

 #include "cltypes.h"

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

       packed += 0x10;

       /* Alloc 1 more struct */

-      if ( ! (tmpsct = realloc(usects, sizeof(struct SECTION) * (j+1))) ) {

+      if ( ! (tmpsct = cli_realloc(usects, sizeof(struct SECTION) * (j+1))) ) {

 	if (usects)

 	  free(usects);

 	return -1;

@@ -38,11 +38,8 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <string.h>

-#include <stdlib.h>

-#include "cltypes.h"

 #include "rebuildpe.h"

 #include "others.h"

@@ -51,18 +51,13 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <stdlib.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <unistd.h>

 #include <string.h>

 #include "cltypes.h"

 #include "pe.h"

 #include "rebuildpe.h"

 #include "others.h"

-#include "spin.h"

 #include "packlibs.h"

 #define EC32(x) le32_to_host(x) /* Convert little endian to host */

@@ -43,11 +43,7 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <stdlib.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <unistd.h>

 #include <string.h>

 #include "cltypes.h"

@@ -51,18 +51,11 @@

 #include "clamav-config.h"

 #endif

-#include <stdio.h>

 #include <stdlib.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <unistd.h>

 #include <string.h>

 #include "cltypes.h"

-#include "pe.h"

-#include "rebuildpe.h"

 #include "others.h"

-#include "wwunpack.h"

 #define VAALIGN(s) (((s)/0x1000+((s)%0x1000!=0))*0x1000)

 #define FIXVS(v, r) (VAALIGN((r>v)?r:v))