X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcontainer_slist.c;h=e75c695c51e56a43082245ddcf3d1da252d1106f;hb=9edc29a3c924554eecc00aa856bf3b0eb95ead52;hp=cecc74ce2594ac78c00167ba15c1bf951e138d0c;hpb=89eaed3f777bd076391f006b830f20be23d38210;p=oweals%2Fgnunet.git diff --git a/src/util/container_slist.c b/src/util/container_slist.c index cecc74ce2..e75c695c5 100644 --- a/src/util/container_slist.c +++ b/src/util/container_slist.c @@ -4,7 +4,7 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -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. */ @@ -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 { @@ -76,27 +78,6 @@ struct GNUNET_CONTAINER_SList }; -/** - * Handle to a singly linked list iterator - */ -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; -}; - /** * Create a new element that is to be inserted into the list @@ -107,22 +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_new (struct GNUNET_CONTAINER_SList_Elem); + e->elem = (void *) buf; + } e->disp = disp; e->len = len; return e; @@ -146,7 +127,8 @@ 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; + if (l->tail == NULL) + l->tail = e; l->length++; } @@ -159,8 +141,8 @@ GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, */ void GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l, - 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; @@ -180,20 +162,24 @@ GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l, * @param src source */ void -GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst, struct GNUNET_CONTAINER_SList *src) +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); + 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); } @@ -204,7 +190,7 @@ GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst, struct GNUNET struct GNUNET_CONTAINER_SList * GNUNET_CONTAINER_slist_create () { - return GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList)); + return GNUNET_new (struct GNUNET_CONTAINER_SList); } @@ -225,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; } @@ -249,13 +235,13 @@ 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; @@ -264,10 +250,11 @@ 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 */ int GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l, @@ -281,6 +268,32 @@ GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l, return GNUNET_NO; } +typedef int (*Comparator)(const void *, size_t, const void *, size_t); + +/** + * 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) + * @param compare comparison function, should return 0 if compared elements match + * + * @return NULL if the 'buf' could not be found, pointer to the + * list element, if found + */ +void * +GNUNET_CONTAINER_slist_contains2 (const struct GNUNET_CONTAINER_SList *l, + const void *buf, size_t len, + Comparator compare) +{ + struct GNUNET_CONTAINER_SList_Elem *e; + + for (e = l->head; e != NULL; e = e->next) + if ((e->len == len) && (*compare)(buf, len, e->elem, e->len) == 0) + return e->elem; + return NULL; +} + /** * Count the elements of a list @@ -394,10 +407,8 @@ GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i, * @param i iterator */ void -GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator - *i) +GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i) { - GNUNET_free (i); } /* end of container_slist.c */