4 files changed, 21 insertions, 18 deletions

diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 561d73c0d..f5b5213bc 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -1336,15 +1336,15 @@ peer_transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Transmit a message to the given peer as soon as possible.
  * If the peer disconnects before the transmission can happen,
- * the callback is invoked with a 'NULL' buffer.
+ * the callback is invoked with a `NULL` @a buffer.
  *
  * @param cp target peer
- * @param is_query is this a query (GNUNET_YES) or content (GNUNET_NO) or neither (GNUNET_SYSERR)
+ * @param is_query is this a query (#GNUNET_YES) or content (#GNUNET_NO) or neither (#GNUNET_SYSERR)
  * @param priority how important is this request?
  * @param timeout when does this request timeout (call gmc with error)
  * @param size number of bytes we would like to send to the peer
  * @param gmc function to call to get the message
- * @param gmc_cls closure for gmc
+ * @param gmc_cls closure for @a gmc
  * @return handle to cancel request
  */
 struct GSF_PeerTransmitHandle *
@@ -1573,10 +1573,10 @@ struct IterationContext
 /**
  * Function that calls the callback for each peer.
  *
- * @param cls the 'struct IterationContext*'
+ * @param cls the `struct IterationContext *`
  * @param key identity of the peer
- * @param value the 'struct GSF_ConnectedPeer*'
- * @return GNUNET_YES to continue iteration
+ * @param value the `struct GSF_ConnectedPeer *`
+ * @return #GNUNET_YES to continue iteration
  */
 static int
 call_iterator (void *cls, const struct GNUNET_HashCode * key, void *value)
@@ -1593,7 +1593,7 @@ call_iterator (void *cls, const struct GNUNET_HashCode * key, void *value)
  * Iterate over all connected peers.
  *
  * @param it function to call for each peer
- * @param it_cls closure for it
+ * @param it_cls closure for @a it
  */
 void
 GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it, void *it_cls)
@@ -1794,7 +1794,7 @@ GSF_connected_peer_init_ ()
                  GNUNET_CONFIGURATION_get_value_filename (GSF_cfg, "fs",
                                                           "RESPECT",
                                                           &respectDirectory));
-  GNUNET_DISK_directory_create (respectDirectory);
+  GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_create (respectDirectory));
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
                                       &cron_flush_respect, NULL);
 }
@@ -1806,7 +1806,7 @@ GSF_connected_peer_init_ ()
  * @param cls closure, unused
  * @param key current key code
  * @param value value in the hash map (peer entry)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
  */
 static int
 clean_peer (void *cls, const struct GNUNET_HashCode * key, void *value)
@@ -1837,7 +1837,7 @@ GSF_connected_peer_done_ ()
  * @param cls the 'struct GSF_LocalClient*' to look for
  * @param key current key code
  * @param value value in the hash map (peer entry)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
  */
 static int
 clean_local_client (void *cls, const struct GNUNET_HashCode * key, void *value)
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 458e21b9d..676efafe5 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1641,6 +1641,7 @@ handle_namestore_block_response (void *cls,
     {
       /* fail longest-standing DHT request */
       rx = GNUNET_CONTAINER_heap_peek (dht_lookup_heap);
+      GNUNET_assert (NULL != rx);
       rx->proc (rx->proc_cls, 0, NULL);
       GNS_resolver_lookup_cancel (rx);
     }
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 12d3345c5..9f106db11 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -722,7 +722,7 @@ GNUNET_DISK_directory_test (const char *fil, int is_readable);
  * caution.
  *
  * @param filename the file to remove
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
 GNUNET_DISK_directory_remove (const char *filename);
@@ -732,7 +732,7 @@ GNUNET_DISK_directory_remove (const char *filename);
  * Implementation of "mkdir -p"
  *
  * @param dir the directory to create
- * @returns GNUNET_SYSERR on failure, GNUNET_OK otherwise
+ * @returns #GNUNET_SYSERR on failure, #GNUNET_OK otherwise
  */
 int
 GNUNET_DISK_directory_create (const char *dir);
@@ -744,8 +744,8 @@ GNUNET_DISK_directory_create (const char *dir);
  * @param fh file handle
  * @param lockStart absolute position from where to lock
  * @param lockEnd absolute position until where to lock
- * @param excl GNUNET_YES for an exclusive lock
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @param excl #GNUNET_YES for an exclusive lock
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
 GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, OFF_T lockStart,
@@ -753,11 +753,12 @@ GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, OFF_T lockStart,
 
 
 /**
- * Unlock a part of a file
+ * Unlock a part of a file.
+ *
  * @param fh file handle
  * @param unlockStart absolute position from where to unlock
  * @param unlockEnd absolute position until where to unlock
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
 GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, OFF_T unlockStart,
@@ -776,7 +777,7 @@ GNUNET_DISK_filename_canonicalize (char *fn);
  * @brief Change owner of a file
  * @param filename file to change
  * @param user new owner of the file
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
 GNUNET_DISK_file_change_owner (const char *filename, const char *user);
@@ -823,7 +824,7 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
  * Unmap a file
  *
  * @param h mapping handle
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h);
diff --git a/src/util/disk.c b/src/util/disk.c
index e815afb2b..066b0b99b 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -653,6 +653,7 @@ GNUNET_DISK_file_test (const char *fil)
 
 /**
  * Implementation of "mkdir -p"
+ *
  * @param dir the directory to create
  * @returns GNUNET_OK on success, GNUNET_SYSERR on failure
  */