Move helper functions to common header file.

4c70046d · Giovanni Bajo · Simon Kelley · 458824dc · 4c70046d · 4c70046d
Commit 4c70046d authored Apr 27, 2012 by Giovanni Bajo Committed by Simon Kelley Aug 20, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 19 deletions

src/dns-protocol.h src/dns-protocol.h +17 -0

src/dnssec.c src/dnssec.c +0 -19

No files found.
--- a/src/dns-protocol.h
+++ b/src/dns-protocol.h
@@ -117,3 +117,20 @@ struct dns_header {
 	(cp) += 4; \
 }

+#define CHECKED_GETCHAR(var, ptr, len) do { \
+    if ((len) < 1) return 0; \
+    var = *ptr++; \
+    (len) -= 1; \
+  } while (0)
+
+#define CHECKED_GETSHORT(var, ptr, len) do { \
+    if ((len) < 2) return 0; \
+    GETSHORT(var, ptr); \
+    (len) -= 2; \
+  } while (0)
+
+#define CHECKED_GETLONG(var, ptr, len) do { \
+    if ((len) < 4) return 0; \
+    GETLONG(var, ptr); \
+    (len) -= 4; \
+  } while (0)
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -3,25 +3,6 @@
 #include "dnssec-crypto.h"
 #include <assert.h>

-#define CHECKED_GETCHAR(var, ptr, len) do { \
-    if ((len) < 1) return 0; \
-    var = *ptr++; \
-    (len) -= 1; \
-  } while (0)
-
-#define CHECKED_GETSHORT(var, ptr, len) do { \
-    if ((len) < 2) return 0; \
-    GETSHORT(var, ptr); \
-    (len) -= 2; \
-  } while (0)
-
-#define CHECKED_GETLONG(var, ptr, len) do { \
-    if ((len) < 4) return 0; \
-    GETLONG(var, ptr); \
-    (len) -= 4; \
-  } while (0)
-
-
 #define SERIAL_UNDEF  -100
 #define SERIAL_EQ        0
 #define SERIAL_LT       -1