src/types.c: Clarify addr_rrtypeflag loop (style)

[adns] / src / types.c

diff --git a/src/types.c b/src/types.c
index ae43e2e..5062c6a 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -365,7 +365,7 @@ enum {
   addr_nrrtypes,
 #define RRTY_FLAG(ty) addr_rf_##ty = 1 << addr__ri_##ty,
   ADDR_RRTYPES(RRTY_FLAG)
-  addr__rrty_hunoz
+  addr__rrty_eat_final_comma
 #undef RRTY_FLAG
 };
 
@@ -373,8 +373,10 @@ static unsigned addr_rrtypeflag(adns_rrtype type) {
   int i;
 
   type &= adns_rrt_typemask;
-  for (i=0; i<addr_nrrtypes && type!=addr_all_rrtypes[i]; i++);
-  return i < addr_nrrtypes ? 1 << i : 0;
+  for (i=0; i<addr_nrrtypes; i++)
+     if (type==addr_all_rrtypes[i])
+       return 1 << i;
+  return 0;
 }
 
 /* About CNAME handling in addr queries.
@@ -1138,12 +1140,12 @@ static adns_status ckl_ptr(adns_state ads, adns_queryflags flags,
                           int labnum, const char *dgram,
                           int labstart, int lablen) {
   if (lablen) {
-    if (adns__revparse_label(&cls->ptr, labnum, dgram,labstart,lablen))
+    if (!adns__revparse_label(&cls->ptr, labnum, dgram,labstart,lablen))
       return adns_s_querydomainwrong;
   } else {
-    if (adns__revparse_done(&cls->ptr, dgram, labnum,
-                           &ctx->tinfo.ptr.rev_rrtype,
-                           &ctx->tinfo.ptr.addr))
+    if (!adns__revparse_done(&cls->ptr, dgram, labnum,
+                            &ctx->tinfo.ptr.rev_rrtype,
+                            &ctx->tinfo.ptr.addr))
       return adns_s_querydomainwrong;
   }
   return adns_s_ok;
@@ -1422,7 +1424,8 @@ static adns_status ckl_srv(adns_state ads, adns_queryflags flags,
                           int labnum, const char *dgram,
                           int labstart, int lablen) {
   const char *label = dgram+labstart;
-  if (labnum < 2 && !(flags & adns_qf_quoteok_query)) {
+  if (labnum < 2) {
+    if (flags & adns_qf_quoteok_query) return adns_s_ok;
     if (!lablen || label[0] != '_') return adns_s_querydomaininvalid;
     return adns_s_ok;
   }