hashtab_insert should return pointer to newly inserted element. Fix grow bug.

git-svn: trunk@3891

ChangeLog

@@ -1,3 +1,8 @@
+Mon Jun 16 23:43:31 EEST 2008 (edwin)
+-------------------------------------
+  * libclamav/hashtab.[ch]: hashtab_insert should return pointer to newly
+  inserted element. Fix grow bug.
+
 Fri Jun 13 13:10:15 CEST 2008 (tk)
 ----------------------------------
   * libclamav/matcher-ac.c: fix handling of nodes which also match single

libclamav/hashtab.c

@@ -243,9 +243,10 @@ struct element* hashtab_find(const struct hashtable *s,const char* key,const siz
 
 static int hashtab_grow(struct hashtable *s)
 {
-	const size_t new_capacity = nearest_power(s->capacity);
+	const size_t new_capacity = nearest_power(s->capacity + 1);
 	struct element* htable = cli_calloc(new_capacity, sizeof(*s->htable));
 	size_t i,idx, used = 0;
+	cli_dbgmsg("hashtab.c: new capacity: %lu\n",new_capacity);
 	if(new_capacity == s->capacity || !htable)
 		return CL_EMEM;
 
@@ -286,14 +287,18 @@ static int hashtab_grow(struct hashtable *s)
 	return CL_SUCCESS;
 }
 
-int hashtab_insert(struct hashtable *s, const char* key, const size_t len, const element_data data)
+const struct element* hashtab_insert(struct hashtable *s, const char* key, const size_t len, const element_data data)
 {
 	struct element* element;
 	struct element* deleted_element = NULL;
 	size_t tries = 1;
 	size_t idx;
 	if(!s)
-		return CL_ENULLARG;
+		return NULL;
+	if(s->used > s->maxfill) {
+		cli_dbgmsg("hashtab.c:Growing hashtable %p, because it has exceeded maxfill, old size:%ld\n",(void*)s,s->capacity);
+		hashtab_grow(s);
+	}
 	do {
 		PROFILE_CALC_HASH(s);
 		idx = hash((const unsigned char*)key, len, s->capacity);
@@ -313,18 +318,14 @@ int hashtab_insert(struct hashtable *s, const char* key, const size_t len, const
 				}
 				thekey = cli_malloc(len+1);
 				if(!thekey)
-					return CL_EMEM;
+					return NULL;
 				strncpy(thekey, key, len+1);
 				thekey[len]='\0';
 				element->key = thekey;
 				element->data = data;
 				element->len = len;
 				s->used++;
-				if(s->used > s->maxfill) {
-					cli_dbgmsg("hashtab.c:Growing hashtable %p, because it has exceeded maxfill, old size:%ld\n",(void*)s,s->capacity);
-					hashtab_grow(s);
-				}
-				return 0;
+				return element;
 			}
 			else if(element->key == DELETED_KEY) {
 				deleted_element = element;
@@ -332,7 +333,7 @@ int hashtab_insert(struct hashtable *s, const char* key, const size_t len, const
 			else if(len == element->len && strncmp(key, element->key, len)==0) {
 				PROFILE_DATA_UPDATE(s, tries);
 				element->data = data;/* key found, update */
-				return 0;
+				return element;
 			}
 			else {
 				idx = (idx + tries++) % s->capacity;
@@ -344,7 +345,7 @@ int hashtab_insert(struct hashtable *s, const char* key, const size_t len, const
 		cli_dbgmsg("hashtab.c: Growing hashtable %p, because its full, old size:%ld.\n",(void*)s,s->capacity);
 	} while( hashtab_grow(s) >= 0 );
 	cli_warnmsg("hashtab.c: Unable to grow hashtable\n");
-	return CL_EMEM;
+	return NULL;
 }
 
 void hashtab_delete(struct hashtable *s, const char* key, const size_t len)

libclamav/hashtab.h

@@ -79,7 +79,7 @@ struct hashtable {
 int hashtab_generate_c(const struct hashtable *s,const char* name);
 struct element* hashtab_find(const struct hashtable *s, const char* key, const size_t len);
 int hashtab_init(struct hashtable *s,size_t capacity);
-int hashtab_insert(struct hashtable *s, const char* key, const size_t len, const element_data data);
+const struct element* hashtab_insert(struct hashtable *s, const char* key, const size_t len, const element_data data);
 void hashtab_delete(struct hashtable *s,const char* key,const size_t len);
 void hashtab_clear(struct hashtable *s);