src/: Carve out a `representation' subfield of adns_rrtype.

[adns.git] / src / types.c

diff --git a/src/types.c b/src/types.c
index cc9f31279c75e08ddb8381acf7f367134504cd4c..83a57927ad9f74f019240ec564a5c5490561af68 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -1222,11 +1222,11 @@ static void mf_flat(adns_query qu, void *data) { }
 #define TYPESZ_M(member)           (sizeof(*((adns_answer*)0)->rrs.member))
 
 #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...)    \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb,                   \
+ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_##memb, \
      GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer,            \
      adns__ckl_hostname, CDR(__VA_ARGS__) }
 #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...)    \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat,                     \
+ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_flat,   \
      GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer,            \
      adns__ckl_hostname, CDR(__VA_ARGS__) }
 
@@ -1267,6 +1267,7 @@ const typeinfo *adns__findtype(adns_rrtype type) {
   const typeinfo *begin, *end, *mid;
 
   if (type & adns_r_unknown) return &typeinfo_unknown;
+  type &= adns_rrt_reprmask;
 
   begin= typeinfos;  end= typeinfos+(sizeof(typeinfos)/sizeof(typeinfo));