Use statement exprs instead of local function

This change lets us compile with clang again.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c
index 0f67977a1..706432ece 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -777,9 +777,6 @@ run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_MQ_hd_fixed_size (p2p_revoke,
-                           GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE,
-                           struct RevokeMessage);
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
     {&handle_query_message, NULL, GNUNET_MESSAGE_TYPE_REVOCATION_QUERY,
      sizeof (struct QueryMessage)},
@@ -788,7 +785,10 @@ run (void *cls,
     {NULL, NULL, 0, 0}
   };
   struct GNUNET_MQ_MessageHandler core_handlers[] = {
-    make_p2p_revoke_handler (NULL),
+    GNUNET_MQ_hd_fixed_size (p2p_revoke,
+                             GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE,
+                             struct RevokeMessage,
+                             NULL),
     GNUNET_MQ_handler_end ()
   };
   char *fn;
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 0b9bc4ea6..8c00ac2ae 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -113,13 +113,13 @@ GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          GNUNET_REVOCATION_Callback func,
                          void *func_cls)
 {
-  GNUNET_MQ_hd_fixed_size (revocation_query_response,
-                           GNUNET_MESSAGE_TYPE_REVOCATION_QUERY_RESPONSE,
-                           struct QueryResponseMessage);
   struct GNUNET_REVOCATION_Query *q
     = GNUNET_new (struct GNUNET_REVOCATION_Query);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_revocation_query_response_handler (q),
+    GNUNET_MQ_hd_fixed_size (revocation_query_response,
+                             GNUNET_MESSAGE_TYPE_REVOCATION_QUERY_RESPONSE,
+                             struct QueryResponseMessage,
+                             q),
     GNUNET_MQ_handler_end ()
   };
   struct QueryMessage *qm;
@@ -255,13 +255,13 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           GNUNET_REVOCATION_Callback func,
                           void *func_cls)
 {
-  GNUNET_MQ_hd_fixed_size (revocation_response,
-                           GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE,
-                           struct RevocationResponseMessage);
   struct GNUNET_REVOCATION_Handle *h
     = GNUNET_new (struct GNUNET_REVOCATION_Handle);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_revocation_response_handler (h),
+    GNUNET_MQ_hd_fixed_size (revocation_response,
+                             GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE,
+                             struct RevocationResponseMessage,
+                             h),
     GNUNET_MQ_handler_end ()
   };
   unsigned long long matching_bits;