From: Christian Grothoff Date: Mon, 28 Sep 2009 08:26:01 +0000 (+0000) Subject: fix X-Git-Tag: initial-import-from-subversion-38251~23459 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee5b1f4bca1a46e19d12d1bf3743ec1272d661e8;p=oweals%2Fgnunet.git fix --- diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index 9756d0751..1f38dae57 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -829,8 +829,8 @@ void *GNUNET_CONTAINER_heap_peek (struct GNUNET_CONTAINER_Heap *heap); * percolation of nodes. * * @param heap the heap - * @param element element to remove - * @return FIXME + * @param element the element to remove + * @return NULL if "element" was not found in the heap, otherwise element */ void *GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap, void *element); diff --git a/src/util/strings.c b/src/util/strings.c index 13c0b6a58..c24649e97 100644 --- a/src/util/strings.c +++ b/src/util/strings.c @@ -54,12 +54,12 @@ * @return number of bytes written to the buffer * (or number of bytes that would have been written) */ -unsigned int +size_t GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...) { - unsigned int needed; - unsigned int slen; + size_t needed; + size_t slen; const char *s; va_list ap;