Use statement exprs instead of local function

This change lets us compile with clang again.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 2b6780c08..1f06c0a75 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -1484,16 +1484,16 @@ run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_MQ_hd_fixed_size (p2p_estimate,
-                           GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD,
-                           struct GNUNET_NSE_FloodMessage);
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
     {&handle_start_message, NULL, GNUNET_MESSAGE_TYPE_NSE_START,
      sizeof (struct GNUNET_MessageHeader)},
     {NULL, NULL, 0, 0}
   };
   struct GNUNET_MQ_MessageHandler core_handlers[] = {
-    make_p2p_estimate_handler (NULL),
+    GNUNET_MQ_hd_fixed_size (p2p_estimate,
+                             GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD,
+                             struct GNUNET_NSE_FloodMessage,
+                             NULL),
     GNUNET_MQ_handler_end ()
   };
   char *proof;
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index e9b704be9..cfe5482eb 100644
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -135,12 +135,12 @@ handle_estimate (void *cls,
 static void
 reconnect (void *cls)
 {
-  GNUNET_MQ_hd_fixed_size (estimate,
-                           GNUNET_MESSAGE_TYPE_NSE_ESTIMATE,
-                           struct GNUNET_NSE_ClientMessage);
   struct GNUNET_NSE_Handle *h = cls;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_estimate_handler (h),
+    GNUNET_MQ_hd_fixed_size (estimate,
+                             GNUNET_MESSAGE_TYPE_NSE_ESTIMATE,
+                             struct GNUNET_NSE_ClientMessage,
+                             h),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MessageHeader *msg;