6 files changed, 44 insertions, 44 deletions

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 98c76882a..eacc3c2df 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1325,12 +1325,12 @@ download_mq_error_handler (void *cls,
 static void
 do_reconnect (void *cls)
 {
-  GNUNET_MQ_hd_var_size (put,
-                         GNUNET_MESSAGE_TYPE_FS_PUT,
-                         struct ClientPutMessage);
   struct GNUNET_FS_DownloadContext *dc = cls;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_put_handler (dc),
+    GNUNET_MQ_hd_var_size (put,
+                           GNUNET_MESSAGE_TYPE_FS_PUT,
+                           struct ClientPutMessage,
+                           dc),
     GNUNET_MQ_handler_end ()
   };
 
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 21385d40b..67183fce2 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -169,17 +169,17 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
                              GNUNET_FS_IndexedFileProcessor iterator,
                              void *iterator_cls)
 {
-  GNUNET_MQ_hd_fixed_size (index_info_end,
-                           GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END,
-                           struct GNUNET_MessageHeader);
-  GNUNET_MQ_hd_var_size (index_info,
-                         GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY,
-                         struct IndexInfoMessage);
   struct GNUNET_FS_GetIndexedContext *gic
     = GNUNET_new (struct GNUNET_FS_GetIndexedContext);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_index_info_end_handler (gic),
-    make_index_info_handler (gic),
+    GNUNET_MQ_hd_fixed_size (index_info_end,
+                             GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END,
+                             struct GNUNET_MessageHeader,
+                             gic),
+    GNUNET_MQ_hd_var_size (index_info,
+                           GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY,
+                           struct IndexInfoMessage,
+                           gic),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 01305d678..5820c3d0c 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -795,16 +795,16 @@ static void
 hash_for_index_cb (void *cls,
                    const struct GNUNET_HashCode *res)
 {
-  GNUNET_MQ_hd_fixed_size (index_start_ok,
-                           GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK,
-                           struct GNUNET_MessageHeader);
-  GNUNET_MQ_hd_var_size (index_start_failed,
-                         GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED,
-                         struct GNUNET_MessageHeader);
   struct GNUNET_FS_PublishContext *pc = cls;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_index_start_ok_handler (pc),
-    make_index_start_failed_handler (pc),
+    GNUNET_MQ_hd_fixed_size (index_start_ok,
+                             GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK,
+                             struct GNUNET_MessageHeader,
+                             pc),
+    GNUNET_MQ_hd_var_size (index_start_failed,
+                           GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED,
+                           struct GNUNET_MessageHeader,
+                           pc),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_FS_FileInformation *p;
@@ -1003,11 +1003,11 @@ loc_mq_error_handler (void *cls,
 static void
 create_loc_uri (struct GNUNET_FS_PublishContext *pc)
 {
-  GNUNET_MQ_hd_fixed_size (signature_response,
-                           GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGNATURE,
-                           struct ResponseLocSignatureMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_signature_response_handler (pc),
+    GNUNET_MQ_hd_fixed_size (signature_response,
+                             GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGNATURE,
+                             struct ResponseLocSignatureMessage,
+                             pc),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 8a3652e3f..7874bb6e0 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -1234,12 +1234,12 @@ search_mq_error_handler (void *cls,
 static void
 do_reconnect (void *cls)
 {
-  GNUNET_MQ_hd_var_size (result,
-                         GNUNET_MESSAGE_TYPE_FS_PUT,
-                         struct ClientPutMessage);
   struct GNUNET_FS_SearchContext *sc = cls;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_result_handler (sc),
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_FS_PUT,
+                           struct ClientPutMessage,
+                           sc),
     GNUNET_MQ_handler_end ()
   };
 
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index f43725a59..2a024ecbb 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -288,11 +288,11 @@ unindex_mq_error_handler (void *cls,
 static void
 unindex_finish (struct GNUNET_FS_UnindexContext *uc)
 {
-  GNUNET_MQ_hd_fixed_size (unindex_response,
-                           GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK,
-                           struct GNUNET_MessageHeader);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_unindex_response_handler (uc),
+    GNUNET_MQ_hd_fixed_size (unindex_response,
+                             GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK,
+                             struct GNUNET_MessageHeader,
+                             uc),
     GNUNET_MQ_handler_end ()
   };
   char *emsg;
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index bc0da09bc..4131b1670 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -617,22 +617,22 @@ static int
 main_init (struct GNUNET_SERVER_Handle *server,
            const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_MQ_hd_var_size (p2p_get,
-                         GNUNET_MESSAGE_TYPE_FS_GET,
-                         struct GetMessage);
-  GNUNET_MQ_hd_var_size (p2p_put,
-                         GNUNET_MESSAGE_TYPE_FS_PUT,
-                         struct PutMessage);
-  GNUNET_MQ_hd_fixed_size (p2p_migration_stop,
-                           GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP,
-                           struct MigrationStopMessage);
   struct GNUNET_MQ_MessageHandler no_p2p_handlers[] = {
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_MessageHandler p2p_handlers[] = {
-    make_p2p_get_handler (NULL),
-    make_p2p_put_handler (NULL),
-    make_p2p_migration_stop_handler (NULL),
+    GNUNET_MQ_hd_var_size (p2p_get,
+                           GNUNET_MESSAGE_TYPE_FS_GET,
+                           struct GetMessage,
+                           NULL),
+    GNUNET_MQ_hd_var_size (p2p_put,
+                           GNUNET_MESSAGE_TYPE_FS_PUT,
+                           struct PutMessage,
+                           NULL),
+    GNUNET_MQ_hd_fixed_size (p2p_migration_stop,
+                             GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP,
+                             struct MigrationStopMessage,
+                             NULL),
     GNUNET_MQ_handler_end ()
   };
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {