Use statement exprs instead of local function

This change lets us compile with clang again.

2 files changed, 20 insertions, 20 deletions

diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c
index 76a6ea484..43b6c7db1 100644
--- a/src/dv/dv_api.c
+++ b/src/dv/dv_api.c
@@ -314,23 +314,23 @@ mq_error_handler (void *cls,
 static void
 reconnect (struct GNUNET_DV_ServiceHandle *sh)
 {
-  GNUNET_MQ_hd_fixed_size (connect,
-                           GNUNET_MESSAGE_TYPE_DV_CONNECT,
-                           struct GNUNET_DV_ConnectMessage);
-  GNUNET_MQ_hd_fixed_size (disconnect,
-                           GNUNET_MESSAGE_TYPE_DV_DISCONNECT,
-                           struct GNUNET_DV_DisconnectMessage);
-  GNUNET_MQ_hd_fixed_size (distance_update,
-                           GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED,
-                           struct GNUNET_DV_DistanceUpdateMessage);
-  GNUNET_MQ_hd_var_size (received,
-                         GNUNET_MESSAGE_TYPE_DV_RECV,
-                         struct GNUNET_DV_ReceivedMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_connect_handler (sh),
-    make_disconnect_handler (sh),
-    make_distance_update_handler (sh),
-    make_received_handler (sh),
+    GNUNET_MQ_hd_fixed_size (connect,
+                             GNUNET_MESSAGE_TYPE_DV_CONNECT,
+                             struct GNUNET_DV_ConnectMessage,
+                             sh),
+    GNUNET_MQ_hd_fixed_size (disconnect,
+                             GNUNET_MESSAGE_TYPE_DV_DISCONNECT,
+                             struct GNUNET_DV_DisconnectMessage,
+                             sh),
+    GNUNET_MQ_hd_fixed_size (distance_update,
+                             GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED,
+                             struct GNUNET_DV_DistanceUpdateMessage,
+                             sh),
+    GNUNET_MQ_hd_var_size (received,
+                           GNUNET_MESSAGE_TYPE_DV_RECV,
+                           struct GNUNET_DV_ReceivedMessage,
+                           sh),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MessageHeader *sm;
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index 11ec13387..667970b75 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -2033,11 +2033,11 @@ run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_MQ_hd_var_size (dv_route_message,
-                         GNUNET_MESSAGE_TYPE_DV_ROUTE,
-                         struct RouteMessage);
   struct GNUNET_MQ_MessageHandler core_handlers[] = {
-    make_dv_route_message_handler (NULL),
+    GNUNET_MQ_hd_var_size (dv_route_message,
+                           GNUNET_MESSAGE_TYPE_DV_ROUTE,
+                           struct RouteMessage,
+                           NULL),
     GNUNET_MQ_handler_end ()
   };
   static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {