From owner-svn-src-user@FreeBSD.ORG  Thu Aug 25 01:47:27 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 483FF1065672;
	Thu, 25 Aug 2011 01:47:27 +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 3867D8FC19;
	Thu, 25 Aug 2011 01:47:27 +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 p7P1lREw079326;
	Thu, 25 Aug 2011 01:47:27 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7P1lRbt079324;
	Thu, 25 Aug 2011 01:47:27 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108250147.p7P1lRbt079324@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 25 Aug 2011 01:47:27 +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: r225162 - 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: Thu, 25 Aug 2011 01:47:27 -0000

Author: gabor
Date: Thu Aug 25 01:47:26 2011
New Revision: 225162
URL: http://svn.freebsd.org/changeset/base/225162

Log:
  - Convert to TRE style

Modified:
  user/gabor/tre-integration/contrib/tre/lib/hashtable.h

Modified: user/gabor/tre-integration/contrib/tre/lib/hashtable.h
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/hashtable.h	Thu Aug 25 01:47:08 2011	(r225161)
+++ user/gabor/tre-integration/contrib/tre/lib/hashtable.h	Thu Aug 25 01:47:26 2011	(r225162)
@@ -5,29 +5,31 @@
 
 #include <sys/types.h>
 
-#define HASH_OK		0
-#define HASH_UPDATED	1
-#define HASH_FAIL	2
-#define HASH_FULL	3
-#define HASH_NOTFOUND	4
+#define HASH_OK         0
+#define HASH_UPDATED    1
+#define HASH_FAIL       2
+#define HASH_FULL       3
+#define HASH_NOTFOUND   4
+
+#define HASHSTEP(x,c) (((x << 5) + x) + (c))
 
 typedef struct {
-	void		*key;
-	void		*value;
+  void *key;
+  void *value;
 } hashtable_entry;
 
 typedef struct {
-	size_t		 key_size;
-	size_t		 table_size;
-	size_t		 usage;
-	size_t		 value_size;
-	hashtable_entry **entries;
+  size_t key_size;
+  size_t table_size;
+  size_t usage;
+  size_t value_size;
+  hashtable_entry **entries;
 } hashtable;
 
-void		 hashtable_free(hashtable *);
-int		 hashtable_get(hashtable *, const void *, void *);
-hashtable	*hashtable_init(size_t, size_t, size_t);
-int		 hashtable_put(hashtable *, const void *, const void *);
-int		 hashtable_remove(hashtable *, const void *);
+void hashtable_free(hashtable *);
+int hashtable_get(hashtable *, const void *, void *);
+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 */