From owner-svn-src-user@FreeBSD.ORG  Tue Jun 28 15:00:18 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E975106564A;
	Tue, 28 Jun 2011 15:00:18 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E7E7A8FC12;
	Tue, 28 Jun 2011 15:00:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5SF0HZo054308;
	Tue, 28 Jun 2011 15:00:17 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5SF0HuD054305;
	Tue, 28 Jun 2011 15:00:17 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201106281500.p5SF0HuD054305@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 28 Jun 2011 15:00:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223646 - user/gabor/tre-integration/contrib/tre/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jun 2011 15:00:18 -0000

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 */