Browse code

fix a gcc warning (bb #786). Thanks to Gianluigi Tiesi <sherpya*netfarm.it>

git-svn: trunk@3513

Török Edvin authored on 2008/01/21 23:29:49
Showing 3 changed files
... ...
@@ -1,3 +1,8 @@
1
+Mon Jan 21 16:04:35 EET 2008 (edwin)
2
+-----------------------------------
3
+  * libclamav/hashtab.[ch]: fix a gcc warning (bb #786). Thanks to
4
+  Gianluigi Tiesi <sherpya*netfarm.it>
5
+
1 6
 Sun Jan 20 23:49:41 EET 2008 (edwin)
2 7
 ------------------------------------
3 8
   * configure: AC_TRY_LINK already adds a main(), remove duplicate main()
... ...
@@ -344,7 +344,7 @@ void hashtab_delete(struct hashtable *s,const unsigned char* key,const size_t le
344 344
 	struct element* e = hashtab_find(s,key,len);
345 345
 	if(e && e->key) {	
346 346
 		PROFILE_HASH_DELETE(s);
347
-		free(e->key);/*FIXME: any way to shut up warnings here? if I make key char*, I get tons of warnings in entitylist.h */
347
+		free((void *)e->key);
348 348
 		e->key = DELETED_KEY;
349 349
 		s->used--;
350 350
 	}
... ...
@@ -356,7 +356,7 @@ void hashtab_clear(struct hashtable *s)
356 356
 	PROFILE_HASH_CLEAR(s);
357 357
 	for(i=0;i < s->capacity;i++) {
358 358
 		if(s->htable[i].key && s->htable[i].key != DELETED_KEY)
359
-			free(s->htable[i].key);/*FIXME: shut up warnings */
359
+			free((void *)s->htable[i].key);
360 360
 	}
361 361
 	memset(s->htable, 0, s->capacity);
362 362
 	s->used = 0;
... ...
@@ -77,7 +77,7 @@ struct hashtable {
77 77
 int hashtab_generate_c(const struct hashtable *s,const char* name);
78 78
 struct element* hashtab_find(const struct hashtable *s,const unsigned char* key,const size_t len);
79 79
 int hashtab_init(struct hashtable *s,size_t capacity);
80
-int hashtab_insert(struct hashtable *s,const unsigned char* key,size_t len,element_data data);
80
+int hashtab_insert(struct hashtable *s,const unsigned char* key,const size_t len,const element_data data);
81 81
 void hashtab_delete(struct hashtable *s,const unsigned char* key,const size_t len);
82 82
 void hashtab_clear(struct hashtable *s);
83 83