From fcbd79567c15f007808e4f88e7b822a04d34c12d Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Thu, 17 May 2007 01:54:30 +0000
Subject: [PATCH] update

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@9 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
 libs/openzap/src/Makefile                    | 10 ++--------
 libs/openzap/src/general.makefile            |  3 +++
 libs/openzap/src/include/hashtable_private.h |  2 +-
 libs/openzap/src/openzap.c                   |  6 +++---
 libs/openzap/src/wanpipe                     |  2 ++
 libs/openzap/src/zt                          |  2 ++
 6 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 libs/openzap/src/general.makefile
 create mode 100644 libs/openzap/src/wanpipe
 create mode 100644 libs/openzap/src/zt

diff --git a/libs/openzap/src/Makefile b/libs/openzap/src/Makefile
index 1a7ca47cce..ae2bf9db0c 100644
--- a/libs/openzap/src/Makefile
+++ b/libs/openzap/src/Makefile
@@ -29,17 +29,11 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-CC=gcc
 OBJS=hashtable.o hashtable_itr.o openzap.o zap_config.o
-CFLAGS=$(USER_CFLAGS) -Iinclude -Wall -Werror -Wextra -std=c99 -pedantic -ansi
+CFLAGS=$(ZAP_CFLAGS) -Iinclude 
 MYLIB=libopenzap.a
 
-CFLAGS +=-DZAP_WANPIPE_SUPPORT
-OBJS += zap_wanpipe.o
-
-#CFLAGS +=-DZAP_ZT_SUPPORT
-#OBJS += zap_zt.o
-
+include general.makefile $(ZAP_MODS)
 
 $(MYLIB): $(OBJS)
 	ar rcs $(MYLIB) $(OBJS)
diff --git a/libs/openzap/src/general.makefile b/libs/openzap/src/general.makefile
new file mode 100644
index 0000000000..c27766a22f
--- /dev/null
+++ b/libs/openzap/src/general.makefile
@@ -0,0 +1,3 @@
+CC=gcc
+CFLAGS += -Wall -Werror -Wextra -std=c99 -pedantic -ansi
+
diff --git a/libs/openzap/src/include/hashtable_private.h b/libs/openzap/src/include/hashtable_private.h
index 3087b8eaa1..8668d58e32 100644
--- a/libs/openzap/src/include/hashtable_private.h
+++ b/libs/openzap/src/include/hashtable_private.h
@@ -25,7 +25,7 @@ struct hashtable {
 
 /*****************************************************************************/
 unsigned int
-hash(struct hashtable *h, void *k);
+hash(struct hashtable *h, const void *k);
 
 /*****************************************************************************/
 /* indexFor */
diff --git a/libs/openzap/src/openzap.c b/libs/openzap/src/openzap.c
index 170bc727eb..ee795bb8db 100644
--- a/libs/openzap/src/openzap.c
+++ b/libs/openzap/src/openzap.c
@@ -228,17 +228,17 @@ zap_status_t zap_global_init(void)
 	zap_config_t cfg;
 	char *var, *val;
 	unsigned configured = 0;
-	zap_software_interface_t *zint = NULL;
+	zap_software_interface_t *zint;
 	
-	zint, 0;
-
 	globals.interface_hash = create_hashtable(16, hashfromstring, equalkeys);
+	zint = NULL;
 
 #ifdef ZAP_WANPIPE_SUPPORT
 	if (wanpipe_init(&zint) == ZAP_SUCCESS) {
 		hashtable_insert(globals.interface_hash, (void *)zint->name, zint);
 	}
 #endif
+	zint = NULL;
 #ifdef ZAP_ZT_SUPPORT
 	if (zt_init(&zint) == ZAP_SUCCESS) {
 		hashtable_insert(globals.interface_hash, (void *)zint->name, zint);
diff --git a/libs/openzap/src/wanpipe b/libs/openzap/src/wanpipe
new file mode 100644
index 0000000000..aef6e1cbac
--- /dev/null
+++ b/libs/openzap/src/wanpipe
@@ -0,0 +1,2 @@
+CFLAGS +=-DZAP_WANPIPE_SUPPORT
+OBJS += zap_wanpipe.o
diff --git a/libs/openzap/src/zt b/libs/openzap/src/zt
new file mode 100644
index 0000000000..d23da58c15
--- /dev/null
+++ b/libs/openzap/src/zt
@@ -0,0 +1,2 @@
+CFLAGS +=-DZAP_ZT_SUPPORT
+OBJS += zap_zt.o