update

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@9 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/src/Makefile b/libs/openzap/src/Makefile
index 1a7ca47cce9f6e671ab4e88b25ee3f050cf993d2..ae2bf9db0c367df20c28ff26402763d8f3a61b13 100644 (file)
--- 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 (file)
index 0000000..c27766a
--- /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 3087b8eaa10557d8a0554dd9baf0fb1b9dc011a3..8668d58e329272975d9e4d4f4a81da7404e310e9 100644 (file)
--- 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 170bc727eb35d7b1629f912c58cd20c1c281f98d..ee795bb8dbf1216108807500d91f9786489e620f 100644 (file)
--- 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 (file)
index 0000000..aef6e1c
--- /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 (file)
index 0000000..d23da58
--- /dev/null
+++ b/libs/openzap/src/zt
@@ -0,0 +1,2 @@
+CFLAGS +=-DZAP_ZT_SUPPORT
+OBJS += zap_zt.o