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

+Wed Feb 18 22:24:22 EET 2009 (edwin)

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

+ * libclamav/: reorder fields (bb #1144)

+

 Wed Feb 18 21:57:22 EET 2009 (edwin)

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

  * clamd/session.c: real fix for BB #1403.

@@ -142,9 +142,9 @@ extern int cl_engine_free(struct cl_engine *engine);

 struct cl_stat {

     char *dir;

-    unsigned int entries;

     struct stat *stattab;

     char **statdname;

+    unsigned int entries;

 };

 struct cl_cvd {		    /* field no. */

@@ -152,6 +152,7 @@ struct cl_cvd {		    /* field no. */

     unsigned int version;   /* 3 */

     unsigned int sigs;	    /* 4 */

     unsigned int fl;	    /* 5 */

+			    /* padding */

     char *md5;		    /* 6 */

     char *dsig;		    /* 7 */

     char *builder;	    /* 8 */

@@ -426,7 +426,6 @@ int hashset_init(struct hashset* hs, size_t initial_capacity, uint8_t load_facto

 		load_factor = 80;

 	}

 	initial_capacity = nearest_power(initial_capacity);

-	hs->load_factor = load_factor;

 	hs->limit = initial_capacity * load_factor / 100;

 	hs->capacity = initial_capacity;

 	hs->mask = initial_capacity - 1;

@@ -500,7 +499,7 @@ static int hashset_grow(struct hashset *hs)

 	 * will hash to different locations. */

 	cli_dbgmsg(MODULE_NAME "Growing hashset, used: %lu, capacity: %lu\n", hs->count, hs->capacity);

 	/* create a bigger hashset */

-	if((rc = hashset_init(&new_hs, hs->capacity << 1, hs->load_factor)) < 0) {

+	if((rc = hashset_init(&new_hs, hs->capacity << 1, hs->limit*100/hs->capacity)) < 0) {

 		return rc;

 	}

 	/* and copy keys */

@@ -90,11 +90,10 @@ int hashtab_store(const struct hashtable *s,FILE* out);

 struct hashset {

 	uint32_t* keys;

 	uint32_t* bitmap;

-	size_t capacity;

-	size_t mask;

-	size_t count;

-	size_t limit;

-	uint8_t load_factor;

+	uint32_t capacity;

+	uint32_t mask;

+	uint32_t count;

+	uint32_t limit;

 };

 int hashset_init(struct hashset* hs, size_t initial_capacity, uint8_t load_factor);

@@ -108,12 +108,12 @@ struct tokens {

 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 int      rec;

 };

 static struct scope* scope_new(struct parser_state *state)

@@ -372,8 +372,8 @@ struct dirent_data {

     char *filename;

     const char *dirname;

     struct stat *statbuf;

-    int   is_dir;/* 0 - no, 1 - yes */

     long  ino; /* -1: inode not available */

+    int   is_dir;/* 0 - no, 1 - yes */

 };

 /* sort files before directories, and lower inodes before higher inodes */

@@ -1281,7 +1281,7 @@ static int cli_loadmd5(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	if(mode == MD5_MDB) { /* section MD5 */

 	    if(!db->md5_sizes_hs.capacity) {

-		    hashset_init(&db->md5_sizes_hs, 32768, 80);

+		    hashset_init(&db->md5_sizes_hs, 65536, 80);

 	    }

 	    hashset_addkey(&db->md5_sizes_hs, size);

 	}

@@ -353,7 +353,7 @@ int init_regex_list(struct regex_matcher* matcher)

 	matcher->list_inited=1;

 	matcher->list_built=0;

 	matcher->list_loaded=0;

-	hashtab_init(&matcher->suffix_hash, 10);

+	hashtab_init(&matcher->suffix_hash, 512);

 #ifdef USE_MPOOL

 	matcher->mempool = mp;

 	matcher->suffixes.mempool = mp;

@@ -45,7 +45,6 @@ enum node_type {

 };

 struct node {

-	enum node_type type;

 	struct node *parent;

 	union {

 		struct {

@@ -55,6 +54,7 @@ struct node {

 		uint8_t*    leaf_class_bitmap;

 		uint8_t     leaf_char;

 	} u;

+	enum node_type type;

 };

 /* --- Prototypes --*/