From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 25 Jun 2018 18:05:25 +0000 (+0200)
Subject: move hexcode, eliminate redundant test
X-Git-Tag: v0.11.0~349
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f895f6c37937c17a73fa2b13211d2d52b94c79e5;p=oweals%2Fgnunet.git

move hexcode, eliminate redundant test
---

diff --git a/src/dns/test_hexcoder.c b/src/dns/test_hexcoder.c
deleted file mode 100644
index 441d7e200..000000000
--- a/src/dns/test_hexcoder.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-    
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-/**
- * @author Christian Grothoff
- * @file dns/test_hexcoder.c
- * @brief test for #GNUNET_DNSPARSER_hex_to_bin() and
- *                 #GNUNET_DNSPARSER_bin_to_hex()
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
-
-#define TESTSTRING "Hello World!"
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  char buf[strlen (TESTSTRING)  + 1];
-  char *ret;
-
-  GNUNET_log_setup ("test-hexcoder", "WARNING", NULL);
-  ret = GNUNET_DNSPARSER_bin_to_hex (TESTSTRING,
-                                     strlen (TESTSTRING) + 1);
-  GNUNET_assert (NULL != ret);
-  GNUNET_assert (sizeof (buf) ==
-                 GNUNET_DNSPARSER_hex_to_bin (ret,
-                                              buf));
-  GNUNET_assert (0 == memcmp (TESTSTRING,
-                              buf,
-                              sizeof (buf)));
-  GNUNET_free (ret);
-  return 0;
-}
-
-
-/* end of test_hexcoder.c */
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 9ed7e4d0e..55475b131 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -698,7 +698,7 @@ GNUNET_DNSPARSER_parse (const char *udp_payload,
   if (n > 0)
   {
     p->queries = GNUNET_new_array (n,
-				   struct GNUNET_DNSPARSER_Query) ;
+				   struct GNUNET_DNSPARSER_Query);
     p->num_queries = n;
     for (unsigned int i=0;i<n;i++)
       if (GNUNET_OK !=
@@ -750,6 +750,7 @@ GNUNET_DNSPARSER_parse (const char *udp_payload,
 					 &off,
 					 &p->additional_records[i]))
 	goto error;
+    }
   }
   return p;
  error:
@@ -957,7 +958,6 @@ GNUNET_DNSPARSER_builder_add_cert (char *dst,
   struct GNUNET_TUN_DnsCertRecord dcert;
 
   if ( (cert->cert_type > UINT16_MAX) ||
-       (cert->cert_tag > UINT16_MAX) ||
        (cert->algorithm > UINT8_MAX) )
   {
     GNUNET_break (0);
@@ -1045,12 +1045,14 @@ GNUNET_DNSPARSER_builder_add_srv (char *dst,
   sd.prio = htons (srv->priority);
   sd.weight = htons (srv->weight);
   sd.port = htons (srv->port);
-  GNUNET_memcpy (&dst[*off], &sd, sizeof (sd));
+  GNUNET_memcpy (&dst[*off],
+		 &sd,
+		 sizeof (sd));
   (*off) += sizeof (sd);
   if (GNUNET_OK != (ret = GNUNET_DNSPARSER_builder_add_name (dst,
-				    dst_len,
-				    off,
-				    srv->target)))
+							     dst_len,
+							     off,
+							     srv->target)))
     return ret;
   return GNUNET_OK;
 }
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
new file mode 100644
index 000000000..441d7e200
--- /dev/null
+++ b/src/util/test_hexcoder.c
@@ -0,0 +1,54 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2014 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+/**
+ * @author Christian Grothoff
+ * @file dns/test_hexcoder.c
+ * @brief test for #GNUNET_DNSPARSER_hex_to_bin() and
+ *                 #GNUNET_DNSPARSER_bin_to_hex()
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_dnsparser_lib.h"
+
+#define TESTSTRING "Hello World!"
+
+
+int
+main (int argc,
+      char *argv[])
+{
+  char buf[strlen (TESTSTRING)  + 1];
+  char *ret;
+
+  GNUNET_log_setup ("test-hexcoder", "WARNING", NULL);
+  ret = GNUNET_DNSPARSER_bin_to_hex (TESTSTRING,
+                                     strlen (TESTSTRING) + 1);
+  GNUNET_assert (NULL != ret);
+  GNUNET_assert (sizeof (buf) ==
+                 GNUNET_DNSPARSER_hex_to_bin (ret,
+                                              buf));
+  GNUNET_assert (0 == memcmp (TESTSTRING,
+                              buf,
+                              sizeof (buf)));
+  GNUNET_free (ret);
+  return 0;
+}
+
+
+/* end of test_hexcoder.c */