Index: trunk/include/sh_inotify.h
===================================================================
--- trunk/include/sh_inotify.h	(revision 358)
+++ trunk/include/sh_inotify.h	(revision 363)
@@ -6,10 +6,17 @@
 typedef struct 
 {
+  /*
+  void * list_of_watches;
+  */
+
   int    watch[SH_INOTIFY_MAX];
   int    flag[SH_INOTIFY_MAX];
   char * file[SH_INOTIFY_MAX];
-  int    count;
 
+  int     count;
+  int  max_count;
 } sh_watches;
+
+#define SH_INOTIFY_INITIALIZER { { 0 }, { 0 }, { NULL}, 0, 0 }
 
 int sh_inotify_wait_for_change(char * filename, sh_watches * watches, 
Index: trunk/include/zAVLTree.h
===================================================================
--- trunk/include/zAVLTree.h	(revision 358)
+++ trunk/include/zAVLTree.h	(revision 363)
@@ -33,8 +33,11 @@
 
 /* typedef the keytype */
-typedef const char * zAVLKey;
+typedef const void * zAVLKey;
 
 /* Comparison function for strings is strcmp(). */
-#define zAVLKey_cmp(tree, a, b) (strcmp((a), (b)))
+/* #define zAVLKey_cmp(tree, a, b) (strcmp((a), (b))) */
+
+#define zAVL_KEY_STRING 0
+#define zAVL_KEY_INT    1
 
 
@@ -53,4 +56,5 @@
   long count;
   zAVLKey (*getkey)(const void *item);
+  int keytype;
 } zAVLTree;
 
@@ -62,5 +66,5 @@
 
 
-extern zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item));
+extern zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item), int keytype);
 extern void zAVLFreeTree (zAVLTree *avltree, void (freeitem)(void *item));
 extern int zAVLInsert (zAVLTree *avltree, void *item);