Changeset 363 for trunk/include

Timestamp:

Oct 21, 2011, 1:08:28 AM (13 years ago)

Author:

katerina

Message:

Change zAVL implementation to allow integer keys.

Location:

trunk/include

Files:

• sh_inotify.h (modified) (1 diff)
• zAVLTree.h (modified) (3 diffs)

trunk/include/sh_inotify.h

@@ -6 +6 @@
 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, 

trunk/include/zAVLTree.h

@@ -33 +33 @@
 
 /* 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 +56 @@
   long count;
   zAVLKey (*getkey)(const void *item);
+  int keytype;
 } zAVLTree;
 
@@ -62 +66 @@
 
 
-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);