@@ -1,3 +1,8 @@

+Sat Nov  8 17:24:59 EET 2008 (edwin)

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

+ * libclamav/blob.h, libclamav/cab.h, libclamav/jsparse/js-norm.c: 

+ reorder some struct fields to avoid holes

+

 Sat Nov  8 05:27:43 CET 2008 (acab)

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

  * libclamav/mpool.c: slightly optimized (we're now faster and more compact

@@ -52,7 +52,6 @@ int	blobGrow(blob *b, size_t len);

  */

 typedef	struct fileblob {

 	FILE	*fp;

-	int	fd;

 	blob	b;	/*

 			 * b.name is the name of the attachment as stored in the

 			 * email, not the full path name of the temporary file

@@ -60,6 +59,7 @@ typedef	struct fileblob {

 	char	*fullname;	/* full pathname of the file */

 	cli_ctx	*ctx;	/* When set we can scan the blob, otherwise NULL */

 	unsigned	long	bytes_scanned;

+	int	fd;

 	unsigned	int	isNotEmpty : 1;

 	unsigned	int	isInfected : 1;

 } fileblob;

@@ -57,10 +57,10 @@ struct cab_file {

     int lread;

     int fd;

     int ofd;

+    uint16_t attribs;

     struct cab_folder *folder;

     struct cab_file *next;

     struct cab_archive *cab;

-    uint16_t attribs;

 };

 struct cab_folder {

@@ -106,14 +106,14 @@ struct tokens {

 /* state for the current JS file being parsed */

 struct parser_state {

-	unsigned long     var_uniq;

-	unsigned long     syntax_errors;

-	unsigned int      rec;

 	struct scope *global;

 	struct scope *current;

 	struct scope *list;

 	yyscan_t scanner;

 	struct tokens tokens;

+	unsigned long     var_uniq;

+	unsigned long     syntax_errors;

+	unsigned int      rec;

 };

 static struct scope* scope_new(struct parser_state *state)