-doxygen, indentation fixes

1 files changed, 43 insertions, 45 deletions

diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index 93101fc86..c3ef42652 100644
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -201,7 +201,7 @@ static struct MonitoringClient *monitoring_clients_tail;
  * Notification context, to send updates on changes to active addresses
  * of our neighbours.
  */
-struct GNUNET_SERVER_NotificationContext *nc = NULL;
+static struct GNUNET_SERVER_NotificationContext *nc;
 
 
 /**
@@ -215,13 +215,9 @@ lookup_client (struct GNUNET_SERVER_Client *client)
 {
   struct TransportClient *tc;
 
-  tc = clients_head;
-  while (tc != NULL)
-  {
+  for (tc = clients_head; NULL != tc; tc = tc->next)
     if (tc->client == client)
       return tc;
-    tc = tc->next;
-  }
   return NULL;
 }
 
@@ -237,10 +233,12 @@ setup_client (struct GNUNET_SERVER_Client *client)
 {
   struct TransportClient *tc;
 
-  GNUNET_assert (lookup_client (client) == NULL);
-  tc = GNUNET_malloc (sizeof (struct TransportClient));
+  GNUNET_assert (NULL == lookup_client (client));
+  tc = GNUNET_new (struct TransportClient);
   tc->client = client;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", tc);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client %p connected\n",
+              tc);
   return tc;
 }
 
@@ -257,13 +255,9 @@ lookup_monitoring_client (struct GNUNET_SERVER_Client *client)
 {
   struct MonitoringClient *mc;
 
-  mc = monitoring_clients_head;
-  while (mc != NULL)
-  {
+  for (mc = monitoring_clients_head; NULL != mc; mc = mc->next)
     if (mc->client == client)
       return mc;
-    mc = mc->next;
-  }
   return NULL;
 }
 
@@ -285,7 +279,7 @@ setup_monitoring_client (struct GNUNET_SERVER_Client *client,
   static struct GNUNET_PeerIdentity all_zeros;
 
   GNUNET_assert (lookup_monitoring_client (client) == NULL);
-  mc = GNUNET_malloc (sizeof (struct MonitoringClient));
+  mc = GNUNET_new (struct MonitoringClient);
   mc->client = client;
   mc->peer = *peer;
   GNUNET_CONTAINER_DLL_insert (monitoring_clients_head,
@@ -310,9 +304,9 @@ setup_monitoring_client (struct GNUNET_SERVER_Client *client,
  * was closed for writing in the meantime.
  *
  * @param cls closure
- * @param size number of bytes available in buf
+ * @param size number of bytes available in @a buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a buf
  */
 static size_t
 transmit_to_client_callback (void *cls, size_t size, void *buf)
@@ -325,7 +319,7 @@ transmit_to_client_callback (void *cls, size_t size, void *buf)
   size_t tsize;
 
   tc->th = NULL;
-  if (buf == NULL)
+  if (NULL == buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Transmission to client failed, closing connection.\n");
@@ -342,7 +336,8 @@ transmit_to_client_callback (void *cls, size_t size, void *buf)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Transmitting message of type %u to client %p.\n",
                 ntohs (msg->type), tc);
-    GNUNET_CONTAINER_DLL_remove (tc->message_queue_head, tc->message_queue_tail,
+    GNUNET_CONTAINER_DLL_remove (tc->message_queue_head,
+                                 tc->message_queue_tail,
                                  q);
     tc->message_count--;
     memcpy (&cbuf[tsize], msg, msize);
@@ -356,7 +351,7 @@ transmit_to_client_callback (void *cls, size_t size, void *buf)
         GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
                                              GNUNET_TIME_UNIT_FOREVER_REL,
                                              &transmit_to_client_callback, tc);
-    GNUNET_assert (tc->th != NULL);
+    GNUNET_assert (NULL != tc->th);
   }
   return tsize;
 }
@@ -367,16 +362,17 @@ transmit_to_client_callback (void *cls, size_t size, void *buf)
  *
  * @param tc target of the message
  * @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
  */
 static void
-unicast (struct TransportClient *tc, const struct GNUNET_MessageHeader *msg,
+unicast (struct TransportClient *tc,
+         const struct GNUNET_MessageHeader *msg,
          int may_drop)
 {
   struct ClientMessageQueueEntry *q;
   uint16_t msize;
 
-  if (msg == NULL)
+  if (NULL == msg)
   {
     GNUNET_break (0);
     return;
@@ -402,13 +398,13 @@ unicast (struct TransportClient *tc, const struct GNUNET_MessageHeader *msg,
   GNUNET_CONTAINER_DLL_insert_tail (tc->message_queue_head,
                                     tc->message_queue_tail, q);
   tc->message_count++;
-  if (tc->th != NULL)
+  if (NULL != tc->th)
     return;
   tc->th =
       GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
                                            GNUNET_TIME_UNIT_FOREVER_REL,
                                            &transmit_to_client_callback, tc);
-  GNUNET_assert (tc->th != NULL);
+  GNUNET_assert (NULL != tc->th);
 }
 
 
@@ -585,13 +581,14 @@ struct SendTransmitContinuationContext
  * OK to send the next message.
  *
  * @param cls closure
- * @param success GNUNET_OK on success, GNUNET_NO on failure, GNUNET_SYSERR if we're not connected
+ * @param success #GNUNET_OK on success, #GNUNET_NO on failure, #GNUNET_SYSERR if we're not connected
  * @param bytes_payload bytes payload sent
  * @param bytes_on_wire bytes sent on wire
  */
 static void
 handle_send_transmit_continuation (void *cls, int success,
-                                   size_t bytes_payload, size_t bytes_on_wire)
+                                   size_t bytes_payload,
+                                   size_t bytes_on_wire)
 {
   struct SendTransmitContinuationContext *stcc = cls;
   struct SendOkMessage send_ok_msg;
@@ -621,7 +618,8 @@ handle_send_transmit_continuation (void *cls, int success,
  * @param message the send message that was sent
  */
 static void
-clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_send (void *cls,
+                     struct GNUNET_SERVER_Client *client,
                      const struct GNUNET_MessageHeader *message)
 {
   const struct OutboundMessage *obm;
@@ -660,7 +658,10 @@ clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' request from client with target `%4s' and first message of type %u and total size %u\n",
-              "SEND", GNUNET_i2s (&obm->peer), ntohs (obmm->type), msize);
+              "SEND",
+              GNUNET_i2s (&obm->peer),
+              ntohs (obmm->type),
+              msize);
   if (GNUNET_NO == GST_neighbours_test_connected (&obm->peer))
   {
     /* not connected, not allowed to send; can happen due to asynchronous operations */
@@ -691,11 +692,12 @@ clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
  *
  * @param cls closure (unused, NULL)
  * @param peer identity of peer that was tested
- * @param result GNUNET_OK if the connection is allowed,
- *               GNUNET_NO if not
+ * @param result #GNUNET_OK if the connection is allowed,
+ *               #GNUNET_NO if not
  */
 static void
-try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer,
+try_connect_if_allowed (void *cls,
+                        const struct GNUNET_PeerIdentity *peer,
                         int result)
 {
   if (GNUNET_OK != result)
@@ -832,7 +834,7 @@ clients_handle_address_to_string (void *cls,
     GNUNET_SERVER_transmit_context_run (tc, rtimeout);
     return;
   }
-  actx = GNUNET_malloc (sizeof (struct AddressToStringContext));
+  actx = GNUNET_new (struct AddressToStringContext);
   actx->tc = tc;
   GNUNET_CONTAINER_DLL_insert (a2s_head, a2s_tail, actx);
   GNUNET_SERVER_disable_receive_done_warning (client);
@@ -850,10 +852,8 @@ clients_handle_address_to_string (void *cls,
  * @return composed message
  */
 static struct AddressIterateResponseMessage *
-compose_address_iterate_response_message (const struct GNUNET_PeerIdentity
-                                          *peer,
-                                          const struct GNUNET_HELLO_Address
-                                          *address)
+compose_address_iterate_response_message (const struct GNUNET_PeerIdentity *peer,
+                                          const struct GNUNET_HELLO_Address *address)
 {
   struct AddressIterateResponseMessage *msg;
   size_t size;
@@ -1032,7 +1032,6 @@ GST_clients_stop ()
     GNUNET_CONTAINER_DLL_remove (a2s_head, a2s_tail, cur);
     GNUNET_free (cur);
   }
-
   if (NULL != nc)
   {
     GNUNET_SERVER_notification_context_destroy (nc);
@@ -1040,18 +1039,19 @@ GST_clients_stop ()
   }
 }
 
+
 /**
  * Broadcast the given message to all of our clients.
  *
  * @param msg message to broadcast
- * @param may_drop GNUNET_YES if the message can be dropped / is payload
+ * @param may_drop #GNUNET_YES if the message can be dropped / is payload
  */
 void
 GST_clients_broadcast (const struct GNUNET_MessageHeader *msg, int may_drop)
 {
   struct TransportClient *tc;
 
-  for (tc = clients_head; tc != NULL; tc = tc->next)
+  for (tc = clients_head; NULL != tc; tc = tc->next)
   {
     if ((GNUNET_YES == may_drop) && (GNUNET_YES != tc->send_payload))
       continue;                 /* skip, this client does not care about payload */
@@ -1065,7 +1065,7 @@ GST_clients_broadcast (const struct GNUNET_MessageHeader *msg, int may_drop)
  *
  * @param client target of the message
  * @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
  */
 void
 GST_clients_unicast (struct GNUNET_SERVER_Client *client,
@@ -1087,10 +1087,8 @@ GST_clients_unicast (struct GNUNET_SERVER_Client *client,
  * @param address address, NULL on disconnect
  */
 void
-GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity
-                                            *peer,
-                                            const struct GNUNET_HELLO_Address
-                                            *address)
+GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity *peer,
+                                            const struct GNUNET_HELLO_Address *address)
 {
   struct AddressIterateResponseMessage *msg;
   struct MonitoringClient *mc;