Changeset 23d27c9c9cec127459721c3b9420eb349109b477

Timestamp:

19/08/06 18:19:31 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1156004371 +0000

git-parent:

[2c2ebc9c31414a523710240e5ca6bc743057a42f]

git-author:

Clément Stenac <zorglub@videolan.org> 1156004371 +0000

Message:

* B-search macro
* Redo dictionnary handling to remove recursion and bugs

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (7 diffs)
• src/Makefile.am (modified) (1 diff)
• src/input/item.c (modified) (1 diff)
• src/misc/dict.c (added)
• src/misc/hashtables.c (deleted)

include/vlc_common.h

@@ -204 +204 @@
-typedef struct variable_t variable_t;
-typedef struct date_t date_t;
-
+
+
-typedef struct gc_object_t gc_object_t ;
-
@@ -718 +719 @@
-    }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    uint64_t  i_hash;
-    void     *p_data;
-};
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-/* MSB (big endian)/LSB (little endian) conversions - network order is always

include/vlc_symbols.h

@@ -464 +464 @@
-    update_t * (*__update_New_inner) (vlc_object_t *);
-    void (*update_download_inner) (update_iterator_t *, char *);
-(*vlc_HashInsert_inner) (hashtable_entry_t **, int *, int, const char *, void *)
-int (*vlc_HashLookup_inner) (hashtable_entry_t *, int, int, const char *)
-* (*vlc_HashRetrieve_inner) (hashtable_entry_t*, int, int, const char *)
+*vlc_HashInsert_deprecated
+void *vlc_HashLookup_deprecated
+ *vlc_HashRetrieve_deprecated
-    void * (*utf8_opendir_inner) (const char *dirname);
-    FILE * (*utf8_fopen_inner) (const char *filename, const char *mode);
@@ -526 +526 @@
-    void (*__intf_ProgressUpdate_inner) (vlc_object_t*, int, const char*, float, int);
-    int (*playlist_AddInput_inner) (playlist_t *, input_item_t *,int , int, vlc_bool_t);
+    void (*vlc_DictInsert_inner) (dict_t *, int, const char *, void *);
+    void* (*vlc_DictGet_inner) (dict_t *, int, const char *);
+    int (*vlc_DictLookup_inner) (dict_t *, int, const char *);
+    void (*vlc_DictClear_inner) (dict_t *);
+    dict_t * (*vlc_DictNew_inner) (void);
-};
-# if defined (__PLUGIN__)
@@ -937 +942 @@
-#  define __update_New (p_symbols)->__update_New_inner
-#  define update_download (p_symbols)->update_download_inner
-#  define vlc_HashInsert (p_symbols)->vlc_HashInsert_inner
-#  define vlc_HashLookup (p_symbols)->vlc_HashLookup_inner
-#  define vlc_HashRetrieve (p_symbols)->vlc_HashRetrieve_inner
-#  define utf8_opendir (p_symbols)->utf8_opendir_inner
-#  define utf8_fopen (p_symbols)->utf8_fopen_inner
@@ -989 +991 @@
-#  define __intf_ProgressUpdate (p_symbols)->__intf_ProgressUpdate_inner
-#  define playlist_AddInput (p_symbols)->playlist_AddInput_inner
+#  define vlc_DictInsert (p_symbols)->vlc_DictInsert_inner
+#  define vlc_DictGet (p_symbols)->vlc_DictGet_inner
+#  define vlc_DictLookup (p_symbols)->vlc_DictLookup_inner
+#  define vlc_DictClear (p_symbols)->vlc_DictClear_inner
+#  define vlc_DictNew (p_symbols)->vlc_DictNew_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1403 +1410 @@
-    ((p_symbols)->__update_New_inner) = __update_New; \
-    ((p_symbols)->update_download_inner) = update_download; \
-    ((p_symbols)->vlc_HashInsert_inner) = vlc_HashInsert; \
-    ((p_symbols)->vlc_HashLookup_inner) = vlc_HashLookup; \
-    ((p_symbols)->vlc_HashRetrieve_inner) = vlc_HashRetrieve; \
-    ((p_symbols)->utf8_opendir_inner) = utf8_opendir; \
-    ((p_symbols)->utf8_fopen_inner) = utf8_fopen; \
@@ -1455 +1459 @@
-    ((p_symbols)->__intf_ProgressUpdate_inner) = __intf_ProgressUpdate; \
-    ((p_symbols)->playlist_AddInput_inner) = playlist_AddInput; \
+    ((p_symbols)->vlc_DictInsert_inner) = vlc_DictInsert; \
+    ((p_symbols)->vlc_DictGet_inner) = vlc_DictGet; \
+    ((p_symbols)->vlc_DictLookup_inner) = vlc_DictLookup; \
+    ((p_symbols)->vlc_DictClear_inner) = vlc_DictClear; \
+    ((p_symbols)->vlc_DictNew_inner) = vlc_DictNew; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
@@ -1490 +1499 @@
-    (p_symbols)->stats_HandlerDestroy_deprecated = NULL; \
-    (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \
+    (p_symbols)->vlc_HashInsert_deprecated = NULL; \
+    (p_symbols)->vlc_HashLookup_deprecated = NULL; \
+    (p_symbols)->vlc_HashRetrieve_deprecated = NULL; \
-    (p_symbols)->playlist_ItemNewFromInput_deprecated = NULL; \
-    (p_symbols)->playlist_PlaylistAdd_deprecated = NULL; \

src/Makefile.am

@@ -326 +326 @@
-    misc/vlm.c \
-    misc/xml.c \
-hashtables
+dict
-    misc/devices.c \
-    extras/libc.c \

src/input/item.c

@@ -71 +71 @@
-{
-    vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg;
-, i_top, i_bottom
+
-    input_item_t *p_input = (input_item_t *) p_this;
-