From fdd1a602d5d26a5b01be322096a3adbd729ec446 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 30 Jan 2018 15:51:28 +0000 Subject: [PATCH] fix to please doxygen's parser. git-svn-id: file:///svn/unbound/trunk@4470 be551aaa-1e26-0410-a405-d3ace91eadb9 --- services/authzone.c | 18 +++++++++--------- services/authzone.h | 5 ++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/services/authzone.c b/services/authzone.c index ded654d54..7e51630fd 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -442,29 +442,29 @@ auth_zone_find_less_equal(struct auth_zones* az, uint8_t* nm, size_t nmlen, } -/** find the auth zone that is above the given qname */ +/** find the auth zone that is above the given name */ struct auth_zone* -auth_zones_find_zone(struct auth_zones* az, uint8_t* qname, size_t qname_len, - uint16_t qclass) +auth_zones_find_zone(struct auth_zones* az, uint8_t* name, size_t name_len, + uint16_t dclass) { - uint8_t* nm = qname; - size_t nmlen = qname_len; + uint8_t* nm = name; + size_t nmlen = name_len; struct auth_zone* z; - if(auth_zone_find_less_equal(az, nm, nmlen, qclass, &z)) { + if(auth_zone_find_less_equal(az, nm, nmlen, dclass, &z)) { /* exact match */ return z; } else { /* less-or-nothing */ if(!z) return NULL; /* nothing smaller, nothing above it */ - /* we found smaller name; smaller may be above the qname, + /* we found smaller name; smaller may be above the name, * but not below it. */ - nm = dname_get_shared_topdomain(z->name, qname); + nm = dname_get_shared_topdomain(z->name, name); dname_count_size_labels(nm, &nmlen); } /* search up */ while(!z && !dname_is_root(nm)) { dname_remove_label(&nm, &nmlen); - z = auth_zone_find(az, nm, nmlen, qclass); + z = auth_zone_find(az, nm, nmlen, dclass); } return z; } diff --git a/services/authzone.h b/services/authzone.h index dc2db6c6b..7db4f4a56 100644 --- a/services/authzone.h +++ b/services/authzone.h @@ -484,13 +484,12 @@ int auth_zones_answer(struct auth_zones* az, struct module_env* env, * returns the closest auth_zone above the qname that pertains to it. * @param az: auth zones structure. * @param name: query to look up for. - * @param namelen: length of name. + * @param name_len: length of name. * @param dclass: class of zone to find. - * @param qinfo: query info to lookup. * @return NULL or auth_zone that pertains to the query. */ struct auth_zone* auth_zones_find_zone(struct auth_zones* az, - uint8_t* name, size_t namelen, uint16_t dclass); + uint8_t* name, size_t name_len, uint16_t dclass); /** find an auth zone by name (exact match by name or NULL returned) */ struct auth_zone* auth_zone_find(struct auth_zones* az, uint8_t* nm,