Halfway through A lookups; need to restructure pa_... argument passing.

[adns] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index 722d9e4..bb08883 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -146,24 +146,11 @@ adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
   return adns_s_ok;
 }
        
-static adns_status findrr_intern(adns_query qu, int serv,
+static adns_status findrr_anychk(adns_query qu, int serv,
                                 const byte *dgram, int dglen, int *cbyte_io,
                                 int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
                                 const byte *eo_dgram, int eo_dglen, int eo_cbyte,
                                 int *eo_matched_r) {
-  /* Like adns__findrr_checked, except that the datagram to compare
-   * with can be specified explicitly.
-   *
-   * If the caller thinks they know what the owner of the RR ought to
-   * be they can pass in details in eo_*: this is another (or perhaps
-   * the same datagram), and a pointer to where the putative owner
-   * starts in that datagram.  In this case *eo_matched_r will be set
-   * to 1 if the datagram matched or 0 if it did not.  Either
-   * both eo_dgram and eo_matched_r must both be non-null, or they
-   * must both be null (in which case eo_dglen and eo_cbyte will be ignored).
-   * The eo datagram and contained owner domain MUST be valid and
-   * untruncated.
-   */
   findlabel_state fls, eo_fls;
   int cbyte;
   
@@ -222,18 +209,18 @@ adns_status adns__findrr(adns_query qu, int serv,
                         int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
                         int *ownermatchedquery_r) {
   if (!ownermatchedquery_r) {
-    return findrr_intern(qu,serv,
+    return findrr_anychk(qu,serv,
                         dgram,dglen,cbyte_io,
                         type_r,class_r,rdlen_r,rdstart_r,
                         0,0,0, 0);
   } else if (!qu->cname_dgram) {
-    return findrr_intern(qu,serv,
+    return findrr_anychk(qu,serv,
                         dgram,dglen,cbyte_io,
                         type_r,class_r,rdlen_r,rdstart_r,
                         qu->query_dgram,qu->query_dglen,DNS_HDRSIZE,
                         ownermatchedquery_r);
   } else {
-    return findrr_intern(qu,serv,
+    return findrr_anychk(qu,serv,
                         dgram,dglen,cbyte_io,
                         type_r,class_r,rdlen_r,rdstart_r,
                         qu->cname_dgram,qu->cname_dglen,qu->cname_begin,