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/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index 44db59949..7181a913b 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -296,11 +296,11 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  GNUNET_MQ_hd_var_size (advertisement,
-                         GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
-                         struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler learn_handlers[] = {
-    make_advertisement_handler (NULL),
+    GNUNET_MQ_hd_var_size (advertisement,
+                           GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
+                           struct GNUNET_MessageHeader,
+                           NULL),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_MessageHandler no_learn_handlers[] = {
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 041898abd..c39c57eb3 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -394,11 +394,11 @@ static void
 setup_learn_peer (struct PeerContext *p,
                   const char *cfgname)
 {
-  GNUNET_MQ_hd_var_size (ad_arrive,
-                         GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
-                         struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler learn_handlers[] = {
-    make_ad_arrive_handler (NULL),
+    GNUNET_MQ_hd_var_size (ad_arrive,
+                           GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
+                           struct GNUNET_MessageHeader,
+                           NULL),
     GNUNET_MQ_handler_end ()
   };
   char *filename;