Use statement exprs instead of local function

[oweals/gnunet.git] / src / gns / gns_api.c

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 8f821f7154e44099b61bd5a00a73982e43e849f7..475d5b5cdc76dc676f1172c2f79edee25a6cc94a 100644 (file)
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -264,11 +264,11 @@ handle_result (void *cls,
 static void
 reconnect (struct GNUNET_GNS_Handle *handle)
 {
-  GNUNET_MQ_hd_var_size (result,
-                         GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT,
-                         struct GNUNET_GNS_ClientLookupResultMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_result_handler (handle),
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT,
+                           struct GNUNET_GNS_ClientLookupResultMessage,
+                           handle),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_GNS_LookupRequest *lh;
@@ -412,7 +412,7 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
     lookup_msg->have_key = htons (GNUNET_YES);
     lookup_msg->shorten_key = *shorten_zone_key;
   }
-  memcpy (&lookup_msg[1],
+  GNUNET_memcpy (&lookup_msg[1],
           name,
           nlen);
   GNUNET_CONTAINER_DLL_insert (handle->lookup_head,