4 files changed, 17 insertions, 17 deletions

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index c4ce1ccc2..481e99157 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -722,12 +722,12 @@ loopback_resolution (void *cls)
 static void
 reconnect_task (void *cls)
 {
-  GNUNET_MQ_hd_var_size (response,
-                         GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE,
-                         struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-     make_response_handler (NULL),
-     GNUNET_MQ_handler_end ()
+    GNUNET_MQ_hd_var_size (response,
+                           GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+    GNUNET_MQ_handler_end ()
   };
 
   r_task = NULL;
diff --git a/src/util/test_client.c b/src/util/test_client.c
index 07af5ea35..558a3cf1e 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -136,11 +136,11 @@ task (void *cls)
   socklen_t slens[2];
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
-  GNUNET_MQ_hd_fixed_size (bounce,
-                           MY_TYPE,
-                           struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler chandlers[] = {
-    make_bounce_handler (cls),
+    GNUNET_MQ_hd_fixed_size (bounce,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             cls),
     GNUNET_MQ_handler_end ()
   };
 
diff --git a/src/util/test_server.c b/src/util/test_server.c
index 6d8fffc69..eac45fc69 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -231,11 +231,11 @@ task (void *cls)
   socklen_t slens[2];
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
-  GNUNET_MQ_hd_fixed_size (reply,
-                           MY_TYPE,
-                           struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler chandlers[] = {
-    make_reply_handler (cls),
+    GNUNET_MQ_hd_fixed_size (reply,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             cls),
     GNUNET_MQ_handler_end ()
   };
 
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index d6064afd5..416f32f62 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -133,11 +133,11 @@ task (void *cls)
   socklen_t slens[2];
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
-  GNUNET_MQ_hd_fixed_size (bounce,
-                           MY_TYPE,
-                           struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler chandlers[] = {
-    make_bounce_handler (cls),
+    GNUNET_MQ_hd_fixed_size (bounce,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             cls),
     GNUNET_MQ_handler_end ()
   };