resolved: make use of dns_{class|type}_is_{pseudo|valid_rr}() everywhere

1 files changed, 8 insertions, 7 deletions

diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h
index deb89e9b7e..bea0adaa16 100644
--- a/src/resolve/dns-type.h
+++ b/src/resolve/dns-type.h
@@ -23,13 +23,6 @@
 
 #include "macro.h"
 
-const char *dns_type_to_string(int type);
-int dns_type_from_string(const char *s);
-
-bool dns_type_is_pseudo(uint16_t type);
-bool dns_type_is_valid_query(uint16_t type);
-bool dns_type_is_valid_rr(uint16_t type);
-
 /* DNS record types, taken from
  * http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml.
  */
@@ -127,12 +120,20 @@ assert_cc(DNS_TYPE_ANY == 255);
 enum {
         DNS_CLASS_IN   = 0x01,
         DNS_CLASS_ANY  = 0xFF,
+
         _DNS_CLASS_MAX,
         _DNS_CLASS_INVALID = -1
 };
 
+bool dns_type_is_pseudo(uint16_t type);
+bool dns_type_is_valid_query(uint16_t type);
+bool dns_type_is_valid_rr(uint16_t type);
+
 bool dns_class_is_pseudo(uint16_t class);
 bool dns_class_is_valid_rr(uint16_t class);
 
+const char *dns_type_to_string(int type);
+int dns_type_from_string(const char *s);
+
 const char *dns_class_to_string(uint16_t type);
 int dns_class_from_string(const char *name);