fix

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 9756d0751f0067165186c5bab3ad63eb944b0405..1f38dae572409b82ec462f8ef208b2b2f6188333 100644 (file)
--- 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 13c0b6a581221f20c1dfa6832974abc0a795bd50..c24649e97a793507220eb1df6b41a87c07112992 100644 (file)
--- 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;