introducing GNUNET_UNUSED macro instead of hard-coding gcc attribute all over the place; also some further documentation fixes

5 files changed, 70 insertions, 70 deletions

diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c
index 838893882..e7d904120 100644
--- a/src/vpn/gnunet-daemon-exit.c
+++ b/src/vpn/gnunet-daemon-exit.c
@@ -170,8 +170,8 @@ struct tunnel_state
  * Function that frees everything from a hashmap
  */
 static int
-free_iterate (void *cls __attribute__ ((unused)), const GNUNET_HashCode * hash
-              __attribute__ ((unused)), void *value)
+free_iterate (void *cls GNUNET_UNUSED, const GNUNET_HashCode * hash
+              GNUNET_UNUSED, void *value)
 {
   GNUNET_free (value);
   return GNUNET_YES;
@@ -182,7 +182,7 @@ free_iterate (void *cls __attribute__ ((unused)), const GNUNET_HashCode * hash
  */
 static void
 cleanup (void *cls
-         __attribute__ ((unused)),
+         GNUNET_UNUSED,
          const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 {
   GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
@@ -200,10 +200,10 @@ cleanup (void *cls
 
 static void *
 new_tunnel (void *cls
-            __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+            GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
             const struct GNUNET_PeerIdentity *initiator
-            __attribute__ ((unused)), const struct GNUNET_ATS_Information *ats
-            __attribute__ ((unused)))
+            GNUNET_UNUSED, const struct GNUNET_ATS_Information *ats
+            GNUNET_UNUSED)
 {
   struct tunnel_state *s = GNUNET_malloc (sizeof *s);
 
@@ -215,7 +215,7 @@ new_tunnel (void *cls
 
 static void
 clean_tunnel (void *cls
-              __attribute__ ((unused)), const struct GNUNET_MESH_Tunnel *tunnel,
+              GNUNET_UNUSED, const struct GNUNET_MESH_Tunnel *tunnel,
               void *tunnel_ctx)
 {
   GNUNET_free (tunnel_ctx);
@@ -531,8 +531,8 @@ tcp_from_helper (struct tcp_pkt *tcp, unsigned char *dadr, size_t addrlen,
  * Receive packets from the helper-process
  */
 static void
-message_token (void *cls __attribute__ ((unused)), void *client
-               __attribute__ ((unused)),
+message_token (void *cls GNUNET_UNUSED, void *client
+               GNUNET_UNUSED,
                const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_HELPER);
@@ -584,7 +584,7 @@ message_token (void *cls __attribute__ ((unused)), void *client
  * @param section name of section in config, equal to hostname
  */
 static void
-read_service_conf (void *cls __attribute__ ((unused)), const char *section)
+read_service_conf (void *cls GNUNET_UNUSED, const char *section)
 {
   if ((strlen (section) < 8) ||
       (0 != strcmp (".gnunet.", section + (strlen (section) - 8))))
@@ -1039,14 +1039,14 @@ prepare_ipv6_packet (size_t len, uint16_t pktlen, void *payload,
  */
 static int
 receive_tcp_service (void *cls
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      const struct GNUNET_PeerIdentity *sender
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      const struct GNUNET_MessageHeader *message,
                      const struct GNUNET_ATS_Information *atsi
-                     __attribute__ ((unused)))
+                     GNUNET_UNUSED)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received TCP-Packet\n");
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
@@ -1145,14 +1145,14 @@ receive_tcp_service (void *cls
 
 static int
 receive_tcp_remote (void *cls
-                    __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+                    GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
                     void **tunnel_ctx
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_PeerIdentity *sender
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_MessageHeader *message,
                     const struct GNUNET_ATS_Information *atsi
-                    __attribute__ ((unused)))
+                    GNUNET_UNUSED)
 {
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1);
@@ -1221,14 +1221,14 @@ receive_tcp_remote (void *cls
 
 static int
 receive_udp_remote (void *cls
-                    __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+                    GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
                     void **tunnel_ctx
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_PeerIdentity *sender
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_MessageHeader *message,
                     const struct GNUNET_ATS_Information *atsi
-                    __attribute__ ((unused)))
+                    GNUNET_UNUSED)
 {
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1);
@@ -1301,13 +1301,13 @@ receive_udp_remote (void *cls
  */
 static int
 receive_udp_service (void *cls
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
                      const struct GNUNET_PeerIdentity *sender
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      const struct GNUNET_MessageHeader *message,
                      const struct GNUNET_ATS_Information *atsi
-                     __attribute__ ((unused)))
+                     GNUNET_UNUSED)
 {
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1);
@@ -1463,8 +1463,8 @@ connect_to_mesh ()
  * @param cfg_ configuration
  */
 static void
-run (void *cls, char *const *args __attribute__ ((unused)), const char *cfgfile
-     __attribute__ ((unused)), const struct GNUNET_CONFIGURATION_Handle *cfg_)
+run (void *cls, char *const *args GNUNET_UNUSED, const char *cfgfile
+     GNUNET_UNUSED, const struct GNUNET_CONFIGURATION_Handle *cfg_)
 {
   cfg = cfg_;
 
diff --git a/src/vpn/gnunet-daemon-vpn-dns.c b/src/vpn/gnunet-daemon-vpn-dns.c
index 77d900046..0e4c88a29 100644
--- a/src/vpn/gnunet-daemon-vpn-dns.c
+++ b/src/vpn/gnunet-daemon-vpn-dns.c
@@ -54,7 +54,7 @@ struct GNUNET_CLIENT_TransmitHandle *dns_transmit_handle;
  * {{{
  */
 size_t
-send_query (void *cls __attribute__ ((unused)), size_t size, void *buf)
+send_query (void *cls GNUNET_UNUSED, size_t size, void *buf)
 {
   size_t len;
 
@@ -128,7 +128,7 @@ send_query (void *cls __attribute__ ((unused)), size_t size, void *buf)
  */
 void
 connect_to_service_dns (void *cls
-                        __attribute__ ((unused)),
+                        GNUNET_UNUSED,
                         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   conn_task = GNUNET_SCHEDULER_NO_TASK;
@@ -170,7 +170,7 @@ connect_to_service_dns (void *cls
  */
 void
 dns_answer_handler (void *cls
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_MessageHeader *msg)
 {
   /* the service disconnected, reconnect after short wait */
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c
index af80764a8..1ffb0f7d8 100644
--- a/src/vpn/gnunet-daemon-vpn-helper.c
+++ b/src/vpn/gnunet-daemon-vpn-helper.c
@@ -169,7 +169,7 @@ initialize_tunnel_state (int addrlen, struct GNUNET_MESH_TransmitHandle *th)
  */
 void
 helper_write (void *cls
-              __attribute__ ((unused)),
+              GNUNET_UNUSED,
               const struct GNUNET_SCHEDULER_TaskContext *tsdkctx)
 {
   if (tsdkctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
@@ -321,8 +321,8 @@ helper_write (void *cls
  * Receive packets from the helper-process
  */
 void
-message_token (void *cls __attribute__ ((unused)), void *client
-               __attribute__ ((unused)),
+message_token (void *cls GNUNET_UNUSED, void *client
+               GNUNET_UNUSED,
                const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_HELPER);
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index cc8001eae..93ee47e4e 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -79,7 +79,7 @@ GNUNET_SCHEDULER_TaskIdentifier shs_task;
  */
 static void
 cleanup (void *cls
-         __attribute__ ((unused)),
+         GNUNET_UNUSED,
          const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 {
   GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
@@ -169,7 +169,7 @@ address4_mapping_exists (uint32_t addr)
 
 static void
 collect_mappings (void *cls
-                  __attribute__ ((unused)),
+                  GNUNET_UNUSED,
                   const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
@@ -336,7 +336,7 @@ port_in_ports (uint64_t ports, uint16_t port)
 void
 send_pkt_to_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
                   const struct GNUNET_ATS_Information *atsi
-                  __attribute__ ((unused)))
+                  GNUNET_UNUSED)
 {
   /* peer == NULL means that all peers in this request are connected */
   if (peer == NULL)
@@ -857,11 +857,11 @@ add_additional_port (struct map_entry *me, uint16_t port)
 
 static int
 receive_udp_back (void *cls
-                  __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+                  GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
                   void **tunnel_ctx, const struct GNUNET_PeerIdentity *sender,
                   const struct GNUNET_MessageHeader *message,
                   const struct GNUNET_ATS_Information *atsi
-                  __attribute__ ((unused)))
+                  GNUNET_UNUSED)
 {
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct remote_addr *s = (struct remote_addr *) desc;
@@ -1034,12 +1034,12 @@ receive_udp_back (void *cls
 
 static int
 receive_tcp_back (void *cls
-                  __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+                  GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
                   void **tunnel_ctx, const struct GNUNET_PeerIdentity *sender
-                  __attribute__ ((unused)),
+                  GNUNET_UNUSED,
                   const struct GNUNET_MessageHeader *message,
                   const struct GNUNET_ATS_Information *atsi
-                  __attribute__ ((unused)))
+                  GNUNET_UNUSED)
 {
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct remote_addr *s = (struct remote_addr *) desc;
@@ -1245,8 +1245,8 @@ cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel, void *tunnel_ctx)
  * @param cfg_ configuration
  */
 static void
-run (void *cls, char *const *args __attribute__ ((unused)), const char *cfgfilep
-     __attribute__ ((unused)), const struct GNUNET_CONFIGURATION_Handle *cfg_)
+run (void *cls, char *const *args GNUNET_UNUSED, const char *cfgfilep
+     GNUNET_UNUSED, const struct GNUNET_CONFIGURATION_Handle *cfg_)
 {
   static const struct GNUNET_MESH_MessageHandler handlers[] = {
     {receive_udp_back, GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK, 0},
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index c8d790b56..e44405a8e 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -168,7 +168,7 @@ client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
  */
 static void
 hijack (void *cls
-        __attribute__ ((unused)), const struct GNUNET_SCHEDULER_TaskContext *tc)
+        GNUNET_UNUSED, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
@@ -208,10 +208,10 @@ hijack (void *cls
 
 static void *
 new_tunnel (void *cls
-            __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+            GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
             const struct GNUNET_PeerIdentity *initiator
-            __attribute__ ((unused)), const struct GNUNET_ATS_Information *ats
-            __attribute__ ((unused)))
+            GNUNET_UNUSED, const struct GNUNET_ATS_Information *ats
+            GNUNET_UNUSED)
 {
   struct tunnel_state *s = GNUNET_malloc (sizeof *s);
 
@@ -223,7 +223,7 @@ new_tunnel (void *cls
 
 static void
 clean_tunnel (void *cls
-              __attribute__ ((unused)), const struct GNUNET_MESH_Tunnel *tunnel,
+              GNUNET_UNUSED, const struct GNUNET_MESH_Tunnel *tunnel,
               void *tunnel_ctx)
 {
   GNUNET_free (tunnel_ctx);
@@ -387,7 +387,7 @@ mesh_send (void *cls, size_t size, void *buf)
 void
 mesh_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
               const struct GNUNET_ATS_Information *atsi
-              __attribute__ ((unused)))
+              GNUNET_UNUSED)
 {
   if (NULL == peer)
     return;
@@ -448,14 +448,14 @@ send_mesh_query (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static int
 receive_mesh_query (void *cls
-                    __attribute__ ((unused)), struct GNUNET_MESH_Tunnel *tunnel,
+                    GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
                     void **ctx
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_PeerIdentity *sender
-                    __attribute__ ((unused)),
+                    GNUNET_UNUSED,
                     const struct GNUNET_MessageHeader *message,
                     const struct GNUNET_ATS_Information *atsi
-                    __attribute__ ((unused)))
+                    GNUNET_UNUSED)
 {
   struct dns_pkt *dns = (struct dns_pkt *) (message + 1);
 
@@ -501,13 +501,13 @@ receive_mesh_query (void *cls
 
 static int
 receive_mesh_answer (void *cls
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      struct GNUNET_MESH_Tunnel *tunnel, void **ctx
-                     __attribute__ ((unused)),
+                     GNUNET_UNUSED,
                      const struct GNUNET_PeerIdentity *sender,
                      const struct GNUNET_MessageHeader *message,
                      const struct GNUNET_ATS_Information *atsi
-                     __attribute__ ((unused)))
+                     GNUNET_UNUSED)
 {
   /* TODo: size check */
   struct dns_pkt *dns = (struct dns_pkt *) (message + 1);
@@ -750,14 +750,14 @@ send_rev_query (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 static void
 receive_dht (void *cls, struct GNUNET_TIME_Absolute exp
-             __attribute__ ((unused)), const GNUNET_HashCode * key
-             __attribute__ ((unused)),
+             GNUNET_UNUSED, const GNUNET_HashCode * key
+             GNUNET_UNUSED,
              const struct GNUNET_PeerIdentity *get_path
-             __attribute__ ((unused)), unsigned int get_path_length
-             __attribute__ ((unused)),
+             GNUNET_UNUSED, unsigned int get_path_length
+             GNUNET_UNUSED,
              const struct GNUNET_PeerIdentity *put_path
-             __attribute__ ((unused)), unsigned int put_path_length
-             __attribute__ ((unused)), enum GNUNET_BLOCK_Type type, size_t size,
+             GNUNET_UNUSED, unsigned int put_path_length
+             GNUNET_UNUSED, enum GNUNET_BLOCK_Type type, size_t size,
              const void *data)
 {
 
@@ -869,8 +869,8 @@ receive_dht (void *cls, struct GNUNET_TIME_Absolute exp
  */
 static void
 rehijack (void *cls
-          __attribute__ ((unused)), struct GNUNET_SERVER_Client *client,
-          const struct GNUNET_MessageHeader *message __attribute__ ((unused)))
+          GNUNET_UNUSED, struct GNUNET_SERVER_Client *client,
+          const struct GNUNET_MessageHeader *message GNUNET_UNUSED)
 {
   unhijack (dnsoutport);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &hijack, NULL);
@@ -883,7 +883,7 @@ rehijack (void *cls
  */
 static void
 receive_query (void *cls
-               __attribute__ ((unused)), struct GNUNET_SERVER_Client *client,
+               GNUNET_UNUSED, struct GNUNET_SERVER_Client *client,
                const struct GNUNET_MessageHeader *message)
 {
   struct query_packet *pkt = (struct query_packet *) message;
@@ -1232,7 +1232,7 @@ handle_response (struct dns_pkt *dns, struct sockaddr *addr, socklen_t addrlen,
  */
 static void
 read_response6 (void *cls
-                __attribute__ ((unused)),
+                GNUNET_UNUSED,
                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_in6 addr;
@@ -1282,7 +1282,7 @@ read_response6 (void *cls
  */
 static void
 read_response (void *cls
-               __attribute__ ((unused)),
+               GNUNET_UNUSED,
                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_in addr;
@@ -1439,7 +1439,7 @@ handle_response (struct dns_pkt *dns, struct sockaddr *addr, socklen_t addrlen,
  */
 static void
 cleanup_task (void *cls
-              __attribute__ ((unused)),
+              GNUNET_UNUSED,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
@@ -1590,7 +1590,7 @@ publish_name (const char *name, uint64_t ports, uint32_t service_type,
  * @param section the current section
  */
 static void
-publish_iterate (void *cls __attribute__ ((unused)), const char *section)
+publish_iterate (void *cls GNUNET_UNUSED, const char *section)
 {
   char *udp_redirects;
   char *tcp_redirects;
@@ -1666,7 +1666,7 @@ publish_iterate (void *cls __attribute__ ((unused)), const char *section)
  */
 static void
 publish_names (void *cls
-               __attribute__ ((unused)),
+               GNUNET_UNUSED,
                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))