X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcontainer_slist.c;h=7b85dc87760780239eeab9720e1e030f64cc97fb;hb=e62ce5b19244ae28472bf0e02b19c3f905f1ee0a;hp=4d3c71a38a1735225052df3afa295a1e8915ace6;hpb=6aaab5e7cb4cb0c5fd5a5575c45b48124597e570;p=oweals%2Fgnunet.git diff --git a/src/util/container_slist.c b/src/util/container_slist.c index 4d3c71a38..7b85dc877 100644 --- a/src/util/container_slist.c +++ b/src/util/container_slist.c @@ -27,6 +27,8 @@ #include "platform.h" #include "gnunet_container_lib.h" +#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) + /** * Element in our linked list. */ @@ -34,7 +36,7 @@ struct GNUNET_CONTAINER_SList_Elem { /** * This is a linked list. - */ + */ struct GNUNET_CONTAINER_SList_Elem *next; /** @@ -55,7 +57,7 @@ struct GNUNET_CONTAINER_SList_Elem /** - * Handle to a singly linked list + * Handle to a singly linked list */ struct GNUNET_CONTAINER_SList { @@ -65,32 +67,17 @@ struct GNUNET_CONTAINER_SList struct GNUNET_CONTAINER_SList_Elem *head; /** - * Number of elements in the list. + * Tail of the linked list. */ - unsigned int length; -}; - + struct GNUNET_CONTAINER_SList_Elem *tail; -/** - * Handle to a singly linked list iterator - */ -struct GNUNET_CONTAINER_SList_Iterator -{ /** - * Linked list that we are iterating over. + * Number of elements in the list. */ - struct GNUNET_CONTAINER_SList *list; + unsigned int length; +}; - /** - * Last element accessed. - */ - struct GNUNET_CONTAINER_SList_Elem *last; - /** - * Current list element. - */ - struct GNUNET_CONTAINER_SList_Elem *elem; -}; /** * Create a new element that is to be inserted into the list @@ -101,23 +88,22 @@ struct GNUNET_CONTAINER_SList_Iterator * @return a new element */ static struct GNUNET_CONTAINER_SList_Elem * -create_elem (enum GNUNET_CONTAINER_SListDisposition disp, - const void *buf, - size_t len) +create_elem (enum GNUNET_CONTAINER_SListDisposition disp, const void *buf, + size_t len) { struct GNUNET_CONTAINER_SList_Elem *e; if (disp == GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT) - { - e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem) + len); - memcpy (&e[1], buf, len); - e->elem = (void*) &e[1]; - } + { + e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem) + len); + memcpy (&e[1], buf, len); + e->elem = (void *) &e[1]; + } else - { - e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem)); - e->elem = (void*) buf; - } + { + e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem)); + e->elem = (void *) buf; + } e->disp = disp; e->len = len; return e; @@ -132,8 +118,8 @@ create_elem (enum GNUNET_CONTAINER_SListDisposition disp, * @param len length of the buffer */ void -GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, - enum GNUNET_CONTAINER_SListDisposition disp, +GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, + enum GNUNET_CONTAINER_SListDisposition disp, const void *buf, size_t len) { struct GNUNET_CONTAINER_SList_Elem *e; @@ -141,10 +127,62 @@ GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, e = create_elem (disp, buf, len); e->next = l->head; l->head = e; + if (l->tail == NULL) + l->tail = e; + l->length++; +} + +/** + * 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 + */ +void +GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l, + enum GNUNET_CONTAINER_SListDisposition disp, + const void *buf, size_t len) +{ + struct GNUNET_CONTAINER_SList_Elem *e; + + e = create_elem (disp, buf, len); + if (l->tail != NULL) + l->tail->next = e; + if (l->head == NULL) + l->head = e; + l->tail = e; l->length++; } +/** + * Append a singly linked list to another + * @param dst list to append to + * @param src source + */ +void +GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst, + struct GNUNET_CONTAINER_SList *src) +{ + struct GNUNET_CONTAINER_SList_Iterator i; + + for (i = GNUNET_CONTAINER_slist_begin (src); + GNUNET_CONTAINER_slist_end (&i) != GNUNET_YES; + GNUNET_CONTAINER_slist_next (&i)) + + { + GNUNET_CONTAINER_slist_add (dst, + (i.elem->disp == + GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC) ? + GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC : + GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, + i.elem->elem, i.elem->len); + } + GNUNET_CONTAINER_slist_iter_destroy (&i); +} + + /** * Create a new singly linked list * @return the new list @@ -173,14 +211,14 @@ GNUNET_CONTAINER_slist_destroy (struct GNUNET_CONTAINER_SList *l) * @param l list * @return iterator pointing to the beginning */ -struct GNUNET_CONTAINER_SList_Iterator * +struct GNUNET_CONTAINER_SList_Iterator GNUNET_CONTAINER_slist_begin (struct GNUNET_CONTAINER_SList *l) { - struct GNUNET_CONTAINER_SList_Iterator *ret; + struct GNUNET_CONTAINER_SList_Iterator ret; - ret = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Iterator)); - ret->elem = l->head; - ret->list = l; + memset (&ret, 0, sizeof (ret)); + ret.elem = l->head; + ret.list = l; return ret; } @@ -197,14 +235,15 @@ GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l) e = l->head; while (e != NULL) - { - n = e->next; - if (e->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC) - GNUNET_free (e->elem); - GNUNET_free (e); - e = n; - } + { + n = e->next; + if (e->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC) + GNUNET_free (e->elem); + GNUNET_free (e); + e = n; + } l->head = NULL; + l->tail = NULL; l->length = 0; } @@ -214,7 +253,7 @@ GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l) * * @param l list * @param buf payload buffer to find - * @param lenght of the payload + * @param len length of the payload (number of bytes in buf) */ int GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l, @@ -223,8 +262,7 @@ GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l, struct GNUNET_CONTAINER_SList_Elem *e; for (e = l->head; e != NULL; e = e->next) - if ( (e->len == len) && - (memcmp (buf, e->elem, len) == 0) ) + if ((e->len == len) && (memcmp (buf, e->elem, len) == 0)) return GNUNET_YES; return GNUNET_NO; } @@ -257,6 +295,8 @@ GNUNET_CONTAINER_slist_erase (struct GNUNET_CONTAINER_SList_Iterator *i) i->last->next = next; else i->list->head = next; + if (next == NULL) + i->list->tail = i->last; if (i->elem->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC) GNUNET_free (i->elem->elem); GNUNET_free (i->elem); @@ -274,8 +314,8 @@ GNUNET_CONTAINER_slist_erase (struct GNUNET_CONTAINER_SList_Iterator *i) */ void GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before, - enum GNUNET_CONTAINER_SListDisposition disp, - const void *buf, size_t len) + enum GNUNET_CONTAINER_SListDisposition disp, + const void *buf, size_t len) { struct GNUNET_CONTAINER_SList_Elem *e; @@ -285,6 +325,8 @@ GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before, before->last->next = e; else before->list->head = e; + if (e->next == NULL) + before->list->tail = e; before->list->length++; } @@ -324,7 +366,7 @@ GNUNET_CONTAINER_slist_end (struct GNUNET_CONTAINER_SList_Iterator *i) * @param len payload length * @return payload */ -const void * +void * GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i, size_t * len) { @@ -333,4 +375,13 @@ GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i, return i->elem->elem; } +/** + * Release an iterator + * @param i iterator + */ +void +GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i) +{ +} + /* end of container_slist.c */