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/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index 7edc39e38..dd8666d4c 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -566,19 +566,19 @@ mq_error_handler (void *cls,
 static void
 reconnect (struct GNUNET_ATS_PerformanceHandle *ph)
 {
-  GNUNET_MQ_hd_var_size (peer_information,
-                         GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION,
-                         struct PeerInformationMessage);
-  GNUNET_MQ_hd_fixed_size (reservation_result,
-                           GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT,
-                           struct ReservationResultMessage);
-  GNUNET_MQ_hd_var_size (address_list,
-                         GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE,
-                         struct PeerInformationMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_peer_information_handler (ph),
-    make_reservation_result_handler (ph),
-    make_address_list_handler (ph),
+    GNUNET_MQ_hd_var_size (peer_information,
+                           GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION,
+                           struct PeerInformationMessage,
+                           ph),
+    GNUNET_MQ_hd_fixed_size (reservation_result,
+                             GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT,
+                             struct ReservationResultMessage,
+                             ph),
+    GNUNET_MQ_hd_var_size (address_list,
+                           GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE,
+                           struct PeerInformationMessage,
+                           ph),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index c4174f99e..4a872b90a 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -515,15 +515,15 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh,
 static void
 reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
 {
-  GNUNET_MQ_hd_fixed_size (ats_session_release,
-                           GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE,
-                           struct GNUNET_ATS_SessionReleaseMessage);
-  GNUNET_MQ_hd_fixed_size (ats_address_suggestion,
-                           GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION,
-                           struct AddressSuggestionMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_ats_session_release_handler (sh),
-    make_ats_address_suggestion_handler (sh),
+    GNUNET_MQ_hd_fixed_size (ats_session_release,
+                             GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE,
+                             struct GNUNET_ATS_SessionReleaseMessage,
+                             sh),
+    GNUNET_MQ_hd_fixed_size (ats_address_suggestion,
+                             GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION,
+                             struct AddressSuggestionMessage,
+                             sh),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *ev;