- fixes, intendation

[oweals/gnunet.git] / src / gns / gnunet-dns2gns.c

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index bd909f9382693a1d35aedc12c6d17d1bdb879e00..5647b808ec69398ee1aec94b7d1e4271c79757ac 100644 (file)
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -80,7 +80,7 @@ struct Request
    * Task run on timeout or shutdown to clean up without
    * response.
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+  struct GNUNET_SCHEDULER_Task * timeout_task;
 
   /**
    * Number of bytes in 'addr'.
@@ -113,12 +113,12 @@ static struct GNUNET_NETWORK_Handle *listen_socket6;
 /**
  * Task for IPv4 socket.
  */
-static GNUNET_SCHEDULER_TaskIdentifier t4;
+static struct GNUNET_SCHEDULER_Task * t4;
 
 /**
  * Task for IPv6 socket.
  */
-static GNUNET_SCHEDULER_TaskIdentifier t6;
+static struct GNUNET_SCHEDULER_Task * t6;
 
 /**
  * DNS suffix, suffix of this gateway in DNS; defaults to '.zkey.eu'
@@ -176,9 +176,9 @@ static void
 do_shutdown (void *cls,
             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (GNUNET_SCHEDULER_NO_TASK != t4)
+  if (NULL != t4)
     GNUNET_SCHEDULER_cancel (t4);
-  if (GNUNET_SCHEDULER_NO_TASK != t6)
+  if (NULL != t6)
     GNUNET_SCHEDULER_cancel (t6);
   if (NULL != listen_socket4)
   {
@@ -357,7 +357,7 @@ result_processor (void *cls,
          break;
        case GNUNET_DNSPARSER_TYPE_CNAME:
          rec.name = GNUNET_strdup (packet->queries[0].name);
-         rec.data.hostname = strdup (rd[i].data);
+         rec.data.hostname = GNUNET_strdup (rd[i].data);
          rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
          rec.type = GNUNET_DNSPARSER_TYPE_CNAME;
          memcpy (rec.data.hostname,