From 6d7c1dd00a193fc054d1f1588ae7c98dc95b6257 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 14 Dec 2014 22:15:06 +0000 Subject: fix #3570: finally remove SList API --- src/include/gnunet_container_lib.h | 245 ------------------------------------- 1 file changed, 245 deletions(-) (limited to 'src/include') diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index 68e62c750..60082489c 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -1818,251 +1818,6 @@ GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_Heap *heap, GNUNET_CONTAINER_HeapCostType new_cost); -/* ******************** Singly linked list *************** */ - -/** - * Possible ways for how data stored in the linked list - * might be allocated. - * @deprecated use DLL macros - */ -enum GNUNET_CONTAINER_SListDisposition -{ - /** - * Single-linked list must copy the buffer. - * @deprecated use DLL macros - */ - GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT = 0, - - /** - * Data is static, no need to copy or free. - * @deprecated use DLL macros - */ - GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC = 2, - - /** - * Data is dynamic, do not copy but free when done. - * @deprecated use DLL macros - */ - GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC = 4 -}; - -struct GNUNET_CONTAINER_SList_Elem; - - -/** - * Handle to a singly linked list - * @deprecated use DLL macros - */ -struct GNUNET_CONTAINER_SList; - -/** - * Handle to a singly linked list iterator - * @deprecated use DLL macros - */ -struct GNUNET_CONTAINER_SList_Iterator -{ - /** - * Linked list that we are iterating over. - */ - struct GNUNET_CONTAINER_SList *list; - - /** - * Last element accessed. - */ - struct GNUNET_CONTAINER_SList_Elem *last; - - /** - * Current list element. - */ - struct GNUNET_CONTAINER_SList_Elem *elem; -}; - - - -/** - * Add a new element to the list - * @param l list - * @param disp memory disposition - * @param buf payload buffer - * @param len length of the buffer - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, - enum GNUNET_CONTAINER_SListDisposition disp, - const void *buf, size_t len); - - -/** - * Add a new element to the end of the list - * @param l list - * @param disp memory disposition - * @param buf payload buffer - * @param len length of the buffer - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l, - enum GNUNET_CONTAINER_SListDisposition disp, - const void *buf, size_t len); - - -/** - * Append a singly linked list to another - * @param dst list to append to - * @param src source - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst, - struct GNUNET_CONTAINER_SList *src); - - -/** - * Create a new singly linked list - * @return the new list - * @deprecated use DLL macros - */ -struct GNUNET_CONTAINER_SList * -GNUNET_CONTAINER_slist_create (void); - - -/** - * Destroy a singly linked list - * @param l the list to be destroyed - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_destroy (struct GNUNET_CONTAINER_SList *l); - - -/** - * Return the beginning of a list - * - * @param l list - * @return iterator pointing to the beginning (by value! Either allocate the - * structure on the stack, or use GNUNET_malloc() yourself! All other - * functions do take pointer to this struct though) - * @deprecated use DLL macros - */ -struct GNUNET_CONTAINER_SList_Iterator -GNUNET_CONTAINER_slist_begin (struct GNUNET_CONTAINER_SList *l); - - -/** - * Clear a list - * - * @param l list - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l); - - -/** - * Check if a list contains a certain element - * @param l list - * @param buf payload buffer to find - * @param len length of the payload (number of bytes in buf) - * @return GNUNET_YES if found, GNUNET_NO otherwise - * @deprecated use DLL macros - */ -int -GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l, - const void *buf, size_t len); - -/** - * Check if a list contains a certain element using 'compare' function - * - * @param l list - * @param buf payload buffer to find - * @param len length of the payload (number of bytes in buf) - * @param compare comparison function - * - * @return NULL if the 'buf' could not be found, pointer to the - * list element, if found - * @deprecated use DLL macros - */ -void * -GNUNET_CONTAINER_slist_contains2 (const struct GNUNET_CONTAINER_SList *l, - const void *buf, size_t len, - int (*compare)(const void *, const size_t, const void *, const size_t)); -/** - * Count the elements of a list - * @param l list - * @return number of elements in the list - * @deprecated use DLL macros - */ -int -GNUNET_CONTAINER_slist_count (const struct GNUNET_CONTAINER_SList *l); - - -/** - * Remove an element from the list - * @param i iterator that points to the element to be removed - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_erase (struct GNUNET_CONTAINER_SList_Iterator *i); - - -/** - * Insert an element into a list at a specific position - * @param before where to insert the new element - * @param disp memory disposition - * @param buf payload buffer - * @param len length of the payload - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before, - enum GNUNET_CONTAINER_SListDisposition disp, - const void *buf, size_t len); - - -/** - * Advance an iterator to the next element - * @param i iterator - * @return GNUNET_YES on success, GNUNET_NO if the end has been reached - * @deprecated use DLL macros - */ -int -GNUNET_CONTAINER_slist_next (struct GNUNET_CONTAINER_SList_Iterator *i); - - -/** - * Check if an iterator points beyond the end of a list - * @param i iterator - * @return GNUNET_YES if the end has been reached, GNUNET_NO if the iterator - * points to a valid element - * @deprecated use DLL macros - */ -int -GNUNET_CONTAINER_slist_end (struct GNUNET_CONTAINER_SList_Iterator *i); - - -/** - * Retrieve the element at a specific position in a list - * - * @param i iterator - * @param len set to the payload length - * @return payload - * @deprecated use DLL macros - */ -void * -GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i, - size_t *len); - - -/** - * Release an iterator - * @param i iterator - * @deprecated use DLL macros - */ -void -GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i); - - #if 0 /* keep Emacsens' auto-indent happy */ { #endif -- cgit v1.2.3