Date: Tue, 28 Jun 2011 15:00:17 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r223646 - user/gabor/tre-integration/contrib/tre/lib Message-ID: <201106281500.p5SF0HuD054305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Tue Jun 28 15:00:17 2011 New Revision: 223646 URL: http://svn.freebsd.org/changeset/base/223646 Log: - Avoid multiple inclusions of hashtable.h - Make this code WARNS=6 clean Modified: user/gabor/tre-integration/contrib/tre/lib/hashtable.c user/gabor/tre-integration/contrib/tre/lib/hashtable.h Modified: user/gabor/tre-integration/contrib/tre/lib/hashtable.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/hashtable.c Tue Jun 28 14:40:17 2011 (r223645) +++ user/gabor/tre-integration/contrib/tre/lib/hashtable.c Tue Jun 28 15:00:17 2011 (r223646) @@ -56,7 +56,6 @@ hashtable int hashtable_put(hashtable *tbl, const void *key, const void *value) { - hashtable_entry *entry; uint32_t hash = 0; if (tbl->table_size == tbl->usage) @@ -149,7 +148,7 @@ hashtable_free(hashtable *tbl) if (tbl == NULL) return; - for (int i = 0; i < tbl->table_size; i++) + for (unsigned int i = 0; i < tbl->table_size; i++) if (tbl->entries[i] != NULL) { // free(tbl->entries[i]->key); // free(tbl->entries[i]->value); Modified: user/gabor/tre-integration/contrib/tre/lib/hashtable.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/hashtable.h Tue Jun 28 14:40:17 2011 (r223645) +++ user/gabor/tre-integration/contrib/tre/lib/hashtable.h Tue Jun 28 15:00:17 2011 (r223646) @@ -24,6 +24,9 @@ * SUCH DAMAGE. */ +#ifndef HASHTABLE_H +#define HASHTABLE_H 1 + #include <sys/types.h> typedef struct { @@ -44,3 +47,5 @@ int hashtable_get(hashtable *, const v hashtable *hashtable_init(size_t, size_t, size_t); int hashtable_put(hashtable *, const void *, const void *); int hashtable_remove(hashtable *, const void *); + +#endif /* HASHTABLE.H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106281500.p5SF0HuD054305>