diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 1f8e49902c..5ad43f2993 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -134,14 +134,14 @@ logged(char *key, int value) { isc_result_t result; if (symtab == NULL) { - return (false); + return false; } result = isc_symtab_lookup(symtab, key, value, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } - return (false); + return false; } static bool @@ -165,7 +165,7 @@ checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, aaaa->type == dns_rdatatype_aaaa); if (a == NULL || aaaa == NULL) { - return (answer); + return answer; } memset(&hints, 0, sizeof(hints)); @@ -222,7 +222,7 @@ checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, add(namebuf, ERR_NO_ADDRESSES); } /* XXX950 make fatal for 9.5.0 */ - return (true); + return true; default: if (!logged(namebuf, ERR_LOOKUP_FAILURE)) { @@ -231,7 +231,7 @@ checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, gai_strerror(result)); add(namebuf, ERR_LOOKUP_FAILURE); } - return (true); + return true; } /* @@ -359,7 +359,7 @@ checkmissing: } } freeaddrinfo(ai); - return (answer); + return answer; } static bool @@ -422,7 +422,7 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { } } freeaddrinfo(ai); - return (answer); + return answer; case EAI_NONAME: #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME) @@ -436,7 +436,7 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { add(namebuf, ERR_NO_ADDRESSES); } /* XXX950 make fatal for 9.5.0. */ - return (true); + return true; default: if (!logged(namebuf, ERR_LOOKUP_FAILURE)) { @@ -445,7 +445,7 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { gai_strerror(result)); add(namebuf, ERR_LOOKUP_FAILURE); } - return (true); + return true; } } @@ -509,7 +509,7 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { } } freeaddrinfo(ai); - return (answer); + return answer; case EAI_NONAME: #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME) @@ -523,7 +523,7 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { add(namebuf, ERR_NO_ADDRESSES); } /* XXX950 make fatal for 9.5.0. */ - return (true); + return true; default: if (!logged(namebuf, ERR_LOOKUP_FAILURE)) { @@ -532,7 +532,7 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { gai_strerror(result)); add(namebuf, ERR_LOOKUP_FAILURE); } - return (true); + return true; } } @@ -544,7 +544,7 @@ setup_logging(FILE *errout) { ISC_LOG_DYNAMIC, ISC_LOGDESTINATION_FILE(errout), 0, ISC_LOGCATEGORY_DEFAULT, ISC_LOGMODULE_DEFAULT); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% load the zone */ @@ -619,7 +619,7 @@ cleanup: if (zone != NULL) { dns_zone_detach(&zone); } - return (result); + return result; } /*% dump the zone */ @@ -650,7 +650,7 @@ dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, "could not open output " "file \"%s\" for writing\n", filename); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -660,5 +660,5 @@ dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, (void)isc_stdio_close(output); } - return (result); + return result; } diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index 5a987a46a0..26c3106547 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -83,10 +83,10 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { cfg_obj_log(obj, ISC_LOG_ERROR, "change directory to '%s' failed: %s\n", directory, isc_result_totext(result)); - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -94,10 +94,10 @@ get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) { int i; for (i = 0;; i++) { if (maps[i] == NULL) { - return (false); + return false; } if (cfg_map_get(maps[i], name, obj) == ISC_R_SUCCESS) { - return (true); + return true; } } } @@ -113,7 +113,7 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) { for (i = 0;; i++) { if (maps[i] == NULL) { - return (false); + return false; } checknames = NULL; result = cfg_map_get(maps[i], "check-names", &checknames); @@ -122,7 +122,7 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) { } if (checknames != NULL && !cfg_obj_islist(checknames)) { *obj = checknames; - return (true); + return true; } for (element = cfg_list_first(checknames); element != NULL; element = cfg_list_next(element)) @@ -136,7 +136,7 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) { continue; } *obj = cfg_tuple_get(value, "mode"); - return (true); + return true; } } } @@ -149,23 +149,23 @@ configure_hint(const char *zfile, const char *zclass, isc_mem_t *mctx) { isc_textregion_t r; if (zfile == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } r.base = UNCONST(zclass); r.length = strlen(zclass); result = dns_rdataclass_fromtext(&rdclass, &r); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_rootns_create(mctx, rdclass, zfile, &db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_db_detach(&db); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% configure the zone */ @@ -221,18 +221,18 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, printf("%s %s %s in-view %s\n", zname, zclass, view, inview); } if (inviewobj != NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_map_get(zoptions, "type", &typeobj); if (typeobj == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (list) { const char *ztype = cfg_obj_asstring(typeobj); printf("%s %s %s %s\n", zname, zclass, view, ztype); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -242,12 +242,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, if (dbobj != NULL && strcmp(ZONEDB_DEFAULT, cfg_obj_asstring(dbobj)) != 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_map_get(zoptions, "dlz", &dlzobj); if (dlzobj != NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_map_get(zoptions, "file", &fileobj); @@ -261,12 +261,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, * master and redirect */ if (strcasecmp(cfg_obj_asstring(typeobj), "hint") == 0) { - return (configure_hint(zfile, zclass, mctx)); + return configure_hint(zfile, zclass, mctx); } else if ((strcasecmp(cfg_obj_asstring(typeobj), "primary") != 0) && (strcasecmp(cfg_obj_asstring(typeobj), "master") != 0) && (strcasecmp(cfg_obj_asstring(typeobj), "redirect") != 0)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -279,12 +279,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, } if (primariesobj != NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } if (zfile == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } obj = NULL; @@ -462,7 +462,7 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, fprintf(stderr, "%s/%s/%s: %s\n", view, zname, zclass, isc_result_totext(result)); } - return (result); + return result; } /*% configure a view */ @@ -497,7 +497,7 @@ configure_view(const char *vclass, const char *view, const cfg_obj_t *config, result = tresult; } } - return (result); + return result; } static isc_result_t @@ -507,11 +507,11 @@ config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, if (!cfg_obj_isstring(classobj)) { *classp = defclass; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } r.base = UNCONST(cfg_obj_asstring(classobj)); r.length = strlen(r.base); - return (dns_rdataclass_fromtext(classp, &r)); + return dns_rdataclass_fromtext(classp, &r); } /*% load zones from the configuration */ @@ -569,7 +569,7 @@ load_zones_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, } cleanup: - return (result); + return result; } static void @@ -762,5 +762,5 @@ cleanup: isc_mem_destroy(&mctx); } - return (result == ISC_R_SUCCESS ? 0 : 1); + return result == ISC_R_SUCCESS ? 0 : 1; } diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 2770bf5be8..db5289d1e3 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -577,5 +577,5 @@ main(int argc, char **argv) { destroy(); isc_mem_destroy(&mctx); - return ((result == ISC_R_SUCCESS) ? 0 : 1); + return (result == ISC_R_SUCCESS) ? 0 : 1; } diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index 1ceaeedcfd..6bdf9634de 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -44,24 +44,24 @@ alg_fromtext(const char *name) { } if (strcasecmp(p, "md5") == 0) { - return (DST_ALG_HMACMD5); + return DST_ALG_HMACMD5; } if (strcasecmp(p, "sha1") == 0) { - return (DST_ALG_HMACSHA1); + return DST_ALG_HMACSHA1; } if (strcasecmp(p, "sha224") == 0) { - return (DST_ALG_HMACSHA224); + return DST_ALG_HMACSHA224; } if (strcasecmp(p, "sha256") == 0) { - return (DST_ALG_HMACSHA256); + return DST_ALG_HMACSHA256; } if (strcasecmp(p, "sha384") == 0) { - return (DST_ALG_HMACSHA384); + return DST_ALG_HMACSHA384; } if (strcasecmp(p, "sha512") == 0) { - return (DST_ALG_HMACSHA512); + return DST_ALG_HMACSHA512; } - return (DST_ALG_UNKNOWN); + return DST_ALG_UNKNOWN; } /*% @@ -71,19 +71,19 @@ int alg_bits(dns_secalg_t alg) { switch (alg) { case DST_ALG_HMACMD5: - return (128); + return 128; case DST_ALG_HMACSHA1: - return (160); + return 160; case DST_ALG_HMACSHA224: - return (224); + return 224; case DST_ALG_HMACSHA256: - return (256); + return 256; case DST_ALG_HMACSHA384: - return (384); + return 384; case DST_ALG_HMACSHA512: - return (512); + return 512; default: - return (0); + return 0; } } diff --git a/bin/confgen/os.c b/bin/confgen/os.c index 445d64bf60..3c3ccbcd2d 100644 --- a/bin/confgen/os.c +++ b/bin/confgen/os.c @@ -30,7 +30,7 @@ set_user(FILE *fd, const char *user) { pw = getpwnam(user); if (pw == NULL) { errno = EINVAL; - return (-1); + return -1; } - return (fchown(fileno(fd), pw->pw_uid, -1)); + return fchown(fileno(fd), pw->pw_uid, -1); } diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c index f96ee47d20..31cfe21aa5 100644 --- a/bin/confgen/rndc-confgen.c +++ b/bin/confgen/rndc-confgen.c @@ -290,5 +290,5 @@ options {\n\ isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/bin/confgen/tsig-keygen.c b/bin/confgen/tsig-keygen.c index 39f13a73fc..9dede3e3cf 100644 --- a/bin/confgen/tsig-keygen.c +++ b/bin/confgen/tsig-keygen.c @@ -296,5 +296,5 @@ nsupdate -k \n"); isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/bin/delv/delv.c b/bin/delv/delv.c index c0d643773a..35cee4fa49 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -566,7 +566,7 @@ setup_style(void) { 48, 80, 8, splitwidth, mctx); } - return (result); + return result; } static isc_result_t @@ -587,11 +587,11 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) { if (result != ISC_R_SUCCESS) { delv_log(ISC_LOG_ERROR, "failed to convert name %s: %s", text, isc_result_totext(result)); - return (result); + return result; } *name = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -624,7 +624,7 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client, dns_view_t *toview) { CHECK(convert_name(&fkeyname, &keyname, keynamestr)); if (!root_validation) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (anchor_name) { @@ -632,11 +632,11 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client, dns_view_t *toview) { } if (!match_root) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (!root_validation) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } delv_log(ISC_LOG_DEBUG(3), "adding trust anchor %s", trust_anchor); @@ -789,7 +789,7 @@ cleanup: result = ISC_R_FAILURE; } - return (result); + return result; } static isc_result_t @@ -814,7 +814,7 @@ cleanup: if (result == DST_R_NOCRYPTO) { result = ISC_R_SUCCESS; } - return (result); + return result; } static isc_result_t @@ -827,7 +827,7 @@ setup_dnsseckeys(dns_client_t *client, dns_view_t *toview) { cfg_obj_t *bindkeys = NULL; if (!root_validation) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (trust_anchor == NULL) { @@ -894,7 +894,7 @@ cleanup: delv_log(ISC_LOG_ERROR, "setup_dnsseckeys: %s", isc_result_totext(result)); } - return (result); + return result; } static isc_result_t @@ -941,7 +941,7 @@ addserver(dns_client_t *client) { if (gaierror != 0) { delv_log(ISC_LOG_ERROR, "getaddrinfo failed: %s", gai_strerror(gaierror)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = ISC_R_SUCCESS; @@ -977,7 +977,7 @@ cleanup: isc_result_totext(result)); } - return (result); + return result; } static isc_result_t @@ -1046,7 +1046,7 @@ cleanup: if (resconf != NULL) { irs_resconf_destroy(&resconf); } - return (result); + return result; } static isc_result_t @@ -1059,10 +1059,10 @@ parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { if (result != ISC_R_SUCCESS) { printf("invalid %s '%s': %s\n", desc, value, isc_result_totext(result)); - return (result); + return result; } *uip = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1442,7 +1442,7 @@ dash_option(char *option, char *next, bool *open_type_class) { if (strlen(option) > 1U) { option = &option[1]; } else { - return (false); + return false; } } opt = option[0]; @@ -1459,7 +1459,7 @@ dash_option(char *option, char *next, bool *open_type_class) { switch (opt) { case 'a': anchorfile = isc_mem_strdup(mctx, value); - return (value_from_next); + return value_from_next; case 'b': hash = strchr(value, '#'); if (hash != NULL) { @@ -1496,7 +1496,7 @@ dash_option(char *option, char *next, bool *open_type_class) { if (hash != NULL) { *hash = '#'; } - return (value_from_next); + return value_from_next; case 'c': if (classset) { warn("extra query class"); @@ -1514,28 +1514,28 @@ dash_option(char *option, char *next, bool *open_type_class) { } else { warn("ignoring invalid class"); } - return (value_from_next); + return value_from_next; case 'd': result = parse_uint(&num, value, 99, "debug level"); if (result != ISC_R_SUCCESS) { fatal("Couldn't parse debug level"); } loglevel = num; - return (value_from_next); + return value_from_next; case 'p': port = value; result = parse_uint(&destport, port, 0xffff, "port"); if (result != ISC_R_SUCCESS) { fatal("Couldn't parse port number"); } - return (value_from_next); + return value_from_next; case 'q': if (curqname != NULL) { warn("extra query name"); isc_mem_free(mctx, curqname); } curqname = isc_mem_strdup(mctx, value); - return (value_from_next); + return value_from_next; case 't': *open_type_class = false; tr.base = value; @@ -1556,7 +1556,7 @@ dash_option(char *option, char *next, bool *open_type_class) { } else { warn("ignoring invalid type"); } - return (value_from_next); + return value_from_next; case 'x': result = get_reverse(textname, sizeof(textname), value, false); if (result == ISC_R_SUCCESS) { @@ -1574,14 +1574,14 @@ dash_option(char *option, char *next, bool *open_type_class) { fprintf(stderr, "Invalid IP address %s\n", value); exit(EXIT_FAILURE); } - return (value_from_next); + return value_from_next; invalid_option: default: fprintf(stderr, "Invalid option: -%s\n", option); usage(); } UNREACHABLE(); - return (false); + return false; } /* @@ -1748,11 +1748,11 @@ parse_args(int argc, char **argv) { static isc_result_t append_str(const char *text, int len, char **p, char *end) { if (len > end - *p) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(*p, text, len); *p += len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1763,17 +1763,17 @@ reverse_octets(const char *in, char **p, char *end) { isc_result_t result; result = reverse_octets(dot + 1, p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = append_str(".", 1, p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } len = (int)(dot - in); } else { len = strlen(in); } - return (append_str(in, len, p, end)); + return append_str(in, len, p, end); } static isc_result_t @@ -1792,10 +1792,10 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) { name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, name); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_format(name, reverse, (unsigned int)len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { /* * Not a valid IPv6 address. Assume IPv4. @@ -1808,17 +1808,17 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) { char *p = reverse; char *end = reverse + len; if (strict && inet_pton(AF_INET, value, &addr.type.in) != 1) { - return (DNS_R_BADDOTTEDQUAD); + return DNS_R_BADDOTTEDQUAD; } result = reverse_octets(value, &p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = append_str(".in-addr.arpa.", 15, &p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -2055,7 +2055,7 @@ accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *arg) { UNUSED(handle); UNUSED(arg); - return (result); + return result; } static void @@ -2130,7 +2130,7 @@ matchview(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, *viewp = view; *viewpatchresultp = ISC_R_SUCCESS; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2262,5 +2262,5 @@ cleanup: isc_managers_destroy(&mctx, &loopmgr, &netmgr); - return (0); + return 0; } diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 89918f17b6..11a1b11dda 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -89,9 +89,9 @@ rcode_totext(dns_rcode_t rcode) { RUNTIME_CHECK(result == ISC_R_SUCCESS); if (strspn(buf + 1, "0123456789") == strlen(buf + 1)) { buf[0] = '?'; - return (buf); + return buf; } - return (buf + 1); + return buf + 1; } /*% print usage */ @@ -473,7 +473,7 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) { if (query->lookup->trace || query->lookup->ns_search_only) { result = dns_rdatatype_totext(rdata->type, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ADD_STRING(buf, " "); } @@ -494,7 +494,7 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) { result = dns_rdata_tofmttext(rdata, NULL, styleflags, 0, splitwidth, " ", buf); if (result == ISC_R_NOSPACE) { - return (result); + return result; } check_result(result, "dns_rdata_totext"); if (query->lookup->identify) { @@ -511,7 +511,7 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) { ADD_STRING(buf, store); } ADD_STRING(buf, "\n"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -535,14 +535,14 @@ dns64prefix_answer(dns_message_t *msg, isc_buffer_t *buf) { dns_rdatatype_aaaa, dns_rdatatype_none, NULL, &rdataset); if (result == DNS_R_NXDOMAIN || result == DNS_R_NXRRSET) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_dns64_findprefix(rdataset, prefix, &count); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (count > 10) { count = 10; @@ -550,15 +550,15 @@ dns64prefix_answer(dns_message_t *msg, isc_buffer_t *buf) { for (i = 0; i < count; i++) { result = isc_netaddr_totext(&prefix[i].addr, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = isc_buffer_printf(buf, "/%u\n", prefix[i].prefixlen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -578,9 +578,9 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, dns_name_init(&empty_name, NULL); result = dns_message_firstname(msg, DNS_SECTION_ANSWER); if (result == ISC_R_NOMORE) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (;;) { @@ -595,7 +595,7 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, dns_rdataset_current(rdataset, &rdata); result = say_message(&rdata, query, buf); if (result == ISC_R_NOSPACE) { - return (result); + return result; } check_result(result, "say_message"); loopresult = dns_rdataset_next(rdataset); @@ -606,11 +606,11 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, if (result == ISC_R_NOMORE) { break; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -628,10 +628,10 @@ isdotlocal(dns_message_t *msg) { dns_name_t *name = NULL; dns_message_currentname(msg, DNS_SECTION_QUESTION, &name); if (dns_name_issubdomain(name, &local)) { - return (true); + return true; } } - return (false); + return false; } /* @@ -1024,7 +1024,7 @@ repopulate_buffer: dig_idnsetup(query->lookup, false); - return (result); + return result; } /*% @@ -1193,7 +1193,7 @@ proxy_handle_addr_string(const char *addr_start, const size_t addr_len, } } - return (result); + return result; } static bool @@ -1213,7 +1213,7 @@ parse_proxy_addresses(const char *addrs, isc_sockaddr_t *psrc, /* start syntax analysis and verification */ if (!rule_proxy_addrs(&st)) { warn("PROXY source and destination addresses cannot be parsed"); - return (false); + return false; } /* get port numeric values */ @@ -1240,7 +1240,7 @@ parse_proxy_addresses(const char *addrs, isc_sockaddr_t *psrc, if (result != ISC_R_SUCCESS) { warn("Cannot get PROXY source address: %s", isc_result_totext(result)); - return (false); + return false; } result = proxy_handle_addr_string(st.dst_addr_start, st.dst_addr_len, @@ -1248,26 +1248,26 @@ parse_proxy_addresses(const char *addrs, isc_sockaddr_t *psrc, if (result != ISC_R_SUCCESS) { warn("Cannot get PROXY destination address: %s", isc_result_totext(result)); - return (false); + return false; } /* addresses should be of the same type */ if (isc_sockaddr_pf(&src) != isc_sockaddr_pf(&dst)) { warn("PROXY source and destination addresses must be of the " "same type"); - return (false); + return false; } *psrc = src; *pdst = dst; - return (true); + return true; } static bool rule_proxy_addrs(isc_proxy_addrs_parser_state_t *st) { if (!rule_addr(st)) { - return (false); + return false; } st->src_addr_start = st->last_addr_start; @@ -1276,13 +1276,13 @@ rule_proxy_addrs(isc_proxy_addrs_parser_state_t *st) { st->src_port_len = st->last_port_len; if (!MATCH('-')) { - return (false); + return false; } ADVANCE(); if (!rule_addr(st)) { - return (false); + return false; } st->dst_addr_start = st->last_addr_start; @@ -1291,17 +1291,17 @@ rule_proxy_addrs(isc_proxy_addrs_parser_state_t *st) { st->dst_port_len = st->last_port_len; if (!MATCH('\0')) { - return (false); + return false; } - return (true); + return true; } static bool rule_addr(isc_proxy_addrs_parser_state_t *st) { const char *start = GETP(); if (!rule_addr_char(st)) { - return (false); + return false; } while (rule_addr_char(st)) { @@ -1315,18 +1315,18 @@ rule_addr(isc_proxy_addrs_parser_state_t *st) { ADVANCE(); if (!rule_port(st)) { - return (false); + return false; } } - return (true); + return true; } static bool rule_port(isc_proxy_addrs_parser_state_t *st) { const char *start = GETP(); if (!MATCH_DIGIT()) { - return (false); + return false; } ADVANCE(); @@ -1338,18 +1338,18 @@ rule_port(isc_proxy_addrs_parser_state_t *st) { st->last_port_start = start; st->last_port_len = GETP() - start; - return (true); + return true; } static bool rule_addr_char(isc_proxy_addrs_parser_state_t *st) { if (MATCH('#') || MATCH('-') || MATCH('\0')) { - return (false); + return false; } ADVANCE(); - return (true); + return true; } #undef GETP @@ -1366,20 +1366,20 @@ plus_proxy_handle_addresses(const char *value, const bool state, * We are not interested in the option value in that * case */ - return (true); + return true; } if (value == NULL || *value == '\0') { lookup->proxy_local = true; - return (true); + return true; } if (!parse_proxy_addresses(value, &lookup->proxy_src_addr, &lookup->proxy_dst_addr)) { - return (false); + return false; } - return (true); + return true; } static bool @@ -1402,10 +1402,10 @@ plus_proxy_options(const char *cmd, const char *value, const bool state, default: goto invalid_option; } - return (true); + return true; invalid_option: - return (false); + return false; } static bool @@ -1500,9 +1500,9 @@ plus_tls_options(const char *cmd, const char *value, const bool state, goto invalid_option; } - return (true); + return true; invalid_option: - return (false); + return false; } /*% @@ -1525,7 +1525,7 @@ plus_option(char *option, bool is_batchfile, bool *need_clone, if ((cmd = strtok_r(option, "=", &last)) == NULL) { printf(";; Invalid option %s\n", option); - return (lookup); + return lookup; } if (strncasecmp(cmd, "no", 2) == 0) { cmd += 2; @@ -2561,7 +2561,7 @@ plus_option(char *option, bool is_batchfile, bool *need_clone, if (value != NULL) { value[-1] = '='; } - return (lookup); + return lookup; #if !TARGET_OS_IPHONE exit_or_usage: @@ -2607,7 +2607,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, } else { fatal("can't find IPv4 networking"); UNREACHABLE(); - return (false); + return false; } break; case '6': @@ -2617,7 +2617,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, } else { fatal("can't find IPv6 networking"); UNREACHABLE(); - return (false); + return false; } break; case 'd': @@ -2626,7 +2626,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, cmd = option; FULLCHECK("debug"); debugging = true; - return (false); + return false; } else { debugging = true; } @@ -2657,7 +2657,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, if (strlen(option) > 1U) { option = &option[1]; } else { - return (false); + return false; } } opt = option[0]; @@ -2701,7 +2701,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, *hash = '#'; } specified_source = true; - return (value_from_next); + return value_from_next; case 'c': if ((*lookup)->rdclassset) { fprintf(stderr, ";; Warning, extra class option\n"); @@ -2720,13 +2720,13 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, "invalid class %s\n", value); } - return (value_from_next); + return value_from_next; case 'f': batchname = value; - return (value_from_next); + return value_from_next; case 'k': strlcpy(keyfile, value, sizeof(keyfile)); - return (value_from_next); + return value_from_next; case 'p': result = parse_uint(&num, value, MAXPORT, "port number"); if (result != ISC_R_SUCCESS) { @@ -2734,7 +2734,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, } port = num; port_set = true; - return (value_from_next); + return value_from_next; case 'q': if (!config_only) { if (*need_clone) { @@ -2753,7 +2753,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, ISC_LIST_APPEND(lookup_list, (*lookup), link); debug("looking up %s", (*lookup)->textname); } - return (value_from_next); + return value_from_next; case 't': *open_type_class = false; if (strncasecmp(value, "ixfr=", 5) == 0) { @@ -2811,7 +2811,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, "invalid type %s\n", value); } - return (value_from_next); + return value_from_next; case 'y': if ((ptr = strtok_r(value, ":", &last)) == NULL) { usage(); @@ -2836,7 +2836,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, ptr[-1] = ':'; } ptr2[-1] = ':'; - return (value_from_next); + return value_from_next; case 'x': if (*need_clone) { *lookup = clone_lookup(default_lookup, true); @@ -2866,14 +2866,14 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, fprintf(stderr, "Invalid IP address %s\n", value); exit(EXIT_FAILURE); } - return (value_from_next); + return value_from_next; invalid_option: default: fprintf(stderr, "Invalid option: -%s\n", option); usage(); } UNREACHABLE(); - return (false); + return false; } /*% @@ -2967,7 +2967,7 @@ split_batchline(char *batchline, char **bargv, int len, const char *msg) { { debug("%s %d: %s", msg, bargc, bargv[bargc]); } - return (bargc); + return bargc; } static void @@ -3428,5 +3428,5 @@ main(int argc, char **argv) { dig_startup(); dig_shutdown(); - return (exitcode); + return exitcode; } diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index bb3348d982..6091445a79 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -234,7 +234,7 @@ count_dots(char *string) { } s++; } - return (i); + return i; } static void @@ -282,11 +282,11 @@ hex_dump(isc_buffer_t *b) { static isc_result_t append(const char *text, size_t len, char **p, char *end) { if (*p + len > end) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(*p, text, len); *p += len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -297,17 +297,17 @@ reverse_octets(const char *in, char **p, char *end) { isc_result_t result; result = reverse_octets(dot + 1, p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = append(".", 1, p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } len = (int)(dot - in); } else { len = (int)strlen(in); } - return (append(in, len, p, end)); + return append(in, len, p, end); } isc_result_t @@ -326,10 +326,10 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) { name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, name); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_format(name, reverse, (unsigned int)len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { /* * Not a valid IPv6 address. Assume IPv4. @@ -342,18 +342,18 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) { char *p = reverse; char *end = reverse + len; if (strict && inet_pton(AF_INET, value, &addr.type.in) != 1) { - return (DNS_R_BADDOTTEDQUAD); + return DNS_R_BADDOTTEDQUAD; } result = reverse_octets(value, &p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Append .in-addr.arpa. and a terminating NUL. */ result = append(".in-addr.arpa.", 15, &p, end); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -454,7 +454,7 @@ make_server(const char *servname, const char *userarg) { strlcpy(srv->servername, servname, MXNAME); strlcpy(srv->userarg, userarg, MXNAME); ISC_LINK_INIT(srv, link); - return (srv); + return srv; } /*% @@ -630,7 +630,7 @@ make_empty_lookup(void) { debug("make_empty_lookup() = %p->references = %" PRIuFAST32, looknew, isc_refcount_current(&looknew->references)); - return (looknew); + return looknew; } #define EDNSOPT_OPTIONS 100U @@ -821,7 +821,7 @@ clone_lookup(dig_lookup_t *lookold, bool servers) { looknew->magic = DIG_LOOKUP_MAGIC; - return (looknew); + return looknew; } /*% @@ -851,7 +851,7 @@ requeue_lookup(dig_lookup_t *lookold, bool servers) { ISC_LIST_PREPEND(lookup_list, looknew, link); debug("after insertion, init -> %p, new = %p, new -> %p", lookold, looknew, looknew->link.next); - return (looknew); + return looknew; } void @@ -912,20 +912,20 @@ parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, if (result != ISC_R_SUCCESS) { printf("invalid %s '%s': %s\n", desc, value, isc_result_totext(result)); - return (result); + return result; } *uip = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { - return (parse_uint_helper(uip, value, max, desc, 10)); + return parse_uint_helper(uip, value, max, desc, 10); } isc_result_t parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { - return (parse_uint_helper(uip, value, max, desc, 0)); + return parse_uint_helper(uip, value, max, desc, 0); } static uint32_t @@ -938,7 +938,7 @@ parse_bits(char *arg, const char *desc, uint32_t max) { fatal("couldn't parse digest bits"); } tmp = (tmp + 7) & ~0x7U; - return (tmp); + return tmp; } isc_result_t @@ -1016,7 +1016,7 @@ done: sa->length = prefix_length; *sap = sa; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1092,7 +1092,7 @@ read_confkey(void) { isc_result_t result; if (!isc_file_exists(keyfile)) { - return (ISC_R_FILENOTFOUND); + return ISC_R_FILENOTFOUND; } result = cfg_parser_create(mctx, &pctx); @@ -1133,7 +1133,7 @@ cleanup: cfg_parser_destroy(&pctx); } - return (result); + return result; } void @@ -1203,7 +1203,7 @@ make_searchlist_entry(char *domain) { strlcpy(search->origin, domain, MXNAME); search->origin[MXNAME - 1] = 0; ISC_LINK_INIT(search, link); - return (search); + return search; } static void @@ -1543,13 +1543,13 @@ check_if_queries_done(dig_lookup_t *l, dig_query_t *except_q) { if (!q->started || isc_refcount_current(&q->references) > 1) { if (!q->canceled && q != except_q) { debug("there is a pending query %p", q); - return (false); + return false; } } q = ISC_LIST_NEXT(q, link); } - return (true); + return true; } static void @@ -1859,7 +1859,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { result = dns_message_findtype(name, dns_rdatatype_soa, 0, &rdataset); if (result == ISC_R_SUCCESS) { - return (0); + return 0; } } rdataset = NULL; @@ -1962,7 +1962,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { if (lookup == NULL && section == DNS_SECTION_ANSWER && (query->lookup->trace || query->lookup->ns_search_only)) { - return (followup_lookup(msg, query, DNS_SECTION_AUTHORITY)); + return followup_lookup(msg, query, DNS_SECTION_AUTHORITY); } /* @@ -1994,7 +1994,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { link); } - return (numLookups); + return numLookups; } /*% @@ -2021,7 +2021,7 @@ next_origin(dig_lookup_t *oldlookup) { * We're not using a search list, so don't even think * about finding the next entry. */ - return (false); + return false; } /* @@ -2033,14 +2033,14 @@ next_origin(dig_lookup_t *oldlookup) { (dns_name_isabsolute(name) || (int)dns_name_countlabels(name) > ndots)) { - return (false); + return false; } if (oldlookup->origin == NULL && !oldlookup->need_search) { /* * Then we just did rootorg; there's nothing left. */ - return (false); + return false; } if (oldlookup->origin == NULL && oldlookup->need_search) { newlookup = requeue_lookup(oldlookup, true); @@ -2049,13 +2049,13 @@ next_origin(dig_lookup_t *oldlookup) { } else { search = ISC_LIST_NEXT(oldlookup->origin, link); if (search == NULL && oldlookup->done_as_is) { - return (false); + return false; } newlookup = requeue_lookup(oldlookup, true); newlookup->origin = search; } cancel_lookup(oldlookup); - return (true); + return true; } /*% @@ -2158,7 +2158,7 @@ _new_query(dig_lookup_t *lookup, char *servname, char *userarg, ISC_LINK_INIT(query, link); query->magic = DIG_QUERY_MAGIC; - return (query); + return query; } /*% @@ -2292,7 +2292,7 @@ setup_lookup(dig_lookup_t *lookup) { dns_message_puttempname(lookup->sendmsg, &lookup->oname); if (result == DNS_R_NAMETOOLONG) { - return (false); + return false; } fatal("'%s' is not in legal name syntax (%s)", lookup->textname, @@ -2319,7 +2319,7 @@ setup_lookup(dig_lookup_t *lookup) { isc_result_totext(result)); #if TARGET_OS_IPHONE clear_current_lookup(); - return (false); + return false; #else /* if TARGET_OS_IPHONE */ cleanup_openssl_refs(); digexit(); @@ -2652,7 +2652,7 @@ setup_lookup(dig_lookup_t *lookup) { ISC_LIST_ENQUEUE(lookup->q, query, link); } - return (true); + return true; } /*% @@ -2797,7 +2797,7 @@ get_create_tls_context(dig_query_t *query, const bool is_https, if (query->lookup->tls_key_file_set != query->lookup->tls_cert_file_set) { - return (NULL); + return NULL; } isc_sockaddr_format(&query->sockaddr, tlsctxname, sizeof(tlsctxname)); @@ -2876,7 +2876,7 @@ get_create_tls_context(dig_query_t *query, const bool is_https, INSIST(*psess_cache == NULL); *psess_cache = sess_cache; } - return (ctx); + return ctx; } if (psess_cache != NULL) { @@ -2885,7 +2885,7 @@ get_create_tls_context(dig_query_t *query, const bool is_https, } INSIST(!query->lookup->tls_ca_set || found_store != NULL); - return (found_ctx); + return found_ctx; failure: if (ctx != NULL) { isc_tlsctx_free(&ctx); @@ -2900,7 +2900,7 @@ failure: if (store != NULL && store != found_store) { isc_tls_cert_store_free(&store); } - return (NULL); + return NULL; } static void @@ -3354,12 +3354,12 @@ try_next_server(dig_lookup_t *lookup) { current_query = lookup->current_query; if (current_query == NULL || !ISC_LINK_LINKED(current_query, link)) { - return (false); + return false; } next_query = ISC_LIST_NEXT(current_query, link); if (next_query == NULL) { - return (false); + return false; } debug("trying next server..."); @@ -3370,7 +3370,7 @@ try_next_server(dig_lookup_t *lookup) { start_udp(next_query); } - return (true); + return true; } static void @@ -3709,7 +3709,7 @@ check_for_more_data(dig_lookup_t *lookup, dig_query_t *query, result = dns_message_firstname(msg, DNS_SECTION_ANSWER); if (result != ISC_R_SUCCESS) { puts("; Transfer failed."); - return (true); + return true; } do { dns_name_t *name; @@ -3735,7 +3735,7 @@ check_for_more_data(dig_lookup_t *lookup, dig_query_t *query, { puts("; Transfer failed. " "Didn't start with SOA answer."); - return (true); + return true; } if ((!query->second_rr_rcvd) && (rdata.type != dns_rdatatype_soa)) @@ -3815,10 +3815,10 @@ check_for_more_data(dig_lookup_t *lookup, dig_query_t *query, isc_nmhandle_detach(&query->readhandle); launch_next_query(query); query_detach(&query); - return (false); + return false; doexit: dighost_received(len, peer, query); - return (true); + return true; } static void @@ -3912,7 +3912,7 @@ process_opt(dig_lookup_t *l, dns_message_t *msg) { static int ednsvers(dns_rdataset_t *opt) { - return ((opt->ttl >> 16) & 0xff); + return (opt->ttl >> 16) & 0xff; } /*% @@ -4126,8 +4126,7 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region, if (l->tcp_mode) { bool fail = true; if (result == ISC_R_SUCCESS) { - if ((!query->first_soa_rcvd || query->warn_id)) - { + if (!query->first_soa_rcvd || query->warn_id) { dighost_warning("%s: ID mismatch: " "expected ID %u, got " "%u", @@ -4583,12 +4582,12 @@ get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) { result = isc_getaddresses(host, myport, sockaddr, 1, &count); isc_loopmgr_nonblocking(loopmgr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(count == 1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } int @@ -4610,7 +4609,7 @@ getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) { fatal("couldn't get address for '%s': %s", host, isc_result_totext(result)); } - return (0); + return 0; } for (i = 0; i < count; i++) { @@ -4620,7 +4619,7 @@ getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) { ISC_LIST_APPEND(lookup->my_server_list, srv, link); } - return (count); + return count; } /*% @@ -4793,7 +4792,7 @@ idn_filter(isc_buffer_t *buffer, unsigned int start) { } resetlocale(LC_ALL); if (res != IDN2_OK) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -4801,14 +4800,14 @@ idn_filter(isc_buffer_t *buffer, unsigned int start) { */ dstlen = strlen(dst); if (isc_buffer_length(buffer) < start + dstlen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_subtract(buffer, srclen); memmove(isc_buffer_used(buffer), dst, dstlen); isc_buffer_add(buffer, dstlen); idn2_free(dst); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -4874,8 +4873,8 @@ dig_idnsetup(dig_lookup_t *lookup, bool active) { bool dig_lookup_is_tls(const dig_lookup_t *lookup) { if (lookup->tls_mode || (lookup->tls_ca_set && !lookup->https_mode)) { - return (true); + return true; } - return (false); + return false; } diff --git a/bin/dig/host.c b/bin/dig/host.c index a44acde55c..356b8a9d1b 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -96,7 +96,7 @@ rcode_totext(dns_rcode_t rcode) { } else { totext.consttext = rcodetext[rcode]; } - return (totext.deconsttext); + return totext.deconsttext; } ISC_NORETURN static void @@ -222,9 +222,9 @@ printsection(dns_message_t *msg, dns_section_t sectionid, result = dns_message_firstname(msg, sectionid); if (result == ISC_R_NOMORE) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (;;) { @@ -262,7 +262,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, print_name, false, no_rdata, &target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } #ifdef USEINITALWS if (first) { @@ -317,11 +317,11 @@ printsection(dns_message_t *msg, dns_section_t sectionid, if (result == ISC_R_NOMORE) { break; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -341,12 +341,12 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, result = dns_rdataset_totext(rdataset, owner, false, false, &target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_usedregion(&target, &r); printf("%.*s", (int)r.length, (char *)r.base); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -423,7 +423,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, : query->lookup->textname, msg->rcode, rcode_totext(msg->rcode)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) { @@ -517,7 +517,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, result = printsection(msg, DNS_SECTION_QUESTION, "QUESTION", true, query); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ANSWER])) { @@ -527,7 +527,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, result = printsection(msg, DNS_SECTION_ANSWER, "ANSWER", !short_form, query); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -538,7 +538,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, result = printsection(msg, DNS_SECTION_AUTHORITY, "AUTHORITY", true, query); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ADDITIONAL]) && @@ -548,7 +548,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, result = printsection(msg, DNS_SECTION_ADDITIONAL, "ADDITIONAL", true, query); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if ((tsig != NULL) && !short_form) { @@ -556,7 +556,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, result = printrdata(msg, tsig, tsigname, "PSEUDOSECTION TSIG", true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (!short_form) { @@ -574,7 +574,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, printf("%s has no %s record\n", namestr, typestr); } seen_error = force_error; - return (result); + return result; } static const char *optstring = "46aAc:dilnm:p:rst:vVwCDN:R:TUW:"; @@ -917,5 +917,5 @@ main(int argc, char **argv) { cancel_all(); destroy_libs(); - return ((seen_error == 0) ? 0 : 1); + return (seen_error == 0) ? 0 : 1; } diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 2c89243751..bef5822b37 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -128,7 +128,7 @@ rcode_totext(dns_rcode_t rcode) { } else { totext.consttext = rcodetext[rcode]; } - return (totext.deconsttext); + return totext.deconsttext; } static void @@ -210,9 +210,9 @@ printsection(dig_query_t *query, dns_message_t *msg, bool headers, result = dns_message_firstname(msg, section); if (result == ISC_R_NOMORE) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (;;) { name = NULL; @@ -256,10 +256,10 @@ printsection(dig_query_t *query, dns_message_t *msg, bool headers, if (result == ISC_R_NOMORE) { break; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -294,9 +294,9 @@ detailsection(dig_query_t *query, dns_message_t *msg, bool headers, result = dns_message_firstname(msg, section); if (result == ISC_R_NOMORE) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (;;) { name = NULL; @@ -338,10 +338,10 @@ detailsection(dig_query_t *query, dns_message_t *msg, bool headers, if (result == ISC_R_NOMORE) { break; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -424,7 +424,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, /* the lookup failed */ print_error |= 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) { @@ -478,7 +478,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, printsection(query, msg, headers, DNS_SECTION_AUTHORITY); printsection(query, msg, headers, DNS_SECTION_ADDITIONAL); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -537,10 +537,10 @@ testtype(char *typetext) { tr.length = strlen(typetext); result = dns_rdatatype_fromtext(&rdtype, &tr); if (result == ISC_R_SUCCESS) { - return (true); + return true; } else { printf("unknown query type: %s\n", typetext); - return (false); + return false; } } @@ -554,10 +554,10 @@ testclass(char *typetext) { tr.length = strlen(typetext); result = dns_rdataclass_fromtext(&rdclass, &tr); if (result == ISC_R_SUCCESS) { - return (true); + return true; } else { printf("unknown query class: %s\n", typetext); - return (false); + return false; } } @@ -975,5 +975,5 @@ main(int argc, char **argv) { cancel_all(); destroy_libs(); - return (query_error | print_error); + return query_error | print_error; } diff --git a/bin/dig/readline.h b/bin/dig/readline.h index 68a38c3ef9..1d778303ac 100644 --- a/bin/dig/readline.h +++ b/bin/dig/readline.h @@ -48,9 +48,9 @@ readline(const char *prompt) { line = fgets(buf, RL_MAXCMD, stdin); if (line == NULL) { free(buf); - return (NULL); + return NULL; } - return (buf); + return buf; }; #define add_history(line) diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index c44875252b..70f8f477c7 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -393,7 +393,7 @@ formatset(dns_rdataset_t *rdataset) { } isc_buffer_putuint8(buf, 0); - return (buf); + return buf; } static void @@ -503,14 +503,14 @@ match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness) { vbprintf(1, "found matching %s %d %d %d\n", c ? "CDS" : "DS", ds.key_tag, ds.algorithm, ds.digest_type); - return (true); + return true; } else if (strictness == TIGHT) { vbprintf(0, "key does not match %s %d %d %d " "when it looks like it should\n", c ? "CDS" : "DS", ds.key_tag, ds.algorithm, ds.digest_type); - return (false); + return false; } } @@ -519,7 +519,7 @@ match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness) { ki->rdata.type == dns_rdatatype_cdnskey ? "CDNSKEY" : "DNSKEY", ki->tag, ki->algo); - return (false); + return false; } /* @@ -573,7 +573,7 @@ match_keyset_dsset(dns_rdataset_t *keyset, dns_rdataset_t *dsset, } } - return (keytable); + return keytable; } static void @@ -679,7 +679,7 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, } } - return (algo); + return algo; } /* @@ -696,7 +696,7 @@ signed_loose(dns_secalg_t *algo) { } } isc_mem_cput(mctx, algo, nkey, sizeof(algo[0])); - return (ok); + return ok; } /* @@ -738,7 +738,7 @@ signed_strict(dns_rdataset_t *dsset, dns_secalg_t *algo) { } isc_mem_cput(mctx, algo, nkey, sizeof(algo[0])); - return (all_ok); + return all_ok; } /* @@ -759,10 +759,10 @@ ds_from_cds(isc_buffer_t *buf, dns_rdata_t *rds, dns_dsdigest_t dt, ds.common.rdtype = dns_rdatatype_ds; if (ds.digest_type != dt) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } - return (dns_rdata_fromstruct(rds, rdclass, dns_rdatatype_ds, &ds, buf)); + return dns_rdata_fromstruct(rds, rdclass, dns_rdatatype_ds, &ds, buf); } static isc_result_t @@ -775,7 +775,7 @@ ds_from_cdnskey(isc_buffer_t *buf, dns_rdata_t *ds, dns_dsdigest_t dt, isc_buffer_availableregion(buf, &r); if (r.length < DNS_DS_BUFFERSIZE) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } result = dns_ds_buildrdata(name, cdnskey, dt, r.base, ds); @@ -783,7 +783,7 @@ ds_from_cdnskey(isc_buffer_t *buf, dns_rdata_t *ds, dns_dsdigest_t dt, isc_buffer_add(buf, DNS_DS_BUFFERSIZE); } - return (result); + return result; } static isc_result_t @@ -814,14 +814,14 @@ append_new_ds_set(ds_maker_func_t *ds_from_rdata, isc_buffer_t *buf, continue; case ISC_R_NOSPACE: isc_mem_put(mctx, ds, sizeof(*ds)); - return (result); + return result; default: isc_mem_put(mctx, ds, sizeof(*ds)); check_result(result, "ds_from_rdata()"); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -866,8 +866,8 @@ make_new_ds_set(ds_maker_func_t *ds_from_rdata, uint32_t ttl, static int rdata_cmp(const void *rdata1, const void *rdata2) { - return (dns_rdata_compare((const dns_rdata_t *)rdata1, - (const dns_rdata_t *)rdata2)); + return dns_rdata_compare((const dns_rdata_t *)rdata1, + (const dns_rdata_t *)rdata2); } /* @@ -948,7 +948,7 @@ consistent_digests(dns_rdataset_t *dsset) { isc_mem_cput(mctx, ds, n, sizeof(dns_rdata_ds_t)); isc_mem_cput(mctx, arrdata, n, sizeof(dns_rdata_t)); - return (match); + return match; } static void @@ -1339,5 +1339,5 @@ cleanup: print_mem_stats = true; cleanup(); - return (0); + return 0; } diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index 2ffd31b898..6cfdf60bf9 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -66,7 +66,7 @@ initname(char *setname) { isc_buffer_init(&buf, setname, strlen(setname)); isc_buffer_add(&buf, strlen(setname)); result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL); - return (result); + return result; } static void @@ -138,7 +138,7 @@ loadset(const char *filename, dns_rdataset_t *rdataset) { if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } static isc_result_t @@ -153,7 +153,7 @@ loadkeyset(char *dirname, dns_rdataset_t *rdataset) { if (dirname != NULL) { /* allow room for a trailing slash */ if (strlen(dirname) >= isc_buffer_availablelength(&buf)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(&buf, dirname); if (dirname[strlen(dirname) - 1] != '/') { @@ -162,18 +162,18 @@ loadkeyset(char *dirname, dns_rdataset_t *rdataset) { } if (isc_buffer_availablelength(&buf) < 7) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(&buf, "keyset-"); result = dns_name_tofilenametext(name, false, &buf); check_result(result, "dns_name_tofilenametext()"); if (isc_buffer_availablelength(&buf) == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(&buf, 0); - return (loadset(filename, rdataset)); + return loadset(filename, rdataset); } static void @@ -549,8 +549,8 @@ main(int argc, char **argv) { fflush(stdout); if (ferror(stdout)) { fprintf(stderr, "write error\n"); - return (1); + return 1; } else { - return (0); + return 0; } } diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index 6fb11b1060..6e9f3e3af1 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -68,7 +68,7 @@ initname(char *setname) { isc_buffer_init(&buf, setname, strlen(setname)); isc_buffer_add(&buf, strlen(setname)); result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL); - return (result); + return result; } static void @@ -141,7 +141,7 @@ loadset(const char *filename, dns_rdataset_t *rdataset) { if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } static void @@ -459,8 +459,8 @@ main(int argc, char **argv) { fflush(stdout); if (ferror(stdout)) { fprintf(stderr, "write error\n"); - return (1); + return 1; } else { - return (0); + return 0; } } diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index a52980f71f..c302528c77 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -750,5 +750,5 @@ main(int argc, char **argv) { free(freeit); } - return (0); + return 0; } diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 2bf382179b..c045745f63 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -1320,5 +1320,5 @@ main(int argc, char **argv) { free(freeit); } - return (0); + return 0; } diff --git a/bin/dnssec/dnssec-ksr.c b/bin/dnssec/dnssec-ksr.c index 10982f6c22..0a929ee3b2 100644 --- a/bin/dnssec/dnssec-ksr.c +++ b/bin/dnssec/dnssec-ksr.c @@ -149,7 +149,7 @@ between(isc_stdtime_t t, isc_stdtime_t start, isc_stdtime_t end) { if (t > 0 && t > start && t < end) { r = t; } - return (r); + return r; } static void @@ -199,15 +199,15 @@ keyalgtag_cmp(const void *k1, const void *k2) { dns_dnsseckey_t **key1 = (dns_dnsseckey_t **)k1; dns_dnsseckey_t **key2 = (dns_dnsseckey_t **)k2; if (dst_key_alg((*key1)->key) < dst_key_alg((*key2)->key)) { - return (-1); + return -1; } else if (dst_key_alg((*key1)->key) > dst_key_alg((*key2)->key)) { - return (1); + return 1; } else if (dst_key_id((*key1)->key) < dst_key_id((*key2)->key)) { - return (-1); + return -1; } else if (dst_key_id((*key1)->key) > dst_key_id((*key2)->key)) { - return (1); + return 1; } - return (0); + return 0; } static void @@ -641,7 +641,7 @@ fail: namestr, algstr, timestr); } - return (next_bundle); + return next_bundle; } static isc_stdtime_t @@ -735,7 +735,7 @@ sign_rrset(ksr_ctx_t *ksr, isc_stdtime_t inception, isc_stdtime_t expiration, print_rdata(&rrsigset); freerrset(&rrsigset); - return (next_bundle); + return next_bundle; } /* @@ -893,11 +893,11 @@ get_keymaterial(ksr_ctx_t *ksr, dns_kasp_t *kasp, isc_stdtime_t inception, dns_rdatalist_tordataset(cdnskeylist, cdnskeyset); dns_rdatalist_tordataset(cdslist, cdsset); - return (next_bundle); + return next_bundle; fail: fatal("failed to create KSK/CDS/CDNSKEY"); - return (0); + return 0; } static void @@ -1008,10 +1008,10 @@ parse_dnskey(isc_lex_t *lex, char *owner, isc_buffer_t *buf, dns_ttl_t *ttl) { isc_buffer_add(&b, strlen(owner)); ret = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } if (dns_name_compare(dname, name) != 0) { - return (DNS_R_BADOWNERNAME); + return DNS_R_BADOWNERNAME; } isc_buffer_clear(&b); @@ -1049,7 +1049,7 @@ parse_dnskey(isc_lex_t *lex, char *owner, isc_buffer_t *buf, dns_ttl_t *ttl) { cleanup: isc_lex_setcomments(lex, 0); - return (ret); + return ret; } static void diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index 92169ca7b6..603ec000e4 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -248,5 +248,5 @@ cleanup: } isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 6c83ee5272..e70e95cbda 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -949,5 +949,5 @@ main(int argc, char **argv) { isc_mem_free(mctx, directory); isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 84a9574952..eece8554f9 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -197,7 +197,7 @@ savezonecut(dns_fixedname_t *fzonecut, dns_name_t *name) { result = dns_fixedname_initname(fzonecut); dns_name_copy(name, result); - return (result); + return result; } static void @@ -325,28 +325,28 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key, static bool issigningkey(dns_dnsseckey_t *key) { - return (key->force_sign || key->hint_sign); + return key->force_sign || key->hint_sign; } static bool ispublishedkey(dns_dnsseckey_t *key) { - return ((key->force_publish || key->hint_publish) && !key->hint_remove); + return (key->force_publish || key->hint_publish) && !key->hint_remove; } static bool iszonekey(dns_dnsseckey_t *key) { - return (dns_name_equal(dst_key_name(key->key), gorigin) && - dst_key_iszonekey(key->key)); + return dns_name_equal(dst_key_name(key->key), gorigin) && + dst_key_iszonekey(key->key); } static bool isksk(dns_dnsseckey_t *key) { - return (key->ksk); + return key->ksk; } static bool iszsk(dns_dnsseckey_t *key) { - return (ignore_kskflag || !key->ksk); + return ignore_kskflag || !key->ksk; } /*% @@ -366,10 +366,10 @@ keythatsigned_unlocked(dns_rdata_rrsig_t *rrsig) { rrsig->algorithm == dst_key_alg(key->key) && dns_name_equal(&rrsig->signer, dst_key_name(key->key))) { - return (key); + return key; } } - return (NULL); + return NULL; } /*% @@ -386,7 +386,7 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) { key = keythatsigned_unlocked(rrsig); RWUNLOCK(&keylist_lock, isc_rwlocktype_read); if (key != NULL) { - return (key); + return key; } /* @@ -400,7 +400,7 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) { key = keythatsigned_unlocked(rrsig); if (key != NULL) { isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_write); - return (key); + return key; } result = dst_key_fromfile(&rrsig->signer, rrsig->keyid, @@ -408,7 +408,7 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) { mctx, &pubkey); if (result != ISC_R_SUCCESS) { isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_write); - return (NULL); + return NULL; } result = dst_key_fromfile( @@ -427,7 +427,7 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) { ISC_LIST_APPEND(keylist, key, link); isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_write); - return (key); + return key; } /*% @@ -449,11 +449,11 @@ expecttofindkey(dns_name_t *name) { case ISC_R_SUCCESS: case DNS_R_NXDOMAIN: case DNS_R_NXRRSET: - return (true); + return true; case DNS_R_DELEGATION: case DNS_R_CNAME: case DNS_R_DNAME: - return (false); + return false; default: break; } @@ -461,7 +461,7 @@ expecttofindkey(dns_name_t *name) { fatal("failure looking for '%s DNSKEY' in database: %s", namestr, isc_result_totext(result)); UNREACHABLE(); - return (false); /* removes a warning */ + return false; /* removes a warning */ } static bool @@ -471,10 +471,10 @@ setverifies(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, result = dns_dnssec_verify(name, set, key, false, 0, mctx, rrsig, NULL); if (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD) { INCSTAT(nverified); - return (true); + return true; } else { INCSTAT(nverifyfailed); - return (false); + return false; } } @@ -855,7 +855,7 @@ hashlist_add_dns_name(hashlist_t *l, static int hashlist_comp(const void *a, const void *b) { - return (memcmp(a, b, hash_length + 1)); + return memcmp(a, b, hash_length + 1); } static void @@ -887,11 +887,11 @@ hashlist_hasdup(hashlist_t *l) { continue; } if (isc_safe_memequal(current, next, l->length - 1)) { - return (true); + return true; } current = next; } - return (false); + return false; } static const unsigned char * @@ -913,16 +913,16 @@ hashlist_findnext(const hashlist_t *l, } } while (entries-- > 1U); INSIST(entries != 0U); - return (next); + return next; } static bool hashlist_exists(const hashlist_t *l, const unsigned char hash[NSEC3_MAX_HASH_LENGTH]) { if (bsearch(hash, l->hashbuf, l->entries, l->length, hashlist_comp)) { - return (true); + return true; } else { - return (false); + return false; } } @@ -1031,7 +1031,7 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { vbprintf(2, "found DS records\n"); dsset->ttl = ttl; dns_db_detach(&db); - return (result); + return result; } } dns_db_detach(&db); @@ -1040,13 +1040,13 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { /* No DS records found; try again, looking for DNSKEY records */ opendb("keyset-", name, gclass, &db); if (db == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } result = dns_db_findnode(db, name, false, &node); if (result != ISC_R_SUCCESS) { dns_db_detach(&db); - return (result); + return result; } dns_rdataset_init(&keyset); @@ -1055,7 +1055,7 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { if (result != ISC_R_SUCCESS) { dns_db_detachnode(db, &node); dns_db_detach(&db); - return (result); + return result; } vbprintf(2, "found DNSKEY records\n"); @@ -1091,7 +1091,7 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { dns_rdataset_disassociate(&keyset); dns_db_detachnode(db, &node); dns_db_detach(&db); - return (result); + return result; } static bool @@ -1100,7 +1100,7 @@ secure(dns_name_t *name, dns_dbnode_t *node) { isc_result_t result; if (dns_name_equal(name, gorigin)) { - return (false); + return false; } dns_rdataset_init(&dsset); @@ -1110,7 +1110,7 @@ secure(dns_name_t *name, dns_dbnode_t *node) { dns_rdataset_disassociate(&dsset); } - return (result == ISC_R_SUCCESS); + return result == ISC_R_SUCCESS; } static bool @@ -1120,7 +1120,7 @@ is_delegation(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, isc_result_t result; if (dns_name_equal(name, origin)) { - return (false); + return false; } dns_rdataset_init(&nsset); @@ -1133,7 +1133,7 @@ is_delegation(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, dns_rdataset_disassociate(&nsset); } - return ((result == ISC_R_SUCCESS)); + return result == ISC_R_SUCCESS; } /*% @@ -1152,7 +1152,7 @@ has_dname(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node) { dns_rdataset_disassociate(&dnameset); } - return ((result == ISC_R_SUCCESS)); + return result == ISC_R_SUCCESS; } /*% @@ -1370,7 +1370,7 @@ active_node(dns_dbnode_t *node) { } dns_rdatasetiter_destroy(&rdsiter); - return (active); + return active; } /*% @@ -1419,7 +1419,7 @@ setsoaserial(uint32_t serial, dns_updatemethod_t method) { result = dns_db_getoriginnode(gdb, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -1493,7 +1493,7 @@ cleanup: } dns_rdata_reset(&rdata); - return (result); + return result; } /*% @@ -4134,5 +4134,5 @@ main(int argc, char *argv[]) { } isc_mutex_destroy(&namelock); - return (vresult == ISC_R_SUCCESS ? 0 : 1); + return vresult == ISC_R_SUCCESS ? 0 : 1; } diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index 45c75d3531..2c22e3f8cf 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -330,5 +330,5 @@ main(int argc, char *argv[]) { } isc_mem_destroy(&mctx); - return (result == ISC_R_SUCCESS ? 0 : 1); + return result == ISC_R_SUCCESS ? 0 : 1; } diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 820878eaaf..da1fffa400 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -173,16 +173,16 @@ time_units(isc_stdtime_t offset, char *suffix, const char *str) { switch (suffix[0]) { case 'Y': case 'y': - return (offset * (365 * 24 * 3600)); + return offset * (365 * 24 * 3600); case 'M': case 'm': switch (suffix[1]) { case 'O': case 'o': - return (offset * (30 * 24 * 3600)); + return offset * (30 * 24 * 3600); case 'I': case 'i': - return (offset * 60); + return offset * 60; case '\0': fatal("'%s' ambiguous: use 'mi' for minutes " "or 'mo' for months", @@ -194,29 +194,29 @@ time_units(isc_stdtime_t offset, char *suffix, const char *str) { break; case 'W': case 'w': - return (offset * (7 * 24 * 3600)); + return offset * (7 * 24 * 3600); case 'D': case 'd': - return (offset * (24 * 3600)); + return offset * (24 * 3600); case 'H': case 'h': - return (offset * 3600); + return offset * 3600; case 'S': case 's': case '\0': - return (offset); + return offset; default: fatal("time value %s is invalid", str); } UNREACHABLE(); - return (0); /* silence compiler warning */ + return 0; /* silence compiler warning */ } static bool isnone(const char *str) { - return ((strcasecmp(str, "none") == 0) || - (strcasecmp(str, "never") == 0) || - (strcasecmp(str, "unset") == 0)); + return (strcasecmp(str, "none") == 0) || + (strcasecmp(str, "never") == 0) || + (strcasecmp(str, "unset") == 0); } dns_ttl_t @@ -226,7 +226,7 @@ strtottl(const char *str) { char *endp; if (isnone(str)) { - return ((dns_ttl_t)0); + return (dns_ttl_t)0; } ttl = strtol(str, &endp, 0); @@ -234,19 +234,19 @@ strtottl(const char *str) { fatal("TTL must be numeric"); } ttl = time_units(ttl, endp, orig); - return (ttl); + return ttl; } dst_key_state_t strtokeystate(const char *str) { if (isnone(str)) { - return (DST_KEY_STATE_NA); + return DST_KEY_STATE_NA; } for (int i = 0; i < KEYSTATES_NVALUES; i++) { if (keystates[i] != NULL && strcasecmp(str, keystates[i]) == 0) { - return ((dst_key_state_t)i); + return (dst_key_state_t)i; } } fatal("unknown key state %s", str); @@ -263,13 +263,13 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) { if (isnone(str)) { SET_IF_NOT_NULL(setp, false); - return ((isc_stdtime_t)0); + return (isc_stdtime_t)0; } SET_IF_NOT_NULL(setp, true); if ((str[0] == '0' || str[0] == '-') && str[1] == '\0') { - return ((isc_stdtime_t)0); + return (isc_stdtime_t)0; } /* @@ -318,7 +318,7 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) { } if (str[0] == '\0') { - return ((isc_stdtime_t)base); + return (isc_stdtime_t)base; } else if (str[0] == '+') { offset = strtol(str + 1, &endp, 0); offset = time_units((isc_stdtime_t)offset, endp, orig); @@ -331,7 +331,7 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) { fatal("time value %s is invalid", orig); } - return ((isc_stdtime_t)val); + return (isc_stdtime_t)val; } dns_rdataclass_t @@ -341,7 +341,7 @@ strtoclass(const char *str) { isc_result_t result; if (str == NULL) { - return (dns_rdataclass_in); + return dns_rdataclass_in; } r.base = UNCONST(str); r.length = strlen(str); @@ -349,7 +349,7 @@ strtoclass(const char *str) { if (result != ISC_R_SUCCESS) { fatal("unknown class %s", str); } - return (rdclass); + return rdclass; } unsigned int @@ -364,14 +364,14 @@ strtodsdigest(const char *str) { if (result != ISC_R_SUCCESS) { fatal("unknown DS algorithm %s", str); } - return (alg); + return alg; } static int cmp_dtype(const void *ap, const void *bp) { int a = *(const uint8_t *)ap; int b = *(const uint8_t *)bp; - return (a - b); + return a - b; } void @@ -403,7 +403,7 @@ try_dir(const char *dirname) { if (result == ISC_R_SUCCESS) { isc_dir_close(&d); } - return (result); + return result; } /* @@ -472,14 +472,14 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, if (id < min || id > max) { fprintf(stderr, "Key ID %d outside of [%u..%u]\n", id, min, max); - return (true); + return true; } if (rid < min || rid > max) { fprintf(stderr, "Revoked Key ID %d (for tag %d) outside of " "[%u..%u]\n", rid, id, min, max); - return (true); + return true; } } @@ -487,7 +487,7 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, result = dns_dnssec_findmatchingkeys(name, NULL, dir, NULL, now, mctx, &matchkeys); if (result == ISC_R_NOTFOUND) { - return (false); + return false; } while (!ISC_LIST_EMPTY(matchkeys) && !conflict) { @@ -531,7 +531,7 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, dns_dnsseckey_destroy(mctx, &key); } - return (conflict); + return conflict; } bool @@ -546,9 +546,9 @@ isoptarg(const char *arg, char **argv, void (*usage)(void)) { isc_commandline_argument = argv[isc_commandline_index]; /* skip to next argument */ isc_commandline_index++; - return (true); + return true; } - return (false); + return false; } void diff --git a/bin/named/builtin.c b/bin/named/builtin.c index 9ed069ecf6..797c9505d2 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -120,7 +120,7 @@ putrdata(bdbnode_t *node, dns_rdatatype_t typeval, dns_ttl_t ttl, rdatalist->ttl = ttl; ISC_LIST_APPEND(node->lists, rdatalist, link); } else if (rdatalist->ttl != ttl) { - return (DNS_R_BADTTL); + return DNS_R_BADTTL; } rdata = isc_mem_get(mctx, sizeof(dns_rdata_t)); @@ -136,7 +136,7 @@ putrdata(bdbnode_t *node, dns_rdatatype_t typeval, dns_ttl_t ttl, ISC_LIST_APPEND(rdatalist->rdata, rdata, link); ISC_LIST_APPEND(node->buffers, rdatabuf, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -159,7 +159,7 @@ putrr(bdbnode_t *node, const char *type, dns_ttl_t ttl, const char *data) { isc_constregion_t r = { .base = type, .length = strlen(type) }; result = dns_rdatatype_fromtext(&typeval, (isc_textregion_t *)&r); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_lex_create(mctx, 64, &lex); @@ -170,7 +170,7 @@ putrr(bdbnode_t *node, const char *type, dns_ttl_t ttl, const char *data) { result = isc_lex_openbuffer(lex, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_allocate(mctx, &rb, DNS_RDATA_MAXLENGTH); @@ -185,7 +185,7 @@ putrr(bdbnode_t *node, const char *type, dns_ttl_t ttl, const char *data) { isc_buffer_free(&rb); - return (result); + return result; } /* Reasonable default SOA values */ @@ -207,9 +207,9 @@ putsoa(bdbnode_t *node, const char *mname, const char *rname, uint32_t serial) { serial, DEFAULT_REFRESH, DEFAULT_RETRY, DEFAULT_EXPIRE, DEFAULT_MINIMUM); if (n >= (int)sizeof(str) || n < 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } - return (putrr(node, "SOA", DEFAULT_TTL, str)); + return putrr(node, "SOA", DEFAULT_TTL, str); } static isc_result_t @@ -222,7 +222,7 @@ puttxt(bdbnode_t *node, const char *text) { } buf[0] = len; memmove(&buf[1], text, len); - return (putrdata(node, dns_rdatatype_txt, 0, buf, len + 1)); + return putrdata(node, dns_rdatatype_txt, 0, buf, len + 1); } /* @@ -279,7 +279,7 @@ dns64_rdata(unsigned char *v, size_t start, unsigned char *rdata) { } } memmove(&rdata[j], "\07in-addr\04arpa", 14); - return (j + 14); + return j + 14; } static isc_result_t @@ -301,7 +301,7 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { zlen = zone->length; nlen = name->length; if ((zlen + nlen) > 74U || zlen < 10U || (nlen % 2) != 0U) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -320,11 +320,11 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { while (j != 0U) { INSIST((i / 2) < sizeof(v)); if (ndata[0] != 1) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } n = hex16[ndata[1] & 0xff]; if (n == 1) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } v[i / 2] = n | (v[i / 2] >> 4); j -= 2; @@ -346,14 +346,14 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * to exist in the zone. */ if (nlen > 16U && v[(nlen - 1) / 4 - 4] != 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * If the total length is not 74 then this is a empty node * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 8, rdata); break; @@ -363,14 +363,14 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * to exist in the zone. */ if (nlen > 12U && v[(nlen - 1) / 4 - 3] != 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * If the total length is not 74 then this is a empty node * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 6, rdata); break; @@ -380,14 +380,14 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * to exist in the zone. */ if (nlen > 8U && v[(nlen - 1) / 4 - 2] != 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * If the total length is not 74 then this is a empty node * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 5, rdata); break; @@ -397,14 +397,14 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * to exist in the zone. */ if (nlen > 4U && v[(nlen - 1) / 4 - 1] != 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * If the total length is not 74 then this is a empty node * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 4, rdata); break; @@ -414,14 +414,14 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * to exist in the zone. */ if (v[(nlen - 1) / 4] != 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * If the total length is not 74 then this is a empty node * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 3, rdata); break; @@ -431,7 +431,7 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * so return success. */ if (nlen + zlen != 74U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = dns64_rdata(v, 0, rdata); break; @@ -440,7 +440,7 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { * This should never be reached unless someone adds a * zone declaration with this internal type to named.conf. */ - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -449,22 +449,22 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, bdbnode_t *node) { if ((v[0] == 170 || v[0] == 171) && v[1] == 0 && v[2] == 0 && v[3] == 192) { - return (putrdata(node, dns_rdatatype_ptr, 3600, ipv4only, - sizeof(ipv4only))); + return putrdata(node, dns_rdatatype_ptr, 3600, ipv4only, + sizeof(ipv4only)); } - return (putrdata(node, dns_rdatatype_cname, 600, rdata, - (unsigned int)len)); + return putrdata(node, dns_rdatatype_cname, 600, rdata, + (unsigned int)len); } static isc_result_t builtin_lookup(bdb_t *bdb, const dns_name_t *name, bdbnode_t *node) { if (name->labels == 0 && name->length == 0) { - return (bdb->lookup(node)); + return bdb->lookup(node); } else if ((node->bdb->implementation->flags & BDB_DNS64) != 0) { - return (dns64_cname(&bdb->common.origin, name, node)); + return dns64_cname(&bdb->common.origin, name, node); } else { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } @@ -483,27 +483,27 @@ builtin_authority(bdb_t *bdb, bdbnode_t *node) { result = putsoa(node, server, contact, 0); if (result != ISC_R_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = putrr(node, "NS", 0, server); if (result != ISC_R_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t version_lookup(bdbnode_t *node) { if (named_g_server->version_set) { if (named_g_server->version == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (puttxt(node, named_g_server->version)); + return puttxt(node, named_g_server->version); } } else { - return (puttxt(node, PACKAGE_VERSION)); + return puttxt(node, PACKAGE_VERSION); } } @@ -511,16 +511,16 @@ static isc_result_t hostname_lookup(bdbnode_t *node) { if (named_g_server->hostname_set) { if (named_g_server->hostname == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (puttxt(node, named_g_server->hostname)); + return puttxt(node, named_g_server->hostname); } } else { char buf[256]; if (gethostname(buf, sizeof(buf)) != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (puttxt(node, buf)); + return puttxt(node, buf); } } @@ -546,16 +546,16 @@ authors_lookup(bdbnode_t *node) { * If a version string is specified, disable the authors.bind zone. */ if (named_g_server->version_set) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (p = authors; *p != NULL; p++) { result = puttxt(node, *p); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -563,13 +563,13 @@ id_lookup(bdbnode_t *node) { if (named_g_server->sctx->usehostname) { char buf[256]; if (gethostname(buf, sizeof(buf)) != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (puttxt(node, buf)); + return puttxt(node, buf); } else if (named_g_server->sctx->server_id != NULL) { - return (puttxt(node, named_g_server->sctx->server_id)); + return puttxt(node, named_g_server->sctx->server_id); } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -577,7 +577,7 @@ static isc_result_t empty_lookup(bdbnode_t *node) { UNUSED(node); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -588,10 +588,10 @@ ipv4only_lookup(bdbnode_t *node) { for (int i = 0; i < 2; i++) { result = putrdata(node, dns_rdatatype_a, 3600, data[i], 4); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -600,7 +600,7 @@ ipv4reverse_lookup(bdbnode_t *node) { result = putrdata(node, dns_rdatatype_ptr, 3600, ipv4only, sizeof(ipv4only)); - return (result); + return result; } /* @@ -670,10 +670,10 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { bdbnode_t *bdbnode = (bdbnode_t *)iterator->node; if (ISC_LIST_EMPTY(bdbnode->lists)) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } bdbiterator->current = ISC_LIST_HEAD(bdbnode->lists); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -682,9 +682,9 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { bdbiterator->current = ISC_LIST_NEXT(bdbiterator->current, link); if (bdbiterator->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -787,7 +787,7 @@ createnode(bdb_t *bdb, bdbnode_t **nodep) { node->magic = BDBNODE_MAGIC; *nodep = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -844,23 +844,23 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { result = createnode(bdb, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = builtin_lookup(bdb, name, node); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { destroynode(node); - return (result); + return result; } result = builtin_authority(bdb, node); if (result != ISC_R_SUCCESS) { destroynode(node); - return (result); + return result; } *nodep = (dns_dbnode_t *)node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -887,26 +887,26 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, result = createnode(bdb, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = builtin_lookup(bdb, name, node); if (result != ISC_R_SUCCESS && (!isorigin || result != ISC_R_NOTFOUND)) { destroynode(node); - return (result); + return result; } if (isorigin) { result = builtin_authority(bdb, node); if (result != ISC_R_SUCCESS) { destroynode(node); - return (result); + return result; } } *nodep = (dns_dbnode_t *)node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -928,7 +928,7 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, REQUIRE(version == NULL || version == (dns_dbversion_t *)&dummy); if (!dns_name_issubdomain(name, &db->origin)) { - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; } olabels = dns_name_countlabels(&db->origin); @@ -954,13 +954,13 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, * No data at zone apex? */ if (i == olabels) { - return (DNS_R_BADDB); + return DNS_R_BADDB; } result = DNS_R_NXDOMAIN; continue; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -1069,7 +1069,7 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, detachnode(db, &node DNS__DB_FLARG_PASS); } - return (result); + return result; } static void @@ -1117,7 +1117,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, UNUSED(sigrdataset); if (type == dns_rdatatype_rrsig) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } list = ISC_LIST_HEAD(bdbnode->lists); @@ -1128,12 +1128,12 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, list = ISC_LIST_NEXT(list, link); } if (list == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } new_rdataset(list, db, node, rdataset); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1158,7 +1158,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, *iteratorp = (dns_rdatasetiter_t *)iterator; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static dns_dbmethods_t bdb_methods = { @@ -1186,7 +1186,7 @@ create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, REQUIRE(implementation != NULL); if (type != dns_dbtype_zone) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } bdb = isc_mem_get(mctx, sizeof(*bdb)); @@ -1241,7 +1241,7 @@ create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, *dbp = (dns_db_t *)bdb; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_name_free(&bdb->common.origin, mctx); @@ -1253,7 +1253,7 @@ cleanup: } isc_mem_putanddetach(&bdb->common.mctx, bdb, sizeof(bdb_t)); - return (result); + return result; } /* @@ -1269,17 +1269,17 @@ named_builtin_init(void) { result = dns_db_register("_builtin", create, &builtin, named_g_mctx, &builtin.dbimp); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_register("_dns64", create, &dns64, named_g_mctx, &dns64.dbimp); if (result != ISC_R_SUCCESS) { dns_db_unregister(&builtin.dbimp); - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/bin/named/config.c b/bin/named/config.c index 83381489b4..975ea4938a 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -355,15 +355,15 @@ named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { isc_buffer_init(&b, defaultconf, sizeof(defaultconf) - 1); isc_buffer_add(&b, sizeof(defaultconf) - 1); - return (cfg_parse_buffer(parser, &b, __FILE__, 0, &cfg_type_namedconf, - CFG_PCTX_NODEPRECATED | CFG_PCTX_NOOBSOLETE | - CFG_PCTX_NOEXPERIMENTAL, - conf)); + return cfg_parse_buffer(parser, &b, __FILE__, 0, &cfg_type_namedconf, + CFG_PCTX_NODEPRECATED | CFG_PCTX_NOOBSOLETE | + CFG_PCTX_NOEXPERIMENTAL, + conf); } const char * named_config_getdefault(void) { - return (defaultconf); + return defaultconf; } isc_result_t @@ -373,10 +373,10 @@ named_config_get(cfg_obj_t const *const *maps, const char *name, for (i = 0; maps[i] != NULL; i++) { if (cfg_map_get(maps[i], name, obj) == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -402,7 +402,7 @@ named_checknames_get(const cfg_obj_t **maps, const char *const names[], */ if (checknames != NULL && !cfg_obj_islist(checknames)) { *obj = checknames; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (element = cfg_list_first(checknames); element != NULL; element = cfg_list_next(element)) @@ -416,13 +416,13 @@ named_checknames_get(const cfg_obj_t **maps, const char *const names[], { *obj = cfg_tuple_get(value, "mode"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } int @@ -434,7 +434,7 @@ named_config_listcount(const cfg_obj_t *list) { i++; } - return (i); + return i; } isc_result_t @@ -445,7 +445,7 @@ named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, if (!cfg_obj_isstring(classobj)) { *classp = defclass; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } r.base = UNCONST(cfg_obj_asstring(classobj)); r.length = strlen(r.base); @@ -454,7 +454,7 @@ named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, cfg_obj_log(classobj, ISC_LOG_ERROR, "unknown class '%s'", r.base); } - return (result); + return result; } isc_result_t @@ -465,7 +465,7 @@ named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, if (!cfg_obj_isstring(typeobj)) { *typep = deftype; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } r.base = UNCONST(cfg_obj_asstring(typeobj)); r.length = strlen(r.base); @@ -474,7 +474,7 @@ named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, cfg_obj_log(typeobj, ISC_LOG_ERROR, "unknown type '%s'", r.base); } - return (result); + return result; } dns_zonetype_t @@ -500,7 +500,7 @@ named_config_getzonetype(const cfg_obj_t *zonetypeobj) { } else { UNREACHABLE(); } - return (ztype); + return ztype; } static isc_result_t @@ -516,7 +516,7 @@ getremotesdef(const cfg_obj_t *cctx, const char *list, const char *name, result = cfg_map_get(cctx, list, &obj); if (result != ISC_R_SUCCESS) { - return (result); + return result; } elt = cfg_list_first(obj); while (elt != NULL) { @@ -525,11 +525,11 @@ getremotesdef(const cfg_obj_t *cctx, const char *list, const char *name, name) == 0) { *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } elt = cfg_list_next(elt); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -538,15 +538,15 @@ named_config_getremotesdef(const cfg_obj_t *cctx, const char *list, isc_result_t result; if (strcmp(list, "parental-agents") == 0) { - return (getremotesdef(cctx, list, name, ret)); + return getremotesdef(cctx, list, name, ret); } else if (strcmp(list, "primaries") == 0) { result = getremotesdef(cctx, list, name, ret); if (result != ISC_R_SUCCESS) { result = getremotesdef(cctx, "masters", name, ret); } - return (result); + return result; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -561,7 +561,7 @@ named_config_getname(isc_mem_t *mctx, const cfg_obj_t *obj, if (!cfg_obj_isstring(obj)) { *namep = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } *namep = isc_mem_get(mctx, sizeof(**namep)); @@ -576,11 +576,11 @@ named_config_getname(isc_mem_t *mctx, const cfg_obj_t *obj, if (result != ISC_R_SUCCESS) { isc_mem_put(mctx, *namep, sizeof(**namep)); *namep = NULL; - return (result); + return result; } dns_name_dup(dns_fixedname_name(&fname), mctx, *namep); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #define grow_array(mctx, array, newlen, oldlen) \ @@ -828,7 +828,7 @@ resume: ipkl->count = addrcount; ipkl->allocated = addrcount; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (addrs != NULL) { @@ -867,7 +867,7 @@ cleanup: if (stack != NULL) { isc_mem_cput(mctx, stack, stackcount, sizeof(stack[0])); } - return (result); + return result; } isc_result_t @@ -892,10 +892,10 @@ named_config_getport(const cfg_obj_t *config, const char *type, if (cfg_obj_asuint32(portobj) >= UINT16_MAX) { cfg_obj_log(portobj, ISC_LOG_ERROR, "port '%u' out of range", cfg_obj_asuint32(portobj)); - return (ISC_R_RANGE); + return ISC_R_RANGE; } *portp = (in_port_t)cfg_obj_asuint32(portobj); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } struct keyalgorithms { @@ -939,15 +939,15 @@ named_config_getkeyalgorithm(const char *str, unsigned int *typep, } } if (algorithms[i].str == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (str[len] == '-') { result = isc_parse_uint16(&bits, str + len + 1, 10); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (bits > algorithms[i].size) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } else if (algorithms[i].size == 0) { bits = 128; @@ -956,5 +956,5 @@ named_config_getkeyalgorithm(const char *str, unsigned int *typep, } SET_IF_NOT_NULL(typep, algorithms[i].type); SET_IF_NOT_NULL(digestbits, bits); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/bin/named/control.c b/bin/named/control.c index a99ce1b850..9d7bc6f167 100644 --- a/bin/named/control.c +++ b/bin/named/control.c @@ -44,23 +44,23 @@ getcommand(isc_lex_t *lex, char **cmdp) { result = isc_lex_gettoken(lex, ISC_LEXOPT_EOF, &token); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_lex_ungettoken(lex, &token); if (token.type != isc_tokentype_string) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *cmdp = token.value.as_textregion.base; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool command_compare(const char *str, const char *command) { - return (strcasecmp(str, command) == 0); + return strcasecmp(str, command) == 0; } /*% @@ -86,7 +86,7 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, /* * No data section. */ - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = isccc_cc_lookupstring(data, "type", &cmdline); @@ -94,7 +94,7 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, /* * We have no idea what this is. */ - return (result); + return result; } isc_lex_create(named_g_mctx, strlen(cmdline), &lex); @@ -305,5 +305,5 @@ cleanup: isc_lex_destroy(&lex); } - return (result); + return result; } diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 52deb65b98..145e0cb43b 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -246,7 +246,7 @@ address_ok(isc_sockaddr_t *sockaddr, controllistener_t *listener) { result = dns_acl_match(&netaddr, NULL, listener->acl, env, &match, NULL); - return (result == ISC_R_SUCCESS && match > 0); + return result == ISC_R_SUCCESS && match > 0; } static void @@ -638,7 +638,7 @@ control_newconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { if (result == ISC_R_SHUTTINGDOWN) { shutdown_listener(listener); } - return (result); + return result; } peeraddr = isc_nmhandle_peeraddr(handle); @@ -649,11 +649,11 @@ control_newconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { NAMED_LOGMODULE_CONTROL, ISC_LOG_WARNING, "rejected command channel message from %s", socktext); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } newconnection(listener, handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -707,11 +707,11 @@ cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname, } } if (element == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } obj = cfg_listelt_value(element); *objp = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -833,7 +833,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { ISC_LOG_INFO, "configuring command channel from '%s'", named_g_keyfile); if (!isc_file_exists(named_g_keyfile)) { - return (ISC_R_FILENOTFOUND); + return ISC_R_FILENOTFOUND; } CHECK(cfg_parser_create(mctx, &pctx)); @@ -899,7 +899,7 @@ cleanup: if (pctx != NULL) { cfg_parser_destroy(&pctx); } - return (result); + return result; } /* @@ -1205,7 +1205,7 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, cfg_obj_log(controls, ISC_LOG_ERROR, "UNIX domain sockets are not " "supported"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } (void)cfg_map_get(controls, "inet", &inetcontrols); @@ -1333,7 +1333,7 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, * down will be taken care of by listen_done(). */ ISC_LIST_APPENDLIST(cp->listeners, new_listeners, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1356,10 +1356,10 @@ named_controls_create(named_server_t *server, named_controls_t **ctrlsp) { if (result != ISC_R_SUCCESS) { isc_mutex_destroy(&controls->symtab_lock); isc_mem_put(server->mctx, controls, sizeof(*controls)); - return (result); + return result; } *ctrlsp = controls; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/bin/named/dlz_dlopen_driver.c b/bin/named/dlz_dlopen_driver.c index 21d1c30e3e..5c0dd1f962 100644 --- a/bin/named/dlz_dlopen_driver.c +++ b/bin/named/dlz_dlopen_driver.c @@ -98,13 +98,13 @@ dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, UNUSED(driverarg); if (cd->dlz_allnodes == NULL) { - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } MAYBE_LOCK(cd); result = cd->dlz_allnodes(zone, cd->dbdata, allnodes); MAYBE_UNLOCK(cd); - return (result); + return result; } static isc_result_t @@ -116,13 +116,13 @@ dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, UNUSED(driverarg); if (cd->dlz_allowzonexfr == NULL) { - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } MAYBE_LOCK(cd); result = cd->dlz_allowzonexfr(cd->dbdata, name, client); MAYBE_UNLOCK(cd); - return (result); + return result; } static isc_result_t @@ -134,13 +134,13 @@ dlopen_dlz_authority(const char *zone, void *driverarg, void *dbdata, UNUSED(driverarg); if (cd->dlz_authority == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } MAYBE_LOCK(cd); result = cd->dlz_authority(zone, cd->dbdata, lookup); MAYBE_UNLOCK(cd); - return (result); + return result; } static isc_result_t @@ -155,7 +155,7 @@ dlopen_dlz_findzonedb(void *driverarg, void *dbdata, const char *name, MAYBE_LOCK(cd); result = cd->dlz_findzonedb(cd->dbdata, name, methods, clientinfo); MAYBE_UNLOCK(cd); - return (result); + return result; } static isc_result_t @@ -172,7 +172,7 @@ dlopen_dlz_lookup(const char *zone, const char *name, void *driverarg, result = cd->dlz_lookup(zone, name, cd->dbdata, lookup, methods, clientinfo); MAYBE_UNLOCK(cd); - return (result); + return result; } /* @@ -195,7 +195,7 @@ dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) { } } - return (ptr); + return ptr; } static void @@ -219,7 +219,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], "dlz_dlopen driver for '%s' needs a path to " "the shared library", dlzname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_mem_create(&mctx); @@ -319,14 +319,14 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], *dbdata = cd; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failed: dlopen_log(ISC_LOG_ERROR, "dlz_dlopen of '%s' failed", dlzname); dlopen_dlz_destroy(NULL, cd); - return (result); + return result; } /* @@ -363,13 +363,13 @@ dlopen_dlz_newversion(const char *zone, void *driverarg, void *dbdata, UNUSED(driverarg); if (cd->dlz_newversion == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } MAYBE_LOCK(cd); result = cd->dlz_newversion(zone, cd->dbdata, versionp); MAYBE_UNLOCK(cd); - return (result); + return result; } /* @@ -404,7 +404,7 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, UNUSED(driverarg); if (cd->dlz_configure == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } MAYBE_LOCK(cd); @@ -413,7 +413,7 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, cd->in_configure = false; MAYBE_UNLOCK(cd); - return (result); + return result; } /* @@ -429,7 +429,7 @@ dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, UNUSED(driverarg); if (cd->dlz_ssumatch == NULL) { - return (false); + return false; } MAYBE_LOCK(cd); @@ -437,7 +437,7 @@ dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, keydata, cd->dbdata); MAYBE_UNLOCK(cd); - return (ret); + return ret; } /* @@ -452,14 +452,14 @@ dlopen_dlz_addrdataset(const char *name, const char *rdatastr, void *driverarg, UNUSED(driverarg); if (cd->dlz_addrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } MAYBE_LOCK(cd); result = cd->dlz_addrdataset(name, rdatastr, cd->dbdata, version); MAYBE_UNLOCK(cd); - return (result); + return result; } /* @@ -474,14 +474,14 @@ dlopen_dlz_subrdataset(const char *name, const char *rdatastr, void *driverarg, UNUSED(driverarg); if (cd->dlz_subrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } MAYBE_LOCK(cd); result = cd->dlz_subrdataset(name, rdatastr, cd->dbdata, version); MAYBE_UNLOCK(cd); - return (result); + return result; } /* @@ -496,14 +496,14 @@ dlopen_dlz_delrdataset(const char *name, const char *type, void *driverarg, UNUSED(driverarg); if (cd->dlz_delrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } MAYBE_LOCK(cd); result = cd->dlz_delrdataset(name, type, cd->dbdata, version); MAYBE_UNLOCK(cd); - return (result); + return result; } static dns_sdlzmethods_t dlz_dlopen_methods = { @@ -535,7 +535,7 @@ dlz_dlopen_init(isc_mem_t *mctx) { result = ISC_R_UNEXPECTED; } - return (result); + return result; } /* diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index 517a696cc0..25804892eb 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -126,7 +126,7 @@ fuzz_thread_client(void *arg) { named_server_flushonshutdown(named_g_server, false); isc_loopmgr_shutdown(named_g_loopmgr); - return (NULL); + return NULL; } raise(SIGSTOP); goto next; @@ -160,7 +160,7 @@ fuzz_thread_client(void *arg) { named_server_flushonshutdown(named_g_server, false); isc_loopmgr_shutdown(named_g_loopmgr); - return (NULL); + return NULL; } /* @@ -374,7 +374,7 @@ fuzz_thread_resolver(void *arg) { named_server_flushonshutdown(named_g_server, false); isc_loopmgr_shutdown(named_g_loopmgr); - return (NULL); + return NULL; } raise(SIGSTOP); continue; @@ -586,7 +586,7 @@ fuzz_thread_resolver(void *arg) { __AFL_LOOP(0); #endif /* ifdef __AFL_LOOP */ - return (NULL); + return NULL; } /* @@ -717,7 +717,7 @@ fuzz_thread_tcp(void *arg) { named_server_flushonshutdown(named_g_server, false); isc_loopmgr_shutdown(named_g_loopmgr); - return (NULL); + return NULL; } #endif /* ENABLE_AFL */ diff --git a/bin/named/geoip.c b/bin/named/geoip.c index 6e713e35b3..1b4822218a 100644 --- a/bin/named/geoip.c +++ b/bin/named/geoip.c @@ -43,7 +43,7 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { ISC_LOG_ERROR, "GeoIP2 database '%s/%s': path too long", dir, dbfile); - return (NULL); + return NULL; } ret = MMDB_open(pathbuf, MMDB_MODE_MMAP, mmdb); @@ -51,7 +51,7 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "opened GeoIP2 database '%s'", pathbuf); - return (mmdb); + return mmdb; } isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -59,7 +59,7 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { "unable to open GeoIP2 database '%s' (status %d)", pathbuf, ret); - return (NULL); + return NULL; } #endif /* HAVE_GEOIP2 */ diff --git a/bin/named/log.c b/bin/named/log.c index ffa916b569..52eb05c86e 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -54,12 +54,12 @@ named_log_init(bool safe) { named_g_logging = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: rcu_read_unlock(); - return (result); + return result; } void @@ -219,7 +219,7 @@ named_log_setdefaultcategory(isc_logconfig_t *lcfg) { } cleanup: - return (result); + return result; } isc_result_t @@ -228,5 +228,5 @@ named_log_setunmatchedcategory(isc_logconfig_t *lcfg) { result = isc_log_usechannel(lcfg, "null", NAMED_LOGCATEGORY_UNMATCHED, ISC_LOGMODULE_DEFAULT); - return (result); + return result; } diff --git a/bin/named/logconf.c b/bin/named/logconf.c index f923722bf3..64d0d0eba8 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -55,11 +55,11 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) { /* * Allow further processing by returning success. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (logconfig == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } destinations = cfg_tuple_get(ccat, "destinations"); @@ -76,10 +76,10 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) { NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "logging channel '%s': %s", channelname, isc_result_totext(result)); - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -127,7 +127,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { "channel '%s': exactly one of file, syslog, " "null, and stderr must be present", channelname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } type = ISC_LOG_TONULL; @@ -308,7 +308,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { } done: - return (result); + return result; } isc_result_t @@ -363,8 +363,8 @@ named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { CHECK(named_log_setunmatchedcategory(logconfig)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: - return (result); + return result; } diff --git a/bin/named/main.c b/bin/named/main.c index 6db92d29e3..1f92349c48 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -402,7 +402,7 @@ parse_int(char *arg, const char *desc) { if (tmp < 0 || tmp != ltmp) { named_main_earlyfatal("%s '%s' out of range", desc, arg); } - return (tmp); + return tmp; } static struct flag_def { @@ -1025,7 +1025,7 @@ create_managers(void) { isc_nm_maxudp(named_g_netmgr, maxudp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1393,7 +1393,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { UNEXPECTED_ERROR("scf_handle_create() failed: %s", scf_strerror(scf_error())); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (scf_handle_bind(h) == -1) { @@ -1402,7 +1402,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { scf_strerror(scf_error())); } scf_handle_destroy(h); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((namelen = scf_myname(h, NULL, 0)) == -1) { @@ -1411,7 +1411,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { scf_strerror(scf_error())); } scf_handle_destroy(h); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((instance = isc_mem_allocate(mctx, namelen + 1)) == NULL) { @@ -1419,7 +1419,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { "allocation failed: %s", isc_result_totext(ISC_R_NOMEMORY)); scf_handle_destroy(h); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (scf_myname(h, instance, namelen + 1) == -1) { @@ -1429,12 +1429,12 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { } scf_handle_destroy(h); isc_mem_free(mctx, instance); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } scf_handle_destroy(h); *ins_name = instance; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* HAVE_LIBSCF */ @@ -1592,5 +1592,5 @@ main(int argc, char *argv[]) { ProfilerStop(); #endif /* ifdef HAVE_GPERFTOOLS_PROFILER */ - return (0); + return 0; } diff --git a/bin/named/os.c b/bin/named/os.c index 6c93d387e2..91f2d52ead 100644 --- a/bin/named/os.c +++ b/bin/named/os.c @@ -400,15 +400,15 @@ named_os_closedevnull(void) { static bool all_digits(const char *s) { if (*s == '\0') { - return (false); + return false; } while (*s != '\0') { if (!isdigit((unsigned char)(*s))) { - return (false); + return false; } s++; } - return (true); + return true; } void @@ -521,9 +521,9 @@ named_os_changeuser(bool permanent) { uid_t named_os_uid(void) { if (runas_pw == NULL) { - return (0); + return 0; } - return (runas_pw->pw_uid); + return runas_pw->pw_uid; } void @@ -587,22 +587,22 @@ safe_open(const char *filename, mode_t mode, bool append) { if (stat(filename, &sb) == -1) { if (errno != ENOENT) { - return (-1); + return -1; } } else if ((sb.st_mode & S_IFREG) == 0) { errno = EOPNOTSUPP; - return (-1); + return -1; } if (append) { fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, mode); } else { if (unlink(filename) < 0 && errno != ENOENT) { - return (-1); + return -1; } fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, mode); } - return (fd); + return fd; } static void @@ -650,7 +650,7 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) { !strcmp(slash + 1, "..")) { *slash = '/'; - return (0); + return 0; } mode = S_IRUSR | S_IWUSR | S_IXUSR; /* u=rwx */ mode |= S_IRGRP | S_IXGRP; /* g=rx */ @@ -672,11 +672,11 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) { } *slash = '/'; } - return (0); + return 0; error: *slash = '/'; - return (-1); + return -1; } FILE * @@ -693,11 +693,11 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user) { strerror_r(errno, strbuf, sizeof(strbuf)); named_main_earlywarning("couldn't strdup() '%s': %s", filename, strbuf); - return (NULL); + return NULL; } if (mkdirpath(f, named_main_earlywarning) == -1) { free(f); - return (NULL); + return NULL; } free(f); @@ -737,7 +737,7 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user) { strerror_r(errno, strbuf, sizeof(strbuf)); named_main_earlywarning("could not open file '%s': %s", filename, strbuf); - return (NULL); + return NULL; } fp = fdopen(fd, "w"); @@ -747,7 +747,7 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user) { filename, strbuf); } - return (fp); + return fp; } void @@ -863,5 +863,5 @@ named_os_uname(void) { if (unamep == NULL) { getuname(); } - return (unamep); + return unamep; } diff --git a/bin/named/server.c b/bin/named/server.c index 104c88ad42..446edd406a 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -568,7 +568,7 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, /* * No value available. *aclp == NULL. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (acltuplename != NULL) { @@ -582,7 +582,7 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, result = cfg_acl_fromconfig(aclobj, config, actx, mctx, 0, aclp); - return (result); + return result; } /*% @@ -616,7 +616,7 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, (void)named_config_get(maps, "sortlist", &aclobj); if (aclobj == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -627,7 +627,7 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, */ result = cfg_acl_fromconfig(aclobj, config, actx, mctx, 3, aclp); - return (result); + return result; } static isc_result_t @@ -667,13 +667,13 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, /* * No value available. *ntp == NULL. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (conftuplename != NULL) { obj = cfg_tuple_get(obj, conftuplename); if (cfg_obj_isvoid(obj)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -695,11 +695,11 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_nametree_detach(ntp); - return (result); + return result; } static isc_result_t @@ -888,10 +888,10 @@ ta_fromconfig(const cfg_obj_t *key, bool *initialp, const char **namestrp, UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: - return (result); + return result; } static void @@ -936,7 +936,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, keyname = dns_fixedname_initname(&fkeyname); result = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } break; case DST_R_UNSUPPORTEDALG: @@ -949,7 +949,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, cfg_obj_log(key, ISC_LOG_WARNING, "ignoring %s for '%s': %s", initializing ? "initial-key" : "static-key", namestr, isc_result_totext(result)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case DST_R_NOCRYPTO: /* * Crypto support is not available. @@ -958,7 +958,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, "ignoring %s for '%s': no crypto support", initializing ? "initial-key" : "static-key", namestr); - return (result); + return result; default: /* * Something unexpected happened; we have no choice but to @@ -968,7 +968,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, cfg_obj_log(key, ISC_LOG_ERROR, "configuring %s for '%s': %s", initializing ? "initial-key" : "static-key", namestr, isc_result_totext(result)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -1006,7 +1006,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, &ds, sfd_add, view); done: - return (result); + return result; } /* @@ -1043,7 +1043,7 @@ cleanup: if (result == DST_R_NOCRYPTO) { result = ISC_R_SUCCESS; } - return (result); + return result; } /*% @@ -1057,7 +1057,7 @@ keyloaded(dns_view_t *view, const dns_name_t *name) { result = dns_view_getsecroots(view, &secroots); if (result != ISC_R_SUCCESS) { - return (false); + return false; } result = dns_keytable_find(secroots, name, &keynode); @@ -1069,7 +1069,7 @@ keyloaded(dns_view_t *view, const dns_name_t *name) { dns_keytable_detach(&secroots); } - return (result == ISC_R_SUCCESS); + return result == ISC_R_SUCCESS; } /*% @@ -1100,7 +1100,7 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, if (strcmp(view->name, "_bind") == 0 && view->rdclass == dns_rdataclass_chaos) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (vconfig != NULL) { @@ -1231,7 +1231,7 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, } cleanup: - return (result); + return result; } static isc_result_t @@ -1261,7 +1261,7 @@ mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver) { result = ISC_R_SUCCESS; cleanup: - return (result); + return result; } /*% @@ -1305,7 +1305,7 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, UNREACHABLE(); } if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1335,19 +1335,19 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, break; } if (isc_sockaddr_equal(&sa, &any)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_format(&sa, buf, sizeof(buf)); isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "could not get query source dispatcher (%s): %s", buf, isc_result_totext(result)); - return (result); + return result; } *dispatchp = disp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1365,13 +1365,13 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) { result = named_config_getclass(cfg_tuple_get(ent, "class"), dns_rdataclass_any, &rdclass); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = named_config_gettype(cfg_tuple_get(ent, "type"), dns_rdatatype_any, &rdtype); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = cfg_tuple_get(ent, "name"); @@ -1387,7 +1387,7 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) { result = dns_name_fromtext(dns_fixedname_name(&fixed), &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = cfg_tuple_get(ent, "ordering"); @@ -1418,12 +1418,12 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) { result = dns_order_add(order, dns_rootname, rdtype, rdclass, mode); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (dns_order_add(order, dns_fixedname_name(&fixed), rdtype, - rdclass, mode)); + return dns_order_add(order, dns_fixedname_name(&fixed), rdtype, rdclass, + mode); } static isc_result_t @@ -1440,7 +1440,7 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { peer = NULL; result = dns_peer_newprefix(mctx, &na, prefixlen, &peer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = NULL; @@ -1630,11 +1630,11 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { } *peerp = peer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_peer_detach(&peer); - return (result); + return result; } static isc_result_t @@ -1661,7 +1661,7 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx, "dynamic database '%s' configuration failed: %s", name, isc_result_totext(result)); } - return (result); + return result; } static isc_result_t @@ -1704,7 +1704,7 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { CHECK(dns_resolver_disable_algorithm(resolver, name, alg)); } cleanup: - return (result); + return result; } static isc_result_t @@ -1743,7 +1743,7 @@ disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) { CHECK(dns_resolver_disable_ds_digest(resolver, name, digest)); } cleanup: - return (result); + return result; } static bool @@ -1768,10 +1768,10 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) { result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (dns_name_equal(name, zonename)) { - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -1801,7 +1801,7 @@ check_dbtype(dns_zone_t *zone, unsigned int dbtypec, const char **dbargv, cleanup: isc_mem_free(mctx, argv); - return (result); + return result; } static void @@ -1831,11 +1831,11 @@ cachelist_find(named_cachelist_t *cachelist, const char *cachename, if (nsc->rdclass == rdclass && strcmp(dns_cache_getname(nsc->cache), cachename) == 0) { - return (nsc); + return nsc; } } - return (NULL); + return NULL; } static bool @@ -1850,10 +1850,10 @@ cache_reusable(dns_view_t *originview, dns_view_t *view, originview->maxcachettl != view->maxcachettl || originview->maxncachettl != view->maxncachettl) { - return (false); + return false; } - return (true); + return true; } static bool @@ -1865,7 +1865,7 @@ cache_sharable(dns_view_t *originview, dns_view_t *view, * shared with other views. */ if (!cache_reusable(originview, view, new_zero_no_soattl)) { - return (false); + return false; } /* @@ -1877,10 +1877,10 @@ cache_sharable(dns_view_t *originview, dns_view_t *view, new_stale_refresh_time || dns_cache_getcachesize(originview->cache) != new_max_cache_size) { - return (false); + return false; } - return (true); + return true; } /* @@ -1894,12 +1894,11 @@ dlzconfigure_callback(dns_view_t *view, dns_dlzdb_t *dlzdb, dns_zone_t *zone) { result = dns_zonemgr_managezone(named_g_server->zonemgr, zone); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_zone_setstats(zone, named_g_server->zonestats); - return (named_zone_configure_writeable_dlz(dlzdb, zone, zclass, - origin)); + return named_zone_configure_writeable_dlz(dlzdb, zone, zclass, origin); } static isc_result_t @@ -1978,7 +1977,7 @@ cleanup: if (zone != NULL) { dns_zone_detach(&zone); } - return (result); + return result; } static isc_result_t @@ -1992,7 +1991,7 @@ configure_rpz_name(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, cfg_obj_log(obj, DNS_RPZ_ERROR_LEVEL, "invalid %s '%s'", msg, str); } - return (result); + return result; } static isc_result_t @@ -2005,7 +2004,7 @@ configure_rpz_name2(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, DNS_RPZ_ERROR_LEVEL, "invalid zone '%s'", str); } - return (result); + return result; } static isc_result_t @@ -2027,7 +2026,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, cfg_obj_log(rpz_obj, DNS_RPZ_ERROR_LEVEL, "limit of %d response policy zones exceeded", DNS_RPZ_MAX_ZONES); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = dns_rpz_new_zone(view->rpzs, &zone); @@ -2035,7 +2034,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, cfg_obj_log(rpz_obj, DNS_RPZ_ERROR_LEVEL, "Error creating new RPZ zone : %s", isc_result_totext(result)); - return (result); + return result; } obj = cfg_tuple_get(rpz_obj, "recursive-only"); @@ -2079,12 +2078,12 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, str = cfg_obj_asstring(cfg_tuple_get(rpz_obj, "zone name")); result = configure_rpz_name(view, rpz_obj, &zone->origin, str, "zone"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (dns_name_equal(&zone->origin, dns_rootname)) { cfg_obj_log(rpz_obj, DNS_RPZ_ERROR_LEVEL, "invalid zone name '%s'", str); - return (DNS_R_EMPTYLABEL); + return DNS_R_EMPTYLABEL; } for (rpz_num = 0; rpz_num < view->rpzs->p.num_zones - 1; ++rpz_num) { if (dns_name_equal(&view->rpzs->zones[rpz_num]->origin, @@ -2093,7 +2092,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, cfg_obj_log(rpz_obj, DNS_RPZ_ERROR_LEVEL, "duplicate '%s'", str); result = DNS_R_DUPLICATE; - return (result); + return result; } } if (*old_rpz_okp && !dns_name_equal(&old->origin, &zone->origin)) { @@ -2103,43 +2102,43 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, result = configure_rpz_name2(view, rpz_obj, &zone->client_ip, DNS_RPZ_CLIENT_IP_ZONE, &zone->origin); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name2(view, rpz_obj, &zone->ip, DNS_RPZ_IP_ZONE, &zone->origin); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name2(view, rpz_obj, &zone->nsdname, DNS_RPZ_NSDNAME_ZONE, &zone->origin); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name2(view, rpz_obj, &zone->nsip, DNS_RPZ_NSIP_ZONE, &zone->origin); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name(view, rpz_obj, &zone->passthru, DNS_RPZ_PASSTHRU_NAME, "name"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name(view, rpz_obj, &zone->drop, DNS_RPZ_DROP_NAME, "name"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = configure_rpz_name(view, rpz_obj, &zone->tcp_only, DNS_RPZ_TCP_ONLY_NAME, "name"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = cfg_tuple_get(rpz_obj, "policy"); @@ -2154,7 +2153,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, result = configure_rpz_name(view, rpz_obj, &zone->cname, str, "cname"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } @@ -2186,7 +2185,7 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, *old_rpz_okp = false; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2210,7 +2209,7 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *rpz_obj, zone_element = cfg_list_first(cfg_tuple_get(rpz_obj, "zone list")); if (zone_element == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } nsip_enabled = true; @@ -2229,7 +2228,7 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *rpz_obj, result = dns_rpz_new_zones(view, named_g_loopmgr, &view->rpzs); if (result != ISC_R_SUCCESS) { - return (result); + return result; } zones = view->rpzs; @@ -2337,7 +2336,7 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *rpz_obj, if (pview_must_detach) { dns_view_detach(&pview); } - return (result); + return result; } } @@ -2367,7 +2366,7 @@ configure_rpz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *rpz_obj, dns_view_detach(&pview); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2702,25 +2701,25 @@ catz_run(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, isc_async_run(named_g_mainloop, action, cz); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t catz_addzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, void *udata) { - return (catz_run(entry, origin, view, udata, CATZ_ADDZONE)); + return catz_run(entry, origin, view, udata, CATZ_ADDZONE); } static isc_result_t catz_delzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, void *udata) { - return (catz_run(entry, origin, view, udata, CATZ_DELZONE)); + return catz_run(entry, origin, view, udata, CATZ_DELZONE); } static isc_result_t catz_modzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, void *udata) { - return (catz_run(entry, origin, view, udata, CATZ_MODZONE)); + return catz_run(entry, origin, view, udata, CATZ_MODZONE); } static void @@ -2909,7 +2908,7 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview, cleanup: dns_name_free(&origin, view->mctx); - return (result); + return result; } static catz_cb_data_t ns_catz_cbdata; @@ -2930,7 +2929,7 @@ configure_catz(dns_view_t *view, dns_view_t *pview, const cfg_obj_t *config, zone_element = cfg_list_first(cfg_tuple_get(catz_obj, "zone list")); if (zone_element == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (pview != NULL) { @@ -2969,7 +2968,7 @@ cleanup: dns_view_detach(&pview); } - return (result); + return result; } #define CHECK_RRL(cond, pat, val1, val2) \ @@ -3020,7 +3019,7 @@ configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) { } result = dns_rrl_init(&rrl, view, min_entries); if (result != ISC_R_SUCCESS) { - return (result); + return result; } i = ISC_MAX(20000, min_entries); @@ -3122,11 +3121,11 @@ configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) { rrl->log_only = false; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_rrl_view_destroy(view); - return (result); + return result; } static isc_result_t @@ -3157,7 +3156,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -3197,7 +3196,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -3387,7 +3386,7 @@ cleanup: INSIST(version == NULL); - return (result); + return result; } static isc_result_t @@ -3464,7 +3463,7 @@ cleanup: if (zone != NULL) { dns_zone_detach(&zone); } - return (result); + return result; } #ifdef HAVE_DNSTAP @@ -3481,7 +3480,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { result = named_config_get(maps, "dnstap", &dlist); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (element = cfg_list_first(dlist); element != NULL; @@ -3659,7 +3658,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { } if (named_g_server->dtenv == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } obj = NULL; @@ -3696,7 +3695,7 @@ cleanup: fstrm_iothr_options_destroy(&fopt); } - return (result); + return result; } #endif /* HAVE_DNSTAP */ @@ -3716,7 +3715,7 @@ create_mapped_acl(void) { dns_acl_attach(acl, &named_g_mapped); } dns_acl_detach(&acl); - return (result); + return result; } /*% @@ -3740,7 +3739,7 @@ register_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, "%s: plugin configuration failed: " "unable to get full plugin path: %s", plugin_path, isc_result_totext(result)); - return (result); + return result; } result = ns_plugin_register(full_path, parameters, config, @@ -3753,7 +3752,7 @@ register_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, isc_result_totext(result)); } - return (result); + return result; } /* @@ -3777,7 +3776,7 @@ minimal_cache_allowed(const cfg_obj_t *maps[4], (void)named_config_get(maps, "recursion", &obj); INSIST(obj != NULL); if (cfg_obj_asboolean(obj)) { - return (false); + return false; } /* @@ -3786,10 +3785,10 @@ minimal_cache_allowed(const cfg_obj_t *maps[4], obj = NULL; (void)named_config_get(optionmaps, "max-cache-size", &obj); if (obj != NULL) { - return (false); + return false; } - return (true); + return true; } static const char *const response_synonyms[] = { "response", NULL }; @@ -5892,7 +5891,7 @@ cleanup: dns_dyndb_destroyctx(&dctx); } - return (result); + return result; } static isc_result_t @@ -5907,7 +5906,7 @@ configure_hints(dns_view_t *view, const char *filename) { dns_db_detach(&db); } - return (result); + return result; } static isc_result_t @@ -5931,7 +5930,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, if (val > UINT16_MAX) { cfg_obj_log(portobj, ISC_LOG_ERROR, "port '%u' out of range", val); - return (ISC_R_RANGE); + return ISC_R_RANGE; } port = (in_port_t)val; } @@ -5969,7 +5968,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, cfg_obj_log(portobj, ISC_LOG_ERROR, "port '%u' out of range", val); - return (ISC_R_RANGE); + return ISC_R_RANGE; } myport = (in_port_t)val; } @@ -5986,7 +5985,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, } cleanup: - return (result); + return result; } static isc_result_t @@ -6000,7 +5999,7 @@ validate_tls(const cfg_obj_t *config, dns_view_t *view, const cfg_obj_t *obj, if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, ISC_LOG_ERROR, "'%s' is not a valid name", str); - return (result); + return result; } if (strcasecmp(str, "ephemeral") != 0) { @@ -6009,7 +6008,7 @@ validate_tls(const cfg_obj_t *config, dns_view_t *view, const cfg_obj_t *obj, if (tlsmap == NULL) { cfg_obj_log(obj, ISC_LOG_ERROR, "tls '%s' is not defined", str); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -6019,7 +6018,7 @@ validate_tls(const cfg_obj_t *config, dns_view_t *view, const cfg_obj_t *obj, dns_name_dup(nm, view->mctx, *name); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -6053,7 +6052,7 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, if (val > UINT16_MAX) { cfg_obj_log(portobj, ISC_LOG_ERROR, "port '%u' out of range", val); - return (ISC_R_RANGE); + return ISC_R_RANGE; } port = tls_port = (in_port_t)val; } @@ -6070,7 +6069,7 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, result = validate_tls(config, view, tlspobj, tls, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } @@ -6163,7 +6162,7 @@ cleanup: isc_mem_put(view->mctx, fwd, sizeof(dns_forwarder_t)); } - return (result); + return result; } static isc_result_t @@ -6199,7 +6198,7 @@ get_viewinfo(const cfg_obj_t *vconfig, const char **namep, *classp = viewclass; cleanup: - return (result); + return result; } /* @@ -6217,16 +6216,16 @@ find_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, result = get_viewinfo(vconfig, &viewname, &viewclass); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_viewlist_find(viewlist, viewname, viewclass, &view); if (result != ISC_R_SUCCESS) { - return (result); + return result; } *viewp = view; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -6246,29 +6245,29 @@ create_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, result = get_viewinfo(vconfig, &viewname, &viewclass); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_viewlist_find(viewlist, viewname, viewclass, &view); if (result == ISC_R_SUCCESS) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } if (result != ISC_R_NOTFOUND) { - return (result); + return result; } INSIST(view == NULL); result = dns_view_create(named_g_mctx, named_g_dispatchmgr, viewclass, viewname, &view); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_nonce_buf(view->secret, sizeof(view->secret)); ISC_LIST_APPEND(*viewlist, view, link); dns_view_attach(view, viewp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -6613,10 +6612,10 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, /* * Determine if we need to set up inline signing. */ - zone_maybe_inline = ((strcasecmp(ztypestr, "primary") == 0 || - strcasecmp(ztypestr, "master") == 0 || - strcasecmp(ztypestr, "secondary") == 0 || - strcasecmp(ztypestr, "slave") == 0)); + zone_maybe_inline = (strcasecmp(ztypestr, "primary") == 0 || + strcasecmp(ztypestr, "master") == 0 || + strcasecmp(ztypestr, "secondary") == 0 || + strcasecmp(ztypestr, "slave") == 0); if (zone_maybe_inline) { inline_signing = named_zone_inlinesigning(zconfig, vconfig, @@ -6688,7 +6687,7 @@ cleanup: dns_view_detach(&pview); } - return (result); + return result; } /* @@ -6709,7 +6708,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) { - return (result); + return result; } if (pview != NULL) { @@ -6720,7 +6719,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { dns_zone_setviewcommit(pview->managed_keys); dns_view_detach(&pview); dns_zone_synckeyzone(view->managed_keys); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_view_detach(&pview); @@ -6774,7 +6773,7 @@ cleanup: dns_acl_detach(&none); } - return (result); + return result; } /* @@ -6820,7 +6819,7 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "directory '%s' is not writable", directory); - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } result = isc_dir_chdir(directory); @@ -6828,7 +6827,7 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { cfg_obj_log(obj, ISC_LOG_ERROR, "change directory to '%s' failed: %s", directory, isc_result_totext(result)); - return (result); + return result; } char cwd[PATH_MAX]; @@ -6838,7 +6837,7 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { cwd); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -6869,11 +6868,11 @@ cid(const void *a, const void *b) { const uint16_t ida = *(const uint16_t *)a; const uint16_t idb = *(const uint16_t *)b; if (ida < idb) { - return (-1); + return -1; } else if (ida > idb) { - return (1); + return 1; } else { - return (0); + return 0; } } @@ -6955,7 +6954,7 @@ get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) { } if (n == 0) { - return (DNS_R_EMPTYNAME); + return DNS_R_EMPTYNAME; } if (n > 1) { @@ -6971,18 +6970,18 @@ get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) { r.length = sizeof(label); m = snprintf(r.base, r.length, "_ta"); if (m < 0 || (unsigned int)m > r.length) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_textregion_consume(&r, m); for (i = 0; i < n; i++) { m = snprintf(r.base, r.length, "-%04x", ids[i]); if (m < 0 || (unsigned int)m > r.length) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_textregion_consume(&r, m); } - return (dns_name_fromstring(target, label, keyname, 0, NULL)); + return dns_name_fromstring(target, label, keyname, 0, NULL); } static void @@ -7186,12 +7185,12 @@ setoptstring(named_server_t *server, char **field, const cfg_obj_t *obj) { static isc_result_t removed(dns_zone_t *zone, void *uap) { if (dns_zone_getview(zone) != uap) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_zone_log(zone, ISC_LOG_INFO, "(%s) removed", dns_zonetype_name(dns_zone_gettype(zone))); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -7239,7 +7238,7 @@ generate_session_key(const char *filename, const char *keynamestr, result = dst_key_generate(keyname, alg, bits, 1, 0, DNS_KEYPROTO_ANY, dns_rdataclass_in, NULL, mctx, &key, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -7276,7 +7275,7 @@ generate_session_key(const char *filename, const char *keynamestr, } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -7292,7 +7291,7 @@ cleanup: dst_key_free(&key); } - return (result); + return result; } static isc_result_t @@ -7330,7 +7329,7 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, keyname = dns_fixedname_initname(&fname); result = dns_name_fromtext(keyname, &buffer, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = NULL; @@ -7345,7 +7344,7 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, "session-keyalg: " "unsupported or unknown algorithm '%s'%s", algstr, server->session_keyfile != NULL ? s : ""); - return (result); + return result; } /* See if we need to (re)generate a new key. */ @@ -7393,11 +7392,11 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, &server->sessionkey)); } - return (result); + return result; cleanup: cleanup_session_key(server, mctx); - return (result); + return result; } static isc_result_t @@ -7443,7 +7442,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "invalid new-zones-directory %s: %s", dir, isc_result_totext(result)); - return (result); + return result; } if (!isc_file_isdirwritable(dir)) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, @@ -7451,7 +7450,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, "new-zones-directory '%s' " "is not writable", dir); - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } dns_view_setnewzonedir(view, dir); @@ -7467,14 +7466,14 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, "%" PRId64 "' " "is too small", mapsize); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else if (mapsize > (1ULL << 40)) { /* 1 terabyte */ cfg_obj_log(obj, ISC_LOG_ERROR, "'lmdb-mapsize " "%" PRId64 "' " "is too large", mapsize); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } #else /* ifdef HAVE_LMDB */ @@ -7498,7 +7497,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, if (!allow) { dns_view_setnewzones(view, false, NULL, NULL, 0ULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } nzcfg = isc_mem_get(view->mctx, sizeof(*nzcfg)); @@ -7522,7 +7521,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, cfg_parser_destroy(&nzcfg->conf_parser); isc_mem_putanddetach(&nzcfg->mctx, nzcfg, sizeof(*nzcfg)); dns_view_setnewzones(view, false, NULL, NULL, 0ULL); - return (result); + return result; } cfg_obj_attach(config, &nzcfg->config); @@ -7531,7 +7530,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, } result = load_nzf(view, nzcfg); - return (result); + return result; } static void @@ -7586,7 +7585,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, nzctx = view->new_zone_config; if (nzctx == NULL || nzctx->nzf_config == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -7617,7 +7616,7 @@ cleanup: configure_zone_setviewcommit(result, zconfig, view); } - return (result); + return result; } #else /* HAVE_LMDB */ @@ -7690,7 +7689,7 @@ cleanup: cfg_obj_destroy(named_g_addparser, &zoneconf); } - return (result); + return result; } /*% @@ -7726,7 +7725,7 @@ for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config, status = mdb_cursor_open(txn, dbi, &cursor); if (status != MDB_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST); @@ -7776,7 +7775,7 @@ for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config, } mdb_cursor_close(cursor); - return (result); + return result; } /*% @@ -7786,10 +7785,10 @@ static isc_result_t configure_newzone(const cfg_obj_t *zconfig, cfg_obj_t *config, cfg_obj_t *vconfig, dns_view_t *view, cfg_aclconfctx_t *actx) { - return (configure_zone( + return configure_zone( config, zconfig, vconfig, view, &named_g_server->viewlist, &named_g_server->kasplist, &named_g_server->keystorelist, actx, - true, false, false, false)); + true, false, false, false); } /*% @@ -7805,7 +7804,7 @@ configure_newzone_revert(const cfg_obj_t *zconfig, cfg_obj_t *config, configure_zone_setviewcommit(ISC_R_FAILURE, zconfig, view); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -7816,7 +7815,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, MDB_dbi dbi; if (view->new_zone_config == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } LOCK(&view->new_zone_lock); @@ -7824,7 +7823,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, result = nzd_open(view, MDB_RDONLY, &txn, &dbi); if (result != ISC_R_SUCCESS) { UNLOCK(&view->new_zone_lock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -7852,7 +7851,7 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, UNLOCK(&view->new_zone_lock); - return (result); + return result; } static isc_result_t @@ -7916,7 +7915,7 @@ cleanup: isc_buffer_free(&text); } - return (result); + return result; } #endif /* HAVE_LMDB */ @@ -9430,7 +9429,7 @@ cleanup_exclusive: ISC_LOG_DEBUG(1), "load_configuration: %s", isc_result_totext(result)); - return (result); + return result; } static isc_result_t @@ -9514,7 +9513,7 @@ view_loaded(void *arg) { ISC_LOG_NOTICE, "running"); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -9576,7 +9575,7 @@ cleanup: isc_loopmgr_resume(named_g_loopmgr); - return (result); + return result; } static void @@ -9774,12 +9773,12 @@ get_matching_view_sync(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, (message->flags & DNS_MESSAGEFLAG_RD) == 0)) { dns_view_attach(view, viewp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static void @@ -9817,7 +9816,7 @@ get_matching_view_next(dns_view_t *view, dns_rdataclass_t rdclass) { if (view == NULL || rdclass == view->rdclass || rdclass == dns_rdataclass_any) { - return (view); + return view; } view = ISC_LIST_NEXT(view, link); }; @@ -9896,14 +9895,14 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, if (loop == NULL) { *viewmatchresult = get_matching_view_sync( srcaddr, destaddr, message, env, sigresult, viewp); - return (*viewmatchresult); + return *viewmatchresult; } /* Also no offloading when there is no view at all to match against. */ view = get_matching_view_next(NULL, message->rdclass); if (view == NULL) { *viewmatchresult = ISC_R_NOTFOUND; - return (*viewmatchresult); + return *viewmatchresult; } dns_message_resetsig(message); @@ -9955,7 +9954,7 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, { *mvctx->viewmatchresult = ISC_R_QUOTA; isc_async_run(loop, get_matching_view_done, mvctx); - return (DNS_R_WAIT); + return DNS_R_WAIT; } } @@ -9964,7 +9963,7 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, get_matching_view_continue, mvctx); INSIST(result == DNS_R_WAIT); - return (DNS_R_WAIT); + return DNS_R_WAIT; } void @@ -10131,7 +10130,7 @@ loadconfig(named_server_t *server) { atomic_store(&server->reload_status, NAMED_RELOAD_FAILED); } - return (result); + return result; } static isc_result_t @@ -10170,7 +10169,7 @@ cleanup: "STATUS=reload command finished: %s\n", isc_result_totext(result)); #endif /* HAVE_LIBSYSTEMD */ - return (result); + return result; } /* @@ -10256,22 +10255,22 @@ next_token(isc_lex_t *lex, isc_buffer_t **text) { (void)putstr(text, "token too large"); (void)putnull(text); } - return (NULL); + return NULL; default: if (text != NULL) { (void)putstr(text, isc_result_totext(result)); (void)putnull(text); } - return (NULL); + return NULL; } if (token.type == isc_tokentype_string || token.type == isc_tokentype_qstring) { - return (token.value.as_textregion.base); + return token.value.as_textregion.base; } - return (NULL); + return NULL; } /* @@ -10308,7 +10307,7 @@ zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } } @@ -10317,7 +10316,7 @@ zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, zonetxt = next_token(lex, text); } if (zonetxt == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Copy zonetxt because it'll be overwritten by next_token() */ @@ -10428,7 +10427,7 @@ cleanup: dns_view_detach(&view); } - return (result); + return result; } /* @@ -10457,10 +10456,10 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, result = zone_from_args(server, lex, arg, &zone, NULL, text, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } dns_zone_getraw(zone, &raw); if (raw != NULL) { @@ -10491,7 +10490,7 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, result = ISC_R_FAILURE; } dns_zone_detach(&zone); - return (result); + return result; } /* @@ -10509,7 +10508,7 @@ named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { result = reload(server); @@ -10549,7 +10548,7 @@ named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, (void)putstr(text, msg); (void)putnull(text); } - return (result); + return result; } /* @@ -10590,7 +10589,7 @@ cleanup: "STATUS=reconfig command finished: %s\n", isc_result_totext(result)); #endif /* HAVE_LIBSYSTEMD */ - return (result); + return result; } /* @@ -10607,10 +10606,10 @@ named_server_notifycommand(named_server_t *server, isc_lex_t *lex, result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } dns_zone_notify(zone); @@ -10618,7 +10617,7 @@ named_server_notifycommand(named_server_t *server, isc_lex_t *lex, (void)putstr(text, msg); (void)putnull(text); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -10637,10 +10636,10 @@ named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } dns_zone_getraw(zone, &raw); @@ -10658,13 +10657,13 @@ named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, dns_zone_detach(&zone); (void)putstr(text, msg1); (void)putnull(text); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_zone_detach(&zone); (void)putstr(text, msg2); (void)putnull(text); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_result_t @@ -10676,7 +10675,7 @@ named_server_setortoggle(named_server_t *server, const char *optname, /* Skip the command name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } prev = ns_server_getoption(server->sctx, option); @@ -10693,11 +10692,11 @@ named_server_setortoggle(named_server_t *server, const char *optname, { value = false; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (value == prev) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } ns_server_setoption(server->sctx, option, value); @@ -10705,7 +10704,7 @@ named_server_setortoggle(named_server_t *server, const char *optname, isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "%s is now %s", optname, value ? "on" : "off"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -10721,7 +10720,7 @@ listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, result = ns_listenlist_create(mctx, &dlist); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (element = cfg_list_first(listenlist); element != NULL; @@ -10737,11 +10736,11 @@ listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, ISC_LIST_APPEND(dlist->elts, delt, link); } *target = dlist; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: ns_listenlist_detach(&dlist); - return (result); + return result; } static const cfg_obj_t * @@ -10755,7 +10754,7 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { result = cfg_map_get(config, listname, &maplist); if (result != ISC_R_SUCCESS) { - return (NULL); + return NULL; } for (elt = cfg_list_first(maplist); elt != NULL; @@ -10765,11 +10764,11 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { if (strcasecmp(cfg_obj_asstring(cfg_map_getname(map)), name) == 0) { - return (map); + return map; } } - return (NULL); + return NULL; } /* @@ -10830,7 +10829,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, cfg_obj_log(tlsobj, ISC_LOG_ERROR, "tls '%s' is not defined", cfg_obj_asstring(tlsobj)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } CHECK(cfg_map_get(tlsmap, "key-file", &keyobj)); @@ -10926,7 +10925,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, const char *httpname = cfg_obj_asstring(httpobj); if (!do_tls && !no_tls) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } http_server = find_maplist(config, "http", httpname); @@ -10935,7 +10934,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, cfg_obj_log(httpobj, ISC_LOG_ERROR, "http '%s' is not defined", cfg_obj_asstring(httpobj)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } http = true; @@ -10950,7 +10949,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, result = named_config_getport( config, "https-port", &port); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } else if (http && !do_tls) { @@ -10960,7 +10959,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, result = named_config_getport( config, "http-port", &port); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } else if (do_tls) { @@ -10970,7 +10969,7 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, result = named_config_getport( config, "tls-port", &port); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } else { @@ -10980,13 +10979,13 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, result = named_config_getport(config, "port", &port); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } } else { if (cfg_obj_asuint32(portobj) >= UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } port = (in_port_t)cfg_obj_asuint32(portobj); } @@ -11022,12 +11021,12 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, actx, mctx, family, &delt->acl); if (result != ISC_R_SUCCESS) { ns_listenelt_destroy(delt); - return (result); + return result; } *target = delt; cleanup: - return (result); + return result; } #ifdef HAVE_LIBNGHTTP2 @@ -11110,12 +11109,12 @@ listenelt_http(const cfg_obj_t *http, const uint16_t family, bool tls, *target = delt; - return (result); + return result; error: if (delt != NULL) { ns_listenelt_destroy(delt); } - return (result); + return result; } #endif /* HAVE_LIBNGHTTP2 */ @@ -11141,7 +11140,7 @@ cleanup: ISC_LOG_ERROR, "dumpstats failed: %s", isc_result_totext(result)); } - return (result); + return result; } static isc_result_t @@ -11154,7 +11153,7 @@ add_zone_tolist(dns_zone_t *zone, void *uap) { dns_zone_attach(zone, &zle->zone); ISC_LINK_INIT(zle, link); ISC_LIST_APPEND(ISC_LIST_TAIL(dctx->viewlist)->zonelist, zle, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -11169,7 +11168,7 @@ add_view_tolist(struct dumpcontext *dctx, dns_view_t *view) { vle = ISC_LIST_NEXT(vle, link)) { if (vle->view == view) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -11183,7 +11182,7 @@ add_view_tolist(struct dumpcontext *dctx, dns_view_t *view) { result = dns_view_apply(view, true, NULL, add_zone_tolist, dctx); } - return (result); + return result; } static void @@ -11388,7 +11387,7 @@ named_server_dumpdb(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } dctx = isc_mem_get(server->mctx, sizeof(*dctx)); @@ -11468,7 +11467,7 @@ nextview: CHECK(putnull(text)); result = ISC_R_NOTFOUND; dumpdone(dctx, result); - return (result); + return result; } ptr = next_token(lex, NULL); if (ptr != NULL) { @@ -11476,11 +11475,11 @@ nextview: } } dumpdone(dctx, ISC_R_SUCCESS); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dumpcontext_destroy(dctx); - return (result); + return result; } isc_result_t @@ -11502,7 +11501,7 @@ named_server_dumpsecroots(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* "-" here means print the output instead of dumping to file */ @@ -11600,7 +11599,7 @@ cleanup: ISC_LOG_ERROR, "dumpsecroots failed: %s", isc_result_totext(result)); } - return (result); + return result; } isc_result_t @@ -11637,7 +11636,7 @@ cleanup: ISC_LOG_ERROR, "dumprecursing failed: %s", isc_result_totext(result)); } - return (result); + return result; } isc_result_t @@ -11651,7 +11650,7 @@ named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) { /* Skip the command name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Look for the new level name. */ @@ -11663,7 +11662,7 @@ named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) { } else { newlevel = strtol(ptr, &endp, 10); if (*endp != '\0' || newlevel < 0 || newlevel > 99) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } named_g_debuglevel = (unsigned int)newlevel; } @@ -11671,7 +11670,7 @@ named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "debug level is now %u", named_g_debuglevel); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -11688,13 +11687,13 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find out what we are to do. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (!strcasecmp(ptr, "on") || !strcasecmp(ptr, "yes") || @@ -11708,7 +11707,7 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, } else if (!strcasecmp(ptr, "check") || !strcasecmp(ptr, "status")) { set = false; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* Look for the view name. */ @@ -11753,7 +11752,7 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, } cleanup: isc_loopmgr_resume(named_g_loopmgr); - return (result); + return result; } isc_result_t @@ -11768,7 +11767,7 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) { /* Skip the command name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Look for the view name. */ @@ -11897,7 +11896,7 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) { } } isc_loopmgr_resume(named_g_loopmgr); - return (result); + return result; } isc_result_t @@ -11915,13 +11914,13 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) { /* Skip the command name. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find the domain name to flush. */ ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } strlcpy(target, ptr, DNS_NAME_FORMATSIZE); @@ -11930,7 +11929,7 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) { name = dns_fixedname_initname(&fixed); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Look for the view name. */ @@ -11988,7 +11987,7 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) { result = ISC_R_FAILURE; } isc_loopmgr_resume(named_g_loopmgr); - return (result); + return result; } isc_result_t @@ -12130,9 +12129,9 @@ named_server_status(named_server_t *server, isc_buffer_t **text) { CHECK(putstr(text, "server is up and running")); CHECK(putnull(text)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: - return (result); + return result; } isc_result_t @@ -12148,7 +12147,7 @@ named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) { /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } ptr = next_token(lex, text); @@ -12166,7 +12165,7 @@ named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) { CHECK(putnull(text)); cleanup: - return (result); + return result; } /* @@ -12186,7 +12185,7 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex, ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcasecmp(ptr, NAMED_COMMAND_SIGN) == 0) { @@ -12197,16 +12196,16 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex, result = zone_from_args(server, lex, NULL, &zone, NULL, text, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { - return (ISC_R_UNEXPECTEDEND); /* XXX: or do all zones? */ + return ISC_R_UNEXPECTEDEND; /* XXX: or do all zones? */ } type = dns_zone_gettype(zone); if (type != dns_zone_primary) { dns_zone_detach(&zone); - return (DNS_R_NOTPRIMARY); + return DNS_R_NOTPRIMARY; } keyopts = dns_zone_getkeyopts(zone); @@ -12223,7 +12222,7 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex, } dns_zone_detach(&zone); - return (result); + return result; } /* @@ -12253,7 +12252,7 @@ synczone(dns_zone_t *zone, void *uap) { } } - return (result); + return result; } isc_result_t @@ -12282,7 +12281,7 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { result = zone_from_args(server, lex, arg, &zone, NULL, text, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (zone == NULL) { @@ -12303,7 +12302,7 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { ISC_LOG_INFO, "dumping all zones%s: %s", cleanup ? ", removing journal files" : "", isc_result_totext(result)); - return (tresult); + return tresult; } isc_loopmgr_pause(named_g_loopmgr); @@ -12329,7 +12328,7 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { cleanup ? ", removing journal file" : "", isc_result_totext(result)); dns_zone_detach(&zone); - return (result); + return result; } /* @@ -12352,7 +12351,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, result = zone_from_args(server, lex, NULL, &mayberaw, NULL, text, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (mayberaw == NULL) { isc_loopmgr_pause(named_g_loopmgr); @@ -12371,7 +12370,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, ISC_LOG_INFO, "%s all zones: %s", freeze ? "freezing" : "thawing", isc_result_totext(tresult)); - return (tresult); + return tresult; } dns_zone_getraw(mayberaw, &raw); if (raw != NULL) { @@ -12382,12 +12381,12 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, type = dns_zone_gettype(mayberaw); if (type != dns_zone_primary) { dns_zone_detach(&mayberaw); - return (DNS_R_NOTPRIMARY); + return DNS_R_NOTPRIMARY; } if (freeze && !dns_zone_isdynamic(mayberaw, true)) { dns_zone_detach(&mayberaw); - return (DNS_R_NOTDYNAMIC); + return DNS_R_NOTDYNAMIC; } isc_loopmgr_pause(named_g_loopmgr); @@ -12455,7 +12454,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, freeze ? "freezing" : "thawing", zonename, classstr, sep, vname, isc_result_totext(result)); dns_zone_detach(&mayberaw); - return (result); + return result; } #ifdef HAVE_LIBSCF @@ -12467,7 +12466,7 @@ isc_result_t named_smf_add_message(isc_buffer_t **text) { REQUIRE(text != NULL); - return (putstr(text, "use svcadm(1M) to manage named")); + return putstr(text, "use svcadm(1M) to manage named"); } #endif /* HAVE_LIBSCF */ @@ -12488,7 +12487,7 @@ add_comment(FILE *fp, const char *viewname) { CHECK(isc_stdio_write(viewname, strlen(viewname), 1, fp, NULL)); CHECK(isc_stdio_write(HEADER2, sizeof(HEADER2) - 1, 1, fp, NULL)); cleanup: - return (result); + return result; } static void @@ -12544,7 +12543,7 @@ cleanup: } } UNLOCK(&view->new_zone_lock); - return (result); + return result; } static isc_result_t @@ -12563,7 +12562,7 @@ nzf_writeconf(const cfg_obj_t *config, dns_view_t *view) { result = isc_file_openunique(tmp, &fp); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } cfg_map_get(config, "zone", &zl); @@ -12592,14 +12591,14 @@ nzf_writeconf(const cfg_obj_t *config, dns_view_t *view) { goto cleanup; } CHECK(isc_file_rename(tmp, view->new_zone_file)); - return (result); + return result; cleanup: if (fp != NULL) { (void)isc_stdio_close(fp); } (void)isc_file_remove(tmp); - return (result); + return result; } static isc_result_t @@ -12608,7 +12607,7 @@ load_nzf(dns_view_t *view, ns_cfgctx_t *nzcfg) { /* The new zone file may not exist. That is OK. */ if (!isc_file_exists(view->new_zone_file)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -12624,7 +12623,7 @@ load_nzf(dns_view_t *view, ns_cfgctx_t *nzcfg) { view->new_zone_file, isc_result_totext(result)); } - return (result); + return result; } #else /* HAVE_LMDB */ @@ -12752,7 +12751,7 @@ cleanup: isc_buffer_free(&text); } - return (result); + return result; } /* @@ -12774,7 +12773,7 @@ nzd_writable(dns_view_t *view) { isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "mdb_txn_begin: %s", mdb_strerror(status)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } status = mdb_dbi_open(txn, NULL, 0, &dbi); @@ -12786,7 +12785,7 @@ nzd_writable(dns_view_t *view) { } mdb_txn_abort(txn); - return (result); + return result; } /* @@ -12826,10 +12825,10 @@ cleanup: if (txn != NULL) { mdb_txn_abort(txn); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -12876,7 +12875,7 @@ nzd_env_reopen(dns_view_t *view) { int status; if (view->new_zone_db == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } nzd_env_close(view); @@ -12916,7 +12915,7 @@ cleanup: if (env != NULL) { mdb_env_close(env); } - return (result); + return result; } /* @@ -12945,7 +12944,7 @@ nzd_close(MDB_txn **txnp, bool commit) { *txnp = NULL; } - return (result); + return result; } /* @@ -13107,7 +13106,7 @@ cleanup: cfg_obj_destroy(named_g_addparser, &nzf_config); } - return (result); + return result; } #endif /* HAVE_LMDB */ @@ -13219,7 +13218,7 @@ newzone_parse(named_server_t *server, char *command, dns_view_t **viewp, *zoneconfp = zoneconf; *redirectp = redirect; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (zoneconf != NULL) { @@ -13229,7 +13228,7 @@ cleanup: dns_view_detach(&view); } - return (result); + return result; } static isc_result_t @@ -13289,7 +13288,7 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, const cfg_obj_t *config, cleanup: UNLOCK(&view->new_zone_lock); - return (result); + return result; } static isc_result_t @@ -13466,7 +13465,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } static isc_result_t @@ -13686,7 +13685,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } /* @@ -13781,7 +13780,7 @@ cleanup: dns_view_detach(&view); } - return (result); + return result; } static bool @@ -13795,9 +13794,9 @@ inuse(const char *file, bool first, isc_buffer_t **text) { } (void)putstr(text, file); (void)putnull(text); - return (false); + return false; } - return (first); + return first; } typedef struct { @@ -13984,13 +13983,13 @@ named_server_delzone(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find out what we are to do. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcmp(ptr, "-clean") == 0 || strcmp(ptr, "-clear") == 0) { @@ -14094,7 +14093,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } static const cfg_obj_t * @@ -14159,7 +14158,7 @@ find_name_in_list_from_map(const cfg_obj_t *config, obj = NULL; } - return (obj); + return obj; } static void @@ -14272,7 +14271,7 @@ cleanup: (void)putnull(text); } - return (result); + return result; } static void @@ -14338,13 +14337,13 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find out what we are to do. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcasecmp(ptr, "-list") == 0) { @@ -14355,7 +14354,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, clear = true; ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } strlcpy(keystr, ptr, sizeof(keystr)); } else if (strcasecmp(ptr, "-nsec3param") == 0) { @@ -14365,7 +14364,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, chain = true; ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcasecmp(ptr, "none") == 0) { @@ -14375,34 +14374,34 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } strlcpy(flagbuf, ptr, sizeof(flagbuf)); ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } strlcpy(iterbuf, ptr, sizeof(iterbuf)); n = snprintf(nbuf, sizeof(nbuf), "%s %s %s", hashbuf, flagbuf, iterbuf); if (n == sizeof(nbuf)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } n = sscanf(nbuf, "%hu %hu %hu", &hash, &flags, &iter); if (n != 3U) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (hash > 0xffU || flags > 0xffU || iter > dns_nsec3_maxiterations()) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } else if (strcasecmp(ptr, "auto") == 0) { /* Auto-generate a random salt. * XXXMUKS: This currently uses the @@ -14423,7 +14422,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, } else if (strcasecmp(ptr, "-serial") == 0) { ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } CHECK(isc_parse_uint32(&serial, ptr, 10)); setserial = true; @@ -14524,7 +14523,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } static bool @@ -14532,16 +14531,16 @@ argcheck(char *cmd, const char *full) { size_t l; if (cmd == NULL || cmd[0] != '-') { - return (false); + return false; } cmd++; l = strlen(cmd); if (l > strlen(full) || strncasecmp(cmd, full, l) != 0) { - return (false); + return false; } - return (true); + return true; } isc_result_t @@ -14575,13 +14574,13 @@ named_server_dnssec(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find out what we are to do. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Initialize current time and key list. */ @@ -14847,7 +14846,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } static isc_result_t @@ -14856,16 +14855,16 @@ putmem(isc_buffer_t **b, const char *str, size_t len) { result = isc_buffer_reserve(*b, (unsigned int)len); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(*b, (const unsigned char *)str, (unsigned int)len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t putstr(isc_buffer_t **b, const char *str) { - return (putmem(b, str, strlen(str))); + return putmem(b, str, strlen(str)); } static isc_result_t @@ -14874,16 +14873,16 @@ putuint8(isc_buffer_t **b, uint8_t val) { result = isc_buffer_reserve(*b, 1); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(*b, val); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t putnull(isc_buffer_t **b) { - return (putuint8(b, 0)); + return putuint8(b, 0); } isc_result_t @@ -15121,7 +15120,7 @@ cleanup: if (result == ISC_R_NOSPACE) { (void)putstr(text, "\n..."); } - if ((result == ISC_R_SUCCESS || result == ISC_R_NOSPACE)) { + if (result == ISC_R_SUCCESS || result == ISC_R_NOSPACE) { (void)putnull(text); } @@ -15148,7 +15147,7 @@ cleanup: if (zone != NULL) { dns_zone_detach(&zone); } - return (result); + return result; } isc_result_t @@ -15182,14 +15181,14 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } for (;;) { /* Check for options */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcmp(ptr, "--") == 0) { @@ -15292,7 +15291,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly, nametext = next_token(lex, text); } if (nametext == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Copy nametext as it'll be overwritten by next_token() */ @@ -15445,7 +15444,7 @@ cleanup: if (ntatable != NULL) { dns_ntatable_detach(&ntatable); } - return (result); + return result; } isc_result_t @@ -15466,7 +15465,7 @@ named_server_saventa(named_server_t *server) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -15490,7 +15489,7 @@ named_server_loadnta(named_server_t *server) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -15504,7 +15503,7 @@ mkey_refresh(dns_view_t *view, isc_buffer_t **text) { CHECK(dns_zone_synckeyzone(view->managed_keys)); cleanup: - return (result); + return result; } static isc_result_t @@ -15568,7 +15567,7 @@ mkey_destroy(dns_view_t *view, isc_buffer_t **text) { cleanup: isc_loopmgr_resume(named_g_loopmgr); - return (result); + return result; } static isc_result_t @@ -15686,7 +15685,7 @@ cleanup: dns_db_detach(&db); } - return (result); + return result; } static isc_result_t @@ -15711,7 +15710,7 @@ mkey_status(dns_view_t *view, isc_buffer_t **text) { CHECK(mkey_dumpzone(view, text)); cleanup: - return (result); + return result; } isc_result_t @@ -15731,13 +15730,13 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex, /* Skip rndc command name */ cmd = next_token(lex, text); if (cmd == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Get managed-keys subcommand */ cmd = next_token(lex, text); if (cmd == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcasecmp(cmd, "status") == 0) { @@ -15834,7 +15833,7 @@ cleanup: (void)putnull(text); } - return (result); + return result; } isc_result_t @@ -15849,13 +15848,13 @@ named_server_dnstap(named_server_t *server, isc_lex_t *lex, REQUIRE(text != NULL); if (server->dtenv == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* Check the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* "dnstap-reopen" was used in 9.11.0b1 */ @@ -15864,36 +15863,36 @@ named_server_dnstap(named_server_t *server, isc_lex_t *lex, } else { ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } } if (reopen || strcasecmp(ptr, "-reopen") == 0) { backups = ISC_LOG_ROLLNEVER; - } else if ((strcasecmp(ptr, "-roll") == 0)) { + } else if (strcasecmp(ptr, "-roll") == 0) { unsigned int n; ptr = next_token(lex, text); if (ptr != NULL) { unsigned int u; n = sscanf(ptr, "%u", &u); if (n != 1U || u > INT_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } backups = u; } else { backups = ISC_LOG_ROLLINFINITE; } } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } result = dns_dt_reopen(server->dtenv, backups); - return (result); + return result; #else /* ifdef HAVE_DNSTAP */ UNUSED(server); UNUSED(lex); UNUSED(text); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif /* ifdef HAVE_DNSTAP */ } @@ -15907,7 +15906,7 @@ named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_nm_gettimeouts(named_g_netmgr, &initial, &idle, &keepalive, @@ -15927,7 +15926,7 @@ named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } CHECK(isc_parse_uint32(&idle, ptr, 10)); idle *= 100; @@ -15940,7 +15939,7 @@ named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } CHECK(isc_parse_uint32(&keepalive, ptr, 10)); keepalive *= 100; @@ -15953,7 +15952,7 @@ named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } CHECK(isc_parse_uint32(&advertised, ptr, 10)); advertised *= 100; @@ -15981,7 +15980,7 @@ cleanup: (void)putnull(text); } - return (result); + return result; } isc_result_t @@ -16001,12 +16000,12 @@ named_server_servestale(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (!strcasecmp(ptr, "on") || !strcasecmp(ptr, "yes") || @@ -16022,7 +16021,7 @@ named_server_servestale(named_server_t *server, isc_lex_t *lex, } else if (!strcasecmp(ptr, "check") || !strcasecmp(ptr, "status")) { wantstatus = true; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* Look for the optional class name. */ @@ -16147,7 +16146,7 @@ cleanup: (void)putnull(text); } - return (result); + return result; } isc_result_t @@ -16164,7 +16163,7 @@ named_server_fetchlimit(named_server_t *server, isc_lex_t *lex, /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Look for the view name. */ @@ -16234,7 +16233,7 @@ cleanup: (void)putnull(text); } - return (result); + return result; } isc_result_t @@ -16248,13 +16247,13 @@ named_server_skr(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { /* Skip the command name. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* Find out what we are to do. */ ptr = next_token(lex, text); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (strcasecmp(ptr, "-import") != 0) { @@ -16263,7 +16262,7 @@ named_server_skr(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { ptr = next_token(lex, NULL); if (ptr == NULL) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } (void)snprintf(skrfile, sizeof(skrfile), "%s", ptr); @@ -16299,5 +16298,5 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 56bdea17fa..52685c0b23 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -126,19 +126,19 @@ user_zonetype(dns_zone_t *zone) { const struct zt *tp; if ((dns_zone_getoptions(zone) & DNS_ZONEOPT_AUTOEMPTY) != 0) { - return ("builtin"); + return "builtin"; } view = dns_zone_getview(zone); if (view != NULL && strcmp(view->name, "_bind") == 0) { - return ("builtin"); + return "builtin"; } ztype = dns_zone_gettype(zone); for (tp = typemap; tp->string != NULL && tp->type != ztype; tp++) { /* empty */ } - return (tp->string); + return tp->string; } #endif /* ifdef EXTENDED_STATS */ @@ -251,7 +251,7 @@ get_histo_desc(const char *prefix, int i, int inf, bool ext) { } INSIST(0 < len && (size_t)len < space); used += len + 1; - return (desc); + return desc; } static void @@ -816,8 +816,8 @@ dump_stats(isc_stats_t *stats, isc_statsformat_t type, void *arg, memset(values, 0, sizeof(values[0]) * ncounters); isc_stats_dump(stats, generalstat_dump, &dumparg, options); - return (dump_counters(type, arg, category, desc, ncounters, indices, - values, options)); + return dump_counters(type, arg, category, desc, ncounters, indices, + values, options); } #if defined(EXTENDED_STATS) @@ -833,8 +833,8 @@ dump_histo(isc_histomulti_t *hm, isc_statsformat_t type, void *arg, } isc_histo_destroy(&hg); - return (dump_counters(type, arg, category, desc, ncounters, indices, - values, options)); + return dump_counters(type, arg, category, desc, ncounters, indices, + values, options); } #endif /* defined(EXTENDED_STATS) */ @@ -863,7 +863,7 @@ dump_counters(isc_statsformat_t type, void *arg, const char *category, if (category != NULL) { cat = json_object_new_object(); if (cat == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } json_object_object_add(job, category, cat); } @@ -928,19 +928,19 @@ dump_counters(isc_statsformat_t type, void *arg, const char *category, #ifdef HAVE_JSON_C counter = json_object_new_int64(value); if (counter == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } json_object_object_add(cat, desc[idx], counter); #endif /* ifdef HAVE_JSON_C */ break; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #ifdef HAVE_LIBXML2 cleanup: isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "failed at dump_counters()"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; #endif /* ifdef HAVE_LIBXML2 */ } @@ -1009,7 +1009,7 @@ cleanup: static bool rdatastatstype_attr(dns_rdatastatstype_t type, unsigned int attr) { - return ((DNS_RDATASTATSTYPE_ATTR(type) & attr) != 0); + return (DNS_RDATASTATSTYPE_ATTR(type) & attr) != 0; } static void @@ -1289,7 +1289,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { statlevel = dns_zone_getstatlevel(zone); if (statlevel == dns_zonestat_none) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dumparg.type = isc_statsformat_xml; @@ -1446,11 +1446,11 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { TRY0(xmlTextWriterEndElement(writer)); /* zone */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Failed at zone_xmlrender()"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } static isc_result_t @@ -1476,7 +1476,7 @@ xfrin_xmlrender(dns_zone_t *zone, void *arg) { statlevel = dns_zone_getstatlevel(zone); if (statlevel == dns_zonestat_none) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (dns_zone_getxfr(zone, &xfr, &is_firstrefresh, &is_running, @@ -1488,7 +1488,7 @@ xfrin_xmlrender(dns_zone_t *zone, void *arg) { * (if any), but we still want to continue generating the * remaining parts of the output. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (!is_running && !is_deferred && !is_presoa && !is_pending && @@ -1498,12 +1498,12 @@ xfrin_xmlrender(dns_zone_t *zone, void *arg) { dns_xfrin_detach(&xfr); } /* No ongoing/queued transfer. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (is_running && xfr == NULL) { /* The transfer is finished, and it's shutting down. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "xfrin")); @@ -1713,7 +1713,7 @@ xfrin_xmlrender(dns_zone_t *zone, void *arg) { dns_xfrin_detach(&xfr); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (xfr != NULL) { @@ -1723,7 +1723,7 @@ cleanup: isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "Failed at xfrin_xmlrender()"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } static isc_result_t @@ -2125,7 +2125,7 @@ generatexml(named_server_t *server, uint32_t flags, int *buflen, xmlFreeTextWriter(writer); xmlFreeDoc(doc); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, @@ -2136,7 +2136,7 @@ cleanup: if (doc != NULL) { xmlFreeDoc(doc); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } static void @@ -2170,7 +2170,7 @@ render_xml(uint32_t flags, void *arg, unsigned int *retcode, ISC_LOG_ERROR, "failed at rendering XML()"); } - return (result); + return result; } static isc_result_t @@ -2180,8 +2180,8 @@ render_xml_all(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_ALL, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_ALL, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2191,8 +2191,8 @@ render_xml_status(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_STATUS, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_STATUS, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2202,8 +2202,8 @@ render_xml_server(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_SERVER, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_SERVER, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2213,8 +2213,8 @@ render_xml_zones(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_ZONES, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_ZONES, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2224,8 +2224,8 @@ render_xml_xfrins(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_XFRINS, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_XFRINS, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2235,8 +2235,8 @@ render_xml_net(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_NET, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_NET, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2246,8 +2246,8 @@ render_xml_mem(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_MEM, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_MEM, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -2257,8 +2257,8 @@ render_xml_traffic(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_xml(STATS_XML_TRAFFIC, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_xml(STATS_XML_TRAFFIC, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } #endif /* HAVE_LIBXML2 */ @@ -2298,7 +2298,7 @@ addzone(char *name, char *classname, const char *ztype, uint32_t serial, json_object *node = json_object_new_object(); if (node == NULL) { - return (NULL); + return NULL; } json_object_object_add(node, "name", json_object_new_string(name)); @@ -2312,7 +2312,7 @@ addzone(char *name, char *classname, const char *ztype, uint32_t serial, json_object_object_add(node, "type", json_object_new_string(ztype)); } - return (node); + return node; } static isc_result_t @@ -2331,7 +2331,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { statlevel = dns_zone_getstatlevel(zone); if (statlevel == dns_zonestat_none) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_zone_nameonly(zone, buf, sizeof(buf)); @@ -2350,7 +2350,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { } if (zoneobj == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* @@ -2518,7 +2518,7 @@ cleanup: if (zoneobj != NULL) { json_object_put(zoneobj); } - return (result); + return result; } static isc_result_t @@ -2547,7 +2547,7 @@ xfrin_jsonrender(dns_zone_t *zone, void *arg) { statlevel = dns_zone_getstatlevel(zone); if (statlevel == dns_zonestat_none) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_zone_nameonly(zone, buf, sizeof(buf)); @@ -2772,7 +2772,7 @@ cleanup: if (xfrinobj != NULL) { json_object_put(xfrinobj); } - return (result); + return result; } static isc_result_t @@ -2810,7 +2810,7 @@ generatejson(named_server_t *server, size_t *msglen, const char **msg, bindstats = json_object_new_object(); if (bindstats == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* @@ -3343,7 +3343,7 @@ cleanup: json_object_put(bindstats); } - return (result); + return result; } static isc_result_t @@ -3372,7 +3372,7 @@ render_json(uint32_t flags, void *arg, unsigned int *retcode, ISC_LOG_ERROR, "failed at rendering JSON()"); } - return (result); + return result; } static isc_result_t @@ -3382,8 +3382,8 @@ render_json_all(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_ALL, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_json(STATS_JSON_ALL, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3393,8 +3393,8 @@ render_json_status(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_STATUS, arg, retcode, retmsg, mimetype, - b, freecb, freecb_args)); + return render_json(STATS_JSON_STATUS, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3404,8 +3404,8 @@ render_json_server(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_SERVER, arg, retcode, retmsg, mimetype, - b, freecb, freecb_args)); + return render_json(STATS_JSON_SERVER, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3415,8 +3415,8 @@ render_json_zones(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_ZONES, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_json(STATS_JSON_ZONES, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3426,8 +3426,8 @@ render_json_xfrins(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_XFRINS, arg, retcode, retmsg, mimetype, - b, freecb, freecb_args)); + return render_json(STATS_JSON_XFRINS, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3437,8 +3437,8 @@ render_json_mem(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_MEM, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_json(STATS_JSON_MEM, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3448,8 +3448,8 @@ render_json_net(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_NET, arg, retcode, retmsg, mimetype, b, - freecb, freecb_args)); + return render_json(STATS_JSON_NET, arg, retcode, retmsg, mimetype, b, + freecb, freecb_args); } static isc_result_t @@ -3459,8 +3459,8 @@ render_json_traffic(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, isc_httpdfree_t **freecb, void **freecb_args) { UNUSED(httpd); UNUSED(urlinfo); - return (render_json(STATS_JSON_TRAFFIC, arg, retcode, retmsg, mimetype, - b, freecb, freecb_args)); + return render_json(STATS_JSON_TRAFFIC, arg, retcode, retmsg, mimetype, + b, freecb, freecb_args); } #endif /* HAVE_JSON_C */ @@ -3523,7 +3523,7 @@ send: isc_buffer_reinit(b, p, strlen(xslmsg)); isc_buffer_add(b, strlen(xslmsg)); end: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif @@ -3558,7 +3558,7 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) { match > 0) { UNLOCK(&listener->lock); - return (true); + return true; } UNLOCK(&listener->lock); @@ -3567,7 +3567,7 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) { ISC_LOG_WARNING, "rejected statistics connection from %s", socktext); - return (false); + return false; } #endif @@ -3601,7 +3601,7 @@ add_listener(named_server_t *server, named_statschannel_t **listenerp, UNUSED(aclconfctx); UNUSED(socktext); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #else isc_result_t result; named_statschannel_t *listener = NULL; @@ -3704,7 +3704,7 @@ add_listener(named_server_t *server, named_statschannel_t **listenerp, ISC_LOG_NOTICE, "statistics channel listening on %s", socktext); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (listener->acl != NULL) { @@ -3713,7 +3713,7 @@ cleanup: isc_mutex_destroy(&listener->lock); isc_mem_putanddetach(&listener->mctx, listener, sizeof(*listener)); - return (result); + return result; #endif } @@ -3906,7 +3906,7 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, } ISC_LIST_APPENDLIST(server->statschannels, new_listeners, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -4144,5 +4144,5 @@ named_stats_dump(named_server_t *server, FILE *fp) { fprintf(fp, "--- Statistics Dump --- (%lu)\n", (unsigned long)now); - return (ISC_R_SUCCESS); /* this function currently always succeeds */ + return ISC_R_SUCCESS; /* this function currently always succeeds */ } diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index b650f37478..9fff9b27d1 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -55,7 +55,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, result = dns_tkeyctx_create(mctx, &tctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = NULL; @@ -91,9 +91,9 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, } *tctxp = tctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: dns_tkeyctx_destroy(&tctx); - return (result); + return result; } diff --git a/bin/named/transportconf.c b/bin/named/transportconf.c index da68b0e924..17596a0e7d 100644 --- a/bin/named/transportconf.c +++ b/bin/named/transportconf.c @@ -131,12 +131,12 @@ add_doh_transports(const cfg_obj_t *transportlist, dns_transport_list_t *list) { dns_transport_set_remote_hostname); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: cfg_obj_log(doh, ISC_LOG_ERROR, "configuring DoH '%s': %s", dohid, isc_result_totext(result)); - return (result); + return result; } static isc_result_t @@ -184,12 +184,12 @@ add_tls_transports(const cfg_obj_t *transportlist, dns_transport_list_t *list) { dns_transport_set_remote_hostname); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: cfg_obj_log(tls, ISC_LOG_ERROR, "configuring tls '%s': %s", tlsid, isc_result_totext(result)); - return (result); + return result; } #define CHECK(f) \ @@ -216,7 +216,7 @@ transport_list_fromconfig(const cfg_obj_t *config, dns_transport_list_t *list) { obj = NULL; } - return (result); + return result; } static void @@ -258,8 +258,8 @@ named_transports_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, } *listp = list; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: dns_transport_list_detach(&list); - return (result); + return result; } diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index fda2701bc4..cac60180c8 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -123,7 +123,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsigkeyring_t *ring, dns_tsigkey_detach(&tsigkey); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (secret != NULL) { @@ -131,7 +131,7 @@ failure: } cfg_obj_log(key, ISC_LOG_ERROR, "configuring key '%s': %s", keyid, isc_result_totext(ret)); - return (ret); + return ret; } isc_result_t @@ -172,9 +172,9 @@ named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, } *ringp = ring; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: dns_tsigkeyring_detach(&ring); - return (result); + return result; } diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index af54b54b0e..483c06aff2 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -148,7 +148,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, /* Failing that, see if there's a default ACL already in the view */ if (aclp != NULL && *aclp != NULL) { (*setzacl)(zone, *aclp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Check for default ACLs that haven't been parsed yet */ @@ -171,14 +171,14 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, (void)named_config_get(maps, aclname, &aclobj); if (aclobj == NULL) { (*clearzacl)(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } parse_acl: result = cfg_acl_fromconfig(aclobj, config, actx, named_g_mctx, 0, &acl); if (result != ISC_R_SUCCESS) { - return (result); + return result; } (*setzacl)(zone, acl); @@ -188,7 +188,7 @@ parse_acl: } dns_acl_detach(&acl); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -213,7 +213,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, if (updatepolicy == NULL) { dns_zone_setssutable(zone, NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (cfg_obj_isstring(updatepolicy) && @@ -395,7 +395,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, cleanup: isc_buffer_clearmctx(&dbuf); dns_ssutable_detach(&table); - return (result); + return result; } /* @@ -437,7 +437,7 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, cfg_obj_log(zconfig, ISC_LOG_ERROR, "port is not configurable for " "static stub server-addresses"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_netaddr_fromsockaddr(&na, sa); if (isc_netaddr_getzone(&na) != 0) { @@ -445,7 +445,7 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, "scoped address is not allowed " "for static stub " "server-addresses"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } switch (na.family) { @@ -476,7 +476,7 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, if (ISC_LIST_EMPTY(rdatalist_a->rdata) && ISC_LIST_EMPTY(rdatalist_aaaa->rdata)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Add to the list an apex NS with the ns name being the origin name */ @@ -490,7 +490,7 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, ®ion); ISC_LIST_APPEND(rdatalist_ns->rdata, rdata, link); - return (result); + return result; } /*% @@ -531,14 +531,14 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, "server-name '%s' is not a valid " "name", str); - return (result); + return result; } if (dns_name_issubdomain(nsname, dns_zone_getorigin(zone))) { cfg_obj_log(zconfig, ISC_LOG_ERROR, "server-name '%s' must not be a " "subdomain of zone name '%s'", str, zname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_name_toregion(nsname, &sregion); @@ -552,7 +552,7 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, ISC_LIST_APPEND(rdatalist->rdata, rdata, link); } - return (result); + return result; } /*% @@ -692,7 +692,7 @@ cleanup: INSIST(dbversion == NULL); - return (result); + return result; } /*% @@ -705,7 +705,7 @@ zonetype_fromconfig(const cfg_obj_t *map) { result = cfg_map_get(map, "type", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); - return (named_config_getzonetype(obj)); + return named_config_getzonetype(obj); } /*% @@ -736,11 +736,11 @@ strtoargvsub(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp, result = strtoargvsub(mctx, p, argcp, argvp, n + 1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } (*argvp)[n] = s; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -752,7 +752,7 @@ strtoargvsub(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp, */ static isc_result_t strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) { - return (strtoargvsub(mctx, s, argcp, argvp, 0)); + return strtoargvsub(mctx, s, argcp, argvp, 0); } static const char *const primary_synonyms[] = { "primary", "master", NULL }; @@ -799,12 +799,12 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, /* interfacemgr can be destroyed only in exclusive mode. */ if (named_g_server->interfacemgr == NULL) { - return (true); + return true; } if (!ns_interfacemgr_listeningon(named_g_server->interfacemgr, dstaddr)) { - return (false); + return false; } isc_netaddr_fromsockaddr(&netsrc, srcaddr); @@ -847,7 +847,7 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, break; } } - return (view == myview); + return view == myview; } /*% @@ -865,7 +865,7 @@ process_notifytype(dns_notifytype_t ntype, dns_zonetype_t ztype, * zone is configured with something else than "notify yes;". */ if (ztype != dns_zone_mirror || ntype != dns_notifytype_yes) { - return (ntype); + return ntype; } /* @@ -879,7 +879,7 @@ process_notifytype(dns_notifytype_t ntype, dns_zonetype_t ztype, zname); } - return (dns_notifytype_explicit); + return dns_notifytype_explicit; } isc_result_t @@ -1953,7 +1953,7 @@ cleanup: if (kasp != NULL) { dns_kasp_detach(&kasp); } - return (result); + return result; } /* @@ -1968,11 +1968,11 @@ named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, dns_zone_settype(zone, dns_zone_dlz); result = dns_sdlz_setdb(dlzdatabase, rdclass, name, &db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_zone_dlzpostload(zone, db); dns_db_detach(&db); - return (result); + return result; } bool @@ -1996,7 +1996,7 @@ named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig, if (zonetype_fromconfig(zoptions) == dns_zone_staticstub) { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: staticstub"); - return (false); + return false; } /* If there's a raw zone, use that for filename and type comparison */ @@ -2017,17 +2017,17 @@ named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig, if (!inline_signing && has_raw) { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: old zone was inline-signing"); - return (false); + return false; } else if (inline_signing && !has_raw) { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: old zone was not inline-signing"); - return (false); + return false; } if (zonetype_fromconfig(zoptions) != ztype) { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: type mismatch"); - return (false); + return false; } obj = NULL; @@ -2043,10 +2043,10 @@ named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig, { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: filename mismatch"); - return (false); + return false; } - return (true); + return true; } bool @@ -2080,13 +2080,13 @@ named_zone_inlinesigning(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, if (res != ISC_R_SUCCESS || strcmp(cfg_obj_asstring(policy), "none") == 0) { - return (false); + return false; } /* Lookup the policy. */ res = dns_kasplist_find(kasplist, cfg_obj_asstring(policy), &kasp); if (res != ISC_R_SUCCESS) { - return (false); + return false; } inline_signing = dns_kasp_inlinesigning(kasp); @@ -2099,8 +2099,8 @@ named_zone_inlinesigning(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, */ res = cfg_map_get(maps[0], "inline-signing", &signing); if (res == ISC_R_SUCCESS && cfg_obj_isboolean(signing)) { - return (cfg_obj_asboolean(signing)); + return cfg_obj_asboolean(signing); } - return (inline_signing); + return inline_signing; } diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 8285fa4aba..2f1da21209 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -253,7 +253,7 @@ getzoneclass(void) { if (zoneclass == dns_rdataclass_none) { zoneclass = defaultclass; } - return (zoneclass); + return zoneclass; } static bool @@ -263,9 +263,9 @@ setzoneclass(dns_rdataclass_t rdclass) { zoneclass = rdclass; } if (zoneclass != rdclass) { - return (false); + return false; } - return (true); + return true; } static void @@ -329,7 +329,7 @@ nsu_strsep(char **stringp, const char *delim) { char sc, dc; if (string == NULL) { - return (NULL); + return NULL; } for (; *string != '\0'; string++) { @@ -350,11 +350,11 @@ nsu_strsep(char **stringp, const char *delim) { if (sc == dc) { *s++ = '\0'; *stringp = s; - return (string); + return string; } } } - return (string); + return string; } static void @@ -390,7 +390,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, if (len >= sizeof(buf)) { error("unknown key type '%.*s'", (int)(len), hmacstr); - return (false); + return false; } /* Copy len bytes and NUL terminate. */ @@ -403,7 +403,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[9], 10); if (result != ISC_R_SUCCESS || digestbits > 128) { error("digest-bits out of range [0..128]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else if (strcasecmp(buf, "hmac-sha1") == 0) { @@ -413,7 +413,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[10], 10); if (result != ISC_R_SUCCESS || digestbits > 160) { error("digest-bits out of range [0..160]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else if (strcasecmp(buf, "hmac-sha224") == 0) { @@ -423,7 +423,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[12], 10); if (result != ISC_R_SUCCESS || digestbits > 224) { error("digest-bits out of range [0..224]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else if (strcasecmp(buf, "hmac-sha256") == 0) { @@ -433,7 +433,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[12], 10); if (result != ISC_R_SUCCESS || digestbits > 256) { error("digest-bits out of range [0..256]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else if (strcasecmp(buf, "hmac-sha384") == 0) { @@ -443,7 +443,7 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[12], 10); if (result != ISC_R_SUCCESS || digestbits > 384) { error("digest-bits out of range [0..384]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else if (strcasecmp(buf, "hmac-sha512") == 0) { @@ -453,14 +453,14 @@ parse_hmac(const char *hmacstr, size_t len, dst_algorithm_t *hmac_alg, result = isc_parse_uint16(&digestbits, &buf[12], 10); if (result != ISC_R_SUCCESS || digestbits > 512) { error("digest-bits out of range [0..512]"); - return (false); + return false; } *digestbitsp = (digestbits + 7) & ~0x7U; } else { error("unknown key type '%s'", buf); - return (false); + return false; } - return (true); + return true; } static int @@ -474,7 +474,7 @@ basenamelen(const char *file) { } else if (len > 4 && strcmp(file + len - 4, ".key") == 0) { len -= 4; } - return (len); + return len; } static void @@ -570,7 +570,7 @@ read_sessionkey(isc_mem_t *mctx) { int len; if (!isc_file_exists(keyfile)) { - return (ISC_R_FILENOTFOUND); + return ISC_R_FILENOTFOUND; } result = cfg_parser_create(mctx, &pctx); @@ -616,7 +616,7 @@ cleanup: isc_mem_free(mctx, keystr); } - return (result); + return result; } static void @@ -794,8 +794,8 @@ create_name(const char *str, char *namedata, size_t len, dns_name_t *name) { isc_buffer_add(&namesrc, strlen(str)); isc_buffer_init(&namebuf, namedata, len); - return (dns_name_fromtext(name, &namesrc, dns_rootname, - DNS_NAME_DOWNCASE, &namebuf)); + return dns_name_fromtext(name, &namesrc, dns_rootname, + DNS_NAME_DOWNCASE, &namebuf); } static void @@ -993,7 +993,7 @@ get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr, error("couldn't get address for '%s': %s", host, isc_result_totext(result)); } - return (count); + return count; } #define PARSE_ARGS_FMT "46A:C:dDE:ghH:iK:lL:MoOk:p:Pr:R:St:Tu:vVy:" @@ -1303,7 +1303,7 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) { word = nsu_strsep(cmdlinep, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read owner name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } dns_message_gettempname(msg, namep); @@ -1314,10 +1314,10 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) { error("invalid owner name: %s", isc_result_totext(result)); isc_buffer_invalidate(&source); dns_message_puttempname(msg, namep); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } isc_buffer_invalidate(&source); - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1332,7 +1332,7 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, if (cmdline == NULL) { rdata->flags = DNS_RDATA_UPDATE; - return (STATUS_MORE); + return STATUS_MORE; } while (*cmdline != 0 && isspace((unsigned char)*cmdline)) { @@ -1363,13 +1363,13 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, fprintf(stderr, "invalid rdata format: %s\n", isc_result_totext(result)); isc_buffer_free(&buf); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } } else { rdata->flags = DNS_RDATA_UPDATE; } *cmdlinep = cmdline; - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1392,7 +1392,7 @@ make_prereq(char *cmdline, bool ispositive, bool isrrset) { */ retval = parse_name(&cmdline, updatemsg, &name); if (retval != STATUS_MORE) { - return (retval); + return retval; } /* @@ -1472,13 +1472,13 @@ make_prereq(char *cmdline, bool ispositive, bool isrrset) { ISC_LIST_INIT(name->list); ISC_LIST_APPEND(name->list, rdataset, link); dns_message_addname(updatemsg, name, DNS_SECTION_PREREQUISITE); - return (STATUS_MORE); + return STATUS_MORE; failure: if (name != NULL) { dns_message_puttempname(updatemsg, &name); } - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } static uint16_t @@ -1490,7 +1490,7 @@ evaluate_prereq(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read operation code\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (strcasecmp(word, "nxdomain") == 0) { ispositive = false; @@ -1506,9 +1506,9 @@ evaluate_prereq(char *cmdline) { isrrset = true; } else { fprintf(stderr, "incorrect operation code: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (make_prereq(cmdline, ispositive, isrrset)); + return make_prereq(cmdline, ispositive, isrrset); } static void @@ -1554,7 +1554,7 @@ evaluate_lease(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read ttl\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (!strcasecmp(word, "none")) { @@ -1563,12 +1563,12 @@ evaluate_lease(char *cmdline) { keylease = 0; keylease_set = false; updateopt(); - return (STATUS_MORE); + return STATUS_MORE; } result = isc_parse_uint32(&value1, word, 10); if (result != ISC_R_SUCCESS) { - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } word = nsu_strsep(&cmdline, " \t\r\n"); @@ -1578,12 +1578,12 @@ evaluate_lease(char *cmdline) { keylease = 0; keylease_set = false; updateopt(); - return (STATUS_MORE); + return STATUS_MORE; } result = isc_parse_uint32(&value2, word, 10); if (result != ISC_R_SUCCESS) { - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } lease = value1; @@ -1592,7 +1592,7 @@ evaluate_lease(char *cmdline) { keylease_set = true; updateopt(); - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1602,13 +1602,13 @@ evaluate_server(char *cmdline) { if (local_only) { fprintf(stderr, "cannot reset server in localhost-only mode\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read server name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } server = word; @@ -1620,13 +1620,13 @@ evaluate_server(char *cmdline) { port = strtol(word, &endp, 10); if (*endp != 0) { fprintf(stderr, "port '%s' is not numeric\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } else if (port < 1 || port > 65535) { fprintf(stderr, "port '%s' is out of range " "(1 to 65535)\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } } @@ -1644,10 +1644,10 @@ evaluate_server(char *cmdline) { servers = isc_mem_cget(gmctx, ns_alloc, sizeof(isc_sockaddr_t)); ns_total = get_addresses(server, (in_port_t)port, servers, ns_alloc); if (ns_total == 0) { - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1660,7 +1660,7 @@ evaluate_local(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read server name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } local = word; @@ -1672,13 +1672,13 @@ evaluate_local(char *cmdline) { port = strtol(word, &endp, 10); if (*endp != 0) { fprintf(stderr, "port '%s' is not numeric\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } else if (port < 1 || port > 65535) { fprintf(stderr, "port '%s' is out of range " "(1 to 65535)\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } } @@ -1694,10 +1694,10 @@ evaluate_local(char *cmdline) { isc_sockaddr_fromin(localaddr4, &in4, (in_port_t)port); } else { fprintf(stderr, "invalid address %s", local); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1718,7 +1718,7 @@ evaluate_key(char *cmdline) { namestr = nsu_strsep(&cmdline, " \t\r\n"); if (namestr == NULL || *namestr == 0) { fprintf(stderr, "could not read key name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } mykeyname = dns_fixedname_initname(&fkeyname); @@ -1726,7 +1726,7 @@ evaluate_key(char *cmdline) { n = strchr(namestr, ':'); if (n != NULL) { if (!parse_hmac(namestr, n - namestr, &hmac_alg, &digestbits)) { - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } namestr = n + 1; } else { @@ -1738,13 +1738,13 @@ evaluate_key(char *cmdline) { result = dns_name_fromtext(mykeyname, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "could not parse key name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } secretstr = nsu_strsep(&cmdline, "\r\n"); if (secretstr == NULL || *secretstr == 0) { fprintf(stderr, "could not read key secret\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } secretlen = strlen(secretstr) * 3 / 4; secret = isc_mem_allocate(gmctx, secretlen); @@ -1755,7 +1755,7 @@ evaluate_key(char *cmdline) { fprintf(stderr, "could not create key from %s: %s\n", secretstr, isc_result_totext(result)); isc_mem_free(gmctx, secret); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } secretlen = isc_buffer_usedlength(&secretbuf); @@ -1768,10 +1768,10 @@ evaluate_key(char *cmdline) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "could not create key from %s %s: %s\n", namestr, secretstr, isc_result_totext(result)); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } dst_key_setbits(tsigkey->key, digestbits); - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1783,7 +1783,7 @@ evaluate_zone(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read zone name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } userzone = dns_fixedname_initname(&fuserzone); @@ -1793,10 +1793,10 @@ evaluate_zone(char *cmdline) { if (result != ISC_R_SUCCESS) { userzone = NULL; /* Lest it point to an invalid name */ fprintf(stderr, "could not parse zone name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1813,19 +1813,19 @@ evaluate_realm(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { - return (STATUS_MORE); + return STATUS_MORE; } n = snprintf(buf, sizeof(buf), "@%s", word); if (n < 0 || (size_t)n >= sizeof(buf)) { error("realm is too long"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } realm = isc_mem_strdup(gmctx, buf); - return (STATUS_MORE); + return STATUS_MORE; #else /* HAVE_GSSAPI */ UNUSED(cmdline); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; #endif /* HAVE_GSSAPI */ } @@ -1838,29 +1838,29 @@ evaluate_ttl(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read ttl\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (!strcasecmp(word, "none")) { default_ttl = 0; default_ttl_set = false; - return (STATUS_MORE); + return STATUS_MORE; } result = isc_parse_uint32(&ttl, word, 10); if (result != ISC_R_SUCCESS) { - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (ttl > TTL_MAX) { fprintf(stderr, "ttl '%s' is out of range (0 to %u)\n", word, TTL_MAX); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } default_ttl = ttl; default_ttl_set = true; - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1873,7 +1873,7 @@ evaluate_class(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read class name\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } r.base = word; @@ -1881,19 +1881,19 @@ evaluate_class(char *cmdline) { result = dns_rdataclass_fromtext(&rdclass, &r); if (result != ISC_R_SUCCESS) { fprintf(stderr, "could not parse class name: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } switch (rdclass) { case dns_rdataclass_none: case dns_rdataclass_any: case dns_rdataclass_reserved0: fprintf(stderr, "bad default class: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; default: defaultclass = rdclass; } - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -1917,7 +1917,7 @@ update_addordelete(char *cmdline, bool isdelete) { */ retval = parse_name(&cmdline, updatemsg, &name); if (retval != STATUS_MORE) { - return (retval); + return retval; } dns_message_gettemprdata(updatemsg, &rdata); @@ -2103,14 +2103,14 @@ doneparsing: ISC_LIST_INIT(name->list); ISC_LIST_APPEND(name->list, rdataset, link); dns_message_addname(updatemsg, name, DNS_SECTION_UPDATE); - return (STATUS_MORE); + return STATUS_MORE; failure: if (name != NULL) { dns_message_puttempname(updatemsg, &name); } dns_message_puttemprdata(updatemsg, &rdata); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } static uint16_t @@ -2122,7 +2122,7 @@ evaluate_update(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read operation code\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (strcasecmp(word, "delete") == 0) { isdelete = true; @@ -2132,9 +2132,9 @@ evaluate_update(char *cmdline) { isdelete = false; } else { fprintf(stderr, "incorrect operation code: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (update_addordelete(cmdline, isdelete)); + return update_addordelete(cmdline, isdelete); } static uint16_t @@ -2145,7 +2145,7 @@ evaluate_checknames(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read check-names directive\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (strcasecmp(word, "yes") == 0 || strcasecmp(word, "true") == 0 || strcasecmp(word, "on") == 0) @@ -2158,9 +2158,9 @@ evaluate_checknames(char *cmdline) { checknames = false; } else { fprintf(stderr, "incorrect check-names directive: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (STATUS_MORE); + return STATUS_MORE; } static uint16_t @@ -2171,7 +2171,7 @@ evaluate_checksvcb(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { fprintf(stderr, "could not read check-svcb directive\n"); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } if (strcasecmp(word, "yes") == 0 || strcasecmp(word, "true") == 0 || strcasecmp(word, "on") == 0) @@ -2184,9 +2184,9 @@ evaluate_checksvcb(char *cmdline) { checksvcb = false; } else { fprintf(stderr, "incorrect check-svcb directive: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } - return (STATUS_MORE); + return STATUS_MORE; } static void @@ -2264,58 +2264,58 @@ do_next_command(char *cmdline) { word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { - return (STATUS_SEND); + return STATUS_SEND; } if (word[0] == ';') { - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "quit") == 0) { - return (STATUS_QUIT); + return STATUS_QUIT; } if (strcasecmp(word, "prereq") == 0) { - return (evaluate_prereq(cmdline)); + return evaluate_prereq(cmdline); } if (strcasecmp(word, "nxdomain") == 0) { - return (make_prereq(cmdline, false, false)); + return make_prereq(cmdline, false, false); } if (strcasecmp(word, "yxdomain") == 0) { - return (make_prereq(cmdline, true, false)); + return make_prereq(cmdline, true, false); } if (strcasecmp(word, "nxrrset") == 0) { - return (make_prereq(cmdline, false, true)); + return make_prereq(cmdline, false, true); } if (strcasecmp(word, "yxrrset") == 0) { - return (make_prereq(cmdline, true, true)); + return make_prereq(cmdline, true, true); } if (strcasecmp(word, "update") == 0) { - return (evaluate_update(cmdline)); + return evaluate_update(cmdline); } if (strcasecmp(word, "delete") == 0) { - return (update_addordelete(cmdline, true)); + return update_addordelete(cmdline, true); } if (strcasecmp(word, "del") == 0) { - return (update_addordelete(cmdline, true)); + return update_addordelete(cmdline, true); } if (strcasecmp(word, "add") == 0) { - return (update_addordelete(cmdline, false)); + return update_addordelete(cmdline, false); } if (strcasecmp(word, "lease") == 0) { - return (evaluate_lease(cmdline)); + return evaluate_lease(cmdline); } if (strcasecmp(word, "server") == 0) { - return (evaluate_server(cmdline)); + return evaluate_server(cmdline); } if (strcasecmp(word, "local") == 0) { - return (evaluate_local(cmdline)); + return evaluate_local(cmdline); } if (strcasecmp(word, "zone") == 0) { - return (evaluate_zone(cmdline)); + return evaluate_zone(cmdline); } if (strcasecmp(word, "class") == 0) { - return (evaluate_class(cmdline)); + return evaluate_class(cmdline); } if (strcasecmp(word, "send") == 0) { - return (STATUS_SEND); + return STATUS_SEND; } if (strcasecmp(word, "debug") == 0) { if (debugging) { @@ -2323,14 +2323,14 @@ do_next_command(char *cmdline) { } else { debugging = true; } - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "ttl") == 0) { - return (evaluate_ttl(cmdline)); + return evaluate_ttl(cmdline); } if (strcasecmp(word, "show") == 0) { show_message(stdout, updatemsg, "Outgoing update query:"); - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "answer") == 0) { LOCK(&answer_lock); @@ -2338,24 +2338,24 @@ do_next_command(char *cmdline) { show_message(stdout, answer, "Answer:"); } UNLOCK(&answer_lock); - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "key") == 0) { usegsstsig = false; - return (evaluate_key(cmdline)); + return evaluate_key(cmdline); } if (strcasecmp(word, "realm") == 0) { - return (evaluate_realm(cmdline)); + return evaluate_realm(cmdline); } if (strcasecmp(word, "check-names") == 0 || strcasecmp(word, "checknames") == 0) { - return (evaluate_checknames(cmdline)); + return evaluate_checknames(cmdline); } if (strcasecmp(word, "check-svcb") == 0 || strcasecmp(word, "checksvcb") == 0) { - return (evaluate_checksvcb(cmdline)); + return evaluate_checksvcb(cmdline); } if (strcasecmp(word, "gsstsig") == 0) { #if HAVE_GSSAPI @@ -2363,7 +2363,7 @@ do_next_command(char *cmdline) { #else /* HAVE_GSSAPI */ fprintf(stderr, "gsstsig not supported\n"); #endif /* HAVE_GSSAPI */ - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "oldgsstsig") == 0) { #if HAVE_GSSAPI @@ -2371,7 +2371,7 @@ do_next_command(char *cmdline) { #else /* HAVE_GSSAPI */ fprintf(stderr, "gsstsig not supported\n"); #endif /* HAVE_GSSAPI */ - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "help") == 0) { fprintf(stdout, "nsupdate " PACKAGE_VERSION ":\n" @@ -2411,14 +2411,14 @@ do_next_command(char *cmdline) { "record to the zone)\n" "[update] del[ete] .... (remove the given " "record(s) from the zone)\n"); - return (STATUS_MORE); + return STATUS_MORE; } if (strcasecmp(word, "version") == 0) { fprintf(stdout, "nsupdate " PACKAGE_VERSION "\n"); - return (STATUS_MORE); + return STATUS_MORE; } fprintf(stderr, "incorrect section name: %s\n", word); - return (STATUS_SYNTAX); + return STATUS_SYNTAX; } static uint16_t @@ -2450,7 +2450,7 @@ get_next_command(void) { free(ptr); } - return (result); + return result; } static bool @@ -2465,9 +2465,9 @@ user_interaction(void) { } } if (result == STATUS_SEND) { - return (true); + return true; } - return (false); + return false; } static void @@ -2512,10 +2512,10 @@ next_primary(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) { fprintf(stderr, "; Communication with %s failed: %s\n", addrbuf, isc_result_totext(eresult)); if (++primary_inuse >= primary_total) { - return (false); + return false; } ddebug("%s: trying next server", caller); - return (true); + return true; } static void @@ -3556,8 +3556,8 @@ main(int argc, char **argv) { cleanup(); if (seenerror) { - return (2); + return 2; } - return (0); + return 0; } diff --git a/bin/plugins/filter-a.c b/bin/plugins/filter-a.c index 57e6fa7248..bccbb76ada 100644 --- a/bin/plugins/filter-a.c +++ b/bin/plugins/filter-a.c @@ -177,7 +177,7 @@ static const char *filter_a_enums[] = { "break-dnssec", NULL }; static isc_result_t parse_filter_a(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void @@ -210,7 +210,7 @@ parse_filter_a_on(const cfg_obj_t *param_obj, const char *param_name, result = cfg_map_get(param_obj, param_name, &obj); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (cfg_obj_isboolean(obj)) { @@ -225,7 +225,7 @@ parse_filter_a_on(const cfg_obj_t *param_obj, const char *param_name, result = ISC_R_UNEXPECTED; } - return (result); + return result; } static isc_result_t @@ -237,7 +237,7 @@ check_syntax(cfg_obj_t *fmap, const void *cfg, isc_mem_t *mctx, void *actx) { cfg_map_get(fmap, "filter-a", &aclobj); if (aclobj == NULL) { - return (result); + return result; } CHECK(cfg_acl_fromconfig(aclobj, (const cfg_obj_t *)cfg, @@ -265,7 +265,7 @@ cleanup: dns_acl_detach(&acl); } - return (result); + return result; } static isc_result_t @@ -306,7 +306,7 @@ cleanup: if (parser != NULL) { cfg_parser_destroy(&parser); } - return (result); + return result; } /** @@ -358,7 +358,7 @@ cleanup: plugin_destroy((void **)&inst); } - return (result); + return result; } isc_result_t @@ -385,7 +385,7 @@ cleanup: if (parser != NULL) { cfg_parser_destroy(&parser); } - return (result); + return result; } /* @@ -415,7 +415,7 @@ plugin_destroy(void **instp) { */ int plugin_version(void) { - return (NS_PLUGIN_VERSION); + return NS_PLUGIN_VERSION; } /** @@ -440,14 +440,14 @@ typedef struct section_filter { static bool is_v4_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET) { - return (true); + return true; } if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { - return (true); + return true; } - return (false); + return false; } /* @@ -458,9 +458,9 @@ is_v6_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && !IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { - return (true); + return true; } - return (false); + return false; } static filter_data_t * @@ -473,7 +473,7 @@ client_state_get(const query_ctx_t *qctx, filter_instance_t *inst) { sizeof(qctx->client), (void **)&client_state); UNLOCK(&inst->hlock); - return (result == ISC_R_SUCCESS ? client_state : NULL); + return result == ISC_R_SUCCESS ? client_state : NULL; } static void @@ -569,7 +569,7 @@ process_name(query_ctx_t *qctx, filter_a_t mode, const dns_name_t *name, } cleanup: - return (modified); + return modified; } /*% @@ -640,7 +640,7 @@ filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) { client_state_create(qctx, inst); } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -658,7 +658,7 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (client_state == NULL) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (inst->v4_a != NONE || inst->v6_a != NONE) { @@ -675,7 +675,7 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { } } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -695,7 +695,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (client_state == NULL) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (client_state->mode != BREAK_DNSSEC && @@ -703,7 +703,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL && dns_rdataset_isassociated(qctx->sigrdataset)))) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (qctx->qtype == dns_rdatatype_a) { @@ -776,11 +776,11 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = result; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } *resp = result; - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -813,7 +813,7 @@ filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp) { process_section(&filter_answer); } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -850,7 +850,7 @@ filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp) { } } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -865,10 +865,10 @@ filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (!qctx->detach_client) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } client_state_destroy(qctx, inst); - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c index ab5388e686..a1c64d9fa5 100644 --- a/bin/plugins/filter-aaaa.c +++ b/bin/plugins/filter-aaaa.c @@ -177,7 +177,7 @@ static const char *filter_aaaa_enums[] = { "break-dnssec", NULL }; static isc_result_t parse_filter_aaaa(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void @@ -211,7 +211,7 @@ parse_filter_aaaa_on(const cfg_obj_t *param_obj, const char *param_name, result = cfg_map_get(param_obj, param_name, &obj); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (cfg_obj_isboolean(obj)) { @@ -226,7 +226,7 @@ parse_filter_aaaa_on(const cfg_obj_t *param_obj, const char *param_name, result = ISC_R_UNEXPECTED; } - return (result); + return result; } static isc_result_t @@ -238,7 +238,7 @@ check_syntax(cfg_obj_t *fmap, const void *cfg, isc_mem_t *mctx, void *actx) { cfg_map_get(fmap, "filter-aaaa", &aclobj); if (aclobj == NULL) { - return (result); + return result; } CHECK(cfg_acl_fromconfig(aclobj, (const cfg_obj_t *)cfg, @@ -266,7 +266,7 @@ cleanup: dns_acl_detach(&acl); } - return (result); + return result; } static isc_result_t @@ -309,7 +309,7 @@ cleanup: if (parser != NULL) { cfg_parser_destroy(&parser); } - return (result); + return result; } /** @@ -362,7 +362,7 @@ cleanup: plugin_destroy((void **)&inst); } - return (result); + return result; } isc_result_t @@ -389,7 +389,7 @@ cleanup: if (parser != NULL) { cfg_parser_destroy(&parser); } - return (result); + return result; } /* @@ -419,7 +419,7 @@ plugin_destroy(void **instp) { */ int plugin_version(void) { - return (NS_PLUGIN_VERSION); + return NS_PLUGIN_VERSION; } /** @@ -444,14 +444,14 @@ typedef struct section_filter { static bool is_v4_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET) { - return (true); + return true; } if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { - return (true); + return true; } - return (false); + return false; } /* @@ -462,9 +462,9 @@ is_v6_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && !IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { - return (true); + return true; } - return (false); + return false; } static filter_data_t * @@ -477,7 +477,7 @@ client_state_get(const query_ctx_t *qctx, filter_instance_t *inst) { sizeof(qctx->client), (void **)&client_state); UNLOCK(&inst->hlock); - return (result == ISC_R_SUCCESS ? client_state : NULL); + return result == ISC_R_SUCCESS ? client_state : NULL; } static void @@ -573,7 +573,7 @@ process_name(query_ctx_t *qctx, filter_aaaa_t mode, const dns_name_t *name, } cleanup: - return (modified); + return modified; } /*% @@ -644,7 +644,7 @@ filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) { client_state_create(qctx, inst); } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -662,7 +662,7 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (client_state == NULL) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (inst->v4_aaaa != NONE || inst->v6_aaaa != NONE) { @@ -679,7 +679,7 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { } } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -699,7 +699,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (client_state == NULL) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (client_state->mode != BREAK_DNSSEC && @@ -707,7 +707,7 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL && dns_rdataset_isassociated(qctx->sigrdataset)))) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } if (qctx->qtype == dns_rdatatype_aaaa) { @@ -779,11 +779,11 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { *resp = result; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } *resp = result; - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -816,7 +816,7 @@ filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp) { process_section(&filter_answer); } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -853,7 +853,7 @@ filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp) { } } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* @@ -868,10 +868,10 @@ filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (!qctx->detach_client) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } client_state_destroy(qctx, inst); - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index d3e14a9c29..9750d5d537 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -1013,8 +1013,8 @@ main(int argc, char **argv) { isc_managers_destroy(&rndc_mctx, &loopmgr, &netmgr); if (failed) { - return (1); + return 1; } - return (0); + return 0; } diff --git a/bin/tests/system/dlzexternal/driver/driver.c b/bin/tests/system/dlzexternal/driver/driver.c index 20edfd03e4..9750fdc96a 100644 --- a/bin/tests/system/dlzexternal/driver/driver.c +++ b/bin/tests/system/dlzexternal/driver/driver.c @@ -104,10 +104,10 @@ single_valued(const char *type) { for (i = 0; single[i]; i++) { if (strcasecmp(single[i], type) == 0) { - return (true); + return true; } } - return (false); + return false; } /* @@ -141,14 +141,14 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, } if (i == MAX_RECORDS) { logerr("dlz_example: out of record space"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (strlen(name) >= sizeof(list[i].name) || strlen(type) >= sizeof(list[i].type) || strlen(data) >= sizeof(list[i].data)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strncpy(list[i].name, name, sizeof(list[i].name) - 1); @@ -162,7 +162,7 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, list[i].ttl = ttl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -184,10 +184,10 @@ del_name(struct dlz_example_data *state, struct record *list, const char *name, } } if (i == MAX_RECORDS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } memset(&list[i], 0, sizeof(struct record)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -208,15 +208,15 @@ fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { sizeof(addr_buf)); break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (ret == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } snprintf(buffer, size, "%s#%u", addr_buf, port); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -225,7 +225,7 @@ fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { int dlz_version(unsigned int *flags) { UNUSED(flags); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* @@ -265,7 +265,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, state = calloc(1, sizeof(struct dlz_example_data)); if (state == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* Fill in the helper functions */ @@ -278,14 +278,14 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, if (argc < 2 || argv[1][0] == '\0') { logerr("dlz_example: please specify a zone name"); dlz_destroy(state); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* Ensure zone name is absolute */ state->zone_name = malloc(strlen(argv[1]) + 2); if (state->zone_name == NULL) { free(state); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (argv[1][strlen(argv[1]) - 1] == '.') { strcpy(state->zone_name, argv[1]); @@ -319,11 +319,11 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, loginfo("dlz_example: started for zone %s", state->zone_name); *dbdata = state; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: free(state); - return (result); + return result; } /* @@ -370,7 +370,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * this; it will move onto the next database after a single query. */ if (strcasecmp(name, "test.example.com") == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -380,7 +380,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, if (strcasecmp(name, "test.example.net") == 0 && strncmp(addrbuf, "10.53.0.1", 9) == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -389,7 +389,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * zone origin nodes could fail to return SERVFAIL to the client. */ if (strcasecmp(name, "bigcname.domain") == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -397,15 +397,15 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * zone name and the qname */ if (strcasecmp(state->zone_name, name) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } snprintf(absolute, sizeof(absolute), "%s.", name); if (strcasecmp(state->zone_name, absolute) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -435,7 +435,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, UNUSED(zone); if (state->putrr == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (strcmp(name, "@") == 0) { @@ -451,7 +451,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (size < 0 || (size_t)size >= sizeof(full_name) || (size_t)size >= sizeof(last)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -515,7 +515,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, found = true; result = state->putrr(lookup, "TXT", 0, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -529,7 +529,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, found = true; result = state->putrr(lookup, "TXT", 0, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -538,7 +538,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, result = state->putrr(lookup, "A", 0, "100.100.100.2"); found = true; if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -548,7 +548,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, result = state->putrr(lookup, "A", 0, "100.100.100.3"); found = true; if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -560,16 +560,16 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, state->current[i].ttl, state->current[i].data); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } if (!found) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -586,7 +586,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { if (result != ISC_R_SUCCESS) { loginfo("dlz_example: findzonedb returned %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -595,7 +595,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { */ if (strcmp(name, "example.org") == 0) { loginfo("dlz_example: use view ACL for example.org"); - return (ISC_R_DEFAULT); + return ISC_R_DEFAULT; } /* @@ -604,12 +604,12 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { */ if (strcmp(client, "10.53.0.5") == 0) { loginfo("dlz_example: disallow transfer to 10.53.0.5"); - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } loginfo("dlz_example: transfer allowed for %s", name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -623,7 +623,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { UNUSED(zone); if (state->putnamedrr == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } for (i = 0; i < MAX_RECORDS; i++) { @@ -636,11 +636,11 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { state->current[i].ttl, state->current[i].data); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -653,13 +653,13 @@ dlz_newversion(const char *zone, void *dbdata, void **versionp) { if (state->transaction_started) { loginfo("dlz_example: transaction already started for zone %s", zone); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } state->transaction_started = true; *versionp = (void *)&state->transaction_started; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -720,18 +720,18 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { if (state->writeable_zone == NULL) { loginfo("dlz_example: no writeable_zone method available"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = state->writeable_zone(view, dlzdb, state->zone_name); if (result != ISC_R_SUCCESS) { loginfo("dlz_example: failed to configure zone %s", state->zone_name); - return (result); + return result; } loginfo("dlz_example: configured writeable zone %s", state->zone_name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -752,10 +752,10 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, if (strncmp(name, "deny.", 5) == 0) { loginfo("dlz_example: denying update of name=%s by %s", name, signer); - return (false); + return false; } loginfo("dlz_example: allowing update of name=%s by %s", name, signer); - return (true); + return true; } static isc_result_t @@ -768,7 +768,7 @@ modrdataset(struct dlz_example_data *state, const char *name, buf = strdup(rdatastr); if (buf == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -812,11 +812,11 @@ modrdataset(struct dlz_example_data *state, const char *name, result = add_name(state, list, name, type, strtoul(ttlstr, NULL, 10), data); free(buf); - return (result); + return result; error: free(buf); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_result_t @@ -825,12 +825,12 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } loginfo("dlz_example: adding rdataset %s '%s'", name, rdatastr); - return (modrdataset(state, name, rdatastr, &state->adds[0])); + return modrdataset(state, name, rdatastr, &state->adds[0]); } isc_result_t @@ -839,12 +839,12 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } loginfo("dlz_example: subtracting rdataset %s '%s'", name, rdatastr); - return (modrdataset(state, name, rdatastr, &state->deletes[0])); + return modrdataset(state, name, rdatastr, &state->deletes[0]); } isc_result_t @@ -853,10 +853,10 @@ dlz_delrdataset(const char *name, const char *type, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } loginfo("dlz_example: deleting rdataset %s of type %s", name, type); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c index 7fe469b8b0..99f5c7531d 100644 --- a/bin/tests/system/dyndb/driver/db.c +++ b/bin/tests/system/dyndb/driver/db.c @@ -102,7 +102,7 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_newversion(sampledb->db, versionp)); + return dns_db_newversion(sampledb->db, versionp); } static void @@ -132,8 +132,8 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findnode(sampledb->db, name, create, - nodep DNS__DB_FLARG_PASS)); + return dns__db_findnode(sampledb->db, name, create, + nodep DNS__DB_FLARG_PASS); } static isc_result_t @@ -145,9 +145,9 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_find(sampledb->db, name, version, type, options, now, - nodep, foundname, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return dns__db_find(sampledb->db, name, version, type, options, now, + nodep, foundname, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } static isc_result_t @@ -159,9 +159,9 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findzonecut(sampledb->db, name, options, now, nodep, - foundname, dcname, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return dns__db_findzonecut(sampledb->db, name, options, now, nodep, + foundname, dcname, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } static void @@ -190,7 +190,7 @@ createiterator(dns_db_t *db, unsigned int options, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_createiterator(sampledb->db, options, iteratorp)); + return dns_db_createiterator(sampledb->db, options, iteratorp); } static isc_result_t @@ -202,9 +202,9 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findrdataset(sampledb->db, node, version, type, covers, - now, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return dns__db_findrdataset(sampledb->db, node, version, type, covers, + now, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } static isc_result_t @@ -215,8 +215,8 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_allrdatasets(sampledb->db, node, version, options, now, - iteratorp DNS__DB_FLARG_PASS)); + return dns__db_allrdatasets(sampledb->db, node, version, options, now, + iteratorp DNS__DB_FLARG_PASS); } static isc_result_t @@ -242,7 +242,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } cleanup: - return (result); + return result; } static isc_result_t @@ -273,7 +273,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } cleanup: - return (result); + return result; } /* @@ -287,8 +287,8 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_deleterdataset(sampledb->db, node, version, type, - covers DNS__DB_FLARG_PASS)); + return dns__db_deleterdataset(sampledb->db, node, version, type, + covers DNS__DB_FLARG_PASS); } static bool @@ -297,7 +297,7 @@ issecure(dns_db_t *db) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_issecure(sampledb->db)); + return dns_db_issecure(sampledb->db); } static unsigned int @@ -306,7 +306,7 @@ nodecount(dns_db_t *db, dns_dbtree_t tree) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_nodecount(sampledb->db, tree)); + return dns_db_nodecount(sampledb->db, tree); } static void @@ -324,7 +324,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_getoriginnode(sampledb->db, nodep DNS__DB_FLARG_PASS)); + return dns__db_getoriginnode(sampledb->db, nodep DNS__DB_FLARG_PASS); } static isc_result_t @@ -335,8 +335,8 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_getnsec3parameters(sampledb->db, version, hash, flags, - iterations, salt, salt_length)); + return dns_db_getnsec3parameters(sampledb->db, version, hash, flags, + iterations, salt, salt_length); } static isc_result_t @@ -346,8 +346,8 @@ findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findnsec3node(sampledb->db, name, create, - nodep DNS__DB_FLARG_PASS)); + return dns__db_findnsec3node(sampledb->db, name, create, + nodep DNS__DB_FLARG_PASS); } static isc_result_t @@ -356,7 +356,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_setsigningtime(sampledb->db, rdataset, resign)); + return dns_db_setsigningtime(sampledb->db, rdataset, resign); } static isc_result_t @@ -366,7 +366,7 @@ getsigningtime(dns_db_t *db, isc_stdtime_t *resign, dns_name_t *name, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_getsigningtime(sampledb->db, resign, name, type)); + return dns_db_getsigningtime(sampledb->db, resign, name, type); } static dns_stats_t * @@ -375,7 +375,7 @@ getrrsetstats(dns_db_t *db) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_getrrsetstats(sampledb->db)); + return dns_db_getrrsetstats(sampledb->db); } static isc_result_t @@ -386,8 +386,8 @@ findnodeext(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findnodeext(sampledb->db, name, create, methods, - clientinfo, nodep DNS__DB_FLARG_PASS)); + return dns__db_findnodeext(sampledb->db, name, create, methods, + clientinfo, nodep DNS__DB_FLARG_PASS); } static isc_result_t @@ -400,9 +400,9 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns__db_findext(sampledb->db, name, version, type, options, now, - nodep, foundname, methods, clientinfo, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return dns__db_findext(sampledb->db, name, version, type, options, now, + nodep, foundname, methods, clientinfo, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } static isc_result_t @@ -411,7 +411,7 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_setcachestats(sampledb->db, stats)); + return dns_db_setcachestats(sampledb->db, stats); } static isc_result_t @@ -420,7 +420,7 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { REQUIRE(VALID_SAMPLEDB(sampledb)); - return (dns_db_nodefullname(sampledb->db, node, name)); + return dns_db_nodefullname(sampledb->db, node, name); } /* @@ -496,7 +496,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -534,7 +534,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -570,7 +570,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /* @@ -630,7 +630,7 @@ create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, *dbp = (dns_db_t *)sampledb; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (dns_name_dynamic(&sampledb->common.origin)) { @@ -640,5 +640,5 @@ cleanup: isc_mem_putanddetach(&sampledb->common.mctx, sampledb, sizeof(*sampledb)); - return (result); + return result; } diff --git a/bin/tests/system/dyndb/driver/driver.c b/bin/tests/system/dyndb/driver/driver.c index 33702bd9e8..dd81ecdb56 100644 --- a/bin/tests/system/dyndb/driver/driver.c +++ b/bin/tests/system/dyndb/driver/driver.c @@ -138,7 +138,7 @@ cleanup: isc_mem_cput(mctx, argv, argc, sizeof(*argv)); } - return (result); + return result; } /* @@ -160,5 +160,5 @@ int dyndb_version(unsigned int *flags) { UNUSED(flags); - return (DNS_DYNDB_VERSION); + return DNS_DYNDB_VERSION; } diff --git a/bin/tests/system/dyndb/driver/instance.c b/bin/tests/system/dyndb/driver/instance.c index 22a6a00697..f2ee4aa16b 100644 --- a/bin/tests/system/dyndb/driver/instance.c +++ b/bin/tests/system/dyndb/driver/instance.c @@ -99,7 +99,7 @@ parse_params(isc_mem_t *mctx, int argc, char **argv, dns_name_t *z1, result = ISC_R_SUCCESS; cleanup: - return (result); + return result; } /* @@ -152,7 +152,7 @@ cleanup: if (result != ISC_R_SUCCESS) { destroy_sample_instance(&inst); } - return (result); + return result; } /* @@ -194,7 +194,7 @@ load_sample_instance_zones(sample_instance_t *inst) { } cleanup: - return (result); + return result; } void diff --git a/bin/tests/system/dyndb/driver/syncptr.c b/bin/tests/system/dyndb/driver/syncptr.c index 6e232e2902..8822f10945 100644 --- a/bin/tests/system/dyndb/driver/syncptr.c +++ b/bin/tests/system/dyndb/driver/syncptr.c @@ -190,7 +190,7 @@ cleanup: dns_rdata_freestruct(&ipv6); } - return (result); + return result; } /* @@ -281,7 +281,7 @@ cleanup: isc_mem_put(mctx, syncptr, sizeof(*syncptr)); } - return (result); + return result; } /* @@ -312,5 +312,5 @@ syncptrs(sample_instance_t *inst, dns_name_t *name, dns_rdataset_t *rdataset, } cleanup: - return (result); + return result; } diff --git a/bin/tests/system/dyndb/driver/zone.c b/bin/tests/system/dyndb/driver/zone.c index caa615b4df..d8c702236f 100644 --- a/bin/tests/system/dyndb/driver/zone.c +++ b/bin/tests/system/dyndb/driver/zone.c @@ -100,7 +100,7 @@ create_zone(sample_instance_t *const inst, dns_name_t *const name, dns_acl_detach(&acl_any); *rawp = raw; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_name_format(name, zone_name, DNS_NAME_FORMATSIZE); @@ -116,7 +116,7 @@ cleanup: dns_acl_detach(&acl_any); } - return (result); + return result; } /* @@ -188,7 +188,7 @@ cleanup: dns_view_freeze(inst->view); } - return (result); + return result; } /* @@ -223,7 +223,7 @@ load_zone(dns_zone_t *zone) { } cleanup: - return (result); + return result; } /* @@ -253,5 +253,5 @@ activate_zone(sample_instance_t *inst, dns_zone_t *raw) { } cleanup: - return (result); + return result; } diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c index 4ea7587377..11481f3bbb 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -63,7 +63,7 @@ int main(int argc, char **argv) { if (argc != 2) { usage(); - return (1); + return 1; } if (strcmp(argv[1], "--edns-version") == 0) { @@ -72,22 +72,22 @@ main(int argc, char **argv) { #else /* ifdef DNS_EDNS_VERSION */ printf("0\n"); #endif /* ifdef DNS_EDNS_VERSION */ - return (0); + return 0; } if (strcmp(argv[1], "--enable-dnstap") == 0) { #ifdef HAVE_DNSTAP - return (0); + return 0; #else /* ifdef HAVE_DNSTAP */ - return (1); + return 1; #endif /* ifdef HAVE_DNSTAP */ } if (strcmp(argv[1], "--enable-querytrace") == 0) { #ifdef WANT_QUERYTRACE - return (0); + return 0; #else /* ifdef WANT_QUERYTRACE */ - return (1); + return 1; #endif /* ifdef WANT_QUERYTRACE */ } @@ -97,9 +97,9 @@ main(int argc, char **argv) { if (fips != NULL) { OSSL_PROVIDER_unload(fips); } - return (fips != NULL ? 0 : 1); + return fips != NULL ? 0 : 1; #else - return (1); + return 1; #endif } @@ -110,89 +110,89 @@ main(int argc, char **argv) { n = gethostname(hostname, sizeof(hostname)); if (n == -1) { perror("gethostname"); - return (1); + return 1; } fprintf(stdout, "%s\n", hostname); - return (0); + return 0; } if (strcmp(argv[1], "--gssapi") == 0) { #if HAVE_GSSAPI - return (0); + return 0; #else /* HAVE_GSSAPI */ - return (1); + return 1; #endif /* HAVE_GSSAPI */ } if (strcmp(argv[1], "--have-fips-dh") == 0) { #if defined(ENABLE_FIPS_MODE) #if OPENSSL_VERSION_NUMBER >= 0x30000000L - return (0); + return 0; #else - return (1); + return 1; #endif #else if (isc_fips_mode()) { #if OPENSSL_VERSION_NUMBER >= 0x30000000L - return (0); + return 0; #else - return (1); + return 1; #endif } - return (0); + return 0; #endif } if (strcmp(argv[1], "--have-fips-mode") == 0) { #if defined(ENABLE_FIPS_MODE) - return (0); + return 0; #else - return (isc_fips_mode() ? 0 : 1); + return isc_fips_mode() ? 0 : 1; #endif } if (strcmp(argv[1], "--have-geoip2") == 0) { #ifdef HAVE_GEOIP2 - return (0); + return 0; #else /* ifdef HAVE_GEOIP2 */ - return (1); + return 1; #endif /* ifdef HAVE_GEOIP2 */ } if (strcmp(argv[1], "--have-json-c") == 0) { #ifdef HAVE_JSON_C - return (0); + return 0; #else /* ifdef HAVE_JSON_C */ - return (1); + return 1; #endif /* ifdef HAVE_JSON_C */ } if (strcmp(argv[1], "--have-libxml2") == 0) { #ifdef HAVE_LIBXML2 - return (0); + return 0; #else /* ifdef HAVE_LIBXML2 */ - return (1); + return 1; #endif /* ifdef HAVE_LIBXML2 */ } if (strcmp(argv[1], "--tsan") == 0) { #if defined(__has_feature) #if __has_feature(thread_sanitizer) - return (0); + return 0; #endif #endif #if __SANITIZE_THREAD__ - return (0); + return 0; #else - return (1); + return 1; #endif } if (strcmp(argv[1], "--md5") == 0) { if (!dst_algorithm_supported(DST_ALG_HMACMD5)) { - return (1); + return 1; } - return (0); + return 0; } if (strcmp(argv[1], "--ipv6only=no") == 0) { @@ -208,61 +208,61 @@ main(int argc, char **argv) { (void *)&v6only, &len); close(s); } - return ((n == 0 && v6only == 0) ? 0 : 1); + return (n == 0 && v6only == 0) ? 0 : 1; #else /* defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) */ - return (1); + return 1; #endif /* defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) */ } if (strcasecmp(argv[1], "--rsasha1") == 0) { if (!dst_algorithm_supported(DST_ALG_RSASHA1)) { - return (1); + return 1; } - return (0); + return 0; } if (strcmp(argv[1], "--with-dlz-filesystem") == 0) { #ifdef DLZ_FILESYSTEM - return (0); + return 0; #else /* ifdef DLZ_FILESYSTEM */ - return (1); + return 1; #endif /* ifdef DLZ_FILESYSTEM */ } if (strcmp(argv[1], "--with-libidn2") == 0) { #ifdef HAVE_LIBIDN2 - return (0); + return 0; #else /* ifdef HAVE_LIBIDN2 */ - return (1); + return 1; #endif /* ifdef HAVE_LIBIDN2 */ } if (strcmp(argv[1], "--with-lmdb") == 0) { #ifdef HAVE_LMDB - return (0); + return 0; #else /* ifdef HAVE_LMDB */ - return (1); + return 1; #endif /* ifdef HAVE_LMDB */ } if (strcmp(argv[1], "--with-libnghttp2") == 0) { #ifdef HAVE_LIBNGHTTP2 - return (0); + return 0; #else /* ifdef HAVE_LIBNGHTTP2 */ - return (1); + return 1; #endif /* ifdef HAVE_LIBNGHTTP2 */ } if (strcmp(argv[1], "--with-zlib") == 0) { #ifdef HAVE_ZLIB - return (0); + return 0; #else /* ifdef HAVE_ZLIB */ - return (1); + return 1; #endif /* ifdef HAVE_ZLIB */ } fprintf(stderr, "unknown arg: %s\n", argv[1]); usage(); - return (1); + return 1; } diff --git a/bin/tests/system/hooks/driver/test-async.c b/bin/tests/system/hooks/driver/test-async.c index c77d5f7a3a..d6b9faa25e 100644 --- a/bin/tests/system/hooks/driver/test-async.c +++ b/bin/tests/system/hooks/driver/test-async.c @@ -150,7 +150,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file, *instp = inst; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -163,7 +163,7 @@ plugin_check(const char *parameters, const void *cfg, const char *cfg_file, UNUSED(mctx); UNUSED(actx); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -190,7 +190,7 @@ plugin_destroy(void **instp) { */ int plugin_version(void) { - return (NS_PLUGIN_VERSION); + return NS_PLUGIN_VERSION; } static state_t * @@ -203,7 +203,7 @@ client_state_get(const query_ctx_t *qctx, async_instance_t *inst) { sizeof(qctx->client), (void **)&state); UNLOCK(&inst->hlock); - return (result == ISC_R_SUCCESS ? state : NULL); + return result == ISC_R_SUCCESS ? state : NULL; } static void @@ -253,7 +253,7 @@ async_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) { client_state_create(qctx, inst); } - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } static void @@ -299,7 +299,7 @@ doasync(query_ctx_t *qctx, isc_mem_t *mctx, void *arg, isc_loop_t *loop, isc_async_run(loop, cb, rev); *ctxp = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static ns_hookresult_t @@ -316,7 +316,7 @@ async_query_done_begin(void *arg, void *cbdata, isc_result_t *resp) { if (state->async) { /* resuming */ state->async = false; - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } /* initial call */ @@ -324,7 +324,7 @@ async_query_done_begin(void *arg, void *cbdata, isc_result_t *resp) { state->hookpoint = NS_QUERY_DONE_BEGIN; state->origresult = *resp; ns_query_hookasync(qctx, doasync, state); - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } static ns_hookresult_t @@ -336,10 +336,10 @@ async_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp) { *resp = ISC_R_UNSET; if (!qctx->detach_client) { - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } client_state_destroy(qctx, inst); - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } diff --git a/bin/tests/system/makejournal.c b/bin/tests/system/makejournal.c index a1bc055a2f..1cbe75b699 100644 --- a/bin/tests/system/makejournal.c +++ b/bin/tests/system/makejournal.c @@ -40,20 +40,20 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) { result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_create(mctx, ZONEDB_DEFAULT, name, dns_dbtype_zone, dns_rdataclass_in, 0, NULL, db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_load(*db, filename, dns_masterformat_text, 0); if (result == DNS_R_SEENINCLUDE) { result = ISC_R_SUCCESS; } - return (result); + return result; } int @@ -65,7 +65,7 @@ main(int argc, char **argv) { if (argc != 5) { printf("usage: %s origin file1 file2 journal\n", argv[0]); - return (1); + return 1; } origin = argv[1]; @@ -112,5 +112,5 @@ cleanup: isc_mem_destroy(&mctx); } - return (result != ISC_R_SUCCESS ? 1 : 0); + return result != ISC_R_SUCCESS ? 1 : 0; } diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 31ce067a91..617890f9d5 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -130,7 +130,7 @@ sendquery(void) { c = scanf("%255s", host); if (c == EOF) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } onfly++; @@ -166,7 +166,7 @@ sendquery(void) { isc_loop_main(loopmgr), recvresponse, message, &request); CHECK("dns_request_create", result); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -290,5 +290,5 @@ main(int argc, char *argv[]) { isc_managers_destroy(&mctx, &loopmgr, &netmgr); - return (0); + return 0; } diff --git a/bin/tests/system/rndc/gencheck.c b/bin/tests/system/rndc/gencheck.c index ec54f1a7b1..61b885d8b2 100644 --- a/bin/tests/system/rndc/gencheck.c +++ b/bin/tests/system/rndc/gencheck.c @@ -32,11 +32,11 @@ check(const char *buf, ssize_t count, size_t *start) { continue; } if (buf[i] != chars[*start]) { - return (0); + return 0; } } - return (1); + return 1; } int @@ -84,5 +84,5 @@ out: close(fd); } - return (ret); + return ret; } diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 19dd16aaff..a8d4241c2a 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -138,7 +138,7 @@ main(int argc, char **argv) { dst_key_free(&key); isc_mem_destroy(&mctx); - return (0); + return 0; } /*! \file */ diff --git a/bin/tests/test_client.c b/bin/tests/test_client.c index b570e5ff2c..2787b3d990 100644 --- a/bin/tests/test_client.c +++ b/bin/tests/test_client.c @@ -74,12 +74,12 @@ parse_port(const char *input) { long val = strtol(input, &endptr, 10); if ((*endptr != '\0') || (val <= 0) || (val >= 65536)) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } port = input; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -87,11 +87,11 @@ parse_protocol(const char *input) { for (size_t i = 0; i < ARRAY_SIZE(protocols); i++) { if (!strcasecmp(input, protocols[i])) { protocol = i; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } static isc_result_t @@ -102,16 +102,16 @@ parse_address(const char *input) { if (inet_pton(AF_INET6, input, &in6) == 1) { family = AF_INET6; address = input; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (inet_pton(AF_INET, input, &in) == 1) { family = AF_INET; address = input; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_BADADDRESSFORM); + return ISC_R_BADADDRESSFORM; } static int @@ -120,12 +120,12 @@ parse_workers(const char *input) { long val = strtol(input, &endptr, 10); if ((*endptr != '\0') || (val <= 0) || (val >= 128)) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } workers = val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -134,12 +134,12 @@ parse_timeout(const char *input) { long val = strtol(input, &endptr, 10); if ((*endptr != '\0') || (val <= 0) || (val >= 120)) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } timeout = (in_port_t)val * 1000; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -157,7 +157,7 @@ parse_input(const char *input) { close(in); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -170,7 +170,7 @@ parse_output(const char *input) { } RUNTIME_CHECK(out >= 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -428,5 +428,5 @@ main(int argc, char **argv) { teardown(); - return (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/bin/tests/test_server.c b/bin/tests/test_server.c index 124074e51a..beb723a65c 100644 --- a/bin/tests/test_server.c +++ b/bin/tests/test_server.c @@ -56,12 +56,12 @@ parse_port(const char *input) { long val = strtol(input, &endptr, 10); if ((*endptr != '\0') || (val <= 0) || (val >= 65536)) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } port = (in_port_t)val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -69,11 +69,11 @@ parse_protocol(const char *input) { for (size_t i = 0; i < ARRAY_SIZE(protocols); i++) { if (!strcasecmp(input, protocols[i])) { protocol = i; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } static isc_result_t @@ -83,15 +83,15 @@ parse_address(const char *input) { if (inet_pton(AF_INET6, input, &in6) == 1) { isc_netaddr_fromin6(&netaddr, &in6); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (inet_pton(AF_INET, input, &in) == 1) { isc_netaddr_fromin(&netaddr, &in); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_BADADDRESSFORM); + return ISC_R_BADADDRESSFORM; } static int @@ -100,12 +100,12 @@ parse_workers(const char *input) { long val = strtol(input, &endptr, 10); if ((*endptr != '\0') || (val <= 0) || (val >= 128)) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } workers = val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -234,7 +234,7 @@ accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { REQUIRE(eresult == ISC_R_SUCCESS); UNUSED(cbarg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -303,5 +303,5 @@ main(int argc, char **argv) { teardown(); - return (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index e2e6b43221..0b1a867a14 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -48,11 +48,11 @@ CHECKRESULT(isc_result_t result, const char *msg) { static int fromhex(char c) { if (c >= '0' && c <= '9') { - return (c - '0'); + return c - '0'; } else if (c >= 'a' && c <= 'f') { - return (c - 'a' + 10); + return c - 'a' + 10; } else if (c >= 'A' && c <= 'F') { - return (c - 'A' + 10); + return c - 'A' + 10; } fprintf(stderr, "bad input format: %02x\n", c); @@ -97,7 +97,7 @@ printmessage(dns_message_t *msg) { isc_mem_put(mctx, buf, len); } - return (result); + return result; } int @@ -260,7 +260,7 @@ main(int argc, char *argv[]) { } isc_mem_destroy(&mctx); - return (0); + return 0; } static void diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c index 4ccf5f9c53..5428c97672 100644 --- a/bin/tools/arpaname.c +++ b/bin/tools/arpaname.c @@ -40,8 +40,8 @@ main(int argc, char *argv[]) { argv++; continue; } - return (1); + return 1; } fflush(stdout); - return (ferror(stdout)); + return ferror(stdout); } diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 1587600585..c9270fba25 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -183,7 +183,7 @@ rcode_totext(dns_rcode_t rcode) { } else { totext.consttext = rcodetext[rcode]; } - return (totext.deconsttext); + return totext.deconsttext; } static void @@ -756,7 +756,7 @@ sendquery(struct query *query) { message, &request); CHECK("dns_request_create", result); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -910,20 +910,20 @@ parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, if (result != ISC_R_SUCCESS) { printf("invalid %s '%s': %s\n", desc, value, isc_result_totext(result)); - return (result); + return result; } *uip = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { - return (parse_uint_helper(uip, value, max, desc, 10)); + return parse_uint_helper(uip, value, max, desc, 10); } static isc_result_t parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { - return (parse_uint_helper(uip, value, max, desc, 0)); + return parse_uint_helper(uip, value, max, desc, 0); } static void @@ -1041,7 +1041,7 @@ parse_netprefix(isc_sockaddr_t **sap, const char *value) { sa->length = netmask; *sap = sa; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -1051,11 +1051,11 @@ parse_netprefix(isc_sockaddr_t **sap, const char *value) { static isc_result_t append(const char *text, int len, char **p, char *end) { if (len > end - *p) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(*p, text, len); *p += len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1072,7 +1072,7 @@ reverse_octets(const char *in, char **p, char *end) { } else { len = strlen(in); } - return (append(in, len, p, end)); + return append(in, len, p, end); } static void @@ -1675,7 +1675,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, } else { fatal("can't find IPv4 networking"); UNREACHABLE(); - return (false); + return false; } break; case '6': @@ -1686,7 +1686,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, } else { fatal("can't find IPv6 networking"); UNREACHABLE(); - return (false); + return false; } break; case 'h': @@ -1708,7 +1708,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, if (strlen(option) > 1U) { option = &option[1]; } else { - return (false); + return false; } } opt = option[0]; @@ -1751,7 +1751,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, *hash = '#'; } have_src = true; - return (value_from_next); + return value_from_next; case 'c': tr.base = value; tr.length = strlen(value); @@ -1759,16 +1759,16 @@ dash_option(const char *option, char *next, struct query *query, bool global, (isc_textregion_t *)&tr); CHECK("dns_rdataclass_fromtext", result); query->rdclass = rdclass; - return (value_from_next); + return value_from_next; case 'f': batchname = value; - return (value_from_next); + return value_from_next; case 'p': GLOBAL(); result = parse_uint(&num, value, MAXPORT, "port number"); CHECK("parse_uint(port)", result); port = num; - return (value_from_next); + return value_from_next; case 't': tr.base = value; tr.length = strlen(value); @@ -1776,14 +1776,14 @@ dash_option(const char *option, char *next, struct query *query, bool global, (isc_textregion_t *)&tr); CHECK("dns_rdatatype_fromtext", result); query->rdtype = rdtype; - return (value_from_next); + return value_from_next; case 'x': get_reverse(textname, sizeof(textname), value); strlcpy(query->textname, textname, sizeof(query->textname)); query->rdtype = dns_rdatatype_ptr; query->rdclass = dns_rdataclass_in; *setname = true; - return (value_from_next); + return value_from_next; global_option: fprintf(stderr, "Ignored late global option: -%s\n", option); usage(); @@ -1793,7 +1793,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, usage(); } UNREACHABLE(); - return (false); + return false; } static struct query * @@ -1813,7 +1813,7 @@ clone_default_query(void) { query->timeout = tcp_mode ? TCPTIMEOUT : UDPTIMEOUT; } - return (query); + return query; } /*% @@ -2213,5 +2213,5 @@ main(int argc, char *argv[]) { } isc_managers_destroy(&mctx, &loopmgr, &netmgr); - return (0); + return 0; } diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c index 3eebb27ed0..f5eb1e2368 100644 --- a/bin/tools/named-journalprint.c +++ b/bin/tools/named-journalprint.c @@ -110,5 +110,5 @@ main(int argc, char **argv) { } } isc_mem_detach(&mctx); - return (result != ISC_R_SUCCESS ? 1 : 0); + return result != ISC_R_SUCCESS ? 1 : 0; } diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c index 5c2959a1e3..42be33f7fc 100644 --- a/bin/tools/named-nzd2nzf.c +++ b/bin/tools/named-nzd2nzf.c @@ -97,5 +97,5 @@ main(int argc, char *argv[]) { mdb_txn_abort(txn); mdb_env_close(env); - return (0); + return 0; } diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index d06e4aee2f..c53d2ba1f8 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -343,5 +343,5 @@ main(int argc, char *argv[]) { } cleanup(); - return (0); + return 0; } diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index 88a47b5acb..dbba2d91b4 100644 --- a/bin/tools/nsec3hash.c +++ b/bin/tools/nsec3hash.c @@ -191,5 +191,5 @@ skip: nsec3hash(nsec3hash_print, argv[1], NULL, argv[2], argv[0], argv[3]); } - return (0); + return 0; } diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c index 4e3af35a93..132ea911e0 100644 --- a/contrib/dlz/example/dlz_example.c +++ b/contrib/dlz/example/dlz_example.c @@ -71,10 +71,10 @@ single_valued(const char *type) { for (i = 0; single[i]; i++) { if (strcasecmp(single[i], type) == 0) { - return (true); + return true; } } - return (false); + return false; } /* @@ -110,14 +110,14 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, state->log(ISC_LOG_ERROR, "dlz_example: out of record " "space"); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (strlen(name) >= sizeof(list[i].name) || strlen(type) >= sizeof(list[i].type) || strlen(data) >= sizeof(list[i].data)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strncpy(list[i].name, name, sizeof(list[i].name)); @@ -131,7 +131,7 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, list[i].ttl = ttl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -153,10 +153,10 @@ del_name(struct dlz_example_data *state, struct record *list, const char *name, } } if (i == MAX_RECORDS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } memset(&list[i], 0, sizeof(struct record)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -177,15 +177,15 @@ fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { sizeof(addr_buf)); break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (ret == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } snprintf(buffer, size, "%s#%u", addr_buf, port); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -194,7 +194,7 @@ fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { int dlz_version(unsigned int *flags) { UNUSED(flags); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* @@ -235,7 +235,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, state = calloc(1, sizeof(struct dlz_example_data)); if (state == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* Fill in the helper functions */ @@ -251,14 +251,14 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, "a zone name"); } dlz_destroy(state); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* Ensure zone name is absolute */ state->zone_name = malloc(strlen(argv[1]) + 2); if (state->zone_name == NULL) { free(state); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (argv[1][strlen(argv[1]) - 1] == '.') { strcpy(state->zone_name, argv[1]); @@ -295,11 +295,11 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, } *dbdata = state; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: free(state); - return (result); + return result; } /* @@ -352,7 +352,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * this; it will move onto the next database after a single query. */ if (strcasecmp(name, "test.example.com") == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -362,19 +362,19 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, if (strcasecmp(name, "test.example.net") == 0 && strncmp(addrbuf, "10.53.0.1", 9) == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (strcasecmp(state->zone_name, name) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } snprintf(absolute, sizeof(absolute), "%s.", name); if (strcasecmp(state->zone_name, absolute) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -403,7 +403,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, UNUSED(zone); if (state->putrr == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (strcmp(name, "@") == 0) { @@ -469,7 +469,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, snprintf(buf, sizeof(buf), "%s.redirect.example.", ecsbuf); result = state->putrr(lookup, "CNAME", 0, buf); */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -481,7 +481,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, found = true; result = state->putrr(lookup, "TXT", 0, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -492,16 +492,16 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, state->current[i].ttl, state->current[i].data); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } if (!found) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -512,7 +512,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { UNUSED(client); /* Just say yes for all our zones */ - return (dlz_findzonedb(dbdata, name, NULL, NULL)); + return dlz_findzonedb(dbdata, name, NULL, NULL); } /* @@ -526,7 +526,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { UNUSED(zone); if (state->putnamedrr == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } for (i = 0; i < MAX_RECORDS; i++) { @@ -539,11 +539,11 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { state->current[i].ttl, state->current[i].data); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -560,13 +560,13 @@ dlz_newversion(const char *zone, void *dbdata, void **versionp) { "started for zone %s", zone); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } state->transaction_started = true; *versionp = (void *)&state->transaction_started; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -647,7 +647,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { "writeable_zone method " "available"); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = state->writeable_zone(view, dlzdb, state->zone_name); @@ -658,7 +658,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { "configure zone %s", state->zone_name); } - return (result); + return result; } if (state->log != NULL) { @@ -667,7 +667,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { "zone %s", state->zone_name); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -692,7 +692,7 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, "of name=%s by %s", name, signer); } - return (false); + return false; } if (state->log != NULL) { state->log(ISC_LOG_INFO, @@ -700,7 +700,7 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, "name=%s by %s", name, signer); } - return (true); + return true; } static isc_result_t @@ -713,7 +713,7 @@ modrdataset(struct dlz_example_data *state, const char *name, buf = strdup(rdatastr); if (buf == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -757,11 +757,11 @@ modrdataset(struct dlz_example_data *state, const char *name, result = add_name(state, list, name, type, strtoul(ttlstr, NULL, 10), data); free(buf); - return (result); + return result; error: free(buf); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_result_t @@ -770,7 +770,7 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (state->log != NULL) { @@ -778,7 +778,7 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, name, rdatastr); } - return (modrdataset(state, name, rdatastr, &state->adds[0])); + return modrdataset(state, name, rdatastr, &state->adds[0]); } isc_result_t @@ -787,7 +787,7 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (state->log != NULL) { @@ -797,7 +797,7 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, name, rdatastr); } - return (modrdataset(state, name, rdatastr, &state->deletes[0])); + return modrdataset(state, name, rdatastr, &state->deletes[0]); } isc_result_t @@ -806,7 +806,7 @@ dlz_delrdataset(const char *name, const char *type, void *dbdata, struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (state->log != NULL) { @@ -816,5 +816,5 @@ dlz_delrdataset(const char *name, const char *type, void *dbdata, name, type); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c index e84f866136..e7d8e93041 100644 --- a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c +++ b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c @@ -92,14 +92,14 @@ bdbhpt_strrev(char *str) { char *p1, *p2; if (!str || !*str) { - return (str); + return str; } for (p1 = str, p2 = str + strlen(str) - 1; p2 > p1; ++p1, --p2) { *p1 ^= *p2; *p2 ^= *p1; *p1 ^= *p2; } - return (str); + return str; } /*% @@ -144,11 +144,11 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { tmp = strchr(tmp, ' '); /* verify we found a space */ if (tmp == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* make sure it is safe to increment pointer */ if (++tmp > lastchar) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* save pointer to host */ @@ -158,13 +158,13 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { tmp = strchr(tmp, ' '); /* verify we found a space */ if (tmp == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* change the space to a null (string terminator) */ tmp[0] = '\0'; /* make sure it is safe to increment pointer */ if (++tmp > lastchar) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* save pointer to ttl string */ @@ -174,13 +174,13 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { tmp = strchr(tmp, ' '); /* verify we found a space */ if (tmp == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* change the space to a null (string terminator) */ tmp[0] = '\0'; /* make sure it is safe to increment pointer */ if (++tmp > lastchar) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* save pointer to dns type */ @@ -190,13 +190,13 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { tmp = strchr(tmp, ' '); /* verify we found a space */ if (tmp == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* change the space to a null (string terminator) */ tmp[0] = '\0'; /* make sure it is safe to increment pointer */ if (++tmp > lastchar) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* save pointer to remainder of DNS data */ @@ -207,11 +207,11 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { if (*endp != '\0' || pd->ttl < 0) { log(ISC_LOG_ERROR, "bdbhpt_dynamic: " "ttl must be a positive number"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* if we get this far everything should have worked. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -230,7 +230,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { result = dlz_findzonedb(dbdata, name); #endif /* if DLZ_DLOPEN_VERSION >= 3 */ if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } memset(&key, 0, sizeof(DBT)); @@ -273,7 +273,7 @@ xfr_cleanup: free(data.data); } - return (result); + return result; } /*% @@ -323,7 +323,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { xfr_key.data = tmp_zone = strdup(zone); if (xfr_key.data == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } xfr_key.size = strlen(xfr_key.data); @@ -426,7 +426,7 @@ allnodes_cleanup: dns_cursor->c_close(dns_cursor); } - return (result); + return result; } /*% @@ -484,7 +484,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, key.data = strdup(name); if (key.data == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* @@ -516,7 +516,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, free(data.data); } - return (result); + return result; } /* @@ -559,7 +559,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, key.data = keyStr = malloc((key.size + 1) * sizeof(char)); if (keyStr == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } strcpy(keyStr, zone); @@ -608,7 +608,7 @@ lookup_cleanup: free(tmp); } - return (result); + return result; } /*% @@ -625,7 +625,7 @@ bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, "bdbhpt_dynamic: could not initialize %s database. " "BerkeleyDB error: %s", db_name, db_strerror(result)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* set database flags. */ @@ -634,7 +634,7 @@ bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, "bdbhpt_dynamic: could not set flags for %s database. " "BerkeleyDB error: %s", db_name, db_strerror(result)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* open the database. */ @@ -645,10 +645,10 @@ bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, "bdbhpt_dynamic: could not open %s database in %s. " "BerkeleyDB error: %s", db_name, db_file, db_strerror(result)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -670,7 +670,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* Allocate memory for our db structures and helper functions */ db = calloc(1, sizeof(struct bdbhpt_instance)); if (db == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* Fill in the helper functions */ @@ -686,7 +686,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, "bdbhpt_dynamic: please supply 3 command line args. " "You supplied: %s", argc); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } switch ((char)*argv[1]) { @@ -726,7 +726,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, "operating mode must be set to P or C or T. " "You specified '%s'", argv[1]); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -788,11 +788,11 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, db->log(ISC_LOG_INFO, "bdbhpt_dynamic: version %s, started", dlz_bdbhpt_dynamic_version); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; init_cleanup: bdbhpt_cleanup(db); - return (result); + return result; } /* @@ -814,7 +814,7 @@ dlz_destroy(void *dbdata) { int dlz_version(unsigned int *flags) { UNUSED(flags); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* diff --git a/contrib/dlz/modules/common/dlz_dbi.c b/contrib/dlz/modules/common/dlz_dbi.c index d8e1909c44..a817aea6fd 100644 --- a/contrib/dlz/modules/common/dlz_dbi.c +++ b/contrib/dlz/modules/common/dlz_dbi.c @@ -95,10 +95,10 @@ build_querylist(const char *query_str, char **zone, char **record, if (query_str == NULL || strlen(query_str) < 1) { if ((flags & REQUIRE_QUERY) == 0) { /* we don't need it were ok. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { /* we did need it, PROBLEM!!! */ - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -106,7 +106,7 @@ build_querylist(const char *query_str, char **zone, char **record, tql = calloc(1, sizeof(query_list_t)); /* couldn't allocate memory. Problem!! */ if (tql == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* initialize the query segment list */ @@ -236,7 +236,7 @@ build_querylist(const char *query_str, char **zone, char **record, *querylist = (query_list_t *)tql; /* return success */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: /* get rid of temp_str */ @@ -247,7 +247,7 @@ cleanup: flag_fail: /* get rid of what was build of the query list */ destroy_querylist(&tql); - return (result); + return result; } /*% @@ -279,7 +279,7 @@ build_querystring(query_list_t *querylist) { qs = malloc(length + 1); if (qs == NULL) { - return (NULL); + return NULL; } *qs = '\0'; @@ -297,7 +297,7 @@ build_querystring(query_list_t *querylist) { tseg = DLZ_LIST_NEXT(tseg, link); } - return (qs); + return qs; } /*% constructs a dbinstance (DBI) */ @@ -317,7 +317,7 @@ build_dbinstance(const char *allnodes_str, const char *allowxfr_str, log(ISC_LOG_ERROR, "Could not allocate memory for " "database instance object."); } - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(db, 0, sizeof(dbinstance_t)); db->dbconn = NULL; @@ -423,13 +423,13 @@ build_dbinstance(const char *allnodes_str, const char *allowxfr_str, *dbi = (dbinstance_t *)db; /* return success */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: /* destroy whatever was build of the db instance */ destroy_dbinstance(db); /* return failure */ - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } void @@ -457,19 +457,19 @@ get_parameter_value(const char *input, const char *key) { int i; if (key == NULL || input == NULL || *input == '\0') { - return (NULL); + return NULL; } keylen = strlen(key); if (keylen < 1) { - return (NULL); + return NULL; } keystart = strstr(input, key); if (keystart == NULL) { - return (NULL); + return NULL; } for (i = 0; i < 255; i++) { @@ -480,5 +480,5 @@ get_parameter_value(const char *input, const char *key) { } } - return (strdup(value)); + return strdup(value); } diff --git a/contrib/dlz/modules/filesystem/dir.c b/contrib/dlz/modules/filesystem/dir.c index f2b3a4e578..1bc0f61adb 100644 --- a/contrib/dlz/modules/filesystem/dir.c +++ b/contrib/dlz/modules/filesystem/dir.c @@ -32,7 +32,7 @@ dir_open(dir_t *dir, const char *dirname) { isc_result_t result = ISC_R_SUCCESS; if (strlen(dirname) + 3 > sizeof(dir->dirname)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strcpy(dir->dirname, dirname); @@ -69,7 +69,7 @@ dir_open(dir_t *dir, const char *dirname) { } } - return (result); + return result; } /*! @@ -85,17 +85,17 @@ dir_read(dir_t *dir) { entry = readdir(dir->handle); if (entry == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (sizeof(dir->entry.name) <= strlen(entry->d_name)) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } strcpy(dir->entry.name, entry->d_name); dir->entry.length = strlen(entry->d_name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*! @@ -114,5 +114,5 @@ isc_result_t dir_reset(dir_t *dir) { rewinddir(dir->handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index 3b8a8bbc68..f255a9d151 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -89,15 +89,15 @@ is_safe(const char *input) { if (input[i] == '.') { /* '.' is not allowed as first char */ if (i == 0) { - return (false); + return false; } /* '..', two dots together is not allowed. */ if (input[i - 1] == '.') { - return (false); + return false; } /* '.' is not allowed as last char */ if (i == len - 1) { - return (false); + return false; } /* only 1 dot in ok location, continue at next char */ continue; @@ -140,10 +140,10 @@ is_safe(const char *input) { * if we reach this point we have encountered a * disallowed char! */ - return (false); + return false; } /* everything ok. */ - return (true); + return true; } static isc_result_t @@ -154,7 +154,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { tmpString = strdup(in); if (tmpString == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* @@ -204,7 +204,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { } free(tmpString); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -229,17 +229,17 @@ create_path(const char *zone, const char *host, const char *client, /* if the requested zone is "unsafe", return error */ if (!isroot && !is_safe(zone)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* if host was passed, verify that it is safe */ if (host != NULL && !is_safe(host)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* if client was passed, verify that it is safe */ if (client != NULL && !is_safe(client)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* Determine how much memory the split up string will require */ @@ -338,7 +338,7 @@ cleanup_mem: free(tmpPath); } - return (result); + return result; } static isc_result_t @@ -477,7 +477,7 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, if (dir_list != NULL) { direntry = malloc(sizeof(dir_entry_t)); if (direntry == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } strcpy(direntry->dirpath, tmp); DLZ_LINK_INIT(direntry, link); @@ -507,7 +507,7 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, "Filesystem driver: " "%s could not be parsed properly", tmp); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* replace separator char with NULL to split string */ @@ -521,7 +521,7 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, "Filesystem driver: " "%s could not be parsed properly", tmp); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* replace separator char with NULL to split string */ @@ -557,11 +557,11 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, /* if error, return error right away */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } } /* end of while loop */ - return (result); + return result; } /* @@ -578,7 +578,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { cd = (config_data_t *)dbdata; if (create_path(name, NULL, client, cd, &path) != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (stat(path, &sb) != 0) { @@ -595,7 +595,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { complete_AXFR: free(path); - return (result); + return result; } isc_result_t @@ -706,7 +706,7 @@ complete_allnds: free(basepath); } - return (result); + return result; } #if DLZ_DLOPEN_VERSION < 3 @@ -730,7 +730,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, #endif /* if DLZ_DLOPEN_VERSION >= 3 */ if (create_path(name, NULL, NULL, cd, &path) != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } cd->log(ISC_LOG_DEBUG(1), @@ -751,7 +751,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, complete_FZ: free(path); - return (result); + return result; } #if DLZ_DLOPEN_VERSION == 1 @@ -788,7 +788,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* remove path separator at end of path so stat works properly */ @@ -828,7 +828,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, complete_lkup: free(path); - return (result); + return result; } isc_result_t @@ -931,7 +931,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, *dbdata = cd; /* return success */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; /* handle no memory error */ no_mem: @@ -950,7 +950,7 @@ free_cd: } /* return error */ - return (result); + return result; } void @@ -985,7 +985,7 @@ dlz_destroy(void *dbdata) { int dlz_version(unsigned int *flags) { UNUSED(flags); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c index ce1c50c44a..e3f2728594 100644 --- a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c +++ b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c @@ -170,7 +170,7 @@ cleanup: ldap_free_urldesc(ldap_url); } - return (result); + return result; } /*% Connects / reconnects to LDAP server */ @@ -190,7 +190,7 @@ dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { /* initialize. */ dbc->dbconn = ldap_init(dbi->hosts, LDAP_PORT); if (dbc->dbconn == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } /* set protocol version. */ @@ -210,7 +210,7 @@ dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { goto cleanup; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: @@ -220,7 +220,7 @@ cleanup: dbc->dbconn = NULL; } - return (result); + return result; } /*% @@ -275,7 +275,7 @@ dlz_ldap_find_avail_conn(ldap_instance_t *ldap) { while (count < dbc_search_limit) { /* try to lock on the mutex */ if (dlz_mutex_trylock(&dbi->lock) == 0) { - return (dbi); /* success, return the DBI for use. */ + return dbi; /* success, return the DBI for use. */ } /* not successful, keep trying */ dbi = DLZ_LIST_NEXT(dbi, link); @@ -291,7 +291,7 @@ dlz_ldap_find_avail_conn(ldap_instance_t *ldap) { "LDAP driver unable to find available connection " "after searching %d times", count); - return (NULL); + return NULL; } static isc_result_t @@ -314,7 +314,7 @@ dlz_ldap_process_results(ldap_instance_t *db, LDAP *dbc, LDAPMessage *msg, entry = ldap_first_entry(dbc, msg); if (entry == NULL) { db->log(ISC_LOG_INFO, "LDAP no entries to process."); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* loop through all entries returned */ @@ -507,7 +507,7 @@ cleanup: free(data); } - return (result); + return result; } /*% @@ -541,7 +541,7 @@ dlz_ldap_get_results(const char *zone, const char *record, const char *client, /* if DBI is null, can't do anything else */ if (dbi == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* set fields */ @@ -802,7 +802,7 @@ cleanup: } /* return result */ - return (result); + return result; } /* @@ -819,25 +819,25 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { result = dlz_findzonedb(dbdata, name, NULL, NULL); #endif /* if DLZ_DLOPEN_VERSION < 3 */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* get all the zone data */ result = dlz_ldap_get_results(name, NULL, client, ALLOWXFR, dbdata, NULL); - return (result); + return result; } isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { - return (dlz_ldap_get_results(zone, NULL, NULL, ALLNODES, dbdata, - allnodes)); + return dlz_ldap_get_results(zone, NULL, NULL, ALLNODES, dbdata, + allnodes); } isc_result_t dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { - return (dlz_ldap_get_results(zone, NULL, NULL, AUTHORITY, dbdata, - lookup)); + return dlz_ldap_get_results(zone, NULL, NULL, AUTHORITY, dbdata, + lookup); } #if DLZ_DLOPEN_VERSION < 3 @@ -853,7 +853,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, UNUSED(methods); UNUSED(clientinfo); #endif /* if DLZ_DLOPEN_VERSION >= 3 */ - return (dlz_ldap_get_results(name, NULL, NULL, FINDZONE, dbdata, NULL)); + return dlz_ldap_get_results(name, NULL, NULL, FINDZONE, dbdata, NULL); } #if DLZ_DLOPEN_VERSION == 1 @@ -881,7 +881,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, result = dlz_ldap_get_results(zone, name, NULL, LOOKUP, dbdata, lookup); } - return (result); + return result; } isc_result_t @@ -900,7 +900,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* allocate memory for LDAP instance */ ldap = calloc(1, sizeof(ldap_instance_t)); if (ldap == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(ldap, 0, sizeof(ldap_instance_t)); @@ -1131,12 +1131,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* set dbdata to the ldap_instance we created. */ *dbdata = ldap; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dlz_destroy(ldap); - return (result); + return result; } void @@ -1167,7 +1167,7 @@ dlz_destroy(void *dbdata) { int dlz_version(unsigned int *flags) { *flags |= DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE; - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c index a6e0ebfab6..3f5caad321 100644 --- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c +++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c @@ -152,7 +152,7 @@ mysql_find_avail_conn(mysql_instance_t *mysql) { while (count < dbc_search_limit) { /* try to lock on the mutex */ if (dlz_mutex_trylock(&dbi->lock) == 0) { - return (dbi); /* success, return the DBI for use. */ + return dbi; /* success, return the DBI for use. */ } /* not successful, keep trying */ dbi = DLZ_LIST_NEXT(dbi, link); @@ -168,7 +168,7 @@ mysql_find_avail_conn(mysql_instance_t *mysql) { "MySQL module unable to find available connection " "after searching %d times", count); - return (NULL); + return NULL; } /*% @@ -184,18 +184,18 @@ mysqldrv_escape_string(MYSQL *mysql, const char *instr) { unsigned int len; if (instr == NULL) { - return (NULL); + return NULL; } len = strlen(instr); outstr = malloc((2 * len * sizeof(char)) + 1); if (outstr == NULL) { - return (NULL); + return NULL; } mysql_real_escape_string(mysql, outstr, instr, len); - return (outstr); + return outstr; } /*% @@ -222,7 +222,7 @@ mysql_get_resultset(const char *zone, const char *record, const char *client, dbi = mysql_find_avail_conn(db); if (dbi == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* what type of query are we going to run? */ @@ -404,7 +404,7 @@ cleanup: free(querystring); } - return (result); + return result; } /*% @@ -456,7 +456,7 @@ mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, db->log(ISC_LOG_ERROR, "MySQL module ttl must " "be " "a positive number"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = db->putrr(lookup, safeGet(row[1]), ttl, @@ -483,7 +483,7 @@ mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, "memory for temporary " "string"); mysql_free_result(rs); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } strcpy(tmpString, safeGet(row[2])); @@ -498,7 +498,7 @@ mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, "be " "a positive number"); free(tmpString); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = db->putrr(lookup, safeGet(row[1]), ttl, @@ -510,14 +510,14 @@ mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, mysql_free_result(rs); db->log(ISC_LOG_ERROR, "putrr returned error: %d", result); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } row = mysql_fetch_row(rs); } mysql_free_result(rs); - return (result); + return result; } /* @@ -545,7 +545,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, db->log(ISC_LOG_ERROR, "MySQL module unable to return " "result set for findzone query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -555,10 +555,10 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, mysql_free_result(rs); if (rows > 0) { mysql_get_resultset(name, NULL, NULL, COUNTZONE, dbdata, NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /*% Determine if the client is allowed to perform a zone transfer */ @@ -572,7 +572,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { /* first check if the zone is supported by the database. */ result = dlz_findzonedb(dbdata, name, NULL, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -583,7 +583,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { */ result = mysql_get_resultset(name, NULL, client, ALLOWXFR, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } if (result != ISC_R_SUCCESS || rs == NULL) { @@ -592,7 +592,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { } db->log(ISC_LOG_ERROR, "MySQL module unable to return " "result set for allow xfr query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -602,10 +602,10 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { rows = mysql_num_rows(rs); mysql_free_result(rs); if (rows > 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } /*% @@ -627,7 +627,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { result = mysql_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } /* if we didn't get a result set, log an err msg. */ @@ -710,7 +710,7 @@ cleanup: mysql_free_result(rs); } - return (result); + return result; } /*% @@ -725,7 +725,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { result = mysql_get_resultset(zone, NULL, NULL, AUTHORITY, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } if (result != ISC_R_SUCCESS) { @@ -734,14 +734,14 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { } db->log(ISC_LOG_ERROR, "MySQL module unable to return " "result set for authority query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * lookup and authority result sets are processed in the same * manner: mysql_process_rs does the job for both functions. */ - return (mysql_process_rs(db, lookup, rs)); + return mysql_process_rs(db, lookup, rs); } /*% If zone is supported, lookup up a (or multiple) record(s) in it */ @@ -765,14 +765,14 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } db->log(ISC_LOG_ERROR, "MySQL module unable to return " "result set for lookup query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * lookup and authority result sets are processed in the same * manner: mysql_process_rs does the job for both functions. */ - return (mysql_process_rs(db, lookup, rs)); + return mysql_process_rs(db, lookup, rs); } /*% @@ -796,7 +796,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* allocate memory for MySQL instance */ mysql = calloc(1, sizeof(mysql_instance_t)); if (mysql == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(mysql, 0, sizeof(mysql_instance_t)); @@ -814,14 +814,14 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, if (argc < 4) { mysql->log(ISC_LOG_ERROR, "MySQL module requires " "at least 4 command line args."); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* no more than 8 arg's should be passed to the module */ if (argc > 8) { mysql->log(ISC_LOG_ERROR, "MySQL module cannot accept " "more than 7 command line args."); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* get db name - required */ @@ -1004,12 +1004,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, *dbdata = mysql; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dlz_destroy(mysql); - return (result); + return result; } /*% @@ -1048,7 +1048,7 @@ int dlz_version(unsigned int *flags) { *flags |= (DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c index bdd0bccdc6..8db3699c38 100644 --- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c @@ -259,7 +259,7 @@ db_connect(mysql_data_t *state, mysql_instance_t *dbi) { mysql_thread_init(); if (dbi->connected) { - return (true); + return true; } if (state->log != NULL) { @@ -278,11 +278,11 @@ db_connect(mysql_data_t *state, mysql_instance_t *dbi) { } dlz_mutex_unlock(&dbi->mutex); - return (false); + return false; } dbi->connected = 1; - return (true); + return true; } static mysql_instance_t * @@ -303,9 +303,9 @@ get_dbi(mysql_data_t *state) { state->log(ISC_LOG_ERROR, "%s: No available connections", modname); } - return (NULL); + return NULL; } - return (&state->db[i]); + return &state->db[i]; } /* @@ -317,7 +317,7 @@ sanitize(mysql_instance_t *dbi, const char *original) { char *s; if (original == NULL) { - return (NULL); + return NULL; } s = (char *)malloc((strlen(original) * 2) + 1); @@ -328,7 +328,7 @@ sanitize(mysql_instance_t *dbi, const char *original) { strlen(original)); } - return (s); + return s; } /* @@ -341,7 +341,7 @@ additem(mysql_arglist_t *arglist, char **s, size_t *len) { item = malloc(sizeof(*item)); if (item == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } DLZ_LINK_INIT(item, link); @@ -350,7 +350,7 @@ additem(mysql_arglist_t *arglist, char **s, size_t *len) { DLZ_LIST_APPEND(*arglist, item, link); *s = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -379,7 +379,7 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, if (dbi == NULL) { dbi = get_dbi(state); if (dbi == NULL) { - return (NULL); + return NULL; } localdbi = true; } @@ -480,22 +480,22 @@ fail: dlz_mutex_unlock(&dbi->mutex); } - return (query); + return query; } /* Does this name end in a dot? */ static bool isrelative(const char *s) { if (s == NULL || s[strlen(s) - 1] == '.') { - return (false); + return false; } - return (true); + return true; } /* Return a dot if 's' doesn't already end with one */ static const char * dot(const char *s) { - return (isrelative(s) ? "." : ""); + return isrelative(s) ? "." : ""; } /* @@ -532,7 +532,7 @@ relname(const char *name, const char *zone) { new = (char *)malloc(strlen(name) + 1); if (new == NULL) { - return (NULL); + return NULL; } nlen = strlen(name); @@ -540,10 +540,10 @@ relname(const char *name, const char *zone) { if (nlen < zlen) { strcpy(new, name); - return (new); + return new; } else if (nlen == zlen || strcasecmp(name, zone) == 0) { strcpy(new, "@"); - return (new); + return new; } p = name + nlen - zlen; @@ -551,12 +551,12 @@ relname(const char *name, const char *zone) { (zone[zlen - 1] != '.' || strncasecmp(p, zone, zlen - 1) != 0)) { strcpy(new, name); - return (new); + return new; } strncpy(new, name, nlen - zlen); new[nlen - zlen - 1] = '\0'; - return (new); + return new; } static isc_result_t @@ -577,7 +577,7 @@ validate_txn(mysql_data_t *state, mysql_transaction_t *txn) { state->log(ISC_LOG_ERROR, "%s: invalid txn %x", modname, txn); } - return (result); + return result; } static isc_result_t @@ -586,7 +586,7 @@ db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { /* Make sure this instance is connected. */ if (!db_connect(state, dbi)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } ret = mysql_real_query(dbi->sock, query, strlen(query)); @@ -595,7 +595,7 @@ db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { state->log(ISC_LOG_ERROR, "%s: query '%s' failed: %s", modname, query, mysql_error(dbi->sock)); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (state->debug && state->log != NULL) { @@ -603,7 +603,7 @@ db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { query); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static MYSQL_RES * @@ -613,14 +613,14 @@ db_query(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { MYSQL_RES *res = NULL; if (query == NULL) { - return (NULL); + return NULL; } /* Get a DB instance if needed */ if (dbi == NULL) { dbi = get_dbi(state); if (dbi == NULL) { - return (NULL); + return NULL; } localdbi = true; } @@ -654,7 +654,7 @@ fail: if (dbi != NULL && localdbi) { dlz_mutex_unlock(&dbi->mutex); } - return (res); + return res; } /* @@ -676,7 +676,7 @@ make_notify(const char *zone, int *packetlen) { unsigned char *packet = (unsigned char *)malloc(strlen(zone) + 18); if (packet == NULL) { - return (NULL); + return NULL; } *packetlen = strlen(zone) + 18; @@ -722,7 +722,7 @@ make_notify(const char *zone, int *packetlen) { packet[j + 3] = htons(i) & 0xff; packet[j + 4] = htons(i) >> 8; - return (packet); + return packet; } static void @@ -851,7 +851,7 @@ makerecord(mysql_data_t *state, const char *name, const char *rdatastr) { "%s: makerecord - unable to malloc", modname); } - return (NULL); + return NULL; } buf = strdup(rdatastr); @@ -862,7 +862,7 @@ makerecord(mysql_data_t *state, const char *name, const char *rdatastr) { modname); } free(new_record); - return (NULL); + return NULL; } /* @@ -903,12 +903,12 @@ makerecord(mysql_data_t *state, const char *name, const char *rdatastr) { sprintf(new_record->ttl, "%d", ttlvalue); free(buf); - return (new_record); + return new_record; error: free(buf); free(new_record); - return (NULL); + return NULL; } /* @@ -941,7 +941,7 @@ int dlz_version(unsigned int *flags) { UNUSED(flags); *flags |= DNS_SDLZFLAG_THREADSAFE; - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* @@ -959,7 +959,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, state = calloc(1, sizeof(mysql_data_t)); if (state == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } dlz_mutex_init(&state->tx_mutex, NULL); @@ -984,7 +984,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, modname); } dlz_destroy(state); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } state->db_name = strdup(argv[1]); @@ -1033,7 +1033,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, *dbdata = state; dlz_mutex_unlock(&state->tx_mutex); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } free(state->db_name); @@ -1042,7 +1042,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, free(state->db_pass); dlz_mutex_destroy(&state->tx_mutex); free(state); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -1088,12 +1088,12 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, query = build_query(state, NULL, Q_FINDZONE, name); if (query == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } res = db_query(state, NULL, query); if (res == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (mysql_num_rows(res) == 0) { @@ -1101,7 +1101,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, } mysql_free_result(res); - return (result); + return result; } /* @@ -1128,7 +1128,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, state->log(ISC_LOG_ERROR, "%s: dlz_lookup - no putrr", modname); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } /* Are we okay to try to find the txn version? */ @@ -1147,13 +1147,13 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (strcmp(name, "@") == 0) { real_name = (char *)malloc(strlen(zone) + 1); if (real_name == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } strcpy(real_name, zone); } else { real_name = (char *)malloc(strlen(name) + 1); if (real_name == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } strcpy(real_name, name); } @@ -1166,7 +1166,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, query = build_query(state, dbi, Q_GETSOA, zone); if (query == NULL) { free(real_name); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } res = db_query(state, dbi, query); @@ -1174,7 +1174,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (res == NULL) { free(real_name); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } while ((row = mysql_fetch_row(res)) != NULL) { @@ -1194,7 +1194,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (result != ISC_R_SUCCESS) { free(real_name); mysql_free_result(res); - return (result); + return result; } } @@ -1213,7 +1213,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (res == NULL) { free(real_name); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } while ((row = mysql_fetch_row(res)) != NULL) { @@ -1223,7 +1223,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (result != ISC_R_SUCCESS) { free(real_name); mysql_free_result(res); - return (result); + return result; } found = true; @@ -1238,10 +1238,10 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, free(real_name); if (!found) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1257,7 +1257,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { } /* Just say yes for all our zones */ - return (dlz_findzonedb(dbdata, name, NULL, NULL)); + return dlz_findzonedb(dbdata, name, NULL, NULL); } /* @@ -1278,7 +1278,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { } if (state->putnamedrr == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } /* @@ -1286,13 +1286,13 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { */ query = build_query(state, NULL, Q_GETALL, zone); if (query == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } res = db_query(state, NULL, query); free(query); if (res == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } while ((row = mysql_fetch_row(res)) != NULL) { @@ -1309,7 +1309,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { } mysql_free_result(res); - return (result); + return result; } /* @@ -1330,18 +1330,18 @@ dlz_newversion(const char *zone, void *dbdata, void **versionp) { */ query = build_query(state, NULL, Q_WRITEABLE, zone); if (query == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } res = db_query(state, NULL, query); free(query); if (res == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((row = mysql_fetch_row(res)) == NULL) { mysql_free_result(res); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } strcpy(zone_id, row[0]); @@ -1360,7 +1360,7 @@ dlz_newversion(const char *zone, void *dbdata, void **versionp) { modname, zone); } dlz_mutex_unlock(&state->tx_mutex); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -1423,7 +1423,7 @@ cleanup: } } - return (result); + return result; } /* @@ -1585,7 +1585,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) "%s: no writeable_zone method available", modname); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -1593,7 +1593,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) */ res = db_query(state, NULL, Q_GETZONES); if (res == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } count = 0; @@ -1613,7 +1613,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) modname, row[0]); } mysql_free_result(res); - return (result); + return result; } count++; } @@ -1623,7 +1623,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) state->log(ISC_LOG_INFO, "%s: configured %d zones", modname, count); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1645,7 +1645,7 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, state->log(ISC_LOG_INFO, "%s: allowing update of %s by key %s", modname, name, signer); } - return (true); + return true; } isc_result_t @@ -1658,12 +1658,12 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, isc_result_t result; if (txn == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } new_name = relname(name, txn->zone); if (new_name == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (state->debug && (state->log != NULL)) { @@ -1674,7 +1674,7 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, record = makerecord(state, new_name, rdatastr); free(new_name); if (record == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* Write out data to database */ @@ -1708,7 +1708,7 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, cleanup: free(record); - return (result); + return result; } isc_result_t @@ -1721,12 +1721,12 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, isc_result_t result; if (txn == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } new_name = relname(name, txn->zone); if (new_name == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (state->debug && (state->log != NULL)) { @@ -1737,7 +1737,7 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, record = makerecord(state, new_name, rdatastr); free(new_name); if (record == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * If 'type' isn't 'SOA', delete the records @@ -1759,7 +1759,7 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, cleanup: free(record); - return (result); + return result; } isc_result_t @@ -1771,12 +1771,12 @@ dlz_delrdataset(const char *name, const char *type, void *dbdata, isc_result_t result; if (txn == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } new_name = relname(name, txn->zone); if (new_name == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (state->debug && (state->log != NULL)) { @@ -1796,5 +1796,5 @@ dlz_delrdataset(const char *name, const char *type, void *dbdata, cleanup: free(new_name); - return (result); + return result; } diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.c b/contrib/dlz/modules/perl/dlz_perl_driver.c index b99b296e99..b4b57d40d0 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.c +++ b/contrib/dlz/modules/perl/dlz_perl_driver.c @@ -117,7 +117,7 @@ b9_add_helper(config_data_t *state, const char *helper_name, void *ptr) { int dlz_version(unsigned int *flags) { UNUSED(flags); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } isc_result_t @@ -221,7 +221,7 @@ CLEAN_UP_AND_RETURN: carp("DLZ Perl: Returning from allnodes, r = %i, retval = %i", r, retval); - return (retval); + return retval; } isc_result_t @@ -285,7 +285,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { PUTBACK; FREETMPS; LEAVE; - return (retval); + return retval; } #if DLZ_DLOPEN_VERSION < 3 @@ -356,7 +356,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, PUTBACK; FREETMPS; LEAVE; - return (retval); + return retval; } #if DLZ_DLOPEN_VERSION == 1 @@ -473,7 +473,7 @@ CLEAN_UP_AND_RETURN: carp("DLZ Perl: Returning from lookup, r = %i, retval = %i", r, retval); - return (retval); + return retval; } static const char * @@ -492,12 +492,12 @@ missing_perl_method(const char *perl_class_name) methods[i]); if (get_cv(full_name, 0) == NULL) { - return (methods[i]); + return methods[i]; } i++; } - return (NULL); + return NULL; } isc_result_t @@ -517,7 +517,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, cd = malloc(sizeof(config_data_t)); if (cd == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(cd, 0, sizeof(config_data_t)); @@ -533,14 +533,14 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, cd->log(ISC_LOG_ERROR, "DLZ Perl '%s': Missing script argument.", dlzname); free(cd); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (argc < 3) { cd->log(ISC_LOG_ERROR, "DLZ Perl '%s': Missing class name argument.", dlzname); free(cd); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } perl_class_name = argv[2]; @@ -565,7 +565,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, cd->perl = perl_alloc(); if (cd->perl == NULL) { free(cd); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } #ifdef MULTIPLICITY my_perl = cd->perl; @@ -586,7 +586,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, cd->perl_source = strdup(argv[1]); if (cd->perl_source == NULL) { free(cd); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } perlrun[1] = cd->perl_source; @@ -677,7 +677,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, #ifndef MULTIPLICITY global_perl = cd->perl; #endif /* ifndef MULTIPLICITY */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; CLEAN_UP_PERL_AND_FAIL: PL_perl_destruct_level = 1; @@ -685,7 +685,7 @@ CLEAN_UP_PERL_AND_FAIL: perl_free(cd->perl); free(cd->perl_source); free(cd); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } void diff --git a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c index be6c6d7664..818b03476f 100644 --- a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c +++ b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c @@ -153,7 +153,7 @@ sqlite3_find_avail(sqlite3_instance_t *sqlite3) { while (count < dbc_search_limit) { /* try to lock on the mutex */ if (dlz_mutex_trylock(&dbi->lock) == 0) { - return (dbi); /* success, return the DBI for use. */ + return dbi; /* success, return the DBI for use. */ } /* not successful, keep trying */ dbi = DLZ_LIST_NEXT(dbi, link); @@ -169,7 +169,7 @@ sqlite3_find_avail(sqlite3_instance_t *sqlite3) { "SQLite3 module: unable to find available connection " "after searching %d times", count); - return (NULL); + return NULL; } /*% @@ -189,13 +189,13 @@ escape_string(const char *instr) { unsigned int i; if (instr == NULL) { - return (NULL); + return NULL; } len = strlen(instr); atlen = (2 * len * sizeof(char)) + 1; outstr = malloc(atlen); if (outstr == NULL) { - return (NULL); + return NULL; } ptr = outstr; @@ -214,7 +214,7 @@ escape_string(const char *instr) { } *ptr = '\0'; - return (outstr); + return outstr; } /*% @@ -248,7 +248,7 @@ sqlite3_get_resultset(const char *zone, const char *record, const char *client, dbi = sqlite3_find_avail(db); if (dbi == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* what type of query are we going to run? */ @@ -431,7 +431,7 @@ cleanup: free(querystring); } - return (result); + return result; } /*% @@ -450,7 +450,7 @@ dlz_sqlite3_fetch_row(sqlite3_res_t *rs) { rs->curRow++; } } - return (retval); + return retval; } static unsigned int @@ -459,7 +459,7 @@ dlz_sqlite3_num_fields(sqlite3_res_t *rs) { if (rs != NULL) { retval = rs->pnColumn; } - return (retval); + return retval; } static unsigned int @@ -468,7 +468,7 @@ dlz_sqlite3_num_rows(sqlite3_res_t *rs) { if (rs != NULL) { retval = rs->pnRow; } - return (retval); + return retval; } static void @@ -524,7 +524,7 @@ dlz_sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, db->log(ISC_LOG_ERROR, "SQLite3 module: TTL " "must be " "a positive number"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = db->putrr(lookup, safeGet(row[1]), ttl, @@ -551,7 +551,7 @@ dlz_sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, "memory for temporary " "string"); dlz_sqlite3_free_result(rs); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } strcpy(tmpString, safeGet(row[2])); @@ -566,7 +566,7 @@ dlz_sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, "must be " "a positive number"); free(tmpString); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = db->putrr(lookup, safeGet(row[1]), ttl, @@ -578,14 +578,14 @@ dlz_sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, dlz_sqlite3_free_result(rs); db->log(ISC_LOG_ERROR, "putrr returned error: %d", result); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } row = dlz_sqlite3_fetch_row(rs); } dlz_sqlite3_free_result(rs); - return (result); + return result; } /* @@ -613,7 +613,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, db->log(ISC_LOG_ERROR, "SQLite3 module: unable to return " "result set for FINDZONE query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -624,10 +624,10 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, if (rows > 0) { sqlite3_get_resultset(name, NULL, NULL, COUNTZONE, dbdata, NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /*% Determine if the client is allowed to perform a zone transfer */ @@ -641,7 +641,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { /* first check if the zone is supported by the database. */ result = dlz_findzonedb(dbdata, name, NULL, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -653,7 +653,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { result = sqlite3_get_resultset(name, NULL, client, ALLOWXFR, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } if (result != ISC_R_SUCCESS || rs == NULL) { @@ -662,7 +662,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { } db->log(ISC_LOG_ERROR, "SQLite3 module: unable to return " "result set for ALLOWXFR query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -672,10 +672,10 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { rows = dlz_sqlite3_num_rows(rs); dlz_sqlite3_free_result(rs); if (rows > 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } /*% @@ -697,7 +697,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { result = sqlite3_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } /* if we didn't get a result set, log an err msg. */ @@ -780,7 +780,7 @@ cleanup: dlz_sqlite3_free_result(rs); } - return (result); + return result; } /*% @@ -796,7 +796,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { result = sqlite3_get_resultset(zone, NULL, NULL, AUTHORITY, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { - return (result); + return result; } if (result != ISC_R_SUCCESS) { @@ -805,14 +805,14 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { } db->log(ISC_LOG_ERROR, "SQLite3 module: unable to return " "result set for AUTHORITY query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * lookup and authority result sets are processed in the same * manner: dlz_sqlite3_process_rs does the job for both functions. */ - return (dlz_sqlite3_process_rs(db, lookup, rs)); + return dlz_sqlite3_process_rs(db, lookup, rs); } /*% If zone is supported, lookup up a (or multiple) record(s) in it */ @@ -836,14 +836,14 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } db->log(ISC_LOG_ERROR, "SQLite3 module: unable to return " "result set for LOOKUP query"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * lookup and authority result sets are processed in the same * manner: dlz_sqlite3_process_rs does the job for both functions. */ - return (dlz_sqlite3_process_rs(db, lookup, rs)); + return dlz_sqlite3_process_rs(db, lookup, rs); } /*% @@ -867,7 +867,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* allocate memory for SQLite3 instance */ s3 = calloc(1, sizeof(sqlite3_instance_t)); if (s3 == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(s3, 0, sizeof(sqlite3_instance_t)); @@ -885,14 +885,14 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, if (argc < 4) { s3->log(ISC_LOG_ERROR, "SQLite3 module requires " "at least 4 command line args."); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* no more than 8 arg's should be passed to the module */ if (argc > 8) { s3->log(ISC_LOG_ERROR, "SQLite3 module cannot accept " "more than 8 command line args."); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* get db name - required */ @@ -1002,12 +1002,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, } *dbdata = s3; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dlz_destroy(s3); - return (result); + return result; } /*% @@ -1033,7 +1033,7 @@ int dlz_version(unsigned int *flags) { *flags |= (DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE); - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c index 2bb6975991..6fac188ef9 100644 --- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c +++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c @@ -149,7 +149,7 @@ done: free(querystring); } - return (result); + return result; } isc_result_t @@ -163,9 +163,9 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { "dlz_wildcard allowzonexfr called for client '%s'", client); if (fnmatch(cd->axfr_pattern, client, FNM_CASEFOLD) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } @@ -188,13 +188,13 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, p = shortest_match(cd->zone_pattern, name); if (p == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* Write info message to log */ cd->log(ISC_LOG_DEBUG(1), "dlz_wildcard findzonedb matched '%s'", p); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #if DLZ_DLOPEN_VERSION == 1 @@ -222,7 +222,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, p = shortest_match(cd->zone_pattern, zone); if (p == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } cd->record = UNCONST(name); @@ -233,7 +233,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, size_t len = p - zone; namebuf = malloc(len); if (namebuf == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } strncpy(namebuf, zone, len - 1); namebuf[len - 1] = '\0'; @@ -289,7 +289,7 @@ done: free(querystring); } - return (result); + return result; } isc_result_t @@ -302,7 +302,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { p = shortest_match(cd->zone_pattern, zone); if (p == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } cd->zone = UNCONST(p); @@ -345,7 +345,7 @@ done: free(querystring); } - return (result); + return result; } static void @@ -387,12 +387,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, va_list ap; if (argc < 8 || argc % 4 != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } cd = calloc(1, sizeof(config_data_t)); if (cd == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memset(cd, 0, sizeof(config_data_t)); @@ -470,7 +470,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, *dbdata = cd; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; full_cleanup: destroy_rrlist(cd); @@ -484,7 +484,7 @@ cleanup: } free(cd); - return (result); + return result; } void @@ -510,7 +510,7 @@ int dlz_version(unsigned int *flags) { UNUSED(flags); /* XXX: ok to set DNS_SDLZFLAG_THREADSAFE here? */ - return (DLZ_DLOPEN_VERSION); + return DLZ_DLOPEN_VERSION; } /* @@ -536,22 +536,22 @@ static const char * shortest_match(const char *pattern, const char *string) { const char *p = string; if (pattern == NULL || p == NULL || *p == '\0') { - return (NULL); + return NULL; } p += strlen(p); while (p-- > string) { if (*p == '.') { if (fnmatch(pattern, p + 1, FNM_CASEFOLD) == 0) { - return (p + 1); + return p + 1; } } } if (fnmatch(pattern, string, FNM_CASEFOLD) == 0) { - return (string); + return string; } - return (NULL); + return NULL; } /* @@ -578,21 +578,21 @@ fnmatch(const char *pattern, const char *string, int flags) { switch (c = *pattern++) { case EOS: if ((flags & FNM_LEADING_DIR) && *string == '/') { - return (0); + return 0; } - return (*string == EOS ? 0 : FNM_NOMATCH); + return *string == EOS ? 0 : FNM_NOMATCH; case '?': if (*string == EOS) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } if (*string == '/' && (flags & FNM_PATHNAME)) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } if (*string == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } ++string; break; @@ -607,24 +607,24 @@ fnmatch(const char *pattern, const char *string, int flags) { (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } /* Optimize for pattern with * at end or before /. */ if (c == EOS) { if (flags & FNM_PATHNAME) { - return ((flags & FNM_LEADING_DIR) || - index(string, - '/') == - NULL - ? 0 - : FNM_NOMATCH); + return (flags & FNM_LEADING_DIR) || + index(string, + '/') == + NULL + ? 0 + : FNM_NOMATCH; } else { - return (0); + return 0; } } else if (c == '/' && flags & FNM_PATHNAME) { if ((string = index(string, '/')) == NULL) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } break; } @@ -634,26 +634,26 @@ fnmatch(const char *pattern, const char *string, int flags) { if (!fnmatch(pattern, string, flags & ~FNM_PERIOD)) { - return (0); + return 0; } if (test == '/' && flags & FNM_PATHNAME) { break; } ++string; } - return (FNM_NOMATCH); + return FNM_NOMATCH; case '[': if (*string == EOS) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } if (*string == '/' && (flags & FNM_PATHNAME)) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } if (*string == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) { - return (FNM_NOMATCH); + return FNM_NOMATCH; } switch (rangematch(pattern, *string, flags, &newp)) { @@ -663,7 +663,7 @@ fnmatch(const char *pattern, const char *string, int flags) { pattern = newp; break; case RANGE_NOMATCH: - return (FNM_NOMATCH); + return FNM_NOMATCH; } ++string; break; @@ -683,7 +683,7 @@ fnmatch(const char *pattern, const char *string, int flags) { tolower((unsigned char)*string))) { } else { - return (FNM_NOMATCH); + return FNM_NOMATCH; } string++; break; @@ -724,11 +724,11 @@ rangematch(const char *pattern, char test, int flags, char **newp) { c = *pattern++; } if (c == EOS) { - return (RANGE_ERROR); + return RANGE_ERROR; } if (c == '/' && (flags & FNM_PATHNAME)) { - return (RANGE_NOMATCH); + return RANGE_NOMATCH; } if (flags & FNM_CASEFOLD) { @@ -743,7 +743,7 @@ rangematch(const char *pattern, char test, int flags, char **newp) { c2 = *pattern++; } if (c2 == EOS) { - return (RANGE_ERROR); + return RANGE_ERROR; } if (flags & FNM_CASEFOLD) { @@ -759,5 +759,5 @@ rangematch(const char *pattern, char test, int flags, char **newp) { } while ((c = *pattern++) != ']'); *newp = (char *)(uintptr_t)pattern; - return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); + return ok == negate ? RANGE_NOMATCH : RANGE_MATCH; } diff --git a/doc/misc/cfg_test.c b/doc/misc/cfg_test.c index befb8a8095..e0df72edb4 100644 --- a/doc/misc/cfg_test.c +++ b/doc/misc/cfg_test.c @@ -158,8 +158,8 @@ main(int argc, char **argv) { fflush(stdout); if (ferror(stdout)) { fprintf(stderr, "write error\n"); - return (1); + return 1; } - return (0); + return 0; } diff --git a/fuzz/dns_master_load.c b/fuzz/dns_master_load.c index 75dd0bc966..1acd4c816a 100644 --- a/fuzz/dns_master_load.c +++ b/fuzz/dns_master_load.c @@ -31,7 +31,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) { UNUSED(argc); UNUSED(argv); - return (0); + return 0; } int @@ -53,7 +53,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { dns_dbtype_zone, dns_rdataclass_in, 0, NULL, &db); if (result != ISC_R_SUCCESS) { - return (0); + return 0; } result = dns_db_beginload(db, &callbacks); @@ -75,5 +75,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { end: dns_db_detach(&db); isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/fuzz/dns_message_checksig.c b/fuzz/dns_message_checksig.c index 865de6a0e2..db9a41da55 100644 --- a/fuzz/dns_message_checksig.c +++ b/fuzz/dns_message_checksig.c @@ -139,14 +139,14 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { wd = mkdtemp(template); if (wd == NULL) { fprintf(stderr, "mkdtemp failed\n"); - return (1); + return 1; } snprintf(pathbuf, sizeof(pathbuf), "%s/%s", wd, f1); fd = fopen(pathbuf, "w"); if (fd == NULL) { fprintf(stderr, "fopen(%s) failed\n", pathbuf); - return (1); + return 1; } fputs(c1, fd); fclose(fd); @@ -155,7 +155,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { fd = fopen(pathbuf, "w"); if (fd == NULL) { fprintf(stderr, "fopen(%s) failed\n", pathbuf); - return (1); + return 1; } fputs(c2, fd); fclose(fd); @@ -164,7 +164,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { fd = fopen(pathbuf, "w"); if (fd == NULL) { fprintf(stderr, "fopen(%s) failed\n", pathbuf); - return (1); + return 1; } fputs(c3, fd); fclose(fd); @@ -177,7 +177,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_view_create failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } dns_tsigkeyring_create(mctx, &ring); @@ -187,7 +187,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_name_fromstring failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_tsigkey_create(name, DST_ALG_HMACSHA256, secret, @@ -195,20 +195,20 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_tsigkey_create failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_tsigkeyring_add(ring, tsigkey); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_tsigkeyring_add failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_name_fromstring(name, "sig0key", dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_name_fromstring failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } dns_zone_create(&zone, mctx, 0); @@ -217,7 +217,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_zone_setorigin failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } dns_zone_setclass(zone, view->rdclass); @@ -227,7 +227,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_zone_setkeydirectory failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_zone_setfile(zone, pathbuf, dns_masterformat_text, @@ -235,21 +235,21 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_zone_setfile failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_zone_load(zone, false); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_zone_load failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } result = dns_view_addzone(view, zone); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_view_addzone failed: %s\n", isc_result_totext(result)); - return (1); + return 1; } dns_zone_setview(zone, view); @@ -257,7 +257,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { dns_zone_detach(&zone); - return (0); + return 0; } static isc_result_t @@ -333,7 +333,7 @@ create_message(dns_message_t **messagep, const uint8_t *data, size_t size, } *messagep = message; } - return (result); + return result; } int @@ -362,7 +362,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { * opcode. */ if (size > 65535 || size < 2) { - return (0); + return 0; } addasig = (*data & 0x80) != 0; @@ -387,7 +387,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { result = create_message(&message, data, size, addasig, addtsig); if (result != ISC_R_SUCCESS) { - return (0); + return 0; } /* @@ -466,5 +466,5 @@ cleanup: dns_message_detach(&message); } - return (0); + return 0; } diff --git a/fuzz/dns_message_parse.c b/fuzz/dns_message_parse.c index ae6a37dc24..05160b72e2 100644 --- a/fuzz/dns_message_parse.c +++ b/fuzz/dns_message_parse.c @@ -39,7 +39,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { isc_mem_create(&mctx); output = isc_mem_get(mctx, output_len); - return (0); + return 0; } static isc_result_t @@ -60,7 +60,7 @@ parse_message(isc_buffer_t *input, dns_message_t **messagep) { dns_message_detach(&message); } - return (result); + return result; } static isc_result_t @@ -85,7 +85,7 @@ print_message(dns_message_t *message) { output); } - return (result); + return result; } #define CHECKRESULT(r, f) \ @@ -135,11 +135,11 @@ render_message(dns_message_t **messagep) { result = parse_message(&buffer, messagep); - return (result); + return result; cleanup: dns_compress_invalidate(&cctx); - return (result); + return result; } int @@ -149,7 +149,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { dns_message_t *message = NULL; if (size > 65535) { - return (0); + return 0; } isc_buffer_constinit(&buffer, data, size); @@ -181,5 +181,5 @@ cleanup: dns_message_detach(&message); } - return (0); + return 0; } diff --git a/fuzz/dns_name_fromtext_target.c b/fuzz/dns_name_fromtext_target.c index 437496e5ce..7886b04371 100644 --- a/fuzz/dns_name_fromtext_target.c +++ b/fuzz/dns_name_fromtext_target.c @@ -26,7 +26,7 @@ bool debug = false; int LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { - return (0); + return 0; } int @@ -47,5 +47,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { fprintf(stderr, "dns_name_fromtext: %s\n", isc_result_totext(result)); } - return (0); + return 0; } diff --git a/fuzz/dns_name_fromwire.c b/fuzz/dns_name_fromwire.c index e6ad89a577..4bbe4c28b2 100644 --- a/fuzz/dns_name_fromwire.c +++ b/fuzz/dns_name_fromwire.c @@ -30,7 +30,7 @@ bool debug = false; int LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { - return (0); + return 0; } int @@ -99,5 +99,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { REQUIRE(new_buf.used == old_buf.used); REQUIRE(new_buf.length == old_buf.length); - return (0); + return 0; } diff --git a/fuzz/dns_qp.c b/fuzz/dns_qp.c index 416fd2c849..1077013bfa 100644 --- a/fuzz/dns_qp.c +++ b/fuzz/dns_qp.c @@ -76,7 +76,7 @@ fuzz_makekey(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { assert(ctx == NULL); assert(pval == &item[ival]); memmove(key, item[ival].key, item[ival].len); - return (item[ival].len); + return item[ival].len; } static void @@ -94,7 +94,7 @@ const dns_qpmethods_t fuzz_methods = { static uint8_t random_byte(void) { - return (isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE); + return isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE; } int @@ -112,7 +112,7 @@ LLVMFuzzerInitialize(int *argc, char ***argv) { qp_test_keytoascii(item[i].ascii, len); } - return (0); + return 0; } int @@ -219,5 +219,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert(item[i].refcount == 0); } - return (0); + return 0; } diff --git a/fuzz/dns_qpkey_name.c b/fuzz/dns_qpkey_name.c index cf818d5bc7..c362a4b12d 100644 --- a/fuzz/dns_qpkey_name.c +++ b/fuzz/dns_qpkey_name.c @@ -34,7 +34,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) { UNUSED(argc); UNUSED(argv); - return (0); + return 0; } int @@ -73,5 +73,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert((namerel == 0) == (keyrel == 0)); assert((namerel > 0) == (keyrel > 0)); - return (0); + return 0; } diff --git a/fuzz/dns_rdata_fromtext.c b/fuzz/dns_rdata_fromtext.c index 5c8f1a6970..ecdcb3faca 100644 --- a/fuzz/dns_rdata_fromtext.c +++ b/fuzz/dns_rdata_fromtext.c @@ -37,7 +37,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) { UNUSED(argc); UNUSED(argv); - return (0); + return 0; } /* following code was copied from named-rrchecker */ @@ -146,5 +146,5 @@ cleanup: isc_lex_close(lex); isc_lex_destroy(&lex); isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/fuzz/dns_rdata_fromwire_text.c b/fuzz/dns_rdata_fromwire_text.c index c559849f77..24db379651 100644 --- a/fuzz/dns_rdata_fromwire_text.c +++ b/fuzz/dns_rdata_fromwire_text.c @@ -56,7 +56,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { isc_lex_setspecials(lex, specials); isc_lex_setcomments(lex, ISC_LEXCOMMENT_DNSMASTERFILE); - return (0); + return 0; } static void @@ -99,7 +99,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { * dns_rdata_fromwire() only accepts input up to 2^16-1 octets. */ if (size < 2 || size > 0xffff + 2) { - return (0); + return 0; } /* @@ -210,5 +210,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert(target.used == size); assert(!memcmp(target.base, data, size)); - return (0); + return 0; } diff --git a/fuzz/isc_lex_getmastertoken.c b/fuzz/isc_lex_getmastertoken.c index 3dc8f558f1..3de61307af 100644 --- a/fuzz/isc_lex_getmastertoken.c +++ b/fuzz/isc_lex_getmastertoken.c @@ -38,7 +38,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { isc_mem_create(&mctx); isc_lex_create(mctx, 1024, &lex); - return (0); + return 0; } int @@ -50,7 +50,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { bool eol; if (size < sizeof(expect) + sizeof(eol)) { - return (0); + return 0; } (void)memmove(&expect, data, sizeof(expect)); @@ -71,5 +71,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { result = isc_lex_getmastertoken(lex, &token, expect, eol); } while (result == ISC_R_SUCCESS && token.type != isc_tokentype_eof); - return (0); + return 0; } diff --git a/fuzz/isc_lex_gettoken.c b/fuzz/isc_lex_gettoken.c index 94d60f952b..a41893e3e9 100644 --- a/fuzz/isc_lex_gettoken.c +++ b/fuzz/isc_lex_gettoken.c @@ -31,7 +31,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { isc_mem_create(&mctx); isc_lex_create(mctx, 1024, &lex); - return (0); + return 0; } int @@ -50,5 +50,5 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { result = isc_lex_gettoken(lex, 0, &token); } while (result == ISC_R_SUCCESS); - return (0); + return 0; } diff --git a/fuzz/main.c b/fuzz/main.c index 861987146b..9863df52f2 100644 --- a/fuzz/main.c +++ b/fuzz/main.c @@ -101,7 +101,7 @@ main(int argc, char **argv) { ret = LLVMFuzzerInitialize(&argc, &argv); if (ret != 0) { fprintf(stderr, "LLVMFuzzerInitialize failure: %d\n", ret); - return (1); + return 1; } if (argv[1] != NULL && strcmp(argv[1], "-d") == 0) { @@ -117,7 +117,7 @@ main(int argc, char **argv) { argc--; } POST(argc); - return (0); + return 0; } target = (target != NULL) ? target + 1 : argv[0]; @@ -129,7 +129,7 @@ main(int argc, char **argv) { test_all_from(corpusdir); - return (0); + return 0; } #elif __AFL_COMPILER @@ -142,7 +142,7 @@ main(int argc, char **argv) { LLVMFuzzerInitialize(&argc, &argv); if (ret != 0) { fprintf(stderr, "LLVMFuzzerInitialize failure: %d\n", ret); - return (1); + return 1; } #ifdef __AFL_LOOP @@ -152,13 +152,13 @@ main(int argc, char **argv) { #endif /* ifdef __AFL_LOOP */ ret = fread(buf, 1, sizeof(buf), stdin); if (ret < 0) { - return (0); + return 0; } LLVMFuzzerTestOneInput(buf, ret); } - return (0); + return 0; } #endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */ diff --git a/fuzz/old.c b/fuzz/old.c index 124e5c688d..9ee32a52ac 100644 --- a/fuzz/old.c +++ b/fuzz/old.c @@ -156,12 +156,12 @@ old_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx, * 14-bit compression pointer */ if (!dns_decompress_getpermitted(dctx)) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } new_current = c & 0x3F; state = fw_newcurrent; } else { - return (DNS_R_BADLABELTYPE); + return DNS_R_BADLABELTYPE; } break; case fw_ordinary: @@ -178,7 +178,7 @@ old_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx, new_current *= 256; new_current += c; if (new_current >= biggest_pointer) { - return (DNS_R_BADPOINTER); + return DNS_R_BADPOINTER; } biggest_pointer = new_current; current = new_current; @@ -193,7 +193,7 @@ old_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx, } if (!done) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } name->ndata = (unsigned char *)target->base + target->used; @@ -204,7 +204,7 @@ old_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx, isc_buffer_forward(source, cused); isc_buffer_add(target, name->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; full: if (nmax == DNS_NAME_MAXWIRE) { @@ -212,12 +212,12 @@ full: * The name did not fit even though we had a buffer * big enough to fit a maximum-length name. */ - return (DNS_R_NAMETOOLONG); + return DNS_R_NAMETOOLONG; } else { /* * The name might fit if only the caller could give us a * big enough buffer. */ - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } } diff --git a/lib/dns/acl.c b/lib/dns/acl.c index f44f308d24..244995c995 100644 --- a/lib/dns/acl.c +++ b/lib/dns/acl.c @@ -69,11 +69,11 @@ dns_acl_anyornone(isc_mem_t *mctx, bool neg, dns_acl_t **target) { result = dns_iptable_addprefix(acl->iptable, NULL, 0, !neg); if (result != ISC_R_SUCCESS) { dns_acl_detach(&acl); - return (result); + return result; } *target = acl; - return (result); + return result; } /* @@ -81,7 +81,7 @@ dns_acl_anyornone(isc_mem_t *mctx, bool neg, dns_acl_t **target) { */ isc_result_t dns_acl_any(isc_mem_t *mctx, dns_acl_t **target) { - return (dns_acl_anyornone(mctx, false, target)); + return dns_acl_anyornone(mctx, false, target); } /* @@ -89,7 +89,7 @@ dns_acl_any(isc_mem_t *mctx, dns_acl_t **target) { */ isc_result_t dns_acl_none(isc_mem_t *mctx, dns_acl_t **target) { - return (dns_acl_anyornone(mctx, true, target)); + return dns_acl_anyornone(mctx, true, target); } /* @@ -103,11 +103,11 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos) { acl->iptable->radix == NULL || acl->iptable->radix->head == NULL || acl->iptable->radix->head->prefix == NULL) { - return (false); + return false; } if (acl->length != 0 || dns_acl_node_count(acl) != 1) { - return (false); + return false; } if (acl->iptable->radix->head->prefix->bitlen == 0 && @@ -116,10 +116,10 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos) { acl->iptable->radix->head->data[1] && *(bool *)(acl->iptable->radix->head->data[0]) == pos) { - return (true); + return true; } - return (false); /* All others */ + return false; /* All others */ } /* @@ -127,7 +127,7 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos) { */ bool dns_acl_isany(dns_acl_t *acl) { - return (dns_acl_isanyornone(acl, true)); + return dns_acl_isanyornone(acl, true); } /* @@ -135,7 +135,7 @@ dns_acl_isany(dns_acl_t *acl) { */ bool dns_acl_isnone(dns_acl_t *acl) { - return (dns_acl_isanyornone(acl, false)); + return dns_acl_isanyornone(acl, false); } /* @@ -213,7 +213,7 @@ dns_acl_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -258,10 +258,10 @@ dns_acl_match_port_transport(const isc_netaddr_t *reqaddr, } if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (dns_acl_match(reqaddr, reqsigner, acl, env, match, matchelt)); + return dns_acl_match(reqaddr, reqsigner, acl, env, match, matchelt); } /* @@ -351,7 +351,7 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) { nodes = max_node + dns_acl_node_count(dest); result = dns_iptable_merge(dest->iptable, source->iptable, pos); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (nodes > dns_acl_node_count(dest)) { dns_acl_node_count(dest) = nodes; @@ -362,7 +362,7 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) { */ dns_acl_merge_ports_transports(dest, source, pos); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -390,9 +390,9 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, if (matchelt != NULL) { *matchelt = e; } - return (true); + return true; } else { - return (false); + return false; } case dns_aclelementtype_nestedacl: @@ -401,7 +401,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, case dns_aclelementtype_localhost: if (env == NULL) { - return (false); + return false; } rcu_read_lock(); dns_acl_attach(rcu_dereference(env->localhost), &inner); @@ -410,7 +410,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, case dns_aclelementtype_localnets: if (env == NULL) { - return (false); + return false; } rcu_read_lock(); dns_acl_attach(rcu_dereference(env->localnets), &inner); @@ -420,9 +420,9 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, #if defined(HAVE_GEOIP2) case dns_aclelementtype_geoip: if (env == NULL || env->geoip == NULL) { - return (false); + return false; } - return (dns_geoip_match(reqaddr, env->geoip, &e->geoip_elem)); + return dns_geoip_match(reqaddr, env->geoip, &e->geoip_elem); #endif /* if defined(HAVE_GEOIP2) */ default: UNREACHABLE(); @@ -444,7 +444,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, if (matchelt != NULL) { *matchelt = e; } - return (true); + return true; } /* @@ -455,7 +455,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, *matchelt = NULL; } - return (false); + return false; } static void @@ -578,7 +578,7 @@ dns_acl_isinsecure(const dns_acl_t *a) { insecure = insecure_prefix_found; UNLOCK(&insecure_prefix_lock); if (insecure) { - return (true); + return true; } /* Now check non-radix elements */ @@ -597,7 +597,7 @@ dns_acl_isinsecure(const dns_acl_t *a) { case dns_aclelementtype_nestedacl: if (dns_acl_isinsecure(e->nestedacl)) { - return (true); + return true; } continue; @@ -605,7 +605,7 @@ dns_acl_isinsecure(const dns_acl_t *a) { case dns_aclelementtype_geoip: #endif /* if defined(HAVE_GEOIP2) */ case dns_aclelementtype_localnets: - return (true); + return true; default: UNREACHABLE(); @@ -613,7 +613,7 @@ dns_acl_isinsecure(const dns_acl_t *a) { } /* No insecure elements were found. */ - return (false); + return false; } /*% @@ -626,13 +626,13 @@ dns_acl_allowed(isc_netaddr_t *addr, const dns_name_t *signer, dns_acl_t *acl, isc_result_t result; if (acl == NULL) { - return (true); + return true; } result = dns_acl_match(addr, signer, acl, aclenv, &match, NULL); if (result == ISC_R_SUCCESS && match > 0) { - return (true); + return true; } - return (false); + return false; } /* diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 6ab7816c02..924f640432 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -529,7 +529,7 @@ ttlclamp(dns_ttl_t ttl) { ttl = ADB_CACHE_MAXIMUM; } - return (ttl); + return ttl; } /* @@ -638,12 +638,12 @@ import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset, UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool match_ptr(void *node, const void *key) { - return (node == key); + return node == key; } /* @@ -830,12 +830,12 @@ set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, */ result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &cname, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_dup(&cname.cname, adb->mctx, target); dns_rdata_freestruct(&cname); @@ -856,12 +856,12 @@ set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, */ result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &dname, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -874,12 +874,12 @@ set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, NULL); dns_rdata_freestruct(&dname); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_dup(new_target, adb->mctx, target); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -986,7 +986,7 @@ new_adbname(dns_adb_t *adb, const dns_name_t *dnsname, unsigned int flags) { dns_name_init(&name->target, NULL); inc_adbstats(adb, dns_adbstats_namescnt); - return (name); + return name; } #if DNS_ADB_TRACE @@ -1026,7 +1026,7 @@ new_adbnamehook(dns_adb_t *adb) { .magic = DNS_ADBNAMEHOOK_MAGIC, }; - return (nh); + return nh; } static void @@ -1071,7 +1071,7 @@ new_adbentry(dns_adb_t *adb, const isc_sockaddr_t *addr, isc_stdtime_t now) { inc_adbstats(adb, dns_adbstats_entriescnt); - return (entry); + return entry; } static void @@ -1127,7 +1127,7 @@ new_adbfind(dns_adb_t *adb, in_port_t port) { find->magic = DNS_ADBFIND_MAGIC; - return (find); + return find; } static void @@ -1165,7 +1165,7 @@ new_adbfetch(dns_adb_t *adb) { fetch->magic = DNS_ADBFETCH_MAGIC; - return (fetch); + return fetch; } static void @@ -1206,7 +1206,7 @@ new_adbaddrinfo(dns_adb_t *adb, dns_adbentry_t *entry, in_port_t port) { isc_sockaddr_setport(&ai->sockaddr, port); - return (ai); + return ai; } static void @@ -1238,10 +1238,10 @@ match_adbname(void *node, const void *key) { if ((adbname0->flags & ADBNAME_FLAGS_MASK) != (adbname1->flags & ADBNAME_FLAGS_MASK)) { - return (false); + return false; } - return (dns_name_equal(adbname0->name, adbname1->name)); + return dns_name_equal(adbname0->name, adbname1->name); } static uint32_t @@ -1253,7 +1253,7 @@ hash_adbname(const dns_adbname_t *adbname) { isc_hash32_hash(&hash, adbname->name->ndata, adbname->name->length, false); isc_hash32_hash(&hash, &flags, sizeof(flags), true); - return (isc_hash32_finalize(&hash)); + return isc_hash32_finalize(&hash); } /* @@ -1334,7 +1334,7 @@ get_attached_and_locked_name(dns_adb_t *adb, const dns_name_t *name, */ RWUNLOCK(&adb->names_lock, locktype); - return (adbname); + return adbname; } static void @@ -1351,7 +1351,7 @@ static bool match_adbentry(void *node, const void *key) { dns_adbentry_t *adbentry = node; - return (isc_sockaddr_equal(&adbentry->sockaddr, key)); + return isc_sockaddr_equal(&adbentry->sockaddr, key); } /* @@ -1444,7 +1444,7 @@ get_attached_and_locked_entry(dns_adb_t *adb, isc_stdtime_t now, RWUNLOCK(&adb->entries_lock, locktype); - return (adbentry); + return adbentry; } static void @@ -1530,12 +1530,12 @@ maybe_expire_name(dns_adbname_t *adbname, isc_stdtime_t now) { /* Leave this name alone if it still has active namehooks... */ if (NAME_HAS_V4(adbname) || NAME_HAS_V6(adbname)) { - return (false); + return false; } /* ...an active fetch in progres... */ if (NAME_FETCH(adbname)) { - return (false); + return false; } /* ... or is not yet expired. */ @@ -1543,12 +1543,12 @@ maybe_expire_name(dns_adbname_t *adbname, isc_stdtime_t now) { !EXPIRE_OK(adbname->expire_v6, now) || !EXPIRE_OK(adbname->expire_target, now)) { - return (false); + return false; } expire_name(adbname, DNS_ADB_EXPIRED); - return (true); + return true; } static void @@ -1573,14 +1573,14 @@ expire_entry(dns_adbentry_t *adbentry) { static bool entry_expired(dns_adbentry_t *adbentry, isc_stdtime_t now) { if (!ISC_LIST_EMPTY(adbentry->nhs)) { - return (false); + return false; } if (!EXPIRE_OK(adbentry->expires, now)) { - return (false); + return false; } - return (true); + return true; } static bool @@ -1589,10 +1589,10 @@ maybe_expire_entry(dns_adbentry_t *adbentry, isc_stdtime_t now) { if (entry_expired(adbentry, now)) { expire_entry(adbentry); - return (true); + return true; } - return (false); + return false; } /*% @@ -1952,7 +1952,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_loop_t *loop, isc_job_cb cb, void *cbarg, DP(DEF_LEVEL, "dns_adb_createfind: returning " "ISC_R_SHUTTINGDOWN"); - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } if (now == 0) { @@ -2239,7 +2239,7 @@ post_copy: UNLOCK(&adbname->lock); dns_adbname_detach(&adbname); - return (result); + return result; } void @@ -2344,7 +2344,7 @@ unsigned int dns_adb_findstatus(dns_adbfind_t *find) { REQUIRE(DNS_ADBFIND_VALID(find)); - return (atomic_load(&find->status)); + return atomic_load(&find->status); } void @@ -2587,11 +2587,11 @@ putstr(isc_buffer_t **b, const char *str) { result = isc_buffer_reserve(*b, strlen(str)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putstr(*b, str); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2632,7 +2632,7 @@ dns_adb_dumpquota(dns_adb_t *adb, isc_buffer_t **buf) { isc_hashmap_iter_destroy(&it); RWUNLOCK(&adb->entries_lock, isc_rwlocktype_read); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2779,7 +2779,7 @@ dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) { dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } static void @@ -3035,7 +3035,7 @@ cleanup: dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } void @@ -3283,7 +3283,7 @@ dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { size = entry->udpsize; UNLOCK(&entry->lock); - return (size); + return size; } void @@ -3338,7 +3338,7 @@ dns_adb_getcookie(dns_adbaddrinfo_t *addr, unsigned char *cookie, size_t len) { unlock: UNLOCK(&entry->lock); - return (len); + return len; } isc_result_t @@ -3354,7 +3354,7 @@ dns_adb_findaddrinfo(dns_adb_t *adb, const isc_sockaddr_t *sa, in_port_t port; if (atomic_load(&adb->exiting)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } entry = get_attached_and_locked_entry(adb, now, sa); @@ -3367,7 +3367,7 @@ dns_adb_findaddrinfo(dns_adb_t *adb, const isc_sockaddr_t *sa, dns_adbentry_detach(&entry); - return (result); + return result; } void @@ -3533,14 +3533,14 @@ adbentry_overquota(dns_adbentry_t *entry) { uint_fast32_t quota = atomic_load_relaxed(&entry->quota); uint_fast32_t active = atomic_load_acquire(&entry->active); - return (quota != 0 && active >= quota); + return quota != 0 && active >= quota; } bool dns_adb_overquota(dns_adb_t *adb ISC_ATTR_UNUSED, dns_adbaddrinfo_t *addrinfo) { REQUIRE(DNS_ADBADDRINFO_VALID(addrinfo)); - return (adbentry_overquota(addrinfo->entry)); + return adbentry_overquota(addrinfo->entry); } void @@ -3569,5 +3569,5 @@ isc_stats_t * dns_adb_getstats(dns_adb_t *adb) { REQUIRE(DNS_ADB_VALID(adb)); - return (adb->stats); + return adb->stats; } diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index c134873069..6bffa41ba5 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -86,7 +86,7 @@ dns_badcache_new(isc_mem_t *mctx) { isc_mem_attach(mctx, &bc->mctx); - return (bc); + return bc; } void @@ -114,7 +114,7 @@ bcentry_match(struct cds_lfht_node *ht_node, const void *key) { const dns_name_t *name = key; dns_bcentry_t *bad = caa_container_of(ht_node, dns_bcentry_t, ht_node); - return (dns_name_equal(bad->name, name)); + return dns_name_equal(bad->name, name); } static dns_bcentry_t * @@ -132,7 +132,7 @@ bcentry_new(dns_badcache_t *bc, const dns_name_t *name, bad->name = dns_fixedname_initname(&bad->fname); dns_name_copy(name, bad->name); - return (bad); + return bad; } static void @@ -164,13 +164,13 @@ bcentry_evict(struct cds_lfht *ht, dns_bcentry_t *bad) { static bool bcentry_alive(struct cds_lfht *ht, dns_bcentry_t *bad, isc_stdtime_t now) { if (cds_lfht_is_node_deleted(&bad->ht_node)) { - return (false); + return false; } else if (atomic_load_relaxed(&bad->expire) < now) { bcentry_evict(ht, bad); - return (false); + return false; } - return (true); + return true; } #define cds_lfht_for_each_entry_next(ht, iter, pos, member) \ @@ -283,7 +283,7 @@ dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, rcu_read_unlock(); - return (result); + return result; } void diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index df53ebdab4..a0a83c9ec4 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -74,11 +74,11 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name) { remaining = sizeof(textname) - (cp - textname); strlcpy(cp, "ip6.arpa.", remaining); } else { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } len = (unsigned int)strlen(textname); isc_buffer_init(&buffer, textname, len); isc_buffer_add(&buffer, len); - return (dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL)); + return dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL); } diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 2ddae6acc2..f0f204e650 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -143,7 +143,7 @@ cache_create_db(dns_cache_t *cache, dns_db_t **dbp, isc_mem_t **tmctxp, *hmctxp = hmctx; *tmctxp = tmctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_db: dns_db_detach(&db); @@ -151,7 +151,7 @@ cleanup_mctx: isc_mem_detach(&hmctx); isc_mem_detach(&tmctx); - return (result); + return result; } static void @@ -202,11 +202,11 @@ dns_cache_create(isc_loopmgr_t *loopmgr, dns_rdataclass_t rdclass, } *cachep = cache; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: cache_destroy(cache); - return (result); + return result; } static void @@ -243,7 +243,7 @@ const char * dns_cache_getname(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); - return (cache->name); + return cache->name; } static void @@ -285,7 +285,7 @@ dns_cache_getcachesize(dns_cache_t *cache) { size = cache->size; UNLOCK(&cache->lock); - return (size); + return size; } void @@ -311,7 +311,7 @@ dns_cache_getservestalettl(dns_cache_t *cache) { * to confirm the value that the db is really using. */ result = dns_db_getservestalettl(cache->db, &ttl); - return (result == ISC_R_SUCCESS ? ttl : 0); + return result == ISC_R_SUCCESS ? ttl : 0; } void @@ -333,7 +333,7 @@ dns_cache_getservestalerefresh(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); result = dns_db_getservestalerefresh(cache->db, &interval); - return (result == ISC_R_SUCCESS ? interval : 0); + return result == ISC_R_SUCCESS ? interval : 0; } isc_result_t @@ -345,7 +345,7 @@ dns_cache_flush(dns_cache_t *cache) { result = cache_create_db(cache, &db, &tmctx, &hmctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } LOCK(&cache->lock); @@ -363,7 +363,7 @@ dns_cache_flush(dns_cache_t *cache) { isc_mem_detach(&oldhmctx); isc_mem_detach(&oldtmctx); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -374,7 +374,7 @@ clearnode(dns_db_t *db, dns_dbnode_t *node) { result = dns_db_allrdatasets(db, node, NULL, DNS_DB_STALEOK, (isc_stdtime_t)0, &iter); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; @@ -397,7 +397,7 @@ clearnode(dns_db_t *db, dns_dbnode_t *node) { } dns_rdatasetiter_destroy(&iter); - return (result); + return result; } static isc_result_t @@ -472,12 +472,12 @@ cleanup: dns_db_detachnode(db, &top); } - return (answer); + return answer; } isc_result_t dns_cache_flushname(dns_cache_t *cache, const dns_name_t *name) { - return (dns_cache_flushnode(cache, name, false)); + return dns_cache_flushnode(cache, name, false); } isc_result_t @@ -487,7 +487,7 @@ dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, bool tree) { dns_db_t *db = NULL; if (tree && dns_name_equal(name, dns_rootname)) { - return (dns_cache_flush(cache)); + return dns_cache_flush(cache); } LOCK(&cache->lock); @@ -496,7 +496,7 @@ dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, bool tree) { } UNLOCK(&cache->lock); if (db == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (tree) { @@ -516,13 +516,13 @@ dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, bool tree) { cleanup_db: dns_db_detach(&db); - return (result); + return result; } isc_stats_t * dns_cache_getstats(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); - return (cache->stats); + return cache->stats; } void @@ -668,7 +668,7 @@ renderstat(const char *name, uint64_t value, xmlTextWriterPtr writer) { TRY0(xmlTextWriterEndElement(writer)); /* counter */ error: - return (xmlrc); + return xmlrc; } int @@ -707,7 +707,7 @@ dns_cache_renderxml(dns_cache_t *cache, void *writer0) { TRY0(renderstat("HeapMemInUse", isc_mem_inuse(cache->hmctx), writer)); error: - return (xmlrc); + return xmlrc; } #endif /* ifdef HAVE_LIBXML2 */ @@ -785,6 +785,6 @@ dns_cache_renderjson(dns_cache_t *cache, void *cstats0) { result = ISC_R_SUCCESS; error: - return (result); + return result; } #endif /* ifdef HAVE_JSON_C */ diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 3335cb38e6..ed66de9cfa 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -253,7 +253,7 @@ catz_coo_new(isc_mem_t *mctx, const dns_name_t *domain) { dns_name_dup(domain, mctx, &ncoo->name); isc_refcount_init(&ncoo->references, 1); - return (ncoo); + return ncoo; } static void @@ -312,13 +312,13 @@ dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain) { dns_catz_options_init(&nentry->opts); isc_refcount_init(&nentry->references, 1); - return (nentry); + return nentry; } dns_name_t * dns_catz_entry_getname(dns_catz_entry_t *entry) { REQUIRE(DNS_CATZ_ENTRY_VALID(entry)); - return (&entry->name); + return &entry->name; } dns_catz_entry_t * @@ -331,7 +331,7 @@ dns_catz_entry_copy(dns_catz_zone_t *catz, const dns_catz_entry_t *entry) { dns_catz_options_copy(catz->catzs->mctx, &entry->opts, &nentry->opts); - return (nentry); + return nentry; } void @@ -369,7 +369,7 @@ dns_catz_entry_validate(const dns_catz_entry_t *entry) { REQUIRE(DNS_CATZ_ENTRY_VALID(entry)); UNUSED(entry); - return (true); + return true; } bool @@ -380,24 +380,24 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { REQUIRE(DNS_CATZ_ENTRY_VALID(eb)); if (ea == eb) { - return (true); + return true; } if (ea->opts.masters.count != eb->opts.masters.count) { - return (false); + return false; } if (memcmp(ea->opts.masters.addrs, eb->opts.masters.addrs, ea->opts.masters.count * sizeof(isc_sockaddr_t))) { - return (false); + return false; } for (size_t i = 0; i < eb->opts.masters.count; i++) { if ((ea->opts.masters.keys[i] == NULL) != (eb->opts.masters.keys[i] == NULL)) { - return (false); + return false; } if (ea->opts.masters.keys[i] == NULL) { continue; @@ -405,7 +405,7 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { if (!dns_name_equal(ea->opts.masters.keys[i], eb->opts.masters.keys[i])) { - return (false); + return false; } } @@ -413,7 +413,7 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { if ((ea->opts.masters.tlss[i] == NULL) != (eb->opts.masters.tlss[i] == NULL)) { - return (false); + return false; } if (ea->opts.masters.tlss[i] == NULL) { continue; @@ -421,13 +421,13 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { if (!dns_name_equal(ea->opts.masters.tlss[i], eb->opts.masters.tlss[i])) { - return (false); + return false; } } /* If one is NULL and the other isn't, the entries don't match */ if ((ea->opts.allow_query == NULL) != (eb->opts.allow_query == NULL)) { - return (false); + return false; } /* If one is non-NULL, then they both are */ @@ -435,7 +435,7 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { isc_buffer_usedregion(ea->opts.allow_query, &ra); isc_buffer_usedregion(eb->opts.allow_query, &rb); if (isc_region_compare(&ra, &rb)) { - return (false); + return false; } } @@ -443,32 +443,32 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { if ((ea->opts.allow_transfer == NULL) != (eb->opts.allow_transfer == NULL)) { - return (false); + return false; } if (ea->opts.allow_transfer != NULL) { isc_buffer_usedregion(ea->opts.allow_transfer, &ra); isc_buffer_usedregion(eb->opts.allow_transfer, &rb); if (isc_region_compare(&ra, &rb)) { - return (false); + return false; } } - return (true); + return true; } dns_name_t * dns_catz_zone_getname(dns_catz_zone_t *catz) { REQUIRE(DNS_CATZ_ZONE_VALID(catz)); - return (&catz->name); + return &catz->name; } dns_catz_options_t * dns_catz_zone_getdefoptions(dns_catz_zone_t *catz) { REQUIRE(DNS_CATZ_ZONE_VALID(catz)); - return (&catz->defoptions); + return &catz->defoptions; } void @@ -778,7 +778,7 @@ dns__catz_zones_merge(dns_catz_zone_t *catz, dns_catz_zone_t *newcatz) { UNLOCK(&catz->lock); - return (result); + return result; } dns_catz_zones_t * @@ -798,14 +798,14 @@ dns_catz_zones_new(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_ht_init(&catzs->zones, mctx, 4, ISC_HT_CASE_SENSITIVE); isc_mem_attach(mctx, &catzs->mctx); - return (catzs); + return catzs; } void * dns_catz_zones_get_udata(dns_catz_zones_t *catzs) { REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); - return (catzs->zmm->udata); + return catzs->zmm->udata; } void @@ -844,7 +844,7 @@ dns_catz_zone_new(dns_catz_zones_t *catzs, const dns_name_t *name) { dns_name_init(&catz->name, NULL); dns_name_dup(name, catzs->mctx, &catz->name); - return (catz); + return catz; } static void @@ -939,7 +939,7 @@ dns_catz_zone_add(dns_catz_zones_t *catzs, const dns_name_t *name, *catzp = catz; - return (result); + return result; } dns_catz_zone_t * @@ -953,16 +953,16 @@ dns_catz_zone_get(dns_catz_zones_t *catzs, const dns_name_t *name) { LOCK(&catzs->lock); if (catzs->zones == NULL) { UNLOCK(&catzs->lock); - return (NULL); + return NULL; } result = isc_ht_find(catzs->zones, name->ndata, name->length, (void **)&found); UNLOCK(&catzs->lock); if (result != ISC_R_SUCCESS) { - return (NULL); + return NULL; } - return (found); + return found; } static void @@ -1117,32 +1117,32 @@ catz_opt_cmp(const dns_label_t *option, const char *opt) { if (option->length - 1 == len && memcmp(opt, option->base + 1, len) == 0) { - return (true); + return true; } else { - return (false); + return false; } } static catz_opt_t catz_get_option(const dns_label_t *option) { if (catz_opt_cmp(option, "ext")) { - return (CATZ_OPT_EXT); + return CATZ_OPT_EXT; } else if (catz_opt_cmp(option, "zones")) { - return (CATZ_OPT_ZONES); + return CATZ_OPT_ZONES; } else if (catz_opt_cmp(option, "masters") || catz_opt_cmp(option, "primaries")) { - return (CATZ_OPT_PRIMARIES); + return CATZ_OPT_PRIMARIES; } else if (catz_opt_cmp(option, "allow-query")) { - return (CATZ_OPT_ALLOW_QUERY); + return CATZ_OPT_ALLOW_QUERY; } else if (catz_opt_cmp(option, "allow-transfer")) { - return (CATZ_OPT_ALLOW_TRANSFER); + return CATZ_OPT_ALLOW_TRANSFER; } else if (catz_opt_cmp(option, "coo")) { - return (CATZ_OPT_COO); + return CATZ_OPT_COO; } else if (catz_opt_cmp(option, "version")) { - return (CATZ_OPT_VERSION); + return CATZ_OPT_VERSION; } else { - return (CATZ_OPT_NONE); + return CATZ_OPT_NONE; } } @@ -1157,18 +1157,17 @@ catz_process_zones(dns_catz_zone_t *catz, dns_rdataset_t *value, REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC)); if (name->labels == 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_name_getlabel(name, name->labels - 1, &mhash); if (name->labels == 1) { - return (catz_process_zones_entry(catz, value, &mhash)); + return catz_process_zones_entry(catz, value, &mhash); } else { dns_name_init(&opt, NULL); dns_name_split(name, 1, &opt, NULL); - return (catz_process_zones_suboption(catz, value, &mhash, - &opt)); + return catz_process_zones_suboption(catz, value, &mhash, &opt); } } @@ -1186,11 +1185,11 @@ catz_process_coo(dns_catz_zone_t *catz, dns_label_t *mhash, /* Change of Ownership was introduced in version "2" of the schema. */ if (catz->version < 2) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (value->type != dns_rdatatype_ptr) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (dns_rdataset_count(value) != 1) { @@ -1199,12 +1198,12 @@ catz_process_coo(dns_catz_zone_t *catz, dns_label_t *mhash, "catz: 'coo' property PTR RRset contains " "more than one record, which is invalid"); catz->broken = true; - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = dns_rdataset_first(value); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_init(&rdata); @@ -1212,7 +1211,7 @@ catz_process_coo(dns_catz_zone_t *catz, dns_label_t *mhash, result = dns_rdata_tostruct(&rdata, &ptr, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (dns_name_countlabels(&ptr.ptr) == 0) { @@ -1237,7 +1236,7 @@ catz_process_coo(dns_catz_zone_t *catz, dns_label_t *mhash, cleanup: dns_rdata_freestruct(&ptr); - return (result); + return result; } static isc_result_t @@ -1249,7 +1248,7 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value, dns_catz_entry_t *entry = NULL; if (value->type != dns_rdatatype_ptr) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (dns_rdataset_count(value) != 1) { @@ -1258,12 +1257,12 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value, "catz: member zone PTR RRset contains " "more than one record, which is invalid"); catz->broken = true; - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = dns_rdataset_first(value); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_init(&rdata); @@ -1271,7 +1270,7 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value, result = dns_rdata_tostruct(&rdata, &ptr, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = isc_ht_find(catz->entries, mhash->base, mhash->length, @@ -1280,7 +1279,7 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value, if (dns_name_countlabels(&entry->name) != 0) { /* We have a duplicate. */ dns_rdata_freestruct(&ptr); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { dns_name_dup(&ptr.ptr, catz->catzs->mctx, &entry->name); } @@ -1294,7 +1293,7 @@ catz_process_zones_entry(dns_catz_zone_t *catz, dns_rdataset_t *value, dns_rdata_freestruct(&ptr); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1310,7 +1309,7 @@ catz_process_version(dns_catz_zone_t *catz, dns_rdataset_t *value) { REQUIRE(DNS_RDATASET_VALID(value)); if (value->type != dns_rdatatype_txt) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (dns_rdataset_count(value) != 1) { @@ -1319,12 +1318,12 @@ catz_process_version(dns_catz_zone_t *catz, dns_rdataset_t *value) { "catz: 'version' property TXT RRset contains " "more than one record, which is invalid"); catz->broken = true; - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = dns_rdataset_first(value); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_init(&rdata); @@ -1332,7 +1331,7 @@ catz_process_version(dns_catz_zone_t *catz, dns_rdataset_t *value) { result = dns_rdata_tostruct(&rdata, &rdatatxt, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_rdata_txt_first(&rdatatxt); @@ -1372,7 +1371,7 @@ cleanup: "zone version property"); catz->broken = true; } - return (result); + return result; } static isc_result_t @@ -1441,19 +1440,19 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, result = dns_rdata_txt_first(&rdata_txt); if (result != ISC_R_SUCCESS) { dns_rdata_freestruct(&rdata_txt); - return (result); + return result; } result = dns_rdata_txt_current(&rdata_txt, &rdatastr); if (result != ISC_R_SUCCESS) { dns_rdata_freestruct(&rdata_txt); - return (result); + return result; } result = dns_rdata_txt_next(&rdata_txt); if (result != ISC_R_NOMORE) { dns_rdata_freestruct(&rdata_txt); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* rdatastr.length < DNS_NAME_MAXTEXT */ @@ -1467,11 +1466,11 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, if (result != ISC_R_SUCCESS) { dns_name_free(keyname, mctx); isc_mem_put(mctx, keyname, sizeof(*keyname)); - return (result); + return result; } break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -1497,7 +1496,7 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, } else { result = dns_ipkeylist_resize(mctx, ipkl, i + 1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ipkl->labels[i] = isc_mem_get(mctx, @@ -1513,20 +1512,20 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, } ipkl->count++; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* else - 'simple' case - without labels */ if (value->type != dns_rdatatype_a && value->type != dns_rdatatype_aaaa) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } rcount = dns_rdataset_count(value) + ipkl->count; result = dns_ipkeylist_resize(mctx, ipkl, rcount); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdataset_first(value); result == ISC_R_SUCCESS; @@ -1554,7 +1553,7 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, ipkl->labels[ipkl->count] = NULL; ipkl->count++; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1575,7 +1574,7 @@ catz_process_apl(dns_catz_zone_t *catz, isc_buffer_t **aclbp, REQUIRE(dns_rdataset_isassociated(value)); if (value->type != dns_rdatatype_apl) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (dns_rdataset_count(value) > 1) { @@ -1590,7 +1589,7 @@ catz_process_apl(dns_catz_zone_t *catz, isc_buffer_t **aclbp, dns_rdataset_current(value, &rdata); result = dns_rdata_tostruct(&rdata, &rdata_apl, catz->catzs->mctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_allocate(catz->catzs->mctx, &aclb, 16); for (result = dns_rdata_apl_first(&rdata_apl); result == ISC_R_SUCCESS; @@ -1635,7 +1634,7 @@ cleanup: isc_buffer_free(&aclb); } dns_rdata_freestruct(&rdata_apl); - return (result); + return result; } static isc_result_t @@ -1654,7 +1653,7 @@ catz_process_zones_suboption(dns_catz_zone_t *catz, dns_rdataset_t *value, REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC)); if (name->labels < 1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_name_getlabel(name, name->labels - 1, &option); opt = catz_get_option(&option); @@ -1665,7 +1664,7 @@ catz_process_zones_suboption(dns_catz_zone_t *catz, dns_rdataset_t *value, */ if (catz->version >= 2 && opt >= CATZ_OPT_CUSTOM_START) { if (opt != CATZ_OPT_EXT || name->labels < 2) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } suffix_labels++; dns_name_getlabel(name, name->labels - 2, &option); @@ -1689,27 +1688,26 @@ catz_process_zones_suboption(dns_catz_zone_t *catz, dns_rdataset_t *value, dns_name_split(name, suffix_labels, &prefix, NULL); switch (opt) { case CATZ_OPT_COO: - return (catz_process_coo(catz, mhash, value)); + return catz_process_coo(catz, mhash, value); case CATZ_OPT_PRIMARIES: - return (catz_process_primaries(catz, &entry->opts.masters, - value, &prefix)); + return catz_process_primaries(catz, &entry->opts.masters, value, + &prefix); case CATZ_OPT_ALLOW_QUERY: if (prefix.labels != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (catz_process_apl(catz, &entry->opts.allow_query, - value)); + return catz_process_apl(catz, &entry->opts.allow_query, value); case CATZ_OPT_ALLOW_TRANSFER: if (prefix.labels != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (catz_process_apl(catz, &entry->opts.allow_transfer, - value)); + return catz_process_apl(catz, &entry->opts.allow_transfer, + value); default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } static void @@ -1745,7 +1743,7 @@ catz_process_value(dns_catz_zone_t *catz, dns_name_t *name, REQUIRE(DNS_RDATASET_VALID(rdataset)); if (name->labels < 1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_name_getlabel(name, name->labels - 1, &option); opt = catz_get_option(&option); @@ -1756,7 +1754,7 @@ catz_process_value(dns_catz_zone_t *catz, dns_name_t *name, */ if (catz->version >= 2 && opt >= CATZ_OPT_CUSTOM_START) { if (opt != CATZ_OPT_EXT || name->labels < 2) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } suffix_labels++; dns_name_getlabel(name, name->labels - 2, &option); @@ -1768,29 +1766,29 @@ catz_process_value(dns_catz_zone_t *catz, dns_name_t *name, switch (opt) { case CATZ_OPT_ZONES: - return (catz_process_zones(catz, rdataset, &prefix)); + return catz_process_zones(catz, rdataset, &prefix); case CATZ_OPT_PRIMARIES: - return (catz_process_primaries(catz, &catz->zoneoptions.masters, - rdataset, &prefix)); + return catz_process_primaries(catz, &catz->zoneoptions.masters, + rdataset, &prefix); case CATZ_OPT_ALLOW_QUERY: if (prefix.labels != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (catz_process_apl(catz, &catz->zoneoptions.allow_query, - rdataset)); + return catz_process_apl(catz, &catz->zoneoptions.allow_query, + rdataset); case CATZ_OPT_ALLOW_TRANSFER: if (prefix.labels != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (catz_process_apl( - catz, &catz->zoneoptions.allow_transfer, rdataset)); + return catz_process_apl(catz, &catz->zoneoptions.allow_transfer, + rdataset); case CATZ_OPT_VERSION: if (prefix.labels != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (catz_process_version(catz, rdataset)); + return catz_process_version(catz, rdataset); default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -1822,7 +1820,7 @@ dns__catz_update_process(dns_catz_zone_t *catz, const dns_name_t *src_name, ISC_LOG_ERROR, "catz: RR found which has a non-IN class"); catz->broken = true; - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } nrres = dns_name_fullcompare(src_name, &catz->name, &order, &nlabels); @@ -1830,7 +1828,7 @@ dns__catz_update_process(dns_catz_zone_t *catz, const dns_name_t *src_name, if (rdataset->type == dns_rdatatype_soa) { result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(rdataset, &rdata); @@ -1841,21 +1839,21 @@ dns__catz_update_process(dns_catz_zone_t *catz, const dns_name_t *src_name, * xxxwpk TODO do we want to save something from SOA? */ dns_rdata_freestruct(&soa); - return (result); + return result; } else if (rdataset->type == dns_rdatatype_ns) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } else if (nrres != dns_namereln_subdomain) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } dns_name_init(&prefix, NULL); dns_name_split(src_name, catz->name.labels, &prefix, NULL); result = catz_process_value(catz, &prefix, rdataset); - return (result); + return result; } static isc_result_t @@ -1866,10 +1864,10 @@ digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, size_t left = hashlen - i * 2; int ret = snprintf(hash + i * 2, left, "%02x", digest[i]); if (ret < 0 || (size_t)ret >= left) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1958,7 +1956,7 @@ dns_catz_generate_masterfilename(dns_catz_zone_t *catz, dns_catz_entry_t *entry, cleanup: isc_buffer_free(&tbuf); - return (result); + return result; } /* @@ -2068,11 +2066,11 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *catz, dns_catz_entry_t *entry, isc_buffer_putstr(buffer, "};"); *buf = buffer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_buffer_free(&buffer); - return (result); + return result; } static void @@ -2141,7 +2139,7 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) { catzs = (dns_catz_zones_t *)fn_arg; if (atomic_load(&catzs->shuttingdown)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } dns_name_toregion(&db->origin, &r); @@ -2195,7 +2193,7 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) { cleanup: UNLOCK(&catzs->lock); - return (result); + return result; } void @@ -2216,8 +2214,8 @@ dns_catz_dbupdate_register(dns_db_t *db, dns_catz_zones_t *catzs) { static bool catz_rdatatype_is_processable(const dns_rdatatype_t type) { - return (!dns_rdatatype_isdnssec(type) && type != dns_rdatatype_cds && - type != dns_rdatatype_cdnskey && type != dns_rdatatype_zonemd); + return !dns_rdatatype_isdnssec(type) && type != dns_rdatatype_cds && + type != dns_rdatatype_cdnskey && type != dns_rdatatype_zonemd; } /* diff --git a/lib/dns/client.c b/lib/dns/client.c index bcd9e4c3e5..5e25b9b508 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -174,7 +174,7 @@ cleanup: isc_portset_destroy(mctx, &v6portset); } - return (result); + return result; } static isc_result_t @@ -194,7 +194,7 @@ getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr, *dispp = disp; } - return (result); + return result; } static isc_result_t @@ -208,7 +208,7 @@ createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, isc_nm_t *nm, result = dns_view_create(mctx, dispatchmgr, rdclass, DNS_CLIENTVIEW_NAME, &view); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Initialize view security roots */ @@ -221,11 +221,11 @@ createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, isc_nm_t *nm, &view->cachedb)); *viewp = view; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_view_detach(&view); - return (result); + return result; } isc_result_t @@ -312,7 +312,7 @@ dns_client_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_nm_t *nm, *clientp = client; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_references: isc_refcount_decrementz(&client->references); @@ -328,7 +328,7 @@ cleanup_dispatchmgr: cleanup_client: isc_mem_put(mctx, client, sizeof(*client)); - return (result); + return result; } static void @@ -382,7 +382,7 @@ dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, result = dns_fwdtable_add(client->view->fwdtable, name_space, addrs, dns_fwdpolicy_only); - return (result); + return result; } void @@ -406,7 +406,7 @@ getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) { *rdatasetp = rdataset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -458,7 +458,7 @@ start_fetch(resctx_t *rctx) { rctx->client->loop, fetch_done, rctx, rctx->rdataset, rctx->sigrdataset, &rctx->fetch); - return (result); + return result; } static isc_result_t @@ -478,7 +478,7 @@ view_find(resctx_t *rctx, dns_db_t **dbp, dns_dbnode_t **nodep, nodep, foundname, rctx->rdataset, rctx->sigrdataset); - return (result); + return result; } static void @@ -938,7 +938,7 @@ startresolve(dns_client_t *client, const dns_name_t *name, *transp = (dns_clientrestrans_t *)rctx; client_resfind(rctx, NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (rdataset != NULL) { @@ -950,7 +950,7 @@ cleanup: isc_mem_put(mctx, rctx, sizeof(*rctx)); isc_mem_put(mctx, rev, sizeof(*rev)); - return (result); + return result; } isc_result_t @@ -981,10 +981,10 @@ dns_client_resolve(dns_client_t *client, const dns_name_t *name, resolve_done, resarg, &resarg->trans); if (result != ISC_R_SUCCESS) { isc_mem_put(client->mctx, resarg, sizeof(*resarg)); - return (result); + return result; } - return (result); + return result; } void @@ -1050,5 +1050,5 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, REQUIRE(DNS_CLIENT_VALID(client)); REQUIRE(rdclass == dns_rdataclass_in); - return (dns_view_addtrustedkey(client->view, rdtype, keyname, databuf)); + return dns_view_addtrustedkey(client->view, rdtype, keyname, databuf); } diff --git a/lib/dns/compress.c b/lib/dns/compress.c index 233a5af866..626d91b620 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -82,7 +82,7 @@ dns_compress_setpermitted(dns_compress_t *cctx, bool permitted) { bool dns_compress_getpermitted(dns_compress_t *cctx) { REQUIRE(CCTX_VALID(cctx)); - return ((cctx->flags & DNS_COMPRESS_PERMITTED) != 0); + return (cctx->flags & DNS_COMPRESS_PERMITTED) != 0; } /* @@ -109,16 +109,16 @@ hash_label(uint16_t init, uint8_t *ptr, bool sensitive) { } } - return (isc_hash_bits32(hash, 16)); + return isc_hash_bits32(hash, 16); } static bool match_wirename(uint8_t *a, uint8_t *b, unsigned int len, bool sensitive) { if (sensitive) { - return (memcmp(a, b, len) == 0); + return memcmp(a, b, len) == 0; } else { /* label lengths are < 'A' so unaffected by tolower() */ - return (isc_ascii_lowerequal(a, b, len)); + return isc_ascii_lowerequal(a, b, len); } } @@ -164,7 +164,7 @@ match_suffix(isc_buffer_t *buffer, unsigned int new_coff, uint8_t *sptr, INSIST(llen <= 64 && llen < slen); if (blen < new_coff + llen) { - return (false); + return false; } blen -= new_coff; @@ -172,12 +172,12 @@ match_suffix(isc_buffer_t *buffer, unsigned int new_coff, uint8_t *sptr, /* does the first label of the suffix appear here? */ if (!match_wirename(bptr, sptr, llen, sensitive)) { - return (false); + return false; } /* is this label followed by the previously matched suffix? */ if (old_coff == new_coff + llen) { - return (true); + return true; } blen -= llen; @@ -187,16 +187,16 @@ match_suffix(isc_buffer_t *buffer, unsigned int new_coff, uint8_t *sptr, /* are both labels followed by the root label? */ if (blen >= 1 && slen == 1 && bptr[0] == 0 && sptr[0] == 0) { - return (true); + return true; } /* is this label followed by a pointer to the previous match? */ if (blen >= 2 && bptr[0] == pptr[0] && bptr[1] == pptr[1]) { - return (true); + return true; } /* is this label followed by a copy of the rest of the suffix? */ - return (blen >= slen && match_wirename(bptr, sptr, slen, sensitive)); + return blen >= slen && match_wirename(bptr, sptr, slen, sensitive); } /* @@ -209,12 +209,12 @@ match_suffix(isc_buffer_t *buffer, unsigned int new_coff, uint8_t *sptr, */ static unsigned int probe_distance(dns_compress_t *cctx, unsigned int slot) { - return ((slot - cctx->set[slot].hash) & cctx->mask); + return (slot - cctx->set[slot].hash) & cctx->mask; } static unsigned int slot_index(dns_compress_t *cctx, unsigned int hash, unsigned int probe) { - return ((hash + probe) & cctx->mask); + return (hash + probe) & cctx->mask; } static bool @@ -227,7 +227,7 @@ insert_label(dns_compress_t *cctx, isc_buffer_t *buffer, const dns_name_t *name, unsigned int prefix_len = name->offsets[label]; unsigned int coff = isc_buffer_usedlength(buffer) + prefix_len; if (coff >= 0x4000 || cctx->count > cctx->mask * 3 / 4) { - return (false); + return false; } for (;;) { unsigned int slot = slot_index(cctx, hash, probe); @@ -236,7 +236,7 @@ insert_label(dns_compress_t *cctx, isc_buffer_t *buffer, const dns_name_t *name, cctx->set[slot].hash = hash; cctx->set[slot].coff = coff; cctx->count++; - return (true); + return true; } /* he steals from the rich and gives to the poor */ if (probe > probe_distance(cctx, slot)) { diff --git a/lib/dns/db.c b/lib/dns/db.c index 526b3ecbfc..834d5ab669 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -102,10 +102,10 @@ impfind(const char *name) { imp = ISC_LIST_NEXT(imp, link)) { if (strcasecmp(name, imp->name) == 0) { - return (imp); + return imp; } } - return (NULL); + return NULL; } static void @@ -142,7 +142,7 @@ dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, fprintf(stderr, "dns_db_create:%s:%s:%d:%p->references = 1\n", __func__, __FILE__, __LINE__ + 1, *dbp); #endif - return (result); + return result; } RWUNLOCK(&implock, isc_rwlocktype_read); @@ -150,7 +150,7 @@ dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DB, ISC_LOG_ERROR, "unsupported database type '%s'", db_type); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static void @@ -173,10 +173,10 @@ dns_db_iscache(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if ((db->attributes & DNS_DBATTR_CACHE) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -188,10 +188,10 @@ dns_db_iszone(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if ((db->attributes & (DNS_DBATTR_CACHE | DNS_DBATTR_STUB)) == 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -203,10 +203,10 @@ dns_db_isstub(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if ((db->attributes & DNS_DBATTR_STUB) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -219,9 +219,9 @@ dns_db_issecure(dns_db_t *db) { REQUIRE((db->attributes & DNS_DBATTR_CACHE) == 0); if (db->methods->issecure != NULL) { - return ((db->methods->issecure)(db)); + return (db->methods->issecure)(db); } - return (false); + return false; } bool @@ -234,10 +234,10 @@ dns_db_ispersistent(dns_db_t *db) { if (db->methods->beginload == NULL) { /* If the database can't be loaded, assume it's persistent */ - return (true); + return true; } - return (false); + return false; } dns_name_t * @@ -248,7 +248,7 @@ dns_db_origin(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); - return (&db->origin); + return &db->origin; } dns_rdataclass_t @@ -259,7 +259,7 @@ dns_db_class(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); - return (db->rdclass); + return db->rdclass; } isc_result_t @@ -272,9 +272,9 @@ dns_db_beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { REQUIRE(DNS_CALLBACK_VALID(callbacks)); if (db->methods->beginload != NULL) { - return ((db->methods->beginload)(db, callbacks)); + return (db->methods->beginload)(db, callbacks); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -295,10 +295,10 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { call_updatenotify(db); if (db->methods->endload != NULL) { - return ((db->methods->endload)(db, callbacks)); + return (db->methods->endload)(db, callbacks); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -320,7 +320,7 @@ dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, dns_rdatacallbacks_init(&callbacks); result = dns_db_beginload(db, &callbacks); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_master_loadfile(filename, &db->origin, &db->origin, db->rdclass, options, 0, &callbacks, NULL, @@ -337,7 +337,7 @@ dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, result = eresult; } - return (result); + return result; } /*** @@ -368,9 +368,9 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) { REQUIRE(versionp != NULL && *versionp == NULL); if (db->methods->newversion != NULL) { - return ((db->methods->newversion)(db, versionp)); + return (db->methods->newversion)(db, versionp); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } void @@ -425,11 +425,11 @@ dns__db_findnode(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(nodep != NULL && *nodep == NULL); if (db->methods->findnode != NULL) { - return ((db->methods->findnode)(db, name, create, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->findnode)(db, name, create, + nodep DNS__DB_FLARG_PASS); } else { - return ((db->methods->findnodeext)(db, name, create, NULL, NULL, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->findnodeext)(db, name, create, NULL, NULL, + nodep DNS__DB_FLARG_PASS); } } @@ -447,12 +447,12 @@ dns__db_findnodeext(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(nodep != NULL && *nodep == NULL); if (db->methods->findnodeext != NULL) { - return ((db->methods->findnodeext)(db, name, create, methods, - clientinfo, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->findnodeext)(db, name, create, methods, + clientinfo, + nodep DNS__DB_FLARG_PASS); } else { - return ((db->methods->findnode)(db, name, create, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->findnode)(db, name, create, + nodep DNS__DB_FLARG_PASS); } } @@ -466,8 +466,8 @@ dns__db_findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(DNS_DB_VALID(db)); REQUIRE(nodep != NULL && *nodep == NULL); - return ((db->methods->findnsec3node)(db, name, create, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->findnsec3node)(db, name, create, + nodep DNS__DB_FLARG_PASS); } isc_result_t @@ -492,13 +492,13 @@ dns__db_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, !dns_rdataset_isassociated(sigrdataset))); if (db->methods->find != NULL) { - return ((db->methods->find)(db, name, version, type, options, - now, nodep, foundname, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return (db->methods->find)(db, name, version, type, options, + now, nodep, foundname, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } else { - return ((db->methods->findext)( + return (db->methods->findext)( db, name, version, type, options, now, nodep, foundname, - NULL, NULL, rdataset, sigrdataset DNS__DB_FLARG_PASS)); + NULL, NULL, rdataset, sigrdataset DNS__DB_FLARG_PASS); } } @@ -525,14 +525,14 @@ dns__db_findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, !dns_rdataset_isassociated(sigrdataset))); if (db->methods->findext != NULL) { - return ((db->methods->findext)(db, name, version, type, options, - now, nodep, foundname, methods, - clientinfo, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return (db->methods->findext)(db, name, version, type, options, + now, nodep, foundname, methods, + clientinfo, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } else { - return ((db->methods->find)(db, name, version, type, options, - now, nodep, foundname, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return (db->methods->find)(db, name, version, type, options, + now, nodep, foundname, rdataset, + sigrdataset DNS__DB_FLARG_PASS); } } @@ -557,11 +557,11 @@ dns__db_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, !dns_rdataset_isassociated(sigrdataset))); if (db->methods->findzonecut != NULL) { - return ((db->methods->findzonecut)( + return (db->methods->findzonecut)( db, name, options, now, nodep, foundname, dcname, - rdataset, sigrdataset DNS__DB_FLARG_PASS)); + rdataset, sigrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } void @@ -620,9 +620,9 @@ dns_db_createiterator(dns_db_t *db, unsigned int flags, (DNS_DB_NSEC3ONLY | DNS_DB_NONSEC3)); if (db->methods->createiterator != NULL) { - return (db->methods->createiterator(db, flags, iteratorp)); + return db->methods->createiterator(db, flags, iteratorp); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } /*** @@ -644,9 +644,9 @@ dns__db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, (DNS_RDATASET_VALID(sigrdataset) && !dns_rdataset_isassociated(sigrdataset))); - return ((db->methods->findrdataset)(db, node, version, type, covers, - now, rdataset, - sigrdataset DNS__DB_FLARG_PASS)); + return (db->methods->findrdataset)(db, node, version, type, covers, now, + rdataset, + sigrdataset DNS__DB_FLARG_PASS); } isc_result_t @@ -661,8 +661,8 @@ dns__db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(DNS_DB_VALID(db)); REQUIRE(iteratorp != NULL && *iteratorp == NULL); - return ((db->methods->allrdatasets)(db, node, version, options, now, - iteratorp DNS__DB_FLARG_PASS)); + return (db->methods->allrdatasets)(db, node, version, options, now, + iteratorp DNS__DB_FLARG_PASS); } isc_result_t @@ -689,11 +689,11 @@ dns__db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, !dns_rdataset_isassociated(addedrdataset))); if (db->methods->addrdataset != NULL) { - return ((db->methods->addrdataset)( + return (db->methods->addrdataset)( db, node, version, now, rdataset, options, - addedrdataset DNS__DB_FLARG_PASS)); + addedrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -717,11 +717,11 @@ dns__db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, !dns_rdataset_isassociated(newrdataset))); if (db->methods->subtractrdataset != NULL) { - return ((db->methods->subtractrdataset)( + return (db->methods->subtractrdataset)( db, node, version, rdataset, options, - newrdataset DNS__DB_FLARG_PASS)); + newrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -739,10 +739,10 @@ dns__db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, ((db->attributes & DNS_DBATTR_CACHE) != 0 && version == NULL)); if (db->methods->deleterdataset != NULL) { - return ((db->methods->deleterdataset)( - db, node, version, type, covers DNS__DB_FLARG_PASS)); + return (db->methods->deleterdataset)(db, node, version, type, + covers DNS__DB_FLARG_PASS); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -757,7 +757,7 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, uint32_t *serialp) { result = dns_db_findnode(db, dns_db_origin(db), false, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -788,7 +788,7 @@ freerdataset: freenode: dns_db_detachnode(db, &node); - return (result); + return result; } unsigned int @@ -796,9 +796,9 @@ dns_db_nodecount(dns_db_t *db, dns_dbtree_t tree) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->nodecount != NULL) { - return ((db->methods->nodecount)(db, tree)); + return (db->methods->nodecount)(db, tree); } - return (0); + return 0; } size_t @@ -806,10 +806,10 @@ dns_db_hashsize(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->hashsize == NULL) { - return (0); + return 0; } - return ((db->methods->hashsize)(db)); + return (db->methods->hashsize)(db); } void @@ -835,7 +835,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, imp = impfind(name); if (imp != NULL) { RWUNLOCK(&implock, isc_rwlocktype_write); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } imp = isc_mem_get(mctx, sizeof(dns_dbimplementation_t)); @@ -850,7 +850,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, *dbimp = imp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -877,11 +877,11 @@ dns__db_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { REQUIRE(nodep != NULL && *nodep == NULL); if (db->methods->getoriginnode != NULL) { - return ((db->methods->getoriginnode)(db, - nodep DNS__DB_FLARG_PASS)); + return (db->methods->getoriginnode)(db, + nodep DNS__DB_FLARG_PASS); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_stats_t * @@ -889,10 +889,10 @@ dns_db_getrrsetstats(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->getrrsetstats != NULL) { - return ((db->methods->getrrsetstats)(db)); + return (db->methods->getrrsetstats)(db); } - return (NULL); + return NULL; } isc_result_t @@ -900,10 +900,10 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->setcachestats != NULL) { - return ((db->methods->setcachestats)(db, stats)); + return (db->methods->setcachestats)(db, stats); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -915,12 +915,12 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, REQUIRE(dns_db_iszone(db)); if (db->methods->getnsec3parameters != NULL) { - return ((db->methods->getnsec3parameters)(db, version, hash, - flags, iterations, - salt, salt_length)); + return (db->methods->getnsec3parameters)(db, version, hash, + flags, iterations, + salt, salt_length); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -930,29 +930,29 @@ dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, REQUIRE(dns_db_iszone(db)); if (db->methods->getsize != NULL) { - return ((db->methods->getsize)(db, version, records, bytes)); + return (db->methods->getsize)(db, version, records, bytes); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t dns_db_setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) { if (db->methods->setsigningtime != NULL) { - return ((db->methods->setsigningtime)(db, rdataset, resign)); + return (db->methods->setsigningtime)(db, rdataset, resign); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t dns_db_getsigningtime(dns_db_t *db, isc_stdtime_t *resign, dns_name_t *name, dns_typepair_t *typepair) { if (db->methods->getsigningtime != NULL) { - return ((db->methods->getsigningtime)(db, resign, name, - typepair)); + return (db->methods->getsigningtime)(db, resign, name, + typepair); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static void @@ -986,8 +986,8 @@ updatenotify_match(struct cds_lfht_node *ht_node, const void *_key) { caa_container_of(ht_node, dns_dbonupdatelistener_t, ht_node); const dns_dbonupdatelistener_t *key = _key; - return (listener->onupdate == key->onupdate && - listener->onupdate_arg == key->onupdate_arg); + return listener->onupdate == key->onupdate && + listener->onupdate_arg == key->onupdate_arg; } /* @@ -1054,9 +1054,9 @@ dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl) { REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); if (db->methods->setservestalettl != NULL) { - return ((db->methods->setservestalettl)(db, ttl)); + return (db->methods->setservestalettl)(db, ttl); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -1065,9 +1065,9 @@ dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl) { REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); if (db->methods->getservestalettl != NULL) { - return ((db->methods->getservestalettl)(db, ttl)); + return (db->methods->getservestalettl)(db, ttl); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -1076,9 +1076,9 @@ dns_db_setservestalerefresh(dns_db_t *db, uint32_t interval) { REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); if (db->methods->setservestalerefresh != NULL) { - return ((db->methods->setservestalerefresh)(db, interval)); + return (db->methods->setservestalerefresh)(db, interval); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -1087,9 +1087,9 @@ dns_db_getservestalerefresh(dns_db_t *db, uint32_t *interval) { REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); if (db->methods->getservestalerefresh != NULL) { - return ((db->methods->getservestalerefresh)(db, interval)); + return (db->methods->getservestalerefresh)(db, interval); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -1098,10 +1098,10 @@ dns_db_setgluecachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(stats != NULL); if (db->methods->setgluecachestats != NULL) { - return ((db->methods->setgluecachestats)(db, stats)); + return (db->methods->setgluecachestats)(db, stats); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -1116,10 +1116,10 @@ dns_db_addglue(dns_db_t *db, dns_dbversion_t *version, dns_rdataset_t *rdataset, if (db->methods->addglue != NULL) { (db->methods->addglue)(db, version, rdataset, msg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } void @@ -1157,9 +1157,9 @@ dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { REQUIRE(name != NULL); if (db->methods->nodefullname != NULL) { - return ((db->methods->nodefullname)(db, node, name)); + return (db->methods->nodefullname)(db, node, name); } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } void diff --git a/lib/dns/db_p.h b/lib/dns/db_p.h index 275fc422c3..06c00c7e5a 100644 --- a/lib/dns/db_p.h +++ b/lib/dns/db_p.h @@ -181,9 +181,9 @@ prio_type(dns_typepair_t type) { case DNS_SIGTYPE(dns_rdatatype_ptr): case dns_rdatatype_naptr: case DNS_SIGTYPE(dns_rdatatype_naptr): - return (true); + return true; } - return (false); + return false; } ISC_LANG_ENDDECLS diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c index eaa8eba229..8f202871a6 100644 --- a/lib/dns/dbiterator.c +++ b/lib/dns/dbiterator.c @@ -42,7 +42,7 @@ dns__dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->first(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->first(iterator DNS__DB_FLARG_PASS); } isc_result_t @@ -53,7 +53,7 @@ dns__dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->last(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->last(iterator DNS__DB_FLARG_PASS); } isc_result_t @@ -65,7 +65,7 @@ dns__dbiterator_seek(dns_dbiterator_t *iterator, REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->seek(iterator, name DNS__DB_FLARG_PASS)); + return iterator->methods->seek(iterator, name DNS__DB_FLARG_PASS); } isc_result_t @@ -76,7 +76,7 @@ dns__dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->prev(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->prev(iterator DNS__DB_FLARG_PASS); } isc_result_t @@ -87,7 +87,7 @@ dns__dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->next(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->next(iterator DNS__DB_FLARG_PASS); } isc_result_t @@ -101,8 +101,8 @@ dns__dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, REQUIRE(nodep != NULL && *nodep == NULL); REQUIRE(name == NULL || dns_name_hasbuffer(name)); - return (iterator->methods->current(iterator, nodep, - name DNS__DB_FLARG_PASS)); + return iterator->methods->current(iterator, nodep, + name DNS__DB_FLARG_PASS); } isc_result_t @@ -113,7 +113,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); - return (iterator->methods->pause(iterator)); + return iterator->methods->pause(iterator); } isc_result_t @@ -126,5 +126,5 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { REQUIRE(iterator->relative_names); REQUIRE(dns_name_hasbuffer(name)); - return (iterator->methods->origin(iterator, name)); + return iterator->methods->origin(iterator, name); } diff --git a/lib/dns/diff.c b/lib/dns/diff.c index 2a170146a5..2ab896ab48 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -44,8 +44,7 @@ static dns_rdatatype_t rdata_covers(dns_rdata_t *rdata) { - return (rdata->type == dns_rdatatype_rrsig ? dns_rdata_covers(rdata) - : 0); + return rdata->type == dns_rdatatype_rrsig ? dns_rdata_covers(rdata) : 0; } void @@ -220,7 +219,7 @@ setresign(dns_rdataset_t *modified) { result = dns_rdataset_next(modified); } INSIST(result == ISC_R_NOMORE); - return ((isc_stdtime_t)when); + return (isc_stdtime_t)when; } static void @@ -241,15 +240,15 @@ static const char * optotext(dns_diffop_t op) { switch (op) { case DNS_DIFFOP_ADD: - return ("add"); + return "add"; case DNS_DIFFOP_ADDRESIGN: - return ("add-resign"); + return "add-resign"; case DNS_DIFFOP_DEL: - return ("del"); + return "del"; case DNS_DIFFOP_DELRESIGN: - return ("del-resign"); + return "del-resign"; default: - return ("unknown"); + return "unknown"; } } @@ -484,23 +483,23 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } isc_result_t dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) { - return (diff_apply(diff, db, ver, true)); + return diff_apply(diff, db, ver, true); } isc_result_t dns_diff_applysilently(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) { - return (diff_apply(diff, db, ver, false)); + return diff_apply(diff, db, ver, false); } /* XXX this duplicates lots of code in diff_apply(). */ @@ -579,7 +578,7 @@ failure: if (callbacks->commit != NULL) { callbacks->commit(callbacks->add_private); } - return (result); + return result; } /* @@ -600,7 +599,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { length++; } if (length == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } v = isc_mem_cget(diff->mctx, length, sizeof(dns_difftuple_t *)); for (i = 0; i < length; i++) { @@ -614,7 +613,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { ISC_LIST_APPEND(diff->tuples, v[i], link); } isc_mem_cput(diff->mctx, v, length, sizeof(dns_difftuple_t *)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -719,5 +718,5 @@ cleanup: if (mem != NULL) { isc_mem_put(diff->mctx, mem, size); } - return (result); + return result; } diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 77b04be991..0e33870229 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -214,15 +214,15 @@ socktype2str(dns_dispentry_t *resp) { switch (transport_type) { case DNS_TRANSPORT_UDP: - return ("UDP"); + return "UDP"; case DNS_TRANSPORT_TCP: - return ("TCP"); + return "TCP"; case DNS_TRANSPORT_TLS: - return ("TLS"); + return "TLS"; case DNS_TRANSPORT_HTTP: - return ("HTTP"); + return "HTTP"; default: - return (""); + return ""; } } @@ -230,15 +230,15 @@ static const char * state2str(dns_dispatchstate_t state) { switch (state) { case DNS_DISPATCHSTATE_NONE: - return ("none"); + return "none"; case DNS_DISPATCHSTATE_CONNECTING: - return ("connecting"); + return "connecting"; case DNS_DISPATCHSTATE_CONNECTED: - return ("connected"); + return "connected"; case DNS_DISPATCHSTATE_CANCELED: - return ("canceled"); + return "canceled"; default: - return (""); + return ""; } } @@ -345,7 +345,7 @@ setup_socket(dns_dispatch_t *disp, dns_dispentry_t *resp, in_port_t port = *portp; if (resp->retries++ > 5) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (isc_sockaddr_pf(&disp->local) == AF_INET) { @@ -356,7 +356,7 @@ setup_socket(dns_dispatch_t *disp, dns_dispentry_t *resp, ports = mgr->v6ports; } if (nports == 0) { - return (ISC_R_ADDRNOTAVAIL); + return ISC_R_ADDRNOTAVAIL; } resp->local = disp->local; @@ -369,7 +369,7 @@ setup_socket(dns_dispatch_t *disp, dns_dispentry_t *resp, } resp->port = port; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static uint32_t @@ -382,7 +382,7 @@ qid_hash(const dns_dispentry_t *dispentry) { isc_hash32_hash(&hash, &dispentry->id, sizeof(dispentry->id), true); isc_hash32_hash(&hash, &dispentry->port, sizeof(dispentry->port), true); - return (isc_hash32_finalize(&hash)); + return isc_hash32_finalize(&hash); } static int @@ -391,8 +391,8 @@ qid_match(struct cds_lfht_node *node, const void *key0) { caa_container_of(node, dns_dispentry_t, ht_node); const dns_dispentry_t *key = key0; - return (dispentry->id == key->id && dispentry->port == key->port && - isc_sockaddr_equal(&dispentry->peer, &key->peer)); + return dispentry->id == key->id && dispentry->port == key->port && + isc_sockaddr_equal(&dispentry->peer, &key->peer); } static void @@ -456,10 +456,10 @@ ISC_REFCOUNT_IMPL(dns_dispentry, dispentry_destroy); static unsigned int dispentry_runtime(dns_dispentry_t *resp, const isc_time_t *now) { if (isc_time_isepoch(&resp->start)) { - return (0); + return 0; } - return (isc_time_microdiff(now, &resp->start) / 1000); + return isc_time_microdiff(now, &resp->start) / 1000; } /* @@ -632,10 +632,10 @@ tcp_recv_oldest(dns_dispatch_t *disp, dns_dispentry_t **respp) { disp->timedout++; *respp = resp; - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -661,7 +661,7 @@ tcp_recv_success(dns_dispatch_t *disp, isc_region_t *region, result = dns_message_peekheader(&source, &id, &flags); if (result != ISC_R_SUCCESS) { dispatch_log(disp, ISC_LOG_DEBUG(10), "got garbage packet"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } dispatch_log(disp, ISC_LOG_DEBUG(92), @@ -675,7 +675,7 @@ tcp_recv_success(dns_dispatch_t *disp, isc_region_t *region, if ((flags & DNS_MESSAGEFLAG_QR) == 0) { dispatch_log(disp, ISC_LOG_DEBUG(10), "got DNS query instead of answer"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -712,7 +712,7 @@ tcp_recv_success(dns_dispatch_t *disp, isc_region_t *region, "search for response in hashtable: %s", isc_result_totext(result)); - return (result); + return result; } static void @@ -965,7 +965,7 @@ setavailports(dns_dispatchmgr_t *mgr, isc_portset_t *v4portset, mgr->v6ports = v6ports; mgr->nv6ports = nv6ports; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1019,7 +1019,7 @@ dns_dispatchmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, isc_nm_t *nm, mgr->magic = DNS_DISPATCHMGR_MAGIC; *mgrp = mgr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #if DNS_DISPATCH_TRACE @@ -1040,14 +1040,14 @@ dns_dispatchmgr_setblackhole(dns_dispatchmgr_t *mgr, dns_acl_t *blackhole) { dns_acl_t * dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr) { REQUIRE(VALID_DISPATCHMGR(mgr)); - return (mgr->blackhole); + return mgr->blackhole; } isc_result_t dns_dispatchmgr_setavailports(dns_dispatchmgr_t *mgr, isc_portset_t *v4portset, isc_portset_t *v6portset) { REQUIRE(VALID_DISPATCHMGR(mgr)); - return (setavailports(mgr, v4portset, v6portset)); + return setavailports(mgr, v4portset, v6portset); } static void @@ -1145,7 +1145,7 @@ dispatch_hash(struct dispatch_key *key) { hashval ^= isc_sockaddr_hash(key->local, true); } - return (hashval); + return hashval; } static int @@ -1163,9 +1163,9 @@ dispatch_match(struct cds_lfht_node *node, const void *key0) { peer = disp->peer; } - return (isc_sockaddr_equal(&peer, key->peer) && - disp->transport == key->transport && - (key->local == NULL || isc_sockaddr_equal(&local, key->local))); + return isc_sockaddr_equal(&peer, key->peer) && + disp->transport == key->transport && + (key->local == NULL || isc_sockaddr_equal(&local, key->local)); } isc_result_t @@ -1225,7 +1225,7 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr, } *dispp = disp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1309,7 +1309,7 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, result = ISC_R_SUCCESS; } - return (result); + return result; } isc_result_t @@ -1327,7 +1327,7 @@ dns_dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr, *dispp = disp; } - return (result); + return result; } static isc_result_t @@ -1344,7 +1344,7 @@ dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr, if (!isc_sockaddr_eqaddr(&sa_any, localaddr)) { result = isc_nm_checkaddr(localaddr, isc_socktype_udp); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -1371,7 +1371,7 @@ dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr, *dispp = disp; - return (result); + return result; } static void @@ -1442,7 +1442,7 @@ dns_dispatch_add(dns_dispatch_t *disp, isc_loop_t *loop, REQUIRE(disp->transport == transport); if (disp->state == DNS_DISPATCHSTATE_CANCELED) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } in_port_t localport = isc_sockaddr_getport(&disp->local); @@ -1474,7 +1474,7 @@ dns_dispatch_add(dns_dispatch_t *disp, isc_loop_t *loop, if (result != ISC_R_SUCCESS) { isc_mem_put(disp->mctx, resp, sizeof(*resp)); inc_stats(disp->mgr, dns_resstatscounter_dispsockfail); - return (result); + return result; } } @@ -1512,7 +1512,7 @@ fail: if (result != ISC_R_SUCCESS) { isc_mem_put(disp->mctx, resp, sizeof(*resp)); rcu_read_unlock(); - return (result); + return result; } isc_mem_attach(disp->mctx, &resp->mctx); @@ -1538,7 +1538,7 @@ fail: *idp = resp->id; *respp = resp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1556,7 +1556,7 @@ dns_dispatch_getnext(dns_dispentry_t *resp) { isc_time_t now = isc_loop_now(resp->loop); timeout = resp->timeout - dispentry_runtime(resp, &now); if (timeout <= 0) { - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; } } @@ -1572,7 +1572,7 @@ dns_dispatch_getnext(dns_dispentry_t *resp) { UNREACHABLE(); } - return (result); + return result; } /* @@ -1976,7 +1976,7 @@ tcp_dispatch_connect(dns_dispatch_t *disp, dns_dispentry_t *resp) { resp->mctx, &tlsctx, &sess_cache); if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(tlsctx != NULL); } @@ -2043,7 +2043,7 @@ tcp_dispatch_connect(dns_dispatch_t *disp, dns_dispentry_t *resp) { UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2055,11 +2055,11 @@ dns_dispatch_connect(dns_dispentry_t *resp) { switch (disp->socktype) { case isc_socktype_tcp: - return (tcp_dispatch_connect(disp, resp)); + return tcp_dispatch_connect(disp, resp); case isc_socktype_udp: udp_dispatch_connect(disp, resp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; default: UNREACHABLE(); @@ -2188,9 +2188,9 @@ dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp) { if (disp->socktype == isc_socktype_udp) { *addrp = disp->local; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -2204,10 +2204,10 @@ dns_dispentry_getlocaladdress(dns_dispentry_t *resp, isc_sockaddr_t *addrp) { switch (disp->socktype) { case isc_socktype_tcp: *addrp = disp->local; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case isc_socktype_udp: *addrp = isc_nmhandle_localaddr(resp->handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; default: UNREACHABLE(); } @@ -2219,12 +2219,12 @@ dns_dispatchset_get(dns_dispatchset_t *dset) { /* check that dispatch set is configured */ if (dset == NULL || dset->ndisp == 0) { - return (NULL); + return NULL; } INSIST(tid < dset->ndisp); - return (dset->dispatches[tid]); + return dset->dispatches[tid]; } isc_result_t @@ -2262,7 +2262,7 @@ dns_dispatchset_create(isc_mem_t *mctx, dns_dispatch_t *source, *dsetp = dset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; fail: for (size_t j = 0; j < i; j++) { @@ -2272,7 +2272,7 @@ fail: sizeof(dns_dispatch_t *)); isc_mem_putanddetach(&dset->mctx, dset, sizeof(dns_dispatchset_t)); - return (result); + return result; } void @@ -2295,8 +2295,8 @@ dns_dispatch_checkperm(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); if (disp->handle == NULL || disp->socktype == isc_socktype_udp) { - return (ISC_R_NOPERM); + return ISC_R_NOPERM; } - return (isc_nm_xfr_checkperm(disp->handle)); + return isc_nm_xfr_checkperm(disp->handle); } diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c index d7452c9e0d..3dbdfb3dc0 100644 --- a/lib/dns/dlz.c +++ b/lib/dns/dlz.c @@ -98,10 +98,10 @@ dlz_impfind(const char *name) { imp = ISC_LIST_NEXT(imp, link)) { if (strcasecmp(name, imp->name) == 0) { - return (imp); + return imp; } } - return (NULL); + return NULL; } /*** @@ -142,7 +142,7 @@ dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, case ISC_R_SUCCESS: case ISC_R_NOPERM: case ISC_R_DEFAULT: - return (result); + return result; default: break; } @@ -152,7 +152,7 @@ dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, result = ISC_R_NOTFOUND; } - return (result); + return result; } isc_result_t @@ -194,7 +194,7 @@ dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername, " %s not loaded.", drivername, dlzname); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* Allocate memory to hold the DLZ database driver */ @@ -223,7 +223,7 @@ dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername, isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_DEBUG(2), "DLZ driver loaded successfully."); *dbp = db; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, "DLZ driver failed to load."); @@ -231,7 +231,7 @@ failure: /* impinfo->methods->create failed. */ isc_mem_free(mctx, db->dlzname); isc_mem_put(mctx, db, sizeof(*db)); - return (result); + return result; } void @@ -310,7 +310,7 @@ dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods, ISC_LOG_DEBUG(2), "DLZ Driver '%s' already registered", drivername); RWUNLOCK(&dlz_implock, isc_rwlocktype_write); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /* @@ -340,7 +340,7 @@ dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods, /* Pass back the dlz_implementation that we created. */ *dlzimp = dlz_imp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -352,7 +352,7 @@ dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods, */ isc_result_t dns_dlzstrtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) { - return (isc_commandline_strtoargv(mctx, s, argcp, argvp, 0)); + return isc_commandline_strtoargv(mctx, s, argcp, argvp, 0); } /*% @@ -475,7 +475,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } /*% @@ -494,14 +494,14 @@ dns_dlzconfigure(dns_view_t *view, dns_dlzdb_t *dlzdb, impl = dlzdb->implementation; if (impl->methods->configure == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dlzdb->configure_callback = callback; result = impl->methods->configure(impl->driverarg, dlzdb->dbdata, view, dlzdb); - return (result); + return result; } bool @@ -520,10 +520,10 @@ dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_INFO, "No ssumatch method for DLZ database"); - return (false); + return false; } r = impl->methods->ssumatch(signer, name, tcpaddr, type, key, impl->driverarg, dlzdatabase->dbdata); - return (r); + return r; } diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c index 80ed6c4d91..81cc87fdd6 100644 --- a/lib/dns/dns64.c +++ b/lib/dns/dns64.c @@ -100,7 +100,7 @@ dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, dns64->mctx = NULL; isc_mem_attach(mctx, &dns64->mctx); *dns64p = dns64; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -137,23 +137,23 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, if ((dns64->flags & DNS_DNS64_RECURSIVE_ONLY) != 0 && (flags & DNS_DNS64_RECURSIVE) == 0) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } if ((dns64->flags & DNS_DNS64_BREAK_DNSSEC) == 0 && (flags & DNS_DNS64_DNSSEC) != 0) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } if (dns64->clients != NULL && reqaddr != NULL) { result = dns_acl_match(reqaddr, reqsigner, dns64->clients, env, &match, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (match <= 0) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } } @@ -166,10 +166,10 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, result = dns_acl_match(&netaddr, NULL, dns64->mapped, env, &match, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (match <= 0) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } } @@ -191,13 +191,13 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, } /* Copy suffix. */ memmove(aaaa + nbytes, dns64->bits + nbytes, 16 - nbytes); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_dns64_t * dns_dns64_next(dns_dns64_t *dns64) { dns64 = ISC_LIST_NEXT(dns64, link); - return (dns64); + return dns64; } void @@ -321,7 +321,7 @@ done: aaaaok[i] = true; } } - return (found ? answer : true); + return found ? answer : true; } /* @@ -387,7 +387,7 @@ search(const dns_rdata_t *rd1, const dns_rdata_t *rd2, unsigned int plen) { /* Does the prefix match? */ while ((j * 8U) < plen) { if (rd1->data[j] != rd2->data[j]) { - return (0); + return 0; } j++; } @@ -402,13 +402,13 @@ search(const dns_rdata_t *rd1, const dns_rdata_t *rd2, unsigned int plen) { } } if (j == 16U) { - return (prefixes[i].plen); + return prefixes[i].plen; } if (rd2 != NULL) { - return (0); + return 0; } } - return (0); + return 0; } isc_result_t @@ -473,12 +473,12 @@ dns_dns64_findprefix(dns_rdataset_t *rdataset, isc_netprefix_t *prefix, } } if (count == 0U) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (count > *len) { *len = count; - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *len = count; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index e4f3499bbc..e5bac5257a 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -67,7 +67,7 @@ static isc_result_t digest_callback(void *arg, isc_region_t *data) { dst_context_t *ctx = arg; - return (dst_context_adddata(ctx, data)); + return dst_context_adddata(ctx, data); } static void @@ -82,8 +82,8 @@ inc_stat(isc_statscounter_t counter) { */ static int rdata_compare_wrapper(const void *rdata1, const void *rdata2) { - return (dns_rdata_compare((const dns_rdata_t *)rdata1, - (const dns_rdata_t *)rdata2)); + return dns_rdata_compare((const dns_rdata_t *)rdata1, + (const dns_rdata_t *)rdata2); } /* @@ -107,7 +107,7 @@ rdataset_to_sortedarray(dns_rdataset_t *set, isc_mem_t *mctx, if (ret != ISC_R_SUCCESS) { dns_rdataset_disassociate(&rdataset); isc_mem_cput(mctx, data, n, sizeof(dns_rdata_t)); - return (ret); + return ret; } /* @@ -125,7 +125,7 @@ rdataset_to_sortedarray(dns_rdataset_t *set, isc_mem_t *mctx, *rdata = data; *nrdata = n; dns_rdataset_disassociate(&rdataset); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -145,7 +145,7 @@ dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata, dns_rdata_toregion(rdata, &r); isc_buffer_init(&b, r.base, r.length); isc_buffer_add(&b, r.length); - return (dst_key_fromdns(name, rdata->rdclass, &b, mctx, key)); + return dst_key_fromdns(name, rdata->rdclass, &b, mctx, key); } static isc_result_t @@ -161,7 +161,7 @@ digest_sig(dst_context_t *ctx, bool downcase, dns_rdata_t *sigrdata, r.length = 18; ret = dst_context_adddata(ctx, &r); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } if (downcase) { dns_fixedname_init(&fname); @@ -174,7 +174,7 @@ digest_sig(dst_context_t *ctx, bool downcase, dns_rdata_t *sigrdata, dns_name_toregion(&rrsig->signer, &r); } - return (dst_context_adddata(ctx, &r)); + return dst_context_adddata(ctx, &r); } isc_result_t @@ -206,7 +206,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, REQUIRE(sigrdata != NULL); if (*inception >= *expire) { - return (DNS_R_INVALIDTIME); + return DNS_R_INVALIDTIME; } /* @@ -214,10 +214,10 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ flags = dst_key_flags(key); if ((flags & DNS_KEYTYPE_NOAUTH) != 0) { - return (DNS_R_KEYUNAUTHORIZED); + return DNS_R_KEYUNAUTHORIZED; } if ((flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE) { - return (DNS_R_KEYUNAUTHORIZED); + return DNS_R_KEYUNAUTHORIZED; } sig.mctx = mctx; @@ -247,7 +247,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, sig.keyid = dst_key_id(key); ret = dst_key_sigsize(key, &sigsize); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } sig.siglen = sigsize; /* @@ -364,7 +364,7 @@ cleanup_databuf: isc_buffer_free(&databuf); isc_mem_put(mctx, sig.signature, sig.siglen); - return (ret); + return ret; } isc_result_t @@ -393,16 +393,16 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, ret = dns_rdata_tostruct(sigrdata, &sig, NULL); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } if (set->type != sig.covered) { - return (DNS_R_SIGINVALID); + return DNS_R_SIGINVALID; } if (isc_serial_lt(sig.timeexpire, sig.timesigned)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGINVALID); + return DNS_R_SIGINVALID; } if (!ignoretime) { @@ -413,10 +413,10 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ if (isc_serial_lt((uint32_t)now, sig.timesigned)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGFUTURE); + return DNS_R_SIGFUTURE; } else if (isc_serial_lt(sig.timeexpire, (uint32_t)now)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGEXPIRED); + return DNS_R_SIGEXPIRED; } } @@ -430,19 +430,19 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, case dns_rdatatype_dnskey: if (!dns_name_equal(name, &sig.signer)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGINVALID); + return DNS_R_SIGINVALID; } break; case dns_rdatatype_ds: if (dns_name_equal(name, &sig.signer)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGINVALID); + return DNS_R_SIGINVALID; } FALLTHROUGH; default: if (!dns_name_issubdomain(name, &sig.signer)) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_SIGINVALID); + return DNS_R_SIGINVALID; } break; } @@ -453,11 +453,11 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, flags = dst_key_flags(key); if ((flags & DNS_KEYTYPE_NOAUTH) != 0) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_KEYUNAUTHORIZED); + return DNS_R_KEYUNAUTHORIZED; } if ((flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE) { inc_stat(dns_dnssecstats_fail); - return (DNS_R_KEYUNAUTHORIZED); + return DNS_R_KEYUNAUTHORIZED; } again: @@ -599,7 +599,7 @@ cleanup_struct: inc_stat(dns_dnssecstats_wildcard); ret = DNS_R_FROMWILDCARD; } - return (ret); + return ret; } bool @@ -630,7 +630,7 @@ dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) { * keys are assumed active. */ if (major == 1 && minor <= 2) { - return (true); + return true; } hint_publish = dst_key_is_published(key, now, &publish); @@ -640,18 +640,18 @@ dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) { hint_remove = dst_key_is_removed(key, now, &remove); if (hint_remove) { - return (false); + return false; } if (hint_publish && hint_revoke) { - return (true); + return true; } if (hint_zsign && zsk) { - return (true); + return true; } if (hint_ksign && ksk) { - return (true); + return true; } - return (false); + return false; } /*%< @@ -683,14 +683,14 @@ syncpublish(dst_key_t *key, isc_stdtime_t now) { * Smart signing started with key format 1.3 */ if (major == 1 && minor <= 2) { - return (false); + return false; } /* Check kasp state first. */ result = dst_key_getstate(key, DST_KEY_DS, &state); if (result == ISC_R_SUCCESS) { - return (state == DST_KEY_STATE_RUMOURED || - state == DST_KEY_STATE_OMNIPRESENT); + return state == DST_KEY_STATE_RUMOURED || + state == DST_KEY_STATE_OMNIPRESENT; } /* If no kasp state, check timings. */ @@ -703,7 +703,7 @@ syncpublish(dst_key_t *key, isc_stdtime_t now) { if (result == ISC_R_SUCCESS && when < now) { publish = false; } - return (publish); + return publish; } /*%< @@ -733,25 +733,25 @@ syncdelete(dst_key_t *key, isc_stdtime_t now) { * Smart signing started with key format 1.3. */ if (major == 1 && minor <= 2) { - return (false); + return false; } /* Check kasp state first. */ result = dst_key_getstate(key, DST_KEY_DS, &state); if (result == ISC_R_SUCCESS) { - return (state == DST_KEY_STATE_UNRETENTIVE || - state == DST_KEY_STATE_HIDDEN); + return state == DST_KEY_STATE_UNRETENTIVE || + state == DST_KEY_STATE_HIDDEN; } /* If no kasp state, check timings. */ result = dst_key_gettime(key, DST_TIME_SYNCDELETE, &when); if (result != ISC_R_SUCCESS) { - return (false); + return false; } if (when <= now) { - return (true); + return true; } - return (false); + return false; } #define is_zone_key(key) \ @@ -878,7 +878,7 @@ dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) { dns_rdatalist_tordataset(datalist, dataset); msg->sig0 = dataset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (dynbuf != NULL) { @@ -891,7 +891,7 @@ failure: dst_context_destroy(&ctx); } - return (result); + return result; } isc_result_t @@ -920,7 +920,7 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, if (is_response(msg)) { if (msg->query.base == NULL) { - return (DNS_R_UNEXPECTEDTSIG); + return DNS_R_UNEXPECTEDTSIG; } } @@ -1023,7 +1023,7 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, dst_context_destroy(&ctx); dns_rdata_freestruct(&sig); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (signeedsfree) { @@ -1033,7 +1033,7 @@ failure: dst_context_destroy(&ctx); } - return (result); + return result; } /*% @@ -1053,8 +1053,8 @@ dns_dnssec_selfsigns(dns_rdata_t *rdata, const dns_name_t *name, INSIST(sigrdataset->covers == dns_rdatatype_dnskey); } - return (dns_dnssec_signs(rdata, name, rdataset, sigrdataset, ignoretime, - mctx)); + return dns_dnssec_signs(rdata, name, rdataset, sigrdataset, ignoretime, + mctx); } bool @@ -1070,12 +1070,12 @@ dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, INSIST(sigrdataset->type == dns_rdatatype_rrsig); if (sigrdataset->covers != rdataset->type) { - return (false); + return false; } result = dns_dnssec_keyfromrdata(name, rdata, mctx, &dstkey); if (result != ISC_R_SUCCESS) { - return (false); + return false; } result = dns_rdata_tostruct(rdata, &key, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -1095,12 +1095,12 @@ dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, &sigrdata, NULL); if (result == ISC_R_SUCCESS) { dst_key_free(&dstkey); - return (true); + return true; } } } dst_key_free(&dstkey); - return (false); + return false; } void @@ -1333,7 +1333,7 @@ failure: if (dstkey != NULL) { dst_key_free(&dstkey); } - return (result); + return result; } /*% @@ -1399,7 +1399,7 @@ failure: dst_key_free(&key->key); dns_dnsseckey_destroy(mctx, &key); } - return (result); + return result; } /*% @@ -1503,7 +1503,7 @@ mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) { if (dns_rdataset_isassociated(&sigs)) { dns_rdataset_disassociate(&sigs); } - return (result); + return result; } static isc_result_t @@ -1534,7 +1534,7 @@ keyfromfile(dns_kasp_t *kasp, const char *keydir, dst_key_t *key, int type, } } - return (result); + return result; } /*% @@ -1733,7 +1733,7 @@ failure: if (privkey != NULL) { dst_key_free(&privkey); } - return (result); + return result; } isc_result_t @@ -1746,14 +1746,14 @@ dns_dnssec_make_dnskey(dst_key_t *key, unsigned char *buf, int bufsize, isc_buffer_init(&b, buf, bufsize); result = dst_key_todns(key, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_reset(target); isc_buffer_usedregion(&b, &r); dns_rdata_fromregion(target, dst_key_class(key), dns_rdatatype_dnskey, &r); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1806,7 +1806,7 @@ publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, addrdata(&dnskey, diff, origin, ttl, mctx); failure: - return (result); + return result; } static isc_result_t @@ -1828,7 +1828,7 @@ remove_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, delrdata(&dnskey, diff, origin, ttl, mctx); failure: - return (result); + return result; } static bool @@ -1846,11 +1846,11 @@ exists(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { dns_rdataset_current(&trdataset, ¤t); if (dns_rdata_compare(rdata, ¤t) == 0) { dns_rdataset_disassociate(&trdataset); - return (true); + return true; } } dns_rdataset_disassociate(&trdataset); - return (false); + return false; } static isc_result_t @@ -1871,7 +1871,7 @@ add_cds(dns_dnsseckey_t *key, dns_rdata_t *keyrdata, const char *keystr, ISC_LOG_ERROR, "build rdata CDS (%s) for key %s failed", algbuf, keystr); - return (r); + return r; } cdsrdata.type = dns_rdatatype_cds; @@ -1885,7 +1885,7 @@ add_cds(dns_dnsseckey_t *key, dns_rdata_t *keyrdata, const char *keystr, keystr); addrdata(&cdsrdata, diff, origin, ttl, mctx); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1899,7 +1899,7 @@ delete_cds(dns_dnsseckey_t *key, dns_rdata_t *keyrdata, const char *keystr, r = dns_ds_buildrdata(origin, keyrdata, digesttype, dsbuf, &cdsrdata); if (r != ISC_R_SUCCESS) { - return (r); + return r; } cdsrdata.type = dns_rdatatype_cds; @@ -1913,7 +1913,7 @@ delete_cds(dns_dnsseckey_t *key, dns_rdata_t *keyrdata, const char *keystr, keystr); delrdata(&cdsrdata, diff, origin, cds->ttl, mctx); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2012,7 +2012,7 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, if (!dns_rdataset_isassociated(cds) && !dns_rdataset_isassociated(cdnskey)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -2055,7 +2055,7 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, result = ISC_R_SUCCESS; failure: - return (result); + return result; } isc_result_t @@ -2129,7 +2129,7 @@ dns_dnssec_syncdelete(dns_rdataset_t *cds, dns_rdataset_t *cdnskey, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -2368,7 +2368,7 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, result = ISC_R_SUCCESS; failure: - return (result); + return result; } isc_result_t @@ -2416,5 +2416,5 @@ dns_dnssec_matchdskey(dns_name_t *name, dns_rdata_t *dsrdata, result = ISC_R_NOTFOUND; } - return (result); + return result; } diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index 8525db584e..1d83f1219b 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -240,7 +240,7 @@ cleanup: isc_mem_putanddetach(&env->mctx, env, sizeof(dns_dtenv_t)); } - return (result); + return result; } isc_result_t @@ -256,9 +256,9 @@ dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, if (max_size == 0 && rolls == ISC_LOG_ROLLINFINITE && suffix == isc_log_rollsuffix_increment) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } } @@ -266,7 +266,7 @@ dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, env->rolls = rolls; env->suffix = suffix; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -381,7 +381,7 @@ cleanup: isc_loopmgr_resume(loopmgr); - return (result); + return result; } static isc_result_t @@ -404,21 +404,21 @@ toregion(dns_dtenv_t *env, isc_region_t *r, const char *str) { r->length = strlen((char *)p); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_dt_setidentity(dns_dtenv_t *env, const char *identity) { REQUIRE(VALID_DTENV(env)); - return (toregion(env, &env->identity, identity)); + return toregion(env, &env->identity, identity); } isc_result_t dns_dt_setversion(dns_dtenv_t *env, const char *version) { REQUIRE(VALID_DTENV(env)); - return (toregion(env, &env->version, version)); + return toregion(env, &env->version, version); } static void @@ -434,7 +434,7 @@ dt_queue(dns_dtenv_t *env) { unsigned int generation; if (env->iothr == NULL) { - return (NULL); + return NULL; } generation = atomic_load_acquire(&global_generation); @@ -447,7 +447,7 @@ dt_queue(dns_dtenv_t *env) { set_dt_ioq(generation, ioq); } - return (dt_ioq.ioq); + return dt_ioq.ioq; } void @@ -465,10 +465,10 @@ dns_dt_getstats(dns_dtenv_t *env, isc_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); if (env->stats == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_stats_attach(env->stats, statsp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -531,17 +531,17 @@ pack_dt(const Dnstap__Dnstap *d, void **buf, size_t *sz) { /* Need to use malloc() here because protobuf uses free() */ sbuf.data = malloc(sbuf.alloced); if (sbuf.data == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } sbuf.must_free_data = 1; *sz = dnstap__dnstap__pack_to_buffer(d, (ProtobufCBuffer *)&sbuf); if (sbuf.data == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *buf = sbuf.data; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -602,33 +602,33 @@ static Dnstap__Message__Type dnstap_type(dns_dtmsgtype_t msgtype) { switch (msgtype) { case DNS_DTTYPE_SQ: - return (DNSTAP__MESSAGE__TYPE__STUB_QUERY); + return DNSTAP__MESSAGE__TYPE__STUB_QUERY; case DNS_DTTYPE_SR: - return (DNSTAP__MESSAGE__TYPE__STUB_RESPONSE); + return DNSTAP__MESSAGE__TYPE__STUB_RESPONSE; case DNS_DTTYPE_CQ: - return (DNSTAP__MESSAGE__TYPE__CLIENT_QUERY); + return DNSTAP__MESSAGE__TYPE__CLIENT_QUERY; case DNS_DTTYPE_CR: - return (DNSTAP__MESSAGE__TYPE__CLIENT_RESPONSE); + return DNSTAP__MESSAGE__TYPE__CLIENT_RESPONSE; case DNS_DTTYPE_AQ: - return (DNSTAP__MESSAGE__TYPE__AUTH_QUERY); + return DNSTAP__MESSAGE__TYPE__AUTH_QUERY; case DNS_DTTYPE_AR: - return (DNSTAP__MESSAGE__TYPE__AUTH_RESPONSE); + return DNSTAP__MESSAGE__TYPE__AUTH_RESPONSE; case DNS_DTTYPE_RQ: - return (DNSTAP__MESSAGE__TYPE__RESOLVER_QUERY); + return DNSTAP__MESSAGE__TYPE__RESOLVER_QUERY; case DNS_DTTYPE_RR: - return (DNSTAP__MESSAGE__TYPE__RESOLVER_RESPONSE); + return DNSTAP__MESSAGE__TYPE__RESOLVER_RESPONSE; case DNS_DTTYPE_FQ: - return (DNSTAP__MESSAGE__TYPE__FORWARDER_QUERY); + return DNSTAP__MESSAGE__TYPE__FORWARDER_QUERY; case DNS_DTTYPE_FR: - return (DNSTAP__MESSAGE__TYPE__FORWARDER_RESPONSE); + return DNSTAP__MESSAGE__TYPE__FORWARDER_RESPONSE; case DNS_DTTYPE_TQ: - return (DNSTAP__MESSAGE__TYPE__TOOL_QUERY); + return DNSTAP__MESSAGE__TYPE__TOOL_QUERY; case DNS_DTTYPE_TR: - return (DNSTAP__MESSAGE__TYPE__TOOL_RESPONSE); + return DNSTAP__MESSAGE__TYPE__TOOL_RESPONSE; case DNS_DTTYPE_UQ: - return (DNSTAP__MESSAGE__TYPE__UPDATE_QUERY); + return DNSTAP__MESSAGE__TYPE__UPDATE_QUERY; case DNS_DTTYPE_UR: - return (DNSTAP__MESSAGE__TYPE__UPDATE_RESPONSE); + return DNSTAP__MESSAGE__TYPE__UPDATE_RESPONSE; default: UNREACHABLE(); } @@ -866,11 +866,11 @@ putstr(isc_buffer_t **b, const char *str) { result = isc_buffer_reserve(*b, strlen(str)); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(*b, str); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -879,17 +879,17 @@ putaddr(isc_buffer_t **b, isc_region_t *ip) { if (ip->length == 4) { if (!inet_ntop(AF_INET, ip->base, buf, sizeof(buf))) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else if (ip->length == 16) { if (!inet_ntop(AF_INET6, ip->base, buf, sizeof(buf))) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else { - return (ISC_R_BADADDRESSFORM); + return ISC_R_BADADDRESSFORM; } - return (putstr(b, buf)); + return putstr(b, buf); } static bool @@ -902,30 +902,30 @@ dnstap_file(struct fstrm_reader *r) { res = fstrm_reader_get_control(r, FSTRM_CONTROL_START, &control); if (res != fstrm_res_success) { - return (false); + return false; } res = fstrm_control_get_num_field_content_type(control, &n); if (res != fstrm_res_success) { - return (false); + return false; } if (n > 0) { res = fstrm_control_get_field_content_type(control, 0, &rtype, &rlen); if (res != fstrm_res_success) { - return (false); + return false; } if (rlen != dlen) { - return (false); + return false; } if (memcmp(DNSTAP_CONTENT_TYPE, rtype, dlen) == 0) { - return (true); + return true; } } - return (false); + return false; } isc_result_t @@ -989,7 +989,7 @@ cleanup: if (handle != NULL) { isc_mem_put(mctx, handle, sizeof(*handle)); } - return (result); + return result; } isc_result_t @@ -1007,14 +1007,14 @@ dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep) { switch (res) { case fstrm_res_success: if (data == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *bufp = UNCONST(data); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case fstrm_res_stop: - return (ISC_R_NOMORE); + return ISC_R_NOMORE; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -1221,7 +1221,7 @@ cleanup: dns_dtdata_free(&d); } - return (result); + return result; } isc_result_t @@ -1293,7 +1293,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) { CHECK(putstr(dest, "UR ")); break; default: - return (DNS_R_BADDNSTAP); + return DNS_R_BADDNSTAP; } /* Query and response addresses */ @@ -1373,7 +1373,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) { isc_buffer_putuint8(*dest, 0); cleanup: - return (result); + return result; } void diff --git a/lib/dns/ds.c b/lib/dns/ds.c index 22f158bd71..7086b5d155 100644 --- a/lib/dns/ds.c +++ b/lib/dns/ds.c @@ -46,7 +46,7 @@ dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key, key->type == dns_rdatatype_cdnskey); if (!dst_ds_digest_supported(digest_type)) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } switch (digest_type) { @@ -71,7 +71,7 @@ dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key, md = isc_md_new(); if (md == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } result = isc_md_init(md, md_type); @@ -110,7 +110,7 @@ dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key, end: isc_md_free(md); - return (result); + return result; } isc_result_t @@ -124,12 +124,12 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key, result = dns_ds_fromkeyrdata(owner, key, digest_type, digest, &ds); if (result != ISC_R_SUCCESS) { - return (result); + return result; } memset(buffer, 0, DNS_DS_BUFFERSIZE); isc_buffer_init(&b, buffer, DNS_DS_BUFFERSIZE); result = dns_rdata_fromstruct(rdata, key->rdclass, dns_rdatatype_ds, &ds, &b); - return (result); + return result; } diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 69ec9a88ff..4db3ea2901 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -237,16 +237,16 @@ dst__lib_destroy(void) { bool dst_algorithm_supported(unsigned int alg) { if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL) { - return (false); + return false; } - return (true); + return true; } bool dst_ds_digest_supported(unsigned int digest_type) { - return (digest_type == DNS_DSDIGEST_SHA1 || - digest_type == DNS_DSDIGEST_SHA256 || - digest_type == DNS_DSDIGEST_SHA384); + return digest_type == DNS_DSDIGEST_SHA1 || + digest_type == DNS_DSDIGEST_SHA256 || + digest_type == DNS_DSDIGEST_SHA384; } isc_result_t @@ -260,10 +260,10 @@ dst_context_create(dst_key_t *key, isc_mem_t *mctx, isc_logcategory_t category, REQUIRE(dctxp != NULL && *dctxp == NULL); if (key->func->createctx == NULL && key->func->createctx2 == NULL) { - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } if (key->keydata.generic == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } dctx = isc_mem_get(mctx, sizeof(*dctx)); @@ -284,11 +284,11 @@ dst_context_create(dst_key_t *key, isc_mem_t *mctx, isc_logcategory_t category, dst_key_free(&dctx->key); } isc_mem_putanddetach(&dctx->mctx, dctx, sizeof(dst_context_t)); - return (result); + return result; } dctx->magic = CTX_MAGIC; *dctxp = dctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -314,7 +314,7 @@ dst_context_adddata(dst_context_t *dctx, const isc_region_t *data) { REQUIRE(data != NULL); INSIST(dctx->key->func->adddata != NULL); - return (dctx->key->func->adddata(dctx, data)); + return dctx->key->func->adddata(dctx, data); } isc_result_t @@ -327,17 +327,17 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) { key = dctx->key; CHECKALG(key->key_alg); if (key->keydata.generic == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (key->func->sign == NULL) { - return (DST_R_NOTPRIVATEKEY); + return DST_R_NOTPRIVATEKEY; } if (key->func->isprivate == NULL || !key->func->isprivate(key)) { - return (DST_R_NOTPRIVATEKEY); + return DST_R_NOTPRIVATEKEY; } - return (key->func->sign(dctx, sig)); + return key->func->sign(dctx, sig); } isc_result_t @@ -347,13 +347,13 @@ dst_context_verify(dst_context_t *dctx, isc_region_t *sig) { CHECKALG(dctx->key->key_alg); if (dctx->key->keydata.generic == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (dctx->key->func->verify == NULL) { - return (DST_R_NOTPUBLICKEY); + return DST_R_NOTPUBLICKEY; } - return (dctx->key->func->verify(dctx, sig)); + return dctx->key->func->verify(dctx, sig); } isc_result_t @@ -364,16 +364,16 @@ dst_context_verify2(dst_context_t *dctx, unsigned int maxbits, CHECKALG(dctx->key->key_alg); if (dctx->key->keydata.generic == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (dctx->key->func->verify == NULL && dctx->key->func->verify2 == NULL) { - return (DST_R_NOTPUBLICKEY); + return DST_R_NOTPUBLICKEY; } - return (dctx->key->func->verify2 != NULL - ? dctx->key->func->verify2(dctx, maxbits, sig) - : dctx->key->func->verify(dctx, sig)); + return dctx->key->func->verify2 != NULL + ? dctx->key->func->verify2(dctx, maxbits, sig) + : dctx->key->func->verify(dctx, sig); } isc_result_t @@ -386,20 +386,20 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv, CHECKALG(priv->key_alg); if (pub->keydata.generic == NULL || priv->keydata.generic == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (pub->key_alg != priv->key_alg || pub->func->computesecret == NULL || priv->func->computesecret == NULL) { - return (DST_R_KEYCANNOTCOMPUTESECRET); + return DST_R_KEYCANNOTCOMPUTESECRET; } if (!dst_key_isprivate(priv)) { - return (DST_R_NOTPRIVATEKEY); + return DST_R_NOTPRIVATEKEY; } - return (pub->func->computesecret(pub, priv, secret)); + return pub->func->computesecret(pub, priv, secret); } isc_result_t @@ -413,29 +413,29 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory) { CHECKALG(key->key_alg); if (key->func->tofile == NULL) { - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } if ((type & DST_TYPE_PUBLIC) != 0) { ret = write_public_key(key, type, directory); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } } if ((type & DST_TYPE_STATE) != 0) { ret = write_key_state(key, type, directory); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } } if (((type & DST_TYPE_PRIVATE) != 0) && (key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY) { - return (key->func->tofile(key, directory)); + return key->func->tofile(key, directory); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -449,7 +449,7 @@ bool dst_key_isexternal(dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->external); + return key->external; } void @@ -471,7 +471,7 @@ dst_key_ismodified(const dst_key_t *key) { modified = key->modified; isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (modified); + return modified; } isc_result_t @@ -497,7 +497,7 @@ dst_key_getfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, } } - return (result); + return result; } isc_result_t @@ -548,7 +548,7 @@ out: dst_key_free(&key); } - return (result); + return result; } isc_result_t @@ -687,7 +687,7 @@ out: if (key != NULL) { dst_key_free(&key); } - return (result); + return result; } isc_result_t @@ -698,11 +698,11 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) { CHECKALG(key->key_alg); if (key->func->todns == NULL) { - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } if (isc_buffer_availablelength(target) < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16(target, (uint16_t)(key->key_flags & 0xffff)); isc_buffer_putuint8(target, (uint8_t)key->key_proto); @@ -710,23 +710,23 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) { if ((key->key_flags & DNS_KEYFLAG_EXTENDED) != 0) { if (isc_buffer_availablelength(target) < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16( target, (uint16_t)((key->key_flags >> 16) & 0xffff)); } if (key->keydata.generic == NULL) { /*%< NULL KEY */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (key->func->todns(key, target)); + return key->func->todns(key, target); } isc_result_t dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { - return (dst_key_fromdns_ex(name, rdclass, source, mctx, false, keyp)); + return dst_key_fromdns_ex(name, rdclass, source, mctx, false, keyp); } isc_result_t @@ -743,7 +743,7 @@ dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass, isc_buffer_remainingregion(source, &r); if (isc_buffer_remaininglength(source) < 4) { - return (DST_R_INVALIDPUBLICKEY); + return DST_R_INVALIDPUBLICKEY; } flags = isc_buffer_getuint16(source); proto = isc_buffer_getuint8(source); @@ -754,7 +754,7 @@ dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass, if ((flags & DNS_KEYFLAG_EXTENDED) != 0) { if (isc_buffer_remaininglength(source) < 2) { - return (DST_R_INVALIDPUBLICKEY); + return DST_R_INVALIDPUBLICKEY; } extflags = isc_buffer_getuint16(source); flags |= (extflags << 16); @@ -763,13 +763,13 @@ dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass, result = frombuffer(name, alg, flags, proto, rdclass, source, mctx, no_rdata, &key); if (result != ISC_R_SUCCESS) { - return (result); + return result; } key->key_id = id; key->key_rid = rid; *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -782,17 +782,17 @@ dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, result = frombuffer(name, alg, flags, protocol, rdclass, source, mctx, false, &key); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = computeid(key); if (result != ISC_R_SUCCESS) { dst_key_free(&key); - return (result); + return result; } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -803,10 +803,10 @@ dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) { CHECKALG(key->key_alg); if (key->func->todns == NULL) { - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } - return (key->func->todns(key, target)); + return key->func->todns(key, target); } isc_result_t @@ -829,14 +829,14 @@ out: if (lex != NULL) { isc_lex_destroy(&lex); } - return (result); + return result; } dns_gss_ctx_id_t dst_key_getgssctx(const dst_key_t *key) { REQUIRE(key != NULL); - return (key->keydata.gssctx); + return key->keydata.gssctx; } isc_result_t @@ -868,7 +868,7 @@ out: if (result != ISC_R_SUCCESS) { dst_key_free(&key); } - return (result); + return result; } FILE * @@ -876,7 +876,7 @@ dst_key_open(char *tmpname, mode_t mode) { /* Create public key file. */ int fd = mkstemp(tmpname); if (fd == -1) { - return (NULL); + return NULL; } if (fchmod(fd, mode & ~isc_os_umask()) != 0) { @@ -888,21 +888,21 @@ dst_key_open(char *tmpname, mode_t mode) { goto error; } - return (fp); + return fp; error: (void)close(fd); (void)unlink(tmpname); - return (NULL); + return NULL; } isc_result_t dst_key_close(char *tmpname, FILE *fp, char *filename) { if ((fflush(fp) != 0) || (ferror(fp) != 0)) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } if (rename(tmpname, filename) != 0) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } if (fclose(fp) != 0) { @@ -912,7 +912,7 @@ dst_key_close(char *tmpname, FILE *fp, char *filename) { */ } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -928,7 +928,7 @@ dst_key_cleanup(char *tmpname, FILE *fp) { (void)unlink(tmpname); (void)fclose(fp); - return (DST_R_WRITEERROR); + return DST_R_WRITEERROR; } isc_result_t @@ -954,11 +954,11 @@ dst_key_buildinternal(const dns_name_t *name, unsigned int alg, result = computeid(key); if (result != ISC_R_SUCCESS) { dst_key_free(&key); - return (result); + return result; } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -980,23 +980,23 @@ dst_key_fromlabel(const dns_name_t *name, int alg, unsigned int flags, if (key->func->fromlabel == NULL) { dst_key_free(&key); - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } result = key->func->fromlabel(key, label, pin); if (result != ISC_R_SUCCESS) { dst_key_free(&key); - return (result); + return result; } result = computeid(key); if (result != ISC_R_SUCCESS) { dst_key_free(&key); - return (result); + return result; } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1023,28 +1023,28 @@ dst_key_generate(const dns_name_t *name, unsigned int alg, unsigned int bits, if (bits == 0) { /*%< NULL KEY */ key->key_flags |= DNS_KEYTYPE_NOKEY; *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (key->func->generate == NULL) { dst_key_free(&key); - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } ret = key->func->generate(key, param, callback); if (ret != ISC_R_SUCCESS) { dst_key_free(&key); - return (ret); + return ret; } ret = computeid(key); if (ret != ISC_R_SUCCESS) { dst_key_free(&key); - return (ret); + return ret; } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1056,12 +1056,12 @@ dst_key_getbool(const dst_key_t *key, int type, bool *valuep) { isc_mutex_lock(&(((dst_key_t *)key)->mdlock)); if (!key->boolset[type]) { isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *valuep = key->bools[type]; isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1097,12 +1097,12 @@ dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep) { isc_mutex_lock(&(((dst_key_t *)key)->mdlock)); if (!key->numset[type]) { isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *valuep = key->nums[type]; isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1138,11 +1138,11 @@ dst_key_gettime(const dst_key_t *key, int type, isc_stdtime_t *timep) { isc_mutex_lock(&(((dst_key_t *)key)->mdlock)); if (!key->timeset[type]) { isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *timep = key->times[type]; isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1178,12 +1178,12 @@ dst_key_getstate(const dst_key_t *key, int type, dst_key_state_t *statep) { isc_mutex_lock(&(((dst_key_t *)key)->mdlock)); if (!key->keystateset[type]) { isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *statep = key->keystates[type]; isc_mutex_unlock(&(((dst_key_t *)key)->mdlock)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1217,7 +1217,7 @@ dst_key_getprivateformat(const dst_key_t *key, int *majorp, int *minorp) { REQUIRE(minorp != NULL); *majorp = key->fmt_major; *minorp = key->fmt_minor; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1235,33 +1235,33 @@ comparekeys(const dst_key_t *key1, const dst_key_t *key2, REQUIRE(VALID_KEY(key2)); if (key1 == key2) { - return (true); + return true; } if (key1->key_alg != key2->key_alg) { - return (false); + return false; } if (key1->key_id != key2->key_id) { if (!match_revoked_key) { - return (false); + return false; } if ((key1->key_flags & DNS_KEYFLAG_REVOKE) == (key2->key_flags & DNS_KEYFLAG_REVOKE)) { - return (false); + return false; } if (key1->key_id != key2->key_rid && key1->key_rid != key2->key_id) { - return (false); + return false; } } if (compare != NULL) { - return (compare(key1, key2)); + return compare(key1, key2); } else { - return (false); + return false; } } @@ -1279,7 +1279,7 @@ pub_compare(const dst_key_t *key1, const dst_key_t *key2) { isc_buffer_init(&b1, buf1, sizeof(buf1)); result = dst_key_todns(key1, &b1); if (result != ISC_R_SUCCESS) { - return (false); + return false; } /* Zero out flags. */ buf1[0] = buf1[1] = 0; @@ -1290,7 +1290,7 @@ pub_compare(const dst_key_t *key1, const dst_key_t *key2) { isc_buffer_init(&b2, buf2, sizeof(buf2)); result = dst_key_todns(key2, &b2); if (result != ISC_R_SUCCESS) { - return (false); + return false; } /* Zero out flags. */ buf2[0] = buf2[1] = 0; @@ -1311,18 +1311,18 @@ pub_compare(const dst_key_t *key1, const dst_key_t *key2) { memmove(&buf2[4], &buf2[6], r2.length - 6); r2.length -= 2; } - return (isc_region_compare(&r1, &r2) == 0); + return isc_region_compare(&r1, &r2) == 0; } bool dst_key_compare(const dst_key_t *key1, const dst_key_t *key2) { - return (comparekeys(key1, key2, false, key1->func->compare)); + return comparekeys(key1, key2, false, key1->func->compare); } bool dst_key_pubcompare(const dst_key_t *key1, const dst_key_t *key2, bool match_revoked_key) { - return (comparekeys(key1, key2, match_revoked_key, pub_compare)); + return comparekeys(key1, key2, match_revoked_key, pub_compare); } bool @@ -1331,15 +1331,15 @@ dst_key_paramcompare(const dst_key_t *key1, const dst_key_t *key2) { REQUIRE(VALID_KEY(key2)); if (key1 == key2) { - return (true); + return true; } if (key1->key_alg == key2->key_alg && key1->func->paramcompare != NULL && key1->func->paramcompare(key1, key2)) { - return (true); + return true; } else { - return (false); + return false; } } @@ -1386,7 +1386,7 @@ bool dst_key_isprivate(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); INSIST(key->func->isprivate != NULL); - return (key->func->isprivate(key)); + return key->func->isprivate(key); } isc_result_t @@ -1397,8 +1397,8 @@ dst_key_buildfilename(const dst_key_t *key, int type, const char *directory, type == DST_TYPE_STATE || type == DST_TYPE_TEMPLATE || type == 0); - return (buildfilename(key->key_name, key->key_id, key->key_alg, type, - directory, out)); + return buildfilename(key->key_name, key->key_id, key->key_alg, type, + directory, out); } isc_result_t @@ -1447,9 +1447,9 @@ dst_key_sigsize(const dst_key_t *key, unsigned int *n) { *n = 128; /*%< XXX */ break; default: - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -1459,7 +1459,7 @@ isc_result_t dst_key_setflags(dst_key_t *key, uint32_t flags) { REQUIRE(VALID_KEY(key)); key->key_flags = flags; - return (computeid(key)); + return computeid(key); } void @@ -1480,9 +1480,9 @@ dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) { REQUIRE(VALID_KEY(key)); if (key->func->dump == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return (key->func->dump(key, mctx, buffer, length)); + return key->func->dump(key, mctx, buffer, length); } isc_result_t @@ -1495,11 +1495,11 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, REQUIRE(keyp != NULL && *keyp == NULL); if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL) { - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } if (dst_t_func[alg]->restore == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } key = get_key_struct(name, alg, flags, protocol, 0, rdclass, 0, mctx); @@ -1511,7 +1511,7 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, dst_key_free(&key); } - return (result); + return result; } /*** @@ -1548,14 +1548,14 @@ get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags, isc_mutex_init(&key->mdlock); key->magic = KEY_MAGIC; - return (key); + return key; } bool dst_key_inactive(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->inactive); + return key->inactive; } void @@ -1689,37 +1689,37 @@ cleanup: if (lex != NULL) { isc_lex_destroy(&lex); } - return (ret); + return ret; } static int find_metadata(const char *s, const char *tags[], int ntags) { for (int i = 0; i < ntags; i++) { if (tags[i] != NULL && strcasecmp(s, tags[i]) == 0) { - return (i); + return i; } } - return (-1); + return -1; } static int find_numericdata(const char *s) { - return (find_metadata(s, numerictags, NUMERIC_NTAGS)); + return find_metadata(s, numerictags, NUMERIC_NTAGS); } static int find_booleandata(const char *s) { - return (find_metadata(s, booleantags, BOOLEAN_NTAGS)); + return find_metadata(s, booleantags, BOOLEAN_NTAGS); } static int find_timingdata(const char *s) { - return (find_metadata(s, timingtags, TIMING_NTAGS)); + return find_metadata(s, timingtags, TIMING_NTAGS); } static int find_keystatedata(const char *s) { - return (find_metadata(s, keystatestags, KEYSTATES_NTAGS)); + return find_metadata(s, keystatestags, KEYSTATES_NTAGS); } static isc_result_t @@ -1727,10 +1727,10 @@ keystate_fromtext(const char *s, dst_key_state_t *state) { for (int i = 0; i < KEYSTATES_NVALUES; i++) { if (keystates[i] != NULL && strcasecmp(s, keystates[i]) == 0) { *state = (dst_key_state_t)i; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /*% @@ -1895,7 +1895,7 @@ cleanup: if (lex != NULL) { isc_lex_destroy(&lex); } - return (ret); + return ret; } static bool @@ -1911,7 +1911,7 @@ issymmetric(const dst_key_t *key) { case DST_ALG_ECDSA384: case DST_ALG_ED25519: case DST_ALG_ED448: - return (false); + return false; case DST_ALG_HMACMD5: case DST_ALG_HMACSHA1: case DST_ALG_HMACSHA224: @@ -1919,9 +1919,9 @@ issymmetric(const dst_key_t *key) { case DST_ALG_HMACSHA384: case DST_ALG_HMACSHA512: case DST_ALG_GSSAPI: - return (true); + return true; default: - return (false); + return false; } } @@ -2022,14 +2022,14 @@ write_key_state(const dst_key_t *key, int type, const char *directory) { isc_buffer_init(&fileb, filename, sizeof(filename)); result = dst_key_buildfilename(key, DST_TYPE_STATE, directory, &fileb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_init(&tmpb, tmpname, sizeof(tmpname)); result = dst_key_buildfilename(key, DST_TYPE_TEMPLATE, directory, &tmpb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } mode_t mode = issymmetric(key) ? S_IRUSR | S_IWUSR @@ -2038,7 +2038,7 @@ write_key_state(const dst_key_t *key, int type, const char *directory) { /* Create temporary public key file. */ fp = dst_key_open(tmpname, mode); if (fp == NULL) { - return (DST_R_WRITEERROR); + return DST_R_WRITEERROR; } /* Write key state */ @@ -2046,7 +2046,7 @@ write_key_state(const dst_key_t *key, int type, const char *directory) { fprintf(fp, "; This is the state of key %d, for ", key->key_id); result = dns_name_print(key->key_name, fp); if (result != ISC_R_SUCCESS) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } fputc('\n', fp); @@ -2086,7 +2086,7 @@ write_key_state(const dst_key_t *key, int type, const char *directory) { printstate(key, DST_KEY_GOAL, "GoalState", fp); } - return (dst_key_close(tmpname, fp, filename)); + return dst_key_close(tmpname, fp, filename); } /*% @@ -2113,7 +2113,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { result = dst_key_todns(key, &keyb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_usedregion(&keyb, &r); @@ -2121,12 +2121,12 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { result = dns_rdata_totext(&rdata, (dns_name_t *)NULL, &textb); if (result != ISC_R_SUCCESS) { - return (DST_R_INVALIDPUBLICKEY); + return DST_R_INVALIDPUBLICKEY; } result = dns_rdataclass_totext(key->key_class, &classb); if (result != ISC_R_SUCCESS) { - return (DST_R_INVALIDPUBLICKEY); + return DST_R_INVALIDPUBLICKEY; } /* @@ -2135,14 +2135,14 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { isc_buffer_init(&fileb, filename, sizeof(filename)); result = dst_key_buildfilename(key, DST_TYPE_PUBLIC, directory, &fileb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_init(&tmpb, tmpname, sizeof(tmpname)); result = dst_key_buildfilename(key, DST_TYPE_TEMPLATE, directory, &tmpb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Create temporary public key file. */ @@ -2151,7 +2151,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { fp = dst_key_open(tmpname, mode); if (fp == NULL) { - return (DST_R_WRITEERROR); + return DST_R_WRITEERROR; } /* Write key information in comments */ @@ -2164,7 +2164,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { key->key_id); result = dns_name_print(key->key_name, fp); if (result != ISC_R_SUCCESS) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } fputc('\n', fp); @@ -2181,7 +2181,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { /* Now print the actual key */ result = dns_name_print(key->key_name, fp); if (result != ISC_R_SUCCESS) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } fprintf(fp, " "); @@ -2191,7 +2191,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { isc_buffer_usedregion(&classb, &r); if ((unsigned int)fwrite(r.base, 1, r.length, fp) != r.length) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } if ((type & DST_TYPE_KEY) != 0) { @@ -2202,12 +2202,12 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { isc_buffer_usedregion(&textb, &r); if ((unsigned int)fwrite(r.base, 1, r.length, fp) != r.length) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } fputc('\n', fp); - return (dst_key_close(tmpname, fp, filename)); + return dst_key_close(tmpname, fp, filename); } static isc_result_t @@ -2230,7 +2230,7 @@ buildfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, if (directory != NULL) { if (isc_buffer_availablelength(out) < strlen(directory)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(out, directory); if (strlen(directory) > 0U && @@ -2240,15 +2240,15 @@ buildfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, } } if (isc_buffer_availablelength(out) < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(out, "K"); result = dns_name_tofilenametext(name, false, out); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (isc_buffer_printf(out, "+%03d+%05d%s", alg, id, suffix)); + return isc_buffer_printf(out, "+%03d+%05d%s", alg, id, suffix); } static isc_result_t @@ -2261,13 +2261,13 @@ computeid(dst_key_t *key) { isc_buffer_init(&dnsbuf, dns_array, sizeof(dns_array)); ret = dst_key_todns(key, &dnsbuf); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } isc_buffer_usedregion(&dnsbuf, &r); key->key_id = dst_region_computeid(&r); key->key_rid = dst_region_computerid(&r); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2289,32 +2289,32 @@ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, ret = algorithm_status(alg); if (ret != ISC_R_SUCCESS) { dst_key_free(&key); - return (ret); + return ret; } if (key->func->fromdns == NULL) { dst_key_free(&key); - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } if (!no_rdata) { ret = key->func->fromdns(key, source); if (ret != ISC_R_SUCCESS) { dst_key_free(&key); - return (ret); + return ret; } } } *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t algorithm_status(unsigned int alg) { if (dst_algorithm_supported(alg)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } static isc_result_t @@ -2338,18 +2338,18 @@ addsuffix(char *filename, int len, const char *odirname, const char *ofilename, ofilename, suffix); } if (n < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (n >= len) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_buffer_t * dst_key_tkeytoken(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_tkeytoken); + return key->key_tkeytoken; } /* @@ -2409,7 +2409,7 @@ dst_key_is_unused(dst_key_t *key) { * This key is used. */ if (!state_type_set) { - return (false); + return false; } /* * If the state is not HIDDEN, the key is in use. @@ -2419,11 +2419,11 @@ dst_key_is_unused(dst_key_t *key) { st = DST_KEY_STATE_NA; } if (st != DST_KEY_STATE_HIDDEN) { - return (false); + return false; } } /* This key is unused. */ - return (true); + return true; } isc_result_t @@ -2450,7 +2450,7 @@ dst_key_role(dst_key_t *key, bool *ksk, bool *zsk) { ret = result; } } - return (ret); + return ret; } /* Hints on key whether it can be published and/or used for signing. */ @@ -2486,7 +2486,7 @@ dst_key_is_published(dst_key_t *key, isc_stdtime_t now, time_ok = true; } - return (state_ok && time_ok); + return state_ok && time_ok; } bool @@ -2545,7 +2545,7 @@ dst_key_is_active(dst_key_t *key, isc_stdtime_t now) { inactive = false; } } - return (ds_ok && zrrsig_ok && time_ok && !inactive); + return ds_ok && zrrsig_ok && time_ok && !inactive; } bool @@ -2601,7 +2601,7 @@ dst_key_is_signing(dst_key_t *key, int role, isc_stdtime_t now, inactive = false; } } - return (krrsig_ok && zrrsig_ok && time_ok && !inactive); + return krrsig_ok && zrrsig_ok && time_ok && !inactive; } bool @@ -2618,7 +2618,7 @@ dst_key_is_revoked(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *revoke) { time_ok = (when <= now); } - return (time_ok); + return time_ok; } bool @@ -2632,7 +2632,7 @@ dst_key_is_removed(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *remove) { if (dst_key_is_unused(key)) { /* This key was never used. */ - return (false); + return false; } result = dst_key_gettime(key, DST_TIME_DELETE, &when); @@ -2656,7 +2656,7 @@ dst_key_is_removed(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *remove) { time_ok = true; } - return (state_ok && time_ok); + return state_ok && time_ok; } dst_key_state_t @@ -2668,16 +2668,16 @@ dst_key_goal(dst_key_t *key) { result = dst_key_getstate(key, DST_KEY_GOAL, &state); if (result == ISC_R_SUCCESS) { - return (state); + return state; } - return (DST_KEY_STATE_HIDDEN); + return DST_KEY_STATE_HIDDEN; } bool dst_key_haskasp(dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->kasp); + return key->kasp; } void @@ -2734,18 +2734,18 @@ const char * dst_hmac_algorithm_totext(dst_algorithm_t alg) { switch (alg) { case DST_ALG_HMACMD5: - return ("hmac-md5"); + return "hmac-md5"; case DST_ALG_HMACSHA1: - return ("hmac-sha1"); + return "hmac-sha1"; case DST_ALG_HMACSHA224: - return ("hmac-sha224"); + return "hmac-sha224"; case DST_ALG_HMACSHA256: - return ("hmac-sha256"); + return "hmac-sha256"; case DST_ALG_HMACSHA384: - return ("hmac-sha384"); + return "hmac-sha384"; case DST_ALG_HMACSHA512: - return ("hmac-sha512"); + return "hmac-sha512"; default: - return ("unknown"); + return "unknown"; } } diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index e9f3832752..b897407c41 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -118,10 +118,10 @@ find_value(const char *s, const unsigned int alg) { if (strcasecmp(s, map[i].tag) == 0 && (TAG_ALG(map[i].value) == alg)) { - return (map[i].value); + return map[i].value; } } - return (-1); + return -1; } static const char * @@ -130,9 +130,9 @@ find_tag(const int value) { for (i = 0;; i++) { if (map[i].tag == NULL) { - return (NULL); + return NULL; } else if (value == map[i].value) { - return (map[i].tag); + return map[i].tag; } } } @@ -143,21 +143,21 @@ find_metadata(const char *s, const char *tags[], int ntags) { for (i = 0; i < ntags; i++) { if (tags[i] != NULL && strcasecmp(s, tags[i]) == 0) { - return (i); + return i; } } - return (-1); + return -1; } static int find_timedata(const char *s) { - return (find_metadata(s, timetags, TIMING_NTAGS)); + return find_metadata(s, timetags, TIMING_NTAGS); } static int find_numericdata(const char *s) { - return (find_metadata(s, numerictags, NUMERIC_NTAGS)); + return find_metadata(s, numerictags, NUMERIC_NTAGS); } static int @@ -168,7 +168,7 @@ check_rsa(const dst_private_t *priv, bool external) { unsigned int mask; if (external) { - return ((priv->nelements == 0) ? 0 : -1); + return (priv->nelements == 0) ? 0 : -1; } for (i = 0; i < RSA_NTAGS; i++) { @@ -182,7 +182,7 @@ check_rsa(const dst_private_t *priv, bool external) { } } if (i == RSA_NTAGS) { - return (-1); + return -1; } have[i] = true; } @@ -202,7 +202,7 @@ check_rsa(const dst_private_t *priv, bool external) { have[TAG_RSA_EXPONENT2 & mask] && have[TAG_RSA_COEFFICIENT & mask]; } - return (ok ? 0 : -1); + return ok ? 0 : -1; } static int @@ -213,7 +213,7 @@ check_ecdsa(const dst_private_t *priv, bool external) { unsigned int mask; if (external) { - return ((priv->nelements == 0) ? 0 : -1); + return (priv->nelements == 0) ? 0 : -1; } for (i = 0; i < ECDSA_NTAGS; i++) { @@ -226,7 +226,7 @@ check_ecdsa(const dst_private_t *priv, bool external) { } } if (i == ECDSA_NTAGS) { - return (-1); + return -1; } have[i] = true; } @@ -235,7 +235,7 @@ check_ecdsa(const dst_private_t *priv, bool external) { ok = have[TAG_ECDSA_LABEL & mask] || have[TAG_ECDSA_PRIVATEKEY & mask]; - return (ok ? 0 : -1); + return ok ? 0 : -1; } static int @@ -246,7 +246,7 @@ check_eddsa(const dst_private_t *priv, bool external) { unsigned int mask; if (external) { - return ((priv->nelements == 0) ? 0 : -1); + return (priv->nelements == 0) ? 0 : -1; } for (i = 0; i < EDDSA_NTAGS; i++) { @@ -259,7 +259,7 @@ check_eddsa(const dst_private_t *priv, bool external) { } } if (i == EDDSA_NTAGS) { - return (-1); + return -1; } have[i] = true; } @@ -268,7 +268,7 @@ check_eddsa(const dst_private_t *priv, bool external) { ok = have[TAG_EDDSA_LABEL & mask] || have[TAG_EDDSA_PRIVATEKEY & mask]; - return (ok ? 0 : -1); + return ok ? 0 : -1; } static int @@ -283,9 +283,9 @@ check_hmac_md5(const dst_private_t *priv, bool old) { if (old && priv->nelements == OLD_HMACMD5_NTAGS && priv->elements[0].tag == TAG_HMACMD5_KEY) { - return (0); + return 0; } - return (-1); + return -1; } /* * We must be new format at this point. @@ -297,10 +297,10 @@ check_hmac_md5(const dst_private_t *priv, bool old) { } } if (j == priv->nelements) { - return (-1); + return -1; } } - return (0); + return 0; } static int @@ -308,7 +308,7 @@ check_hmac_sha(const dst_private_t *priv, unsigned int ntags, unsigned int alg) { unsigned int i, j; if (priv->nelements != ntags) { - return (-1); + return -1; } for (i = 0; i < ntags; i++) { for (j = 0; j < priv->nelements; j++) { @@ -317,10 +317,10 @@ check_hmac_sha(const dst_private_t *priv, unsigned int ntags, } } if (j == priv->nelements) { - return (-1); + return -1; } } - return (0); + return 0; } static int @@ -332,27 +332,27 @@ check_data(const dst_private_t *priv, const unsigned int alg, bool old, case DST_ALG_NSEC3RSASHA1: case DST_ALG_RSASHA256: case DST_ALG_RSASHA512: - return (check_rsa(priv, external)); + return check_rsa(priv, external); case DST_ALG_ECDSA256: case DST_ALG_ECDSA384: - return (check_ecdsa(priv, external)); + return check_ecdsa(priv, external); case DST_ALG_ED25519: case DST_ALG_ED448: - return (check_eddsa(priv, external)); + return check_eddsa(priv, external); case DST_ALG_HMACMD5: - return (check_hmac_md5(priv, old)); + return check_hmac_md5(priv, old); case DST_ALG_HMACSHA1: - return (check_hmac_sha(priv, HMACSHA1_NTAGS, alg)); + return check_hmac_sha(priv, HMACSHA1_NTAGS, alg); case DST_ALG_HMACSHA224: - return (check_hmac_sha(priv, HMACSHA224_NTAGS, alg)); + return check_hmac_sha(priv, HMACSHA224_NTAGS, alg); case DST_ALG_HMACSHA256: - return (check_hmac_sha(priv, HMACSHA256_NTAGS, alg)); + return check_hmac_sha(priv, HMACSHA256_NTAGS, alg); case DST_ALG_HMACSHA384: - return (check_hmac_sha(priv, HMACSHA384_NTAGS, alg)); + return check_hmac_sha(priv, HMACSHA384_NTAGS, alg); case DST_ALG_HMACSHA512: - return (check_hmac_sha(priv, HMACSHA512_NTAGS, alg)); + return check_hmac_sha(priv, HMACSHA512_NTAGS, alg); default: - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } } @@ -569,7 +569,7 @@ done: key->external = external; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; fail: dst__privstruct_free(priv, mctx); @@ -577,7 +577,7 @@ fail: isc_mem_put(mctx, data, MAXFIELDSIZE); } - return (ret); + return ret; } isc_result_t @@ -602,16 +602,16 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, ret = check_data(priv, dst_key_alg(key), false, key->external); if (ret < 0) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } else if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } isc_buffer_init(&fileb, filename, sizeof(filename)); result = dst_key_buildfilename(key, DST_TYPE_PRIVATE, directory, &fileb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = isc_file_mode(filename, &mode); @@ -632,12 +632,12 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, result = dst_key_buildfilename(key, DST_TYPE_TEMPLATE, directory, &tmpb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } fp = dst_key_open(tmpname, S_IRUSR | S_IWUSR); if (fp == NULL) { - return (DST_R_WRITEERROR); + return DST_R_WRITEERROR; } dst_key_getprivateformat(key, &major, &minor); @@ -709,7 +709,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, isc_buffer_init(&b, buffer, sizeof(buffer)); result = isc_base64_totext(&r, sizeof(buffer), "", &b); if (result != ISC_R_SUCCESS) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } isc_buffer_usedregion(&b, &r); @@ -740,7 +740,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, isc_buffer_init(&b, buffer, sizeof(buffer)); result = dns_time32_totext(when, &b); if (result != ISC_R_SUCCESS) { - return (dst_key_cleanup(tmpname, fp)); + return dst_key_cleanup(tmpname, fp); } isc_buffer_usedregion(&b, &r); @@ -753,7 +753,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, } result = dst_key_close(tmpname, fp, filename); - return (result); + return result; } /*! \file */ diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c index 99939f8e0f..e862a85552 100644 --- a/lib/dns/dyndb.c +++ b/lib/dns/dyndb.c @@ -73,10 +73,10 @@ impfind(const char *name) { imp = ISC_LIST_NEXT(imp, link)) { if (strcasecmp(name, imp->name) == 0) { - return (imp); + return imp; } } - return (NULL); + return NULL; } static isc_result_t @@ -99,12 +99,12 @@ load_symbol(uv_lib_t *handle, const char *filename, const char *symbol_name, "failed to lookup symbol %s in " "DynDB module '%s': %s", symbol_name, filename, errmsg); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *symbolp = symbol; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -169,7 +169,7 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, *impp = imp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DYNDB, @@ -180,7 +180,7 @@ cleanup: unload_library(&imp); - return (result); + return result; } static void @@ -235,7 +235,7 @@ cleanup: } UNLOCK(&dyndb_lock); - return (result); + return result; } void @@ -291,7 +291,7 @@ dns_dyndb_createctx(isc_mem_t *mctx, const void *hashinit, dns_view_t *view, *dctxp = dctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/ecs.c b/lib/dns/ecs.c index 88e5dadf9d..3079c1af64 100644 --- a/lib/dns/ecs.c +++ b/lib/dns/ecs.c @@ -45,12 +45,12 @@ dns_ecs_equals(const dns_ecs_t *ecs1, const dns_ecs_t *ecs2) { if (ecs1->source != ecs2->source || ecs1->addr.family != ecs2->addr.family) { - return (false); + return false; } alen = (ecs1->source + 7) / 8; if (alen == 0) { - return (true); + return true; } switch (ecs1->addr.family) { @@ -73,7 +73,7 @@ dns_ecs_equals(const dns_ecs_t *ecs1, const dns_ecs_t *ecs2) { * prefix. */ if (alen > 1 && memcmp(addr1, addr2, alen - 1) != 0) { - return (false); + return false; } /* @@ -88,10 +88,10 @@ dns_ecs_equals(const dns_ecs_t *ecs1, const dns_ecs_t *ecs2) { } if ((addr1[alen - 1] & mask) != (addr2[alen - 1] & mask)) { - return (false); + return false; } - return (true); + return true; } void diff --git a/lib/dns/fixedname.c b/lib/dns/fixedname.c index c6d899d95e..d24996e5e7 100644 --- a/lib/dns/fixedname.c +++ b/lib/dns/fixedname.c @@ -29,11 +29,11 @@ dns_fixedname_invalidate(dns_fixedname_t *fixed) { dns_name_t * dns_fixedname_name(dns_fixedname_t *fixed) { - return (&fixed->name); + return &fixed->name; } dns_name_t * dns_fixedname_initname(dns_fixedname_t *fixed) { dns_fixedname_init(fixed); - return (dns_fixedname_name(fixed)); + return dns_fixedname_name(fixed); } diff --git a/lib/dns/forward.c b/lib/dns/forward.c index b186aacee4..e7bb86e650 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.c @@ -83,7 +83,7 @@ new_forwarders(isc_mem_t *mctx, const dns_name_t *name, dns_name_dupwithoffsets(name, mctx, &forwarders->name); - return (forwarders); + return forwarders; } isc_result_t @@ -123,7 +123,7 @@ dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarders_detach(&forwarders); - return (result); + return result; } isc_result_t @@ -155,7 +155,7 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarders_detach(&forwarders); - return (result); + return result; } isc_result_t @@ -176,7 +176,7 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name, } dns_qpread_destroy(fwdtable->table, &qpr); - return (result); + return result; } void @@ -241,7 +241,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { dns_forwarders_t *fwd = pval; - return (dns_qpkey_fromname(key, &fwd->name)); + return dns_qpkey_fromname(key, &fwd->name); } static void diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 120b13cc70..bbd91b9c6b 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -188,7 +188,7 @@ HASH(char *string) { a = tolower((unsigned char)string[0]); b = tolower((unsigned char)string[n - 1]); - return (((a + n) * b) % 256); + return ((a + n) * b) % 256; } static bool @@ -196,9 +196,9 @@ start_directory(const char *path, isc_dir_t *dir) { dir->handle = opendir(path); if (dir->handle != NULL) { - return (true); + return true; } else { - return (false); + return false; } } @@ -224,9 +224,9 @@ next_file(isc_dir_t *dir) { } if (dir->filename != NULL) { - return (true); + return true; } else { - return (false); + return false; } } @@ -261,7 +261,7 @@ upper(char *s) { *b++ = islower(c) ? toupper(c) : c; } *b = '\0'; - return (buf[buf_to_use]); + return buf[buf_to_use]; } static char * @@ -274,7 +274,7 @@ funname(const char *s, char *buf) { *b++ = (c == '-') ? '_' : c; } *b = '\0'; - return (buf); + return buf; } static void @@ -565,7 +565,7 @@ sd(unsigned int rdclass, const char *classbuf, const char *dirbuf, static int ttnam_cmp(const void *va, const void *vb) { const struct ttnam *ttna = va, *ttnb = vb; - return (ttna->type - ttnb->type); + return ttna->type - ttnb->type; } int @@ -1026,5 +1026,5 @@ main(int argc, char **argv) { exit(EXIT_FAILURE); } - return (0); + return 0; } diff --git a/lib/dns/geoip2.c b/lib/dns/geoip2.c index 6c29c19158..9a33ce7df5 100644 --- a/lib/dns/geoip2.c +++ b/lib/dns/geoip2.c @@ -84,18 +84,18 @@ get_entry_for(MMDB_s *const db, const isc_netaddr_t *addr) { if (db == geoip_state.db && isc_netaddr_equal(addr, &geoip_state.addr)) { - return (&geoip_state); + return &geoip_state; } isc_sockaddr_fromnetaddr(&sa, addr, 0); match = MMDB_lookup_sockaddr(db, &sa.type.sa, &err); if (err != MMDB_SUCCESS || !match.found_entry) { - return (NULL); + return NULL; } set_state(db, addr, match, match.entry); - return (&geoip_state); + return &geoip_state; } static dns_geoip_subtype_t @@ -144,7 +144,7 @@ fix_subtype(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) { break; } - return (ret); + return ret; } static MMDB_s * @@ -155,7 +155,7 @@ geoip2_database(const dns_geoip_databases_t *geoip, case dns_geoip_country_name: case dns_geoip_country_continentcode: case dns_geoip_country_continent: - return (geoip->country); + return geoip->country; case dns_geoip_city_countrycode: case dns_geoip_city_countryname: @@ -168,23 +168,23 @@ geoip2_database(const dns_geoip_databases_t *geoip, case dns_geoip_city_timezonecode: case dns_geoip_city_metrocode: case dns_geoip_city_areacode: - return (geoip->city); + return geoip->city; case dns_geoip_isp_name: - return (geoip->isp); + return geoip->isp; case dns_geoip_as_asnum: case dns_geoip_org_name: - return (geoip->as); + return geoip->as; case dns_geoip_domain_name: - return (geoip->domain); + return geoip->domain; default: /* * All other subtypes are unavailable in GeoIP2. */ - return (NULL); + return NULL; } } @@ -196,10 +196,10 @@ match_string(MMDB_entry_data_s *value, const char *str) { value->type != MMDB_DATA_TYPE_UTF8_STRING || value->utf8_string == NULL) { - return (false); + return false; } - return (strncasecmp(value->utf8_string, str, value->data_size) == 0); + return strncasecmp(value->utf8_string, str, value->data_size) == 0; } static bool @@ -208,10 +208,10 @@ match_int(MMDB_entry_data_s *value, const uint32_t ui32) { (value->type != MMDB_DATA_TYPE_UINT32 && value->type != MMDB_DATA_TYPE_UINT16)) { - return (false); + return false; } - return (value->uint32 == ui32); + return value->uint32 == ui32; } bool @@ -232,12 +232,12 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, subtype = fix_subtype(geoip, elt->subtype); db = geoip2_database(geoip, subtype); if (db == NULL) { - return (false); + return false; } state = get_entry_for(db, reqaddr); if (state == NULL) { - return (false); + return false; } switch (subtype) { @@ -246,7 +246,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "country", "iso_code", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -255,7 +255,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "country", "names", "en", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -264,7 +264,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "continent", "code", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -273,7 +273,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "continent", "names", "en", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -282,7 +282,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "subdivisions", "0", "iso_code", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -291,7 +291,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "subdivisions", "0", "names", "en", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -299,7 +299,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "city", "names", "en", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -307,7 +307,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "postal", "code", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -315,7 +315,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "location", "time_zone", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -323,14 +323,14 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "location", "metro_code", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; case dns_geoip_isp_name: ret = MMDB_get_value(&state->entry, &value, "isp", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -346,7 +346,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, s += 2; } i = strtol(s, NULL, 10); - return (match_int(&value, i)); + return match_int(&value, i); } break; @@ -355,7 +355,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, "autonomous_system_organization", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -363,7 +363,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ret = MMDB_get_value(&state->entry, &value, "domain", (char *)0); if (ret == MMDB_SUCCESS) { - return (match_string(&value, elt->as_string)); + return match_string(&value, elt->as_string); } break; @@ -372,11 +372,11 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, * For any other subtype, we assume the database was * unavailable and return false. */ - return (false); + return false; } /* * No database matched: return false. */ - return (false); + return false; } diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c index 33ed54cb66..bf56e7a3dd 100644 --- a/lib/dns/gssapi_link.c +++ b/lib/dns/gssapi_link.c @@ -74,7 +74,7 @@ gssapi_create_signverify_ctx(dst_key_t *key, dst_context_t *dctx) { dctx->ctxdata.gssctx = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -110,7 +110,7 @@ gssapi_adddata(dst_context_t *dctx, const isc_region_t *data) { result = isc_buffer_copyregion(ctx->buffer, data); if (result == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } length = isc_buffer_length(ctx->buffer) + data->length + BUFFER_EXTRA; @@ -124,7 +124,7 @@ gssapi_adddata(dst_context_t *dctx, const isc_region_t *data) { isc_buffer_free(&ctx->buffer); ctx->buffer = newbuffer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -158,7 +158,7 @@ gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) { if (gret != GSS_S_COMPLETE) { gss_log(3, "GSS sign error: %s", gss_error_tostring(gret, minor, buf, sizeof(buf))); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -167,7 +167,7 @@ gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) { */ if (gsig.length > isc_buffer_availablelength(sig)) { gss_release_buffer(&minor, &gsig); - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -179,7 +179,7 @@ gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) { gss_release_buffer(&minor, &gsig); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -219,13 +219,13 @@ gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) { gret == GSS_S_CONTEXT_EXPIRED || gret == GSS_S_NO_CONTEXT || gret == GSS_S_FAILURE) { - return (DST_R_VERIFYFAILURE); + return DST_R_VERIFYFAILURE; } else { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -234,7 +234,7 @@ gssapi_compare(const dst_key_t *key1, const dst_key_t *key2) { gss_ctx_id_t gsskey2 = key2->keydata.gssctx; /* No idea */ - return (gsskey1 == gsskey2); + return gsskey1 == gsskey2; } static isc_result_t @@ -244,13 +244,13 @@ gssapi_generate(dst_key_t *key, int unused, void (*callback)(int)) { UNUSED(callback); /* No idea */ - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } static bool gssapi_isprivate(const dst_key_t *key) { UNUSED(key); - return (true); + return true; } static void @@ -271,7 +271,7 @@ gssapi_restore(dst_key_t *key, const char *keystr) { len = strlen(keystr); if ((len % 4) != 0U) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } len = (len / 4) * 3; @@ -281,7 +281,7 @@ gssapi_restore(dst_key_t *key, const char *keystr) { result = isc_base64_decodestring(keystr, b); if (result != ISC_R_SUCCESS) { isc_buffer_free(&b); - return (result); + return result; } isc_buffer_remainingregion(b, &r); @@ -290,11 +290,11 @@ gssapi_restore(dst_key_t *key, const char *keystr) { (gss_ctx_id_t *)&key->keydata.gssctx); if (major != GSS_S_COMPLETE) { isc_buffer_free(&b); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_buffer_free(&b); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -312,10 +312,10 @@ gssapi_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) { if (major != GSS_S_COMPLETE) { fprintf(stderr, "gss_export_sec_context -> %u, %u\n", major, minor); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (gssbuffer.length == 0U) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } len = ((gssbuffer.length + 2) / 3) * 4; buf = isc_mem_get(mctx, len); @@ -326,7 +326,7 @@ gssapi_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) { gss_release_buffer(&minor, &gssbuffer); *buffer = buf; *length = (int)len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static dst_func_t gssapi_functions = { diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index d4b8017bd0..b9922fe1cf 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -240,7 +240,7 @@ mech_oid_set_create(OM_uint32 *minor, gss_OID_set *mech_oid_set) { gret = gss_create_empty_oid_set(minor, mech_oid_set); if (gret != GSS_S_COMPLETE) { - return (gret); + return gret; } gret = gss_add_oid_set_member(minor, GSS_KRB5_MECHANISM, mech_oid_set); @@ -257,7 +257,7 @@ mech_oid_set_create(OM_uint32 *minor, gss_OID_set *mech_oid_set) { release: REQUIRE(gss_release_oid_set(minor, mech_oid_set) == GSS_S_COMPLETE); - return (gret); + return gret; } static void @@ -302,7 +302,7 @@ dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, gss_log(3, "failed gss_import_name: %s", gss_error_tostring(gret, minor, buf, sizeof(buf))); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else { gname = NULL; @@ -327,7 +327,7 @@ dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, if (gret != GSS_S_COMPLETE) { gss_log(3, "failed to create OID_set: %s", gss_error_tostring(gret, minor, buf, sizeof(buf))); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } gret = gss_acquire_cred(&minor, gname, GSS_C_INDEFINITE, mech_oid_set, @@ -364,7 +364,7 @@ cleanup: } } - return (result); + return result; } bool @@ -396,13 +396,13 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, */ rname = strchr(sbuf, '@'); if (rname == NULL) { - return (false); + return false; } *rname = '\0'; rname++; if (strcmp(rname, rbuf) != 0) { - return (false); + return false; } /* @@ -415,12 +415,12 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, */ sname = strchr(sbuf, '/'); if (sname == NULL) { - return (false); + return false; } *sname = '\0'; sname++; if (strcmp(sbuf, "host") != 0) { - return (false); + return false; } /* @@ -435,15 +435,15 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, result = dns_name_fromstring(machine, sname, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (false); + return false; } if (subdomain) { - return (dns_name_issubdomain(name, machine)); + return dns_name_issubdomain(name, machine); } - return (dns_name_equal(name, machine)); + return dns_name_equal(name, machine); } - return (true); + return true; } bool @@ -475,18 +475,18 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, */ rname = strchr(sbuf, '@'); if (rname == NULL) { - return (false); + return false; } sname = strchr(sbuf, '$'); if (sname == NULL) { - return (false); + return false; } /* * Verify that the $ and @ follow one another. */ if (rname - sname != 1) { - return (false); + return false; } /* @@ -502,7 +502,7 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, *sname = '\0'; if (strcmp(rname, rbuf) != 0) { - return (false); + return false; } /* @@ -516,15 +516,15 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, machine = dns_fixedname_initname(&fixed); result = dns_name_fromstring(machine, sbuf, realm, 0, NULL); if (result != ISC_R_SUCCESS) { - return (false); + return false; } if (subdomain) { - return (dns_name_issubdomain(name, machine)); + return dns_name_issubdomain(name, machine); } - return (dns_name_equal(name, machine)); + return dns_name_equal(name, machine); } - return (true); + return true; } isc_result_t @@ -542,7 +542,7 @@ dst_gssapi_releasecred(dns_gss_cred_id_t *cred) { } *cred = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -651,7 +651,7 @@ out: (void)gss_release_buffer(&minor, &gouttoken); } (void)gss_release_name(&minor, &gname); - return (result); + return result; } isc_result_t @@ -688,7 +688,7 @@ dst_gssapi_acceptctx(dns_gss_cred_id_t cred, const char *gssapi_keytab, "gsskrb5_register_acceptor_identity(%s): %s", gssapi_keytab, gss_error_tostring(gret, 0, buf, sizeof(buf))); - return (DNS_R_INVALIDTKEY); + return DNS_R_INVALIDTKEY; } #else /* @@ -703,11 +703,11 @@ dst_gssapi_acceptctx(dns_gss_cred_id_t cred, const char *gssapi_keytab, size = strlen(gssapi_keytab) + 13; kt = malloc(size); if (kt == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } snprintf(kt, size, "KRB5_KTNAME=%s", gssapi_keytab); if (putenv(kt) != 0) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } } #endif @@ -744,7 +744,7 @@ dst_gssapi_acceptctx(dns_gss_cred_id_t cred, const char *gssapi_keytab, if (gouttoken.length > 0U) { (void)gss_release_buffer(&minor, &gouttoken); } - return (result); + return result; } if (gouttoken.length > 0U) { @@ -810,7 +810,7 @@ out: } } - return (result); + return result; } isc_result_t @@ -830,7 +830,7 @@ dst_gssapi_deletectx(isc_mem_t *mctx, dns_gss_ctx_id_t *gssctx) { gss_log(3, "Failure deleting security context %s", gss_error_tostring(gret, minor, buf, sizeof(buf))); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } char * @@ -858,7 +858,7 @@ gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { if (msg_minor.length != 0U) { (void)gss_release_buffer(&minor_stat, &msg_minor); } - return (buf); + return buf; } #else @@ -872,7 +872,7 @@ dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, UNUSED(initiate); UNUSED(cred); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } bool @@ -884,7 +884,7 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, UNUSED(realm); UNUSED(subdomain); - return (false); + return false; } bool @@ -896,14 +896,14 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, UNUSED(realm); UNUSED(subdomain); - return (false); + return false; } isc_result_t dst_gssapi_releasecred(dns_gss_cred_id_t *cred) { UNUSED(cred); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -917,7 +917,7 @@ dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, UNUSED(mctx); UNUSED(err_message); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -933,14 +933,14 @@ dst_gssapi_acceptctx(dns_gss_cred_id_t cred, const char *gssapi_keytab, UNUSED(principal); UNUSED(mctx); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t dst_gssapi_deletectx(isc_mem_t *mctx, dns_gss_ctx_id_t *gssctx) { UNUSED(mctx); UNUSED(gssctx); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } char * @@ -948,7 +948,7 @@ gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { snprintf(buf, buflen, "GSSAPI error: Major = %u, Minor = %u.", major, minor); - return (buf); + return buf; } #endif diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c index 355b960053..ec98b1cb0f 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c @@ -160,12 +160,12 @@ getkeybits(dst_key_t *key, struct dst_private_element *element) { uint16_t *bits = (uint16_t *)element->data; if (element->length != 2) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } key->key_bits = ntohs(*bits); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -179,11 +179,11 @@ hmac_createctx(const isc_md_type_t *type, const dst_key_t *key, type); if (result != ISC_R_SUCCESS) { isc_hmac_free(ctx); - return (DST_R_UNSUPPORTEDALG); + return DST_R_UNSUPPORTEDALG; } dctx->ctxdata.hmac_ctx = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -204,10 +204,10 @@ hmac_adddata(const dst_context_t *dctx, const isc_region_t *data) { result = isc_hmac_update(ctx, data->base, data->length); if (result != ISC_R_SUCCESS) { - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -218,20 +218,20 @@ hmac_sign(const dst_context_t *dctx, isc_buffer_t *sig) { unsigned int digestlen = sizeof(digest); if (isc_hmac_final(ctx, digest, &digestlen) != ISC_R_SUCCESS) { - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } if (isc_hmac_reset(ctx) != ISC_R_SUCCESS) { - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } if (isc_buffer_availablelength(sig) < digestlen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(sig, digest, digestlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -243,20 +243,20 @@ hmac_verify(const dst_context_t *dctx, const isc_region_t *sig) { REQUIRE(ctx != NULL); if (isc_hmac_final(ctx, digest, &digestlen) != ISC_R_SUCCESS) { - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } if (isc_hmac_reset(ctx) != ISC_R_SUCCESS) { - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } if (sig->length > digestlen) { - return (DST_R_VERIFYFAILURE); + return DST_R_VERIFYFAILURE; } - return (isc_safe_memequal(digest, sig->base, sig->length) - ? ISC_R_SUCCESS - : DST_R_VERIFYFAILURE); + return isc_safe_memequal(digest, sig->base, sig->length) + ? ISC_R_SUCCESS + : DST_R_VERIFYFAILURE; } static bool @@ -268,13 +268,13 @@ hmac_compare(const isc_md_type_t *type, const dst_key_t *key1, hkey2 = key2->keydata.hmac_key; if (hkey1 == NULL && hkey2 == NULL) { - return (true); + return true; } else if (hkey1 == NULL || hkey2 == NULL) { - return (false); + return false; } - return (isc_safe_memequal(hkey1->key, hkey2->key, - isc_md_type_get_block_size(type))); + return isc_safe_memequal(hkey1->key, hkey2->key, + isc_md_type_get_block_size(type)); } static isc_result_t @@ -302,13 +302,13 @@ hmac_generate(const isc_md_type_t *type, dst_key_t *key) { isc_safe_memwipe(data, sizeof(data)); - return (ret); + return ret; } static bool hmac_isprivate(const dst_key_t *key) { UNUSED(key); - return (true); + return true; } static void @@ -327,11 +327,11 @@ hmac_todns(const dst_key_t *key, isc_buffer_t *data) { bytes = (key->key_size + 7) / 8; if (isc_buffer_availablelength(data) < bytes) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(data, hkey->key, bytes); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -342,7 +342,7 @@ hmac_fromdns(const isc_md_type_t *type, dst_key_t *key, isc_buffer_t *data) { isc_buffer_remainingregion(data, &r); if (r.length == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } hkey = isc_mem_get(key->mctx, sizeof(dst_hmac_key_t)); @@ -355,7 +355,7 @@ hmac_fromdns(const isc_md_type_t *type, dst_key_t *key, isc_buffer_t *data) { ISC_R_SUCCESS) { isc_mem_put(key->mctx, hkey, sizeof(dst_hmac_key_t)); - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } } else { memmove(hkey->key, r.base, r.length); @@ -367,23 +367,23 @@ hmac_fromdns(const isc_md_type_t *type, dst_key_t *key, isc_buffer_t *data) { isc_buffer_forward(data, r.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int hmac__get_tag_key(const isc_md_type_t *type) { if (type == ISC_MD_MD5) { - return (TAG_HMACMD5_KEY); + return TAG_HMACMD5_KEY; } else if (type == ISC_MD_SHA1) { - return (TAG_HMACSHA1_KEY); + return TAG_HMACSHA1_KEY; } else if (type == ISC_MD_SHA224) { - return (TAG_HMACSHA224_KEY); + return TAG_HMACSHA224_KEY; } else if (type == ISC_MD_SHA256) { - return (TAG_HMACSHA256_KEY); + return TAG_HMACSHA256_KEY; } else if (type == ISC_MD_SHA384) { - return (TAG_HMACSHA384_KEY); + return TAG_HMACSHA384_KEY; } else if (type == ISC_MD_SHA512) { - return (TAG_HMACSHA512_KEY); + return TAG_HMACSHA512_KEY; } else { UNREACHABLE(); } @@ -392,17 +392,17 @@ hmac__get_tag_key(const isc_md_type_t *type) { static int hmac__get_tag_bits(const isc_md_type_t *type) { if (type == ISC_MD_MD5) { - return (TAG_HMACMD5_BITS); + return TAG_HMACMD5_BITS; } else if (type == ISC_MD_SHA1) { - return (TAG_HMACSHA1_BITS); + return TAG_HMACSHA1_BITS; } else if (type == ISC_MD_SHA224) { - return (TAG_HMACSHA224_BITS); + return TAG_HMACSHA224_BITS; } else if (type == ISC_MD_SHA256) { - return (TAG_HMACSHA256_BITS); + return TAG_HMACSHA256_BITS; } else if (type == ISC_MD_SHA384) { - return (TAG_HMACSHA384_BITS); + return TAG_HMACSHA384_BITS; } else if (type == ISC_MD_SHA512) { - return (TAG_HMACSHA512_BITS); + return TAG_HMACSHA512_BITS; } else { UNREACHABLE(); } @@ -417,11 +417,11 @@ hmac_tofile(const isc_md_type_t *type, const dst_key_t *key, uint16_t bits; if (key->keydata.hmac_key == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (key->external) { - return (DST_R_EXTERNALKEY); + return DST_R_EXTERNALKEY; } hkey = key->keydata.hmac_key; @@ -438,23 +438,23 @@ hmac_tofile(const isc_md_type_t *type, const dst_key_t *key, priv.nelements = 2; - return (dst__privstruct_writefile(key, &priv, directory)); + return dst__privstruct_writefile(key, &priv, directory); } static int hmac__to_dst_alg(const isc_md_type_t *type) { if (type == ISC_MD_MD5) { - return (DST_ALG_HMACMD5); + return DST_ALG_HMACMD5; } else if (type == ISC_MD_SHA1) { - return (DST_ALG_HMACSHA1); + return DST_ALG_HMACSHA1; } else if (type == ISC_MD_SHA224) { - return (DST_ALG_HMACSHA224); + return DST_ALG_HMACSHA224; } else if (type == ISC_MD_SHA256) { - return (DST_ALG_HMACSHA256); + return DST_ALG_HMACSHA256; } else if (type == ISC_MD_SHA384) { - return (DST_ALG_HMACSHA384); + return DST_ALG_HMACSHA384; } else if (type == ISC_MD_SHA512) { - return (DST_ALG_HMACSHA512); + return DST_ALG_HMACSHA512; } else { UNREACHABLE(); } @@ -474,7 +474,7 @@ hmac_parse(const isc_md_type_t *type, dst_key_t *key, isc_lex_t *lexer, result = dst__privstruct_parse(key, hmac__to_dst_alg(type), lexer, mctx, &priv); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (key->external) { @@ -516,7 +516,7 @@ hmac_parse(const isc_md_type_t *type, dst_key_t *key, isc_lex_t *lexer, } dst__privstruct_free(&priv, mctx); isc_safe_memwipe(&priv, sizeof(priv)); - return (result); + return result; } hmac_register_algorithm(md5); diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index 2ea37b548e..8fbe2928b0 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -212,11 +212,11 @@ dns_compress_rollback(dns_compress_t *cctx, unsigned int offset); static inline dns_decompress_t /* inline to suppress code generation */ dns_decompress_setpermitted(dns_decompress_t dctx, bool permitted) { if (dctx == DNS_DECOMPRESS_NEVER || dctx == DNS_DECOMPRESS_ALWAYS) { - return (dctx); + return dctx; } else if (permitted) { - return (DNS_DECOMPRESS_PERMITTED); + return DNS_DECOMPRESS_PERMITTED; } else { - return (DNS_DECOMPRESS_DEFAULT); + return DNS_DECOMPRESS_DEFAULT; } } @@ -225,8 +225,8 @@ dns_decompress_setpermitted(dns_decompress_t dctx, bool permitted) { */ static inline bool /* inline to suppress code generation */ dns_decompress_getpermitted(dns_decompress_t dctx) { - return (dctx == DNS_DECOMPRESS_ALWAYS || - dctx == DNS_DECOMPRESS_PERMITTED); + return dctx == DNS_DECOMPRESS_ALWAYS || + dctx == DNS_DECOMPRESS_PERMITTED; } ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 740fb9c3f9..b9c4164bf9 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -602,7 +602,7 @@ dns_name_countlabels(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); REQUIRE(name->labels <= DNS_NAME_MAXLABELS); - return (name->labels); + return name->labels; } /*%< * How many labels does 'name' have? diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c index d55b19ca09..b24634ef75 100644 --- a/lib/dns/ipkeylist.c +++ b/lib/dns/ipkeylist.c @@ -106,12 +106,12 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, REQUIRE(dst->count == 0); if (src->count == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_ipkeylist_resize(mctx, dst, src->count); if (result != ISC_R_SUCCESS) { - return (result); + return result; } memmove(dst->addrs, src->addrs, src->count * sizeof(isc_sockaddr_t)); @@ -161,7 +161,7 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, } } dst->count = src->count; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -170,7 +170,7 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) { REQUIRE(n > ipkl->count); if (n <= ipkl->allocated) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } ipkl->addrs = isc_mem_creget(mctx, ipkl->addrs, ipkl->allocated, n, @@ -185,5 +185,5 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) { sizeof(ipkl->labels[0])); ipkl->allocated = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c index 2a783a1b08..c405ce54cd 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -59,7 +59,7 @@ dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, result = isc_radix_insert(tab->radix, &node, NULL, &pfx); if (result != ISC_R_SUCCESS) { isc_refcount_destroy(&pfx.refcount); - return (result); + return result; } /* If a node already contains data, don't overwrite it */ @@ -82,7 +82,7 @@ dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, } isc_refcount_destroy(&pfx.refcount); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -99,7 +99,7 @@ dns_iptable_merge(dns_iptable_t *tab, dns_iptable_t *source, bool pos) { result = isc_radix_insert(tab->radix, &new_node, node, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -124,7 +124,7 @@ dns_iptable_merge(dns_iptable_t *tab, dns_iptable_t *source, bool pos) { RADIX_WALK_END; tab->radix->num_added_node += max_node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 5a27cf7df2..19d5f6e34a 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -106,8 +106,8 @@ index_to_disk(dns_journal_t *); static uint32_t decode_uint32(unsigned char *p) { - return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) + - ((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0)); + return ((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) + + ((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0); } static void @@ -156,13 +156,13 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, dns_rdataset_disassociate(&rdataset); dns_db_detachnode(db, &node); - return (result); + return result; freenode: dns_db_detachnode(db, &node); nonode: UNEXPECTED_ERROR("missing SOA"); - return (result); + return result; } /* Journaling */ @@ -414,10 +414,10 @@ journal_seek(dns_journal_t *j, uint32_t offset) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: seek: %s", j->filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } j->offset = offset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -427,15 +427,15 @@ journal_read(dns_journal_t *j, void *mem, size_t nbytes) { result = isc_stdio_read(mem, 1, nbytes, j->fp, NULL); if (result != ISC_R_SUCCESS) { if (result == ISC_R_EOF) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: read: %s", j->filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } j->offset += (off_t)nbytes; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -447,10 +447,10 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: write: %s", j->filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } j->offset += (off_t)nbytes; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -462,16 +462,16 @@ journal_fsync(dns_journal_t *j) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: flush: %s", j->filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } result = isc_stdio_sync(j->fp); if (result != ISC_R_SUCCESS) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: fsync: %s", j->filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -488,32 +488,32 @@ journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) { journal_rawxhdr_ver1_t raw; result = journal_read(j, &raw, sizeof(raw)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } xhdr->size = decode_uint32(raw.size); xhdr->count = 0; xhdr->serial0 = decode_uint32(raw.serial0); xhdr->serial1 = decode_uint32(raw.serial1); j->curxhdr = *xhdr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } case XHDR_VERSION2: { journal_rawxhdr_t raw; result = journal_read(j, &raw, sizeof(raw)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } xhdr->size = decode_uint32(raw.size); xhdr->count = decode_uint32(raw.count); xhdr->serial0 = decode_uint32(raw.serial0); xhdr->serial1 = decode_uint32(raw.serial1); j->curxhdr = *xhdr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } } @@ -525,14 +525,14 @@ journal_write_xhdr(dns_journal_t *j, uint32_t size, uint32_t count, encode_uint32(size, raw.size); encode_uint32(serial0, raw.serial0); encode_uint32(serial1, raw.serial1); - return (journal_write(j, &raw, sizeof(raw))); + return journal_write(j, &raw, sizeof(raw)); } else { journal_rawxhdr_t raw; encode_uint32(size, raw.size); encode_uint32(count, raw.count); encode_uint32(serial0, raw.serial0); encode_uint32(serial1, raw.serial1); - return (journal_write(j, &raw, sizeof(raw))); + return journal_write(j, &raw, sizeof(raw)); } } @@ -547,10 +547,10 @@ journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) { result = journal_read(j, &raw, sizeof(raw)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } rrhdr->size = decode_uint32(raw.size); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -570,7 +570,7 @@ journal_file_create(isc_mem_t *mctx, bool downgrade, const char *filename) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: create: %s", filename, isc_result_totext(result)); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (downgrade) { @@ -595,7 +595,7 @@ journal_file_create(isc_mem_t *mctx, bool downgrade, const char *filename) { (void)isc_stdio_close(fp); (void)isc_file_remove(filename); isc_mem_put(mctx, mem, size); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } isc_mem_put(mctx, mem, size); @@ -605,10 +605,10 @@ journal_file_create(isc_mem_t *mctx, bool downgrade, const char *filename) { ISC_LOG_ERROR, "%s: close: %s", filename, isc_result_totext(result)); (void)isc_file_remove(filename); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -738,7 +738,7 @@ journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create, j->state = writable ? JOURNAL_STATE_WRITE : JOURNAL_STATE_READ; *journalp = j; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: j->magic = 0; @@ -755,7 +755,7 @@ failure: (void)isc_stdio_close(j->fp); } isc_mem_putanddetach(&j->mctx, j, sizeof(*j)); - return (result); + return result; } isc_result_t @@ -781,12 +781,12 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, unsigned int mode, result = snprintf(backup, sizeof(backup), "%.*s.jbk", (int)namelen, filename); if (result >= sizeof(backup)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } result = journal_open(mctx, backup, writable, writable, false, journalp); } - return (result); + return result; } /* @@ -838,17 +838,17 @@ ixfr_order(const void *av, const void *bv) { r = bop - aop; if (r != 0) { - return (r); + return r; } r = (b->rdata.type == dns_rdatatype_soa) - (a->rdata.type == dns_rdatatype_soa); if (r != 0) { - return (r); + return r; } r = (a->rdata.type - b->rdata.type); - return (r); + return r; } static isc_result_t @@ -860,8 +860,8 @@ maybe_fixup_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr, uint32_t serial, * Handle mixture of version 1 and version 2 * transaction headers in a version 1 journal. */ - if ((xhdr->serial0 != serial || - isc_serial_le(xhdr->serial1, xhdr->serial0))) + if (xhdr->serial0 != serial || + isc_serial_le(xhdr->serial1, xhdr->serial0)) { if (j->xhdr_version == XHDR_VERSION1 && xhdr->serial1 == serial) { @@ -921,7 +921,7 @@ maybe_fixup_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr, uint32_t serial, } failure: - return (result); + return result; } /* @@ -950,11 +950,11 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { result = journal_seek(j, pos->offset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (pos->serial == j->header.end.serial) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -963,7 +963,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { */ result = journal_read_xhdr(j, &xhdr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (j->header_ver1) { @@ -981,7 +981,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { "%s: journal file corrupt: " "expected serial %u, got %u", j->filename, pos->serial, xhdr.serial0); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -995,15 +995,15 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "%s: offset too large", j->filename); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } pos->offset += hdrsize + xhdr.size; pos->serial = xhdr.serial1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: - return (result); + return result; } /* @@ -1121,14 +1121,14 @@ journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) { REQUIRE(DNS_JOURNAL_VALID(j)); if (DNS_SERIAL_GT(j->header.begin.serial, serial)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } if (DNS_SERIAL_GT(serial, j->header.end.serial)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } if (serial == j->header.end.serial) { *pos = j->header.end; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } current_pos = j->header.begin; @@ -1136,15 +1136,15 @@ journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) { while (current_pos.serial != serial) { if (DNS_SERIAL_GT(current_pos.serial, serial)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } result = journal_next(j, ¤t_pos); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } *pos = current_pos; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1184,7 +1184,7 @@ dns_journal_begin_transaction(dns_journal_t *j) { j->state = JOURNAL_STATE_TRANSACTION; result = ISC_R_SUCCESS; failure: - return (result); + return result; } isc_result_t @@ -1230,7 +1230,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { "dns_journal_writediff: %s: journal entry " "too big to be stored: %" PRIu64 " bytes", j->filename, size); - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } mem = isc_mem_get(j->mctx, size); @@ -1280,7 +1280,7 @@ failure: if (mem != NULL) { isc_mem_put(j->mctx, mem, size); } - return (result); + return result; } isc_result_t @@ -1303,7 +1303,7 @@ dns_journal_commit(dns_journal_t *j) { CHECK(journal_write(j, &rawheader, sizeof(rawheader))); CHECK(journal_fsync(j)); j->state = JOURNAL_STATE_WRITE; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1314,7 +1314,7 @@ dns_journal_commit(dns_journal_t *j) { ISC_LOG_ERROR, "%s: malformed transaction: %d SOAs", j->filename, j->x.n_soa); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (!DNS_SERIAL_GT(j->x.pos[1].serial, j->x.pos[0].serial)) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, @@ -1322,7 +1322,7 @@ dns_journal_commit(dns_journal_t *j) { "%s: malformed transaction: serial number " "did not increase", j->filename); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (!JOURNAL_EMPTY(&j->header)) { if (j->x.pos[0].serial != j->header.end.serial) { @@ -1333,7 +1333,7 @@ dns_journal_commit(dns_journal_t *j) { "transaction first serial %u", j->filename, j->header.end.serial, j->x.pos[0].serial); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -1347,7 +1347,7 @@ dns_journal_commit(dns_journal_t *j) { "transaction too big to be stored in journal: " "%" PRIu64 "b (max is %" PRIu64 "b)", total, (uint64_t)DNS_JOURNAL_SIZE_MAX); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -1424,7 +1424,7 @@ dns_journal_commit(dns_journal_t *j) { result = ISC_R_SUCCESS; failure: - return (result); + return result; } isc_result_t @@ -1437,7 +1437,7 @@ dns_journal_write_transaction(dns_journal_t *j, dns_diff_t *diff) { CHECK(dns_journal_commit(j)); result = ISC_R_SUCCESS; failure: - return (result); + return result; } void @@ -1629,7 +1629,7 @@ failure: INSIST(ver == NULL); - return (result); + return result; } isc_result_t @@ -1652,12 +1652,12 @@ dns_journal_print(isc_mem_t *mctx, uint32_t flags, const char *filename, if (result == ISC_R_NOTFOUND) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_DEBUG(3), "no journal file"); - return (DNS_R_NOJOURNAL); + return DNS_R_NOJOURNAL; } else if (result != ISC_R_SUCCESS) { isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_JOURNAL, ISC_LOG_ERROR, "journal open failure: %s: %s", isc_result_totext(result), filename); - return (result); + return result; } if (printxhdr) { @@ -1780,7 +1780,7 @@ cleanup: dns_diff_clear(&diff); dns_journal_destroy(&j); - return (result); + return result; } /**************************************************************************/ @@ -1789,22 +1789,22 @@ cleanup: */ bool dns_journal_empty(dns_journal_t *j) { - return (JOURNAL_EMPTY(&j->header)); + return JOURNAL_EMPTY(&j->header); } bool dns_journal_recovered(dns_journal_t *j) { - return (j->recovered); + return j->recovered; } uint32_t dns_journal_first_serial(dns_journal_t *j) { - return (j->header.begin.serial); + return j->header.begin.serial; } uint32_t dns_journal_last_serial(dns_journal_t *j) { - return (j->header.end.serial); + return j->header.end.serial; } void @@ -1825,10 +1825,10 @@ dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial) { REQUIRE(sourceserial != NULL); if (!j->header.serialset) { - return (false); + return false; } *sourceserial = j->header.sourceserial; - return (true); + return true; } /**************************************************************************/ @@ -1860,7 +1860,7 @@ size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned int size) { if (b->length < size) { void *mem = isc_mem_get(mctx, size); if (mem == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (b->base != NULL) { isc_mem_put(mctx, b->base, b->length); @@ -1869,7 +1869,7 @@ size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned int size) { b->length = size; } isc_buffer_clear(b); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1936,7 +1936,7 @@ dns_journal_iter_init(dns_journal_t *j, uint32_t begin_serial, result = ISC_R_SUCCESS; failure: j->it.result = result; - return (j->it.result); + return j->it.result; } isc_result_t @@ -1953,10 +1953,10 @@ dns_journal_first_rr(dns_journal_t *j) { j->it.xsize = 0; /* We have no transaction data yet... */ j->it.xpos = 0; /* ...and haven't used any of it. */ - return (read_one_rr(j)); + return read_one_rr(j); failure: - return (result); + return result; } static isc_result_t @@ -1975,10 +1975,10 @@ read_one_rr(dns_journal_t *j) { ISC_LOG_ERROR, "%s: journal corrupt: possible integer overflow", j->filename); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (j->offset == j->it.epos.offset) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (j->it.xpos == j->it.xsize) { /* @@ -2099,13 +2099,13 @@ read_one_rr(dns_journal_t *j) { failure: j->it.result = result; - return (result); + return result; } isc_result_t dns_journal_next_rr(dns_journal_t *j) { j->it.result = read_one_rr(j); - return (j->it.result); + return j->it.result; } void @@ -2142,7 +2142,7 @@ get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, result = dns_dbiterator_current(dbit, &node, name); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_allrdatasets(db, node, ver, 0, now, &rdsiter); @@ -2185,7 +2185,7 @@ cleanup_iterator: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /* @@ -2203,10 +2203,10 @@ rdata_order(const void *av, const void *bv) { int r; r = (b->rdata.type - a->rdata.type); if (r != 0) { - return (r); + return r; } r = dns_rdata_compare(&a->rdata, &b->rdata); - return (r); + return r; } static isc_result_t @@ -2269,7 +2269,7 @@ dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) { ISC_LIST_APPENDLIST(r->tuples, add, link); result = ISC_R_SUCCESS; failure: - return (result); + return result; } static isc_result_t @@ -2296,7 +2296,7 @@ diff_namespace(dns_db_t *dba, dns_dbversion_t *dbvera, dns_db_t *dbb, result = dns_db_createiterator(db[0], options, &dbit[0]); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_createiterator(db[1], options, &dbit[1]); if (result != ISC_R_SUCCESS) { @@ -2376,7 +2376,7 @@ cleanup_iterator: dns_dbiterator_destroy(&dbit[0]); dns_diff_clear(&diff[0]); dns_diff_clear(&diff[1]); - return (result); + return result; } /* @@ -2397,7 +2397,7 @@ dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, dns_diff_clear(&diff); - return (result); + return result; } isc_result_t @@ -2410,7 +2410,7 @@ dns_db_diffx(dns_diff_t *diff, dns_db_t *dba, dns_dbversion_t *dbvera, result = dns_journal_open(diff->mctx, filename, DNS_JOURNAL_CREATE, &journal); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2431,7 +2431,7 @@ failure: if (journal != NULL) { dns_journal_destroy(&journal); } - return (result); + return result; } static uint32_t @@ -2448,7 +2448,7 @@ rrcount(unsigned char *buf, unsigned int size) { count++; } - return (count); + return count; } static bool @@ -2460,17 +2460,17 @@ check_delta(unsigned char *buf, size_t size) { isc_buffer_add(&b, size); while (isc_buffer_remaininglength(&b) > 0) { if (isc_buffer_remaininglength(&b) < 4) { - return (false); + return false; } rrsize = isc_buffer_getuint32(&b); /* "." + type + class + ttl + rdlen => 11U */ if (rrsize < 11U || isc_buffer_remaininglength(&b) < rrsize) { - return (false); + return false; } isc_buffer_forward(&b, rrsize); } - return (true); + return true; } isc_result_t @@ -2515,7 +2515,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, result = journal_open(mctx, backup, false, false, false, &j1); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -2535,14 +2535,14 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, serial = dns_journal_first_serial(j1); } else if (JOURNAL_EMPTY(&j1->header)) { dns_journal_destroy(&j1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (DNS_SERIAL_GT(j1->header.begin.serial, serial) || DNS_SERIAL_GT(serial, j1->header.end.serial)) { dns_journal_destroy(&j1); - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* @@ -2563,7 +2563,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, */ if (!rewrite && (uint32_t)j1->header.end.offset < target_size) { dns_journal_destroy(&j1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } CHECK(journal_open(mctx, newname, true, true, downgrade, &j2)); @@ -2843,7 +2843,7 @@ failure: if (j2 != NULL) { dns_journal_destroy(&j2); } - return (result); + return result; } static isc_result_t @@ -2871,5 +2871,5 @@ index_to_disk(dns_journal_t *j) { CHECK(journal_write(j, j->rawindex, rawbytes)); } failure: - return (result); + return result; } diff --git a/lib/dns/kasp.c b/lib/dns/kasp.c index 8a03a45cda..cc2290ec49 100644 --- a/lib/dns/kasp.c +++ b/lib/dns/kasp.c @@ -54,7 +54,7 @@ dns_kasp_create(isc_mem_t *mctx, const char *name, dns_kasp_t **kaspp) { isc_refcount_init(&kasp->references, 1); *kaspp = kasp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -110,7 +110,7 @@ const char * dns_kasp_getname(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); - return (kasp->name); + return kasp->name; } void @@ -134,7 +134,7 @@ dns_kasp_signdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->signatures_validity - kasp->signatures_refresh); + return kasp->signatures_validity - kasp->signatures_refresh; } uint32_t @@ -142,7 +142,7 @@ dns_kasp_sigjitter(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->signatures_jitter); + return kasp->signatures_jitter; } void @@ -158,7 +158,7 @@ dns_kasp_sigrefresh(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->signatures_refresh); + return kasp->signatures_refresh; } void @@ -174,7 +174,7 @@ dns_kasp_sigvalidity(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->signatures_validity); + return kasp->signatures_validity; } void @@ -190,7 +190,7 @@ dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->signatures_validity_dnskey); + return kasp->signatures_validity_dnskey; } void @@ -206,7 +206,7 @@ dns_kasp_dnskeyttl(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->dnskey_ttl); + return kasp->dnskey_ttl; } void @@ -222,7 +222,7 @@ dns_kasp_purgekeys(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->purge_keys); + return kasp->purge_keys; } void @@ -238,7 +238,7 @@ dns_kasp_publishsafety(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->publish_safety); + return kasp->publish_safety; } void @@ -254,7 +254,7 @@ dns_kasp_retiresafety(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->retire_safety); + return kasp->retire_safety; } void @@ -270,7 +270,7 @@ dns_kasp_inlinesigning(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->inline_signing); + return kasp->inline_signing; } void @@ -287,9 +287,9 @@ dns_kasp_zonemaxttl(dns_kasp_t *kasp, bool fallback) { REQUIRE(kasp->frozen); if (kasp->zone_max_ttl == 0 && fallback) { - return (DEFAULT_TTLSIG); + return DEFAULT_TTLSIG; } - return (kasp->zone_max_ttl); + return kasp->zone_max_ttl; } void @@ -305,7 +305,7 @@ dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->zone_propagation_delay); + return kasp->zone_propagation_delay; } void @@ -321,7 +321,7 @@ dns_kasp_dsttl(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->parent_ds_ttl); + return kasp->parent_ds_ttl; } void @@ -337,7 +337,7 @@ dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->parent_propagation_delay); + return kasp->parent_propagation_delay; } void @@ -355,7 +355,7 @@ dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) { REQUIRE(kaspp != NULL && *kaspp == NULL); if (list == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (kasp = ISC_LIST_HEAD(*list); kasp != NULL; @@ -367,11 +367,11 @@ dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) { } if (kasp == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_kasp_attach(kasp, kaspp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_kasp_keylist_t @@ -379,14 +379,14 @@ dns_kasp_keys(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->keys); + return kasp->keys; } bool dns_kasp_keylist_empty(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); - return (ISC_LIST_EMPTY(kasp->keys)); + return ISC_LIST_EMPTY(kasp->keys); } void @@ -415,7 +415,7 @@ dns_kasp_key_create(dns_kasp_t *kasp, dns_kasp_key_t **keyp) { ISC_LINK_INIT(key, link); *keyp = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -432,7 +432,7 @@ uint32_t dns_kasp_key_algorithm(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->algorithm); + return key->algorithm; } unsigned int @@ -476,47 +476,47 @@ dns_kasp_key_size(dns_kasp_key_t *key) { /* unsupported */ break; } - return (size); + return size; } uint32_t dns_kasp_key_lifetime(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->lifetime); + return key->lifetime; } dns_keystore_t * dns_kasp_key_keystore(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->keystore); + return key->keystore; } bool dns_kasp_key_ksk(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->role & DNS_KASP_KEY_ROLE_KSK); + return key->role & DNS_KASP_KEY_ROLE_KSK; } bool dns_kasp_key_zsk(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->role & DNS_KASP_KEY_ROLE_ZSK); + return key->role & DNS_KASP_KEY_ROLE_ZSK; } uint16_t dns_kasp_key_tagmin(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->tag_min); + return key->tag_min; } uint16_t dns_kasp_key_tagmax(dns_kasp_key_t *key) { REQUIRE(key != NULL); - return (key->tag_min); + return key->tag_min; } bool @@ -529,33 +529,33 @@ dns_kasp_key_match(dns_kasp_key_t *key, dns_dnsseckey_t *dkey) { /* Matching algorithms? */ if (dst_key_alg(dkey->key) != dns_kasp_key_algorithm(key)) { - return (false); + return false; } /* Matching length? */ if (dst_key_size(dkey->key) != dns_kasp_key_size(key)) { - return (false); + return false; } /* Matching role? */ ret = dst_key_getbool(dkey->key, DST_BOOL_KSK, &role); if (ret != ISC_R_SUCCESS || role != dns_kasp_key_ksk(key)) { - return (false); + return false; } ret = dst_key_getbool(dkey->key, DST_BOOL_ZSK, &role); if (ret != ISC_R_SUCCESS || role != dns_kasp_key_zsk(key)) { - return (false); + return false; } /* Valid key tag range? */ uint16_t id = dst_key_id(dkey->key); uint16_t rid = dst_key_rid(dkey->key); if (id < key->tag_min || id > key->tag_max) { - return (false); + return false; } if (rid < key->tag_min || rid > key->tag_max) { - return (false); + return false; } /* Found a match. */ - return (true); + return true; } uint8_t @@ -564,7 +564,7 @@ dns_kasp_nsec3iter(dns_kasp_t *kasp) { REQUIRE(kasp->frozen); REQUIRE(kasp->nsec3); - return (kasp->nsec3param.iterations); + return kasp->nsec3param.iterations; } uint8_t @@ -574,9 +574,9 @@ dns_kasp_nsec3flags(dns_kasp_t *kasp) { REQUIRE(kasp->nsec3); if (kasp->nsec3param.optout) { - return (0x01); + return 0x01; } - return (0x00); + return 0x00; } uint8_t @@ -585,7 +585,7 @@ dns_kasp_nsec3saltlen(dns_kasp_t *kasp) { REQUIRE(kasp->frozen); REQUIRE(kasp->nsec3); - return (kasp->nsec3param.saltlen); + return kasp->nsec3param.saltlen; } bool @@ -593,7 +593,7 @@ dns_kasp_nsec3(dns_kasp_t *kasp) { REQUIRE(kasp != NULL); REQUIRE(kasp->frozen); - return (kasp->nsec3); + return kasp->nsec3; } void @@ -621,7 +621,7 @@ dns_kasp_offlineksk(dns_kasp_t *kasp) { REQUIRE(kasp != NULL); REQUIRE(kasp->frozen); - return (kasp->offlineksk); + return kasp->offlineksk; } void @@ -637,7 +637,7 @@ dns_kasp_cdnskey(dns_kasp_t *kasp) { REQUIRE(kasp != NULL); REQUIRE(kasp->frozen); - return (kasp->cdnskey); + return kasp->cdnskey; } void @@ -653,7 +653,7 @@ dns_kasp_digests(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); - return (kasp->digests); + return kasp->digests; } void diff --git a/lib/dns/key.c b/lib/dns/key.c index a0cde831a5..6e8091bc75 100644 --- a/lib/dns/key.c +++ b/lib/dns/key.c @@ -47,7 +47,7 @@ dst_region_computeid(const isc_region_t *source) { } ac += (ac >> 16) & 0xffff; - return ((uint16_t)(ac & 0xffff)); + return (uint16_t)(ac & 0xffff); } uint16_t @@ -73,61 +73,61 @@ dst_region_computerid(const isc_region_t *source) { } ac += (ac >> 16) & 0xffff; - return ((uint16_t)(ac & 0xffff)); + return (uint16_t)(ac & 0xffff); } dns_name_t * dst_key_name(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_name); + return key->key_name; } unsigned int dst_key_size(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_size); + return key->key_size; } unsigned int dst_key_proto(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_proto); + return key->key_proto; } unsigned int dst_key_alg(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_alg); + return key->key_alg; } uint32_t dst_key_flags(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_flags); + return key->key_flags; } dns_keytag_t dst_key_id(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_id); + return key->key_id; } dns_keytag_t dst_key_rid(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_rid); + return key->key_rid; } dns_rdataclass_t dst_key_class(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_class); + return key->key_class; } const char * dst_key_directory(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->directory); + return key->directory; } bool @@ -135,17 +135,17 @@ dst_key_iszonekey(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); if ((key->key_flags & DNS_KEYTYPE_NOAUTH) != 0) { - return (false); + return false; } if ((key->key_flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE) { - return (false); + return false; } if (key->key_proto != DNS_KEYPROTO_DNSSEC && key->key_proto != DNS_KEYPROTO_ANY) { - return (false); + return false; } - return (true); + return true; } bool @@ -153,17 +153,17 @@ dst_key_isnullkey(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); if ((key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY) { - return (false); + return false; } if ((key->key_flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE) { - return (false); + return false; } if (key->key_proto != DNS_KEYPROTO_DNSSEC && key->key_proto != DNS_KEYPROTO_ANY) { - return (false); + return false; } - return (true); + return true; } #define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0) @@ -221,7 +221,7 @@ dst_key_have_ksk_and_zsk(dst_key_t **keys, unsigned int nkeys, unsigned int i, SET_IF_NOT_NULL(have_ksk, hksk); SET_IF_NOT_NULL(have_zsk, hzsk); - return (hksk && hzsk); + return hksk && hzsk; } void @@ -239,7 +239,7 @@ dst_key_setbits(dst_key_t *key, uint16_t bits) { uint16_t dst_key_getbits(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_bits); + return key->key_bits; } void @@ -251,7 +251,7 @@ dst_key_setttl(dst_key_t *key, dns_ttl_t ttl) { dns_ttl_t dst_key_getttl(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); - return (key->key_ttl); + return key->key_ttl; } void diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c index c8e2d80cdd..7dde94a283 100644 --- a/lib/dns/keydata.c +++ b/lib/dns/keydata.c @@ -45,7 +45,7 @@ dns_keydata_todnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, memmove(dnskey->data, keydata->data, dnskey->datalen); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -72,5 +72,5 @@ dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, memmove(keydata->data, dnskey->data, keydata->datalen); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c index 1f5ab70c9b..a65ad24a06 100644 --- a/lib/dns/keymgr.c +++ b/lib/dns/keymgr.c @@ -105,20 +105,20 @@ keymgr_keyrole(dst_key_t *key) { isc_result_t ret; ret = dst_key_getbool(key, DST_BOOL_KSK, &ksk); if (ret != ISC_R_SUCCESS) { - return ("UNKNOWN"); + return "UNKNOWN"; } ret = dst_key_getbool(key, DST_BOOL_ZSK, &zsk); if (ret != ISC_R_SUCCESS) { - return ("UNKNOWN"); + return "UNKNOWN"; } if (ksk && zsk) { - return ("CSK"); + return "CSK"; } else if (ksk) { - return ("KSK"); + return "KSK"; } else if (zsk) { - return ("ZSK"); + return "ZSK"; } - return ("NOSIGN"); + return "NOSIGN"; } /* @@ -303,7 +303,7 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp, * No inactive time and no lifetime, * so no need to start a rollover. */ - return (0); + return 0; } if (ISC_OVERFLOW_ADD(active, klifetime, &retire)) { @@ -323,9 +323,9 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp, */ if (prepub > retire) { /* We should have already prepublished the new key. */ - return (now); + return now; } - return (retire - prepub); + return retire - prepub; } static void @@ -432,10 +432,10 @@ keymgr_keyid_conflict(dst_key_t *newkey, uint16_t min, uint16_t max, uint32_t alg = dst_key_alg(newkey); if (id < min || id > max) { - return (true); + return true; } if (rid < min || rid > max) { - return (true); + return true; } for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keys); dkey != NULL; @@ -449,10 +449,10 @@ keymgr_keyid_conflict(dst_key_t *newkey, uint16_t min, uint16_t max, dst_key_id(dkey->key) == rid || dst_key_rid(dkey->key) == rid) { - return (true); + return true; } } - return (false); + return false; } /* @@ -517,10 +517,10 @@ keymgr_createkey(dns_kasp_key_t *kkey, const dns_name_t *origin, dst_key_setdirectory(newkey, dir); } *dst_key = newkey; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: - return (result); + return result; } /* @@ -553,35 +553,35 @@ keymgr_desiredstate(dns_dnsseckey_t *key, dst_key_state_t state) { if (dst_key_getstate(key->key, DST_KEY_GOAL, &goal) != ISC_R_SUCCESS) { /* No goal? No movement. */ - return (state); + return state; } if (goal == HIDDEN) { switch (state) { case RUMOURED: case OMNIPRESENT: - return (UNRETENTIVE); + return UNRETENTIVE; case HIDDEN: case UNRETENTIVE: - return (HIDDEN); + return HIDDEN; default: - return (state); + return state; } } else if (goal == OMNIPRESENT) { switch (state) { case RUMOURED: case OMNIPRESENT: - return (OMNIPRESENT); + return OMNIPRESENT; case HIDDEN: case UNRETENTIVE: - return (RUMOURED); + return RUMOURED; default: - return (state); + return state; } } /* Unknown goal. */ - return (state); + return state; } /* @@ -612,16 +612,16 @@ keymgr_key_match_state(dst_key_t *key, dst_key_t *subject, int type, } else if (dst_key_getstate(key, i, &state) != ISC_R_SUCCESS) { /* This is fine only if expected state is HIDDEN. */ if (states[i] != HIDDEN) { - return (false); + return false; } continue; } if (state != states[i]) { - return (false); + return false; } } /* Match. */ - return (true); + return true; } /* @@ -632,12 +632,12 @@ keymgr_direct_dep(dst_key_t *d, dst_key_t *k) { uint32_t s, p; if (dst_key_getnum(d, DST_NUM_SUCCESSOR, &s) != ISC_R_SUCCESS) { - return (false); + return false; } if (dst_key_getnum(k, DST_NUM_PREDECESSOR, &p) != ISC_R_SUCCESS) { - return (false); + return false; } - return (dst_key_id(d) == p && dst_key_id(k) == s); + return dst_key_id(d) == p && dst_key_id(k) == s; } /* @@ -662,10 +662,10 @@ keymgr_dep(dst_key_t *k, dns_dnsseckeylist_t *keyring, uint32_t *dep) { if (dep != NULL) { *dep = dst_key_id(d->key); } - return (true); + return true; } } - return (false); + return false; } /* @@ -685,21 +685,21 @@ keymgr_key_is_successor(dst_key_t *x, dst_key_t *z, dst_key_t *key, int type, * nothing depending on x. */ if (keymgr_dep(x, keyring, &dep_x)) { - return (false); + return false; } /* * If there is no keys relying on key z, then z is not a successor. */ if (!keymgr_dep(z, keyring, &dep_z)) { - return (false); + return false; } /* * x depends on z, thus key z is a direct successor of key x. */ if (dst_key_id(x) == dep_z) { - return (true); + return true; } /* @@ -744,12 +744,12 @@ keymgr_key_is_successor(dst_key_t *x, dst_key_t *z, dst_key_t *key, int type, * If y is a successor of x, then z is also a * successor of x. */ - return (keymgr_key_is_successor(x, y->key, key, type, - next_state, keyring)); + return keymgr_key_is_successor(x, y->key, key, type, + next_state, keyring); } } - return (false); + return false; } /* @@ -784,7 +784,7 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, /* Found a match. */ if (!check_successor) { - return (true); + return true; } /* @@ -811,12 +811,12 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, key->key, type, next_state, keyring)) { - return (true); + return true; } } } /* No match. */ - return (false); + return false; } /* @@ -829,10 +829,10 @@ keymgr_key_has_successor(dns_dnsseckey_t *predecessor, successor != NULL; successor = ISC_LIST_NEXT(successor, link)) { if (keymgr_direct_dep(predecessor->key, successor->key)) { - return (true); + return true; } } - return (false); + return false; } /* @@ -872,7 +872,7 @@ keymgr_ds_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, } if (must_be_hidden) { - return (false); + return false; } /* @@ -896,11 +896,11 @@ keymgr_ds_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, na, false, match_algorithms)) { /* There is no chain of trust. */ - return (false); + return false; } } /* All good. */ - return (true); + return true; } /* @@ -952,11 +952,11 @@ keymgr_dnskey_hidden_or_chained(dns_dnsseckeylist_t *keyring, false, match_algorithms)) { /* There is no chain of trust. */ - return (false); + return false; } } /* All good. */ - return (true); + return true; } /* @@ -979,13 +979,13 @@ keymgr_have_ds(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, * Equation (3a): * There is a key with the DS in either RUMOURD or OMNIPRESENT state. */ - return (keymgr_key_exists_with_state(keyring, key, type, next_state, - states[0], na, false, false) || - keymgr_key_exists_with_state(keyring, key, type, next_state, - states[1], na, false, false) || - (secure_to_insecure && - keymgr_key_exists_with_state(keyring, key, type, next_state, - na, na, false, false))); + return keymgr_key_exists_with_state(keyring, key, type, next_state, + states[0], na, false, false) || + keymgr_key_exists_with_state(keyring, key, type, next_state, + states[1], na, false, false) || + (secure_to_insecure && + keymgr_key_exists_with_state(keyring, key, type, next_state, na, + na, false, false)); } /* @@ -1013,7 +1013,7 @@ keymgr_have_dnskey(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, /* successor n/a */ dst_key_state_t na[NUM_KEYSTATES] = { NA, NA, NA, NA }; - return ( + return /* * Equation (3b): * There is a key with the same algorithm with its DNSKEY, @@ -1077,7 +1077,7 @@ keymgr_have_dnskey(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, * chain of trust for those validators. */ keymgr_ds_hidden_or_chained(keyring, key, type, next_state, - true, false)); + true, false); } /* @@ -1099,7 +1099,7 @@ keymgr_have_rrsig(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, /* successor n/a */ dst_key_state_t na[NUM_KEYSTATES] = { NA, NA, NA, NA }; - return ( + return /* * If all DS records are hidden than this rule can be ignored. */ @@ -1137,7 +1137,7 @@ keymgr_have_rrsig(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, * must be a path that can be validated from there. */ keymgr_dnskey_hidden_or_chained(keyring, key, type, next_state, - true)); + true); } /* @@ -1175,43 +1175,43 @@ keymgr_policy_approval(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, * Local policy only adds an extra barrier on transitions to * the RUMOURED state. */ - return (true); + return true; } switch (type) { case DST_KEY_DNSKEY: /* No restrictions. */ - return (true); + return true; case DST_KEY_ZRRSIG: /* Make sure the DNSKEY record is OMNIPRESENT. */ (void)dst_key_getstate(key->key, DST_KEY_DNSKEY, &dnskeystate); if (dnskeystate == OMNIPRESENT) { - return (true); + return true; } /* * Or are we introducing a new key for this algorithm? Because * in that case allow publishing the RRSIG records before the * DNSKEY. */ - return (!(keymgr_key_exists_with_state(keyring, key, type, next, - ksk_present, na, false, - true) || - keymgr_key_exists_with_state(keyring, key, type, next, - ds_retired, ds_rumoured, - true, true) || - keymgr_key_exists_with_state( - keyring, key, type, next, ksk_retired, - ksk_rumoured, true, true))); + return !(keymgr_key_exists_with_state(keyring, key, type, next, + ksk_present, na, false, + true) || + keymgr_key_exists_with_state(keyring, key, type, next, + ds_retired, ds_rumoured, + true, true) || + keymgr_key_exists_with_state(keyring, key, type, next, + ksk_retired, ksk_rumoured, + true, true)); case DST_KEY_KRRSIG: /* Only introduce if the DNSKEY is also introduced. */ (void)dst_key_getstate(key->key, DST_KEY_DNSKEY, &dnskeystate); - return (dnskeystate != HIDDEN); + return dnskeystate != HIDDEN; case DST_KEY_DS: /* Make sure the DNSKEY record is OMNIPRESENT. */ (void)dst_key_getstate(key->key, DST_KEY_DNSKEY, &dnskeystate); - return (dnskeystate == OMNIPRESENT); + return dnskeystate == OMNIPRESENT; default: - return (false); + return false; } } @@ -1249,7 +1249,7 @@ keymgr_transition_allowed(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, rule3a ? "true" : "false", rule3b ? "true" : "false"); } - return ( + return /* * Rule 1: There must be a DS at all times. * First check the current situation: if the rule check fails, @@ -1272,7 +1272,7 @@ keymgr_transition_allowed(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, * state. */ (!keymgr_have_rrsig(keyring, key, type, NA) || - keymgr_have_rrsig(keyring, key, type, next_state))); + keymgr_have_rrsig(keyring, key, type, next_state)); } /* @@ -1597,7 +1597,7 @@ transition: goto transition; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1765,7 +1765,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, if (*nexttime == 0 || prepub < *nexttime) { *nexttime = prepub; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (keymgr_key_has_successor(active_key, keyring)) { @@ -1781,7 +1781,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, keystr, keymgr_keyrole(active_key->key), dns_kasp_getname(kasp)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (isc_log_wouldlog(ISC_LOG_DEBUG(1))) { @@ -1805,7 +1805,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, "policy %s, cannot start rollover", keystr, keymgr_keyrole(active_key->key), dns_kasp_getname(kasp)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } else if (isc_log_wouldlog(ISC_LOG_DEBUG(1))) { char namestr[DNS_NAME_FORMATSIZE]; @@ -1842,7 +1842,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, keymgr_createkey(kaspkey, origin, kasp, rdclass, mctx, keydir, keyring, newkeys, &dst_key); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dst_key_setttl(dst_key, dns_kasp_dnskeyttl(kasp)); dst_key_settime(dst_key, DST_TIME_CREATED, now); @@ -1931,7 +1931,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key, keystr, keymgr_keyrole(new_key->key), (candidate != NULL) ? "selected" : "created", dns_kasp_getname(kasp)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -1946,17 +1946,17 @@ keymgr_key_may_be_purged(dst_key_t *key, uint32_t after, isc_stdtime_t now) { /* If 'purge-keys' is disabled, always retain keys. */ if (after == 0) { - return (false); + return false; } /* Don't purge keys with goal OMNIPRESENT */ if (dst_key_goal(key) == OMNIPRESENT) { - return (false); + return false; } /* Don't purge unused keys. */ if (dst_key_is_unused(key)) { - return (false); + return false; } /* If this key is completely HIDDEN it may be purged. */ @@ -1970,7 +1970,7 @@ keymgr_key_may_be_purged(dst_key_t *key, uint32_t after, isc_stdtime_t now) { hidden[DST_KEY_ZRRSIG] = HIDDEN; } if (!keymgr_key_match_state(key, key, 0, NA, hidden)) { - return (false); + return false; } /* @@ -1985,7 +1985,7 @@ keymgr_key_may_be_purged(dst_key_t *key, uint32_t after, isc_stdtime_t now) { } } - return ((lastchange + after) < now); + return (lastchange + after) < now; } static void @@ -2294,7 +2294,7 @@ failure: isc_log_write(DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_DNSSEC, ISC_LOG_DEBUG(3), "keymgr: %s done", namebuf); } - return (result); + return result; } static isc_result_t @@ -2328,7 +2328,7 @@ keymgr_checkds(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, /* * Only checkds for one key at a time. */ - return (DNS_R_TOOMANYKEYS); + return DNS_R_TOOMANYKEYS; } ksk_key = dkey; @@ -2336,7 +2336,7 @@ keymgr_checkds(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, } if (ksk_key == NULL) { - return (DNS_R_NOKEYMATCH); + return DNS_R_NOKEYMATCH; } if (dspublish) { @@ -2380,22 +2380,21 @@ keymgr_checkds(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, dst_key_setmodified(ksk_key->key, false); } - return (result); + return result; } isc_result_t dns_keymgr_checkds(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, isc_stdtime_t now, isc_stdtime_t when, bool dspublish) { - return (keymgr_checkds(kasp, keyring, now, when, dspublish, 0, 0, - false)); + return keymgr_checkds(kasp, keyring, now, when, dspublish, 0, 0, false); } isc_result_t dns_keymgr_checkds_id(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, isc_stdtime_t now, isc_stdtime_t when, bool dspublish, dns_keytag_t id, unsigned int alg) { - return (keymgr_checkds(kasp, keyring, now, when, dspublish, id, alg, - true)); + return keymgr_checkds(kasp, keyring, now, when, dspublish, id, alg, + true); } static void @@ -2626,18 +2625,18 @@ dns_keymgr_rollover(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, /* * Only rollover for one key at a time. */ - return (DNS_R_TOOMANYKEYS); + return DNS_R_TOOMANYKEYS; } key = dkey; } if (key == NULL) { - return (DNS_R_NOKEYMATCH); + return DNS_R_NOKEYMATCH; } result = dst_key_gettime(key->key, DST_TIME_ACTIVATE, &active); if (result != ISC_R_SUCCESS || active > now) { - return (DNS_R_KEYNOTACTIVE); + return DNS_R_KEYNOTACTIVE; } result = dst_key_gettime(key->key, DST_TIME_INACTIVE, &retire); @@ -2674,7 +2673,7 @@ dns_keymgr_rollover(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, dst_key_setmodified(key->key, false); } - return (result); + return result; } isc_result_t @@ -2848,5 +2847,5 @@ failure: ISC_LOG_DEBUG(3), "keymgr: %s (offline-ksk) done", namebuf); } - return (result); + return result; } diff --git a/lib/dns/keystore.c b/lib/dns/keystore.c index 275ca8d445..e35df663cd 100644 --- a/lib/dns/keystore.c +++ b/lib/dns/keystore.c @@ -49,7 +49,7 @@ dns_keystore_create(isc_mem_t *mctx, const char *name, dns_keystore_t **kspp) { keystore->magic = DNS_KEYSTORE_MAGIC; *kspp = keystore; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline void @@ -80,22 +80,22 @@ const char * dns_keystore_name(dns_keystore_t *keystore) { REQUIRE(DNS_KEYSTORE_VALID(keystore)); - return (keystore->name); + return keystore->name; } const char * dns_keystore_directory(dns_keystore_t *keystore, const char *keydir) { if (keystore == NULL) { - return (keydir); + return keydir; } INSIST(DNS_KEYSTORE_VALID(keystore)); if (keystore->directory == NULL) { - return (keydir); + return keydir; } - return (keystore->directory); + return keystore->directory; } void @@ -114,7 +114,7 @@ const char * dns_keystore_pkcs11uri(dns_keystore_t *keystore) { REQUIRE(DNS_KEYSTORE_VALID(keystore)); - return (keystore->pkcs11uri); + return keystore->pkcs11uri; } void @@ -142,14 +142,14 @@ buildpkcs11label(const char *uri, const dns_name_t *zname, const char *policy, /* uri + object */ if (isc_buffer_availablelength(buf) < strlen(uri) + strlen(";object=")) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(buf, uri); isc_buffer_putstr(buf, ";object="); /* zone name */ result = dns_name_tofilenametext(zname, false, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* * policy name @@ -159,20 +159,20 @@ buildpkcs11label(const char *uri, const dns_name_t *zname, const char *policy, * dns_name_tofilenametext() certainly won't fit. */ if (isc_buffer_availablelength(buf) < (strlen(policy) + 1)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(buf, "-"); result = dns_name_fromstring(pname, policy, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_name_tofilenametext(pname, false, buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* key type + current time */ isc_time_formatshorttimestamp(&now, timebuf, sizeof(timebuf)); - return (isc_buffer_printf(buf, "-%s-%s", ksk ? "ksk" : "zsk", timebuf)); + return isc_buffer_printf(buf, "-%s-%s", ksk ? "ksk" : "zsk", timebuf); } isc_result_t @@ -222,7 +222,7 @@ dns_keystore_keygen(dns_keystore_t *keystore, const dns_name_t *origin, "keystore: failed to create PKCS#11 object " "for zone %s, policy %s: %s", namebuf, policy, isc_result_totext(result)); - return (result); + return result; } /* Generate the key */ @@ -237,7 +237,7 @@ dns_keystore_keygen(dns_keystore_t *keystore, const dns_name_t *origin, "keystore: failed to generate PKCS#11 object " "%s: %s", label, isc_result_totext(result)); - return (result); + return result; } isc_log_write(DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_DNSSEC, ISC_LOG_ERROR, @@ -251,7 +251,7 @@ dns_keystore_keygen(dns_keystore_t *keystore, const dns_name_t *origin, if (result == ISC_R_SUCCESS) { *dstkey = newkey; } - return (result); + return result; } isc_result_t @@ -262,7 +262,7 @@ dns_keystorelist_find(dns_keystorelist_t *list, const char *name, REQUIRE(kspp != NULL && *kspp == NULL); if (list == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (keystore = ISC_LIST_HEAD(*list); keystore != NULL; @@ -274,9 +274,9 @@ dns_keystorelist_find(dns_keystorelist_t *list, const char *name, } if (keystore == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_keystore_attach(keystore, kspp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index 7429e68c6e..159740aa74 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -239,7 +239,7 @@ delete_ds(dns_qp_t *qp, dns_keytable_t *keytable, dns_keynode_t *knode, RWLOCK(&knode->rwlock, isc_rwlocktype_read); if (knode->dslist == NULL) { RWUNLOCK(&knode->rwlock, isc_rwlocktype_read); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_buffer_init(&b, data, DNS_DS_BUFFERSIZE); @@ -248,7 +248,7 @@ delete_ds(dns_qp_t *qp, dns_keytable_t *keytable, dns_keynode_t *knode, dns_rdatatype_ds, ds, &b); if (result != ISC_R_SUCCESS) { RWUNLOCK(&knode->rwlock, isc_rwlocktype_write); - return (result); + return result; } for (rdata = ISC_LIST_HEAD(knode->dslist->rdata); rdata != NULL; @@ -266,7 +266,7 @@ delete_ds(dns_qp_t *qp, dns_keytable_t *keytable, dns_keynode_t *knode, * The keyname must have matched or we wouldn't be here, * so we use DNS_R_PARTIALMATCH instead of ISC_R_NOTFOUND. */ - return (DNS_R_PARTIALMATCH); + return DNS_R_PARTIALMATCH; } /* @@ -295,7 +295,7 @@ delete_ds(dns_qp_t *qp, dns_keytable_t *keytable, dns_keynode_t *knode, RWUNLOCK(&knode->rwlock, isc_rwlocktype_read); dns_keynode_detach(&knode); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -332,7 +332,7 @@ new_keynode(const dns_name_t *name, dns_rdata_ds_t *ds, knode->managed = managed; knode->initial = initial; - return (knode); + return knode; } /*% @@ -382,7 +382,7 @@ insert(dns_keytable_t *keytable, bool managed, bool initial, dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(keytable->table, &qp); - return (result); + return result; } isc_result_t @@ -392,13 +392,13 @@ dns_keytable_add(dns_keytable_t *keytable, bool managed, bool initial, REQUIRE(ds != NULL); REQUIRE(!initial || managed); - return (insert(keytable, managed, initial, name, ds, callback, - callback_arg)); + return insert(keytable, managed, initial, name, ds, callback, + callback_arg); } isc_result_t dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name) { - return (insert(keytable, true, false, name, NULL, NULL, NULL)); + return insert(keytable, true, false, name, NULL, NULL, NULL); } isc_result_t @@ -423,7 +423,7 @@ dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname, dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(keytable->table, &qp); - return (result); + return result; } isc_result_t @@ -476,7 +476,7 @@ finish: dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(keytable->table, &qp); - return (result); + return result; } isc_result_t @@ -498,7 +498,7 @@ dns_keytable_find(dns_keytable_t *keytable, const dns_name_t *keyname, } dns_qpread_destroy(keytable->table, &qpr); - return (result); + return result; } isc_result_t @@ -527,7 +527,7 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name, } dns_qpread_destroy(keytable->table, &qpr); - return (result); + return result; } isc_result_t @@ -562,7 +562,7 @@ dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name, dns_qpread_destroy(keytable->table, &qpr); - return (result); + return result; } static isc_result_t @@ -571,11 +571,11 @@ putstr(isc_buffer_t **b, const char *str) { result = isc_buffer_reserve(*b, strlen(str)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putstr(*b, str); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -603,7 +603,7 @@ dns_keytable_dump(dns_keytable_t *keytable, FILE *fp) { (char *)isc_buffer_base(text)); isc_buffer_free(&text); - return (result); + return result; } static isc_result_t @@ -615,7 +615,7 @@ keynode_dslist_totext(dns_keynode_t *keynode, isc_buffer_t **text) { dns_rdataset_init(&dsset); if (!dns_keynode_dsset(keynode, &dsset)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_format(&keynode->name, namebuf, sizeof(namebuf)); @@ -643,12 +643,12 @@ keynode_dslist_totext(dns_keynode_t *keynode, isc_buffer_t **text) { result = putstr(text, obuf); if (result != ISC_R_SUCCESS) { dns_rdataset_disassociate(&dsset); - return (result); + return result; } } dns_rdataset_disassociate(&dsset); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -675,7 +675,7 @@ dns_keytable_totext(dns_keytable_t *keytable, isc_buffer_t **text) { } dns_qpread_destroy(keytable->table, &qpr); - return (result); + return result; } void @@ -718,7 +718,7 @@ dns_keynode_dsset(dns_keynode_t *keynode, dns_rdataset_t *rdataset) { result = false; } RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read); - return (result); + return result; } bool @@ -731,7 +731,7 @@ dns_keynode_managed(dns_keynode_t *keynode) { managed = keynode->managed; RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read); - return (managed); + return managed; } bool @@ -744,7 +744,7 @@ dns_keynode_initial(dns_keynode_t *keynode) { initial = keynode->initial; RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read); - return (initial); + return initial; } void @@ -777,10 +777,10 @@ keynode_first(dns_rdataset_t *rdataset) { RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read); if (rdataset->keytable.iter == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -790,7 +790,7 @@ keynode_next(dns_rdataset_t *rdataset) { rdata = rdataset->keytable.iter; if (rdata == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } keynode = rdataset->keytable.node; @@ -799,10 +799,10 @@ keynode_next(dns_rdataset_t *rdataset) { RWUNLOCK(&keynode->rwlock, isc_rwlocktype_read); if (rdataset->keytable.iter == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -844,7 +844,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { dns_keynode_t *keynode = pval; - return (dns_qpkey_fromname(key, &keynode->name)); + return dns_qpkey_fromname(key, &keynode->name); } static void diff --git a/lib/dns/master.c b/lib/dns/master.c index db42558a74..ec5e7c41e3 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -345,9 +345,9 @@ static dns_name_t const ip6_arpa = DNS_NAME_INITABSOLUTE(ip6_arpa_data, static bool dns_master_isprimary(dns_loadctx_t *lctx) { - return ((lctx->options & DNS_MASTER_ZONE) != 0 && - (lctx->options & DNS_MASTER_SECONDARY) == 0 && - (lctx->options & DNS_MASTER_KEY) == 0); + return (lctx->options & DNS_MASTER_ZONE) != 0 && + (lctx->options & DNS_MASTER_SECONDARY) == 0 && + (lctx->options & DNS_MASTER_KEY) == 0; } static isc_result_t @@ -361,7 +361,7 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, if (result != ISC_R_SUCCESS) { switch (result) { case ISC_R_NOMEMORY: - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; default: (*callbacks->error)(callbacks, "dns_master_load: %s:%lu:" @@ -369,7 +369,7 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, isc_lex_getsourcename(lex), isc_lex_getsourceline(lex), isc_result_totext(result)); - return (result); + return result; } /*NOTREACHED*/ } @@ -393,11 +393,11 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, "dns_master_load: %s:%lu: " "unexpected end of %s", file, line, what); - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -640,7 +640,7 @@ nibbles(char *numbuf, size_t length, unsigned int width, char mode, count++; } } while (value != 0 || width > 0); - return (count); + return count; } static isc_result_t @@ -666,7 +666,7 @@ genname(char *name, int it, char *buffer, size_t length) { name++; if (*name == '$') { if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = *name++; isc_textregion_consume(&r, 1); @@ -681,7 +681,7 @@ genname(char *name, int it, char *buffer, size_t length) { &delta, comma1, &width, comma2, mode, brace); if (n < 2 || n > 6) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (comma1[0] == '}') { /* %{delta} */ @@ -701,10 +701,10 @@ genname(char *name, int it, char *buffer, size_t length) { n = snprintf(fmt, sizeof(fmt), "%%0%u%c", width, mode[0]); } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (n >= sizeof(fmt)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* Skip past closing brace. */ while (*name != '\0' && *name++ != '}') { @@ -715,8 +715,8 @@ genname(char *name, int it, char *buffer, size_t length) { * 'it' is >= 0 so we don't need to check for * underflow. */ - if ((it > 0 && delta > INT_MAX - it)) { - return (ISC_R_RANGE); + if (it > 0 && delta > INT_MAX - it) { + return ISC_R_RANGE; } if (nibblemode) { n = nibbles(numbuf, sizeof(numbuf), width, @@ -726,19 +726,19 @@ genname(char *name, int it, char *buffer, size_t length) { it + delta); } if (n >= sizeof(numbuf)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } cp = numbuf; while (*cp != '\0') { if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = *cp++; isc_textregion_consume(&r, 1); } } else if (*name == '\\') { if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = *name++; isc_textregion_consume(&r, 1); @@ -746,23 +746,23 @@ genname(char *name, int it, char *buffer, size_t length) { continue; } if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = *name++; isc_textregion_consume(&r, 1); } else { if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = *name++; isc_textregion_consume(&r, 1); } } if (r.length == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } r.base[0] = '\0'; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -929,7 +929,7 @@ cleanup: if (rhsbuf != NULL) { isc_mem_put(lctx->mctx, rhsbuf, DNS_MASTER_RHS); } - return (result); + return result; } static void @@ -984,7 +984,7 @@ check_ns(dns_loadctx_t *lctx, isc_token_t *token, const char *source, if (tmp != NULL) { isc_mem_free(lctx->mctx, tmp); } - return (result); + return result; } static void @@ -1006,7 +1006,7 @@ check_wildcard(dns_incctx_t *ictx, const char *source, unsigned long line, static isc_result_t openfile_text(dns_loadctx_t *lctx, const char *master_file) { - return (isc_lex_openfile(lctx->lex, master_file)); + return isc_lex_openfile(lctx->lex, master_file); } static int @@ -1019,7 +1019,7 @@ find_free_name(dns_incctx_t *incctx) { } } INSIST(!incctx->in_use[i]); - return (i); + return i; } static isc_result_t @@ -2178,7 +2178,7 @@ cleanup: isc_mem_free(mctx, rhs); } - return (result); + return result; } static isc_result_t @@ -2223,11 +2223,11 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) { if (lctx->include_cb != NULL) { lctx->include_cb(master_file, lctx->include_arg); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: incctx_destroy(lctx->mctx, newctx); - return (result); + return result; } /* @@ -2246,18 +2246,18 @@ read_and_check(bool do_read, isc_buffer_t *buffer, size_t len, FILE *f, result = isc_stdio_read(isc_buffer_used(buffer), 1, len, f, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_add(buffer, (unsigned int)len); if (*totallen < len) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *totallen -= (uint32_t)len; } else if (isc_buffer_remaininglength(buffer) < len) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2273,7 +2273,7 @@ load_header(dns_loadctx_t *lctx) { REQUIRE(DNS_LCTX_VALID(lctx)); if (lctx->format != dns_masterformat_raw) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } callbacks = lctx->callbacks; @@ -2286,7 +2286,7 @@ load_header(dns_loadctx_t *lctx) { if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("isc_stdio_read failed: %s", isc_result_totext(result)); - return (result); + return result; } isc_buffer_add(&target, (unsigned int)commonlen); @@ -2295,7 +2295,7 @@ load_header(dns_loadctx_t *lctx) { (*callbacks->error)(callbacks, "dns_master_load: " "file format mismatch (not raw)"); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } header.version = isc_buffer_getuint32(&target); @@ -2311,14 +2311,14 @@ load_header(dns_loadctx_t *lctx) { (*callbacks->error)(callbacks, "dns_master_load: " "unsupported file format " "version"); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = isc_stdio_read(data + commonlen, 1, remainder, lctx->f, NULL); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("isc_stdio_read failed: %s", isc_result_totext(result)); - return (result); + return result; } isc_buffer_add(&target, (unsigned int)remainder); @@ -2332,7 +2332,7 @@ load_header(dns_loadctx_t *lctx) { lctx->first = false; lctx->header = header; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2345,7 +2345,7 @@ openfile_raw(dns_loadctx_t *lctx, const char *master_file) { isc_result_totext(result)); } - return (result); + return result; } static isc_result_t @@ -2371,7 +2371,7 @@ load_raw(dns_loadctx_t *lctx) { if (lctx->first) { result = load_header(lctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2649,7 +2649,7 @@ cleanup: isc_result_totext(result)); } - return (result); + return result; } isc_result_t @@ -2679,7 +2679,7 @@ dns_master_loadfile(const char *master_file, dns_name_t *top, cleanup: dns_loadctx_detach(&lctx); - return (result); + return result; } static void @@ -2721,13 +2721,13 @@ dns_master_loadfileasync(const char *master_file, dns_name_t *top, result = (lctx->openfile)(lctx, master_file); if (result != ISC_R_SUCCESS) { dns_loadctx_detach(&lctx); - return (result); + return result; } dns_loadctx_attach(lctx, lctxp); isc_work_enqueue(loop, load, load_done, lctx); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2752,7 +2752,7 @@ dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin, cleanup: dns_loadctx_detach(&lctx); - return (result); + return result; } isc_result_t @@ -2777,7 +2777,7 @@ dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top, dns_name_t *origin, cleanup: dns_loadctx_detach(&lctx); - return (result); + return result; } /* @@ -2825,7 +2825,7 @@ grow_rdatalist(int new_len, dns_rdatalist_t *oldlist, int old_len, if (oldlist != NULL) { isc_mem_cput(mctx, oldlist, old_len, sizeof(*oldlist)); } - return (newlist); + return newlist; } /* @@ -2886,7 +2886,7 @@ grow_rdata(int new_len, dns_rdata_t *oldlist, int old_len, if (oldlist != NULL) { isc_mem_cput(mctx, oldlist, old_len, sizeof(*oldlist)); } - return (newlist); + return newlist; } static uint32_t @@ -2914,7 +2914,7 @@ resign_fromlist(dns_rdatalist_t *this, dns_loadctx_t *lctx) { } rdata = ISC_LIST_NEXT(rdata, link); } - return (when); + return when; } /* @@ -2974,7 +2974,7 @@ commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx, this = ISC_LIST_HEAD(*head); } - return (result); + return result; } /* @@ -2999,7 +2999,7 @@ is_glue(rdatalist_head_t *head, dns_name_t *owner) { this = ISC_LIST_NEXT(this, link); } if (this == NULL) { - return (false); + return false; } rdata = ISC_LIST_HEAD(this->rdata); @@ -3008,11 +3008,11 @@ is_glue(rdatalist_head_t *head, dns_name_t *owner) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); if (dns_name_equal(&name, owner)) { - return (true); + return true; } rdata = ISC_LIST_NEXT(rdata, link); } - return (false); + return false; } void diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 7f035b1699..adbdd862d2 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -303,7 +303,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth, if (ntabs > 0) { isc_buffer_availableregion(target, &r); if (r.length < (unsigned int)ntabs) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } p = r.base; @@ -326,7 +326,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth, isc_buffer_availableregion(target, &r); if (r.length < (unsigned int)nspaces) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } p = r.base; @@ -343,7 +343,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth, isc_buffer_add(target, nspaces); *current = to; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -379,7 +379,7 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, isc_buffer_availableregion(&buf, &r); if (r.length < 1) { - return (DNS_R_TEXTTOOLONG); + return DNS_R_TEXTTOOLONG; } r.base[0] = '\n'; isc_buffer_add(&buf, 1); @@ -390,7 +390,7 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, unsigned int i, len = strlen(indentctx->string); for (i = 0; i < indentctx->count; i++) { if (isc_buffer_availablelength(&buf) < len) { - return (DNS_R_TEXTTOOLONG); + return DNS_R_TEXTTOOLONG; } isc_buffer_putstr(&buf, indentctx->string); } @@ -399,7 +399,7 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, if ((ctx->style.flags & DNS_STYLEFLAG_COMMENTDATA) != 0) { isc_buffer_availableregion(&buf, &r); if (r.length < 1) { - return (DNS_R_TEXTTOOLONG); + return DNS_R_TEXTTOOLONG; } r.base[0] = ';'; isc_buffer_add(&buf, 1); @@ -415,15 +415,15 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, * so it won't help. Use DNS_R_TEXTTOOLONG as a substitute. */ if (result == ISC_R_NOSPACE) { - return (DNS_R_TEXTTOOLONG); + return DNS_R_TEXTTOOLONG; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_availableregion(&buf, &r); if (r.length < 1) { - return (DNS_R_TEXTTOOLONG); + return DNS_R_TEXTTOOLONG; } r.base[0] = '\0'; isc_buffer_add(&buf, 1); @@ -439,7 +439,7 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, ctx->serve_stale_ttl = 0; ctx->indent = *indentctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #define INDENT_TO(col) \ @@ -463,12 +463,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -479,7 +479,7 @@ yaml_stringify(isc_buffer_t *target, char *start) { isc_buffer_availableregion(target, &r); if (r.length < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* NUL terminate buffer for string operations below */ @@ -490,7 +490,7 @@ yaml_stringify(isc_buffer_t *target, char *start) { isc_buffer_availableregion(target, &r); /* Space to shift by 1 with trailing NUL? */ if (r.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tmp + 1, tmp, (char *)isc_buffer_used(target) - tmp + 1); @@ -499,7 +499,7 @@ yaml_stringify(isc_buffer_t *target, char *start) { s = tmp + 2; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -571,7 +571,7 @@ cleanup: dns_rdataset_disassociate(&rds); } - return (result); + return result; } /* @@ -668,7 +668,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, result = dns_ttl_totext(rdataset->ttl, false, false, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } column += target->used - length; } else { @@ -677,7 +677,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, INSIST(length <= sizeof(ttlbuf)); isc_buffer_availableregion(target, &r); if (r.length < length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(r.base, ttlbuf, length); isc_buffer_add(target, length); @@ -714,7 +714,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, rdataset->rdclass, target); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } column += (target->used - class_start); } @@ -741,7 +741,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, if (isc_buffer_availablelength(target) < (sizeof(KEYDATA) - 1)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(target, KEYDATA); break; @@ -757,7 +757,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, result = dns_rdatatype_totext(type, target); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } } column += (target->used - type_start); @@ -803,7 +803,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if (result != ISC_R_NOMORE) { - return (result); + return result; } /* @@ -817,7 +817,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, ctx->current_ttl = current_ttl; ctx->current_ttl_valid = current_ttl_valid; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -865,7 +865,7 @@ question_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, target); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } column += (target->used - class_start); } @@ -882,7 +882,7 @@ question_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, result = dns_rdatatype_totext(rdataset->type, target); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } column += (target->used - type_start); } @@ -893,7 +893,7 @@ question_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } RETERR(str_totext("\n", target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -904,7 +904,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, result = totext_ctx_init(&dns_master_style_debug, NULL, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("could not set master file style"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -918,11 +918,11 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if (question) { - return (question_totext(rdataset, owner_name, &ctx, - omit_final_dot, target)); + return question_totext(rdataset, owner_name, &ctx, + omit_final_dot, target); } else { - return (rdataset_totext(rdataset, owner_name, &ctx, - omit_final_dot, target)); + return rdataset_totext(rdataset, owner_name, &ctx, + omit_final_dot, target); } } @@ -936,10 +936,10 @@ dns_master_rdatasettotext(const dns_name_t *owner_name, result = totext_ctx_init(style, indent, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("could not set master file style"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } - return (rdataset_totext(rdataset, owner_name, &ctx, false, target)); + return rdataset_totext(rdataset, owner_name, &ctx, false, target); } isc_result_t @@ -952,10 +952,10 @@ dns_master_questiontotext(const dns_name_t *owner_name, result = totext_ctx_init(style, NULL, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("could not set master file style"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } - return (question_totext(rdataset, owner_name, &ctx, false, target)); + return question_totext(rdataset, owner_name, &ctx, false, target); } /* @@ -1017,7 +1017,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, isc_buffer_init(buffer, newmem, newlength); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -1029,10 +1029,10 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("master file write failed: %s", isc_result_totext(result)); - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1066,13 +1066,13 @@ dump_order(const dns_rdataset_t *rds) { t += 2; break; } - return ((t << 1) + sig); + return (t << 1) + sig; } static int dump_order_compare(const void *a, const void *b) { - return (dump_order(*((const dns_rdataset_t *const *)a)) - - dump_order(*((const dns_rdataset_t *const *)b))); + return dump_order(*((const dns_rdataset_t *const *)a)) - + dump_order(*((const dns_rdataset_t *const *)b)); } /* @@ -1197,7 +1197,7 @@ again: } if (dumpresult != ISC_R_SUCCESS) { - return (dumpresult); + return dumpresult; } /* @@ -1212,7 +1212,7 @@ again: itresult = ISC_R_SUCCESS; } - return (itresult); + return itresult; } /* @@ -1294,7 +1294,7 @@ restart: } while (result == ISC_R_SUCCESS); if (result != ISC_R_NOMORE) { - return (result); + return result; } /* @@ -1316,10 +1316,10 @@ restart: if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR("raw master file write failed: %s", isc_result_totext(result)); - return (result); + return result; } - return (result); + return result; } static isc_result_t @@ -1351,7 +1351,7 @@ dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *owner_name, } dns_rdataset_disassociate(&rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -1359,7 +1359,7 @@ dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *owner_name, result = ISC_R_SUCCESS; } - return (result); + return result; } /* @@ -1422,13 +1422,13 @@ dns_dumpctx_detach(dns_dumpctx_t **dctxp) { dns_dbversion_t * dns_dumpctx_version(dns_dumpctx_t *dctx) { REQUIRE(DNS_DCTX_VALID(dctx)); - return (dctx->version); + return dctx->version; } dns_db_t * dns_dumpctx_db(dns_dumpctx_t *dctx) { REQUIRE(DNS_DCTX_VALID(dctx)); - return (dctx->db); + return dctx->db; } void @@ -1476,7 +1476,7 @@ flushandsync(FILE *f, isc_result_t result, const char *temp) { isc_result_totext(result)); } } - return (result); + return result; } static isc_result_t @@ -1512,7 +1512,7 @@ closeandrename(FILE *f, isc_result_t result, const char *temp, "dumping master file: rename: %s: %s", file, isc_result_totext(result)); } - return (result); + return result; } /* @@ -1625,7 +1625,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, isc_refcount_init(&dctx->references, 1); dctx->magic = DNS_DCTX_MAGIC; *dctxp = dctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (dctx->dbiter != NULL) { @@ -1635,7 +1635,7 @@ cleanup: dns_db_detach(&dctx->db); } isc_mem_put(mctx, dctx, sizeof(*dctx)); - return (result); + return result; } static isc_result_t @@ -1706,7 +1706,7 @@ writeheader(dns_dumpctx_t *dctx) { } isc_mem_put(dctx->mctx, buffer.base, buffer.length); - return (result); + return result; } static isc_result_t @@ -1782,7 +1782,7 @@ dumptostream(dns_dumpctx_t *dctx) { cleanup: RUNTIME_CHECK(dns_dbiterator_pause(dctx->dbiter) == ISC_R_SUCCESS); isc_mem_put(dctx->mctx, buffer.base, buffer.length); - return (result); + return result; } isc_result_t @@ -1801,7 +1801,7 @@ dns_master_dumptostreamasync(isc_mem_t *mctx, dns_db_t *db, result = dumpctx_create(mctx, db, version, style, f, &dctx, dns_masterformat_text, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dctx->done = done; dctx->done_arg = done_arg; @@ -1809,7 +1809,7 @@ dns_master_dumptostreamasync(isc_mem_t *mctx, dns_db_t *db, dns_dumpctx_attach(dctx, dctxp); isc_work_enqueue(loop, master_dump_cb, master_dump_done_cb, dctx); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1823,7 +1823,7 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, result = dumpctx_create(mctx, db, version, style, f, &dctx, format, header); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dumptostream(dctx); @@ -1831,7 +1831,7 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, dns_dumpctx_detach(&dctx); result = flushandsync(f, result, NULL); - return (result); + return result; } static isc_result_t @@ -1864,11 +1864,11 @@ opentmp(isc_mem_t *mctx, const char *file, char **tempp, FILE **fp) { *tempp = tempname; *fp = f; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_mem_free(mctx, tempname); - return (result); + return result; } isc_result_t @@ -1904,7 +1904,7 @@ dns_master_dumpasync(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, dns_dumpctx_attach(dctx, dctxp); isc_work_enqueue(loop, master_dump_cb, master_dump_done_cb, dctx); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_tempname: (void)isc_stdio_close(f); @@ -1914,7 +1914,7 @@ cleanup_tempname: cleanup_file: isc_mem_free(mctx, file); - return (result); + return result; } isc_result_t @@ -1928,7 +1928,7 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, result = opentmp(mctx, filename, &tempname, &f); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dumpctx_create(mctx, db, version, style, f, &dctx, format, @@ -1945,13 +1945,13 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, cleanup: isc_mem_free(mctx, tempname); - return (result); + return result; } dns_masterstyle_flags_t dns_master_styleflags(const dns_master_style_t *style) { REQUIRE(style != NULL); - return (style->flags); + return style->flags; } isc_result_t @@ -1975,7 +1975,7 @@ dns_master_stylecreate(dns_master_style_t **stylep, style->tab_width = tab_width; style->split_width = split_width; *stylep = style; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/message.c b/lib/dns/message.c index ed6762c3cf..096784d753 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -239,7 +239,7 @@ msgblock_allocate(isc_mem_t *mctx, unsigned int sizeof_type, ISC_LINK_INIT(block, link); - return (block); + return block; } /* @@ -251,7 +251,7 @@ msgblock_internalget(dns_msgblock_t *block, unsigned int sizeof_type) { void *ptr; if (block == NULL || block->remaining == 0) { - return (NULL); + return NULL; } block->remaining--; @@ -259,7 +259,7 @@ msgblock_internalget(dns_msgblock_t *block, unsigned int sizeof_type) { ptr = (((unsigned char *)block) + sizeof(dns_msgblock_t) + (sizeof_type * block->remaining)); - return (ptr); + return ptr; } static void @@ -293,7 +293,7 @@ newbuffer(dns_message_t *msg, unsigned int size) { isc_buffer_allocate(msg->mctx, &dynbuf, size); ISC_LIST_APPEND(msg->scratchpad, dynbuf, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_buffer_t * @@ -303,7 +303,7 @@ currentbuffer(dns_message_t *msg) { dynbuf = ISC_LIST_TAIL(msg->scratchpad); INSIST(dynbuf != NULL); - return (dynbuf); + return dynbuf; } static void @@ -319,7 +319,7 @@ newrdata(dns_message_t *msg) { rdata = ISC_LIST_HEAD(msg->freerdata); if (rdata != NULL) { ISC_LIST_UNLINK(msg->freerdata, rdata, link); - return (rdata); + return rdata; } msgblock = ISC_LIST_TAIL(msg->rdatas); @@ -333,7 +333,7 @@ newrdata(dns_message_t *msg) { } dns_rdata_init(rdata); - return (rdata); + return rdata; } static void @@ -363,7 +363,7 @@ newrdatalist(dns_message_t *msg) { } out: dns_rdatalist_init(rdatalist); - return (rdatalist); + return rdatalist; } static dns_offsets_t * @@ -381,7 +381,7 @@ newoffsets(dns_message_t *msg) { offsets = msgblock_get(msgblock, dns_offsets_t); } - return (offsets); + return offsets; } static void @@ -714,7 +714,7 @@ spacefortsig(dns_tsigkey_t *key, int otherlen) { x = 0; } } - return (26 + r1.length + r2.length + x + otherlen); + return 26 + r1.length + r2.length + x + otherlen; } void @@ -799,7 +799,7 @@ ISC_REFCOUNT_IMPL(dns_message, dns__message_destroy); static bool name_match(void *node, const void *key) { - return (dns_name_equal(node, key)); + return dns_name_equal(node, key); } static isc_result_t @@ -812,11 +812,11 @@ findname(dns_name_t **foundname, const dns_name_t *target, if (foundname != NULL) { *foundname = name; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static uint32_t @@ -828,7 +828,7 @@ rds_hash(dns_rdataset_t *rds) { isc_hash32_hash(&state, &rds->type, sizeof(rds->type), true); isc_hash32_hash(&state, &rds->covers, sizeof(rds->covers), true); - return (isc_hash32_finalize(&state)); + return isc_hash32_finalize(&state); } static bool @@ -836,8 +836,8 @@ rds_match(void *node, const void *key0) { const dns_rdataset_t *rds = node; const dns_rdataset_t *key = key0; - return (rds->rdclass == key->rdclass && rds->type == key->type && - rds->covers == key->covers); + return rds->rdclass == key->rdclass && rds->type == key->type && + rds->covers == key->covers; } isc_result_t @@ -852,11 +852,11 @@ dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type, if (rds->type == type && rds->covers == covers) { SET_IF_NOT_NULL(rdatasetp, rds); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -884,13 +884,13 @@ getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, result = newbuffer(msg, SCRATCHPAD_SIZE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } scratch = currentbuffer(msg); dns_name_reset(name); } else { - return (result); + return result; } } @@ -933,7 +933,7 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, } else { INSIST(trysize != 0); if (trysize >= 65535) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* XXX DNS_R_RRTOOLONG? */ trysize *= 2; @@ -941,12 +941,12 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, tries++; result = newbuffer(msg, trysize); if (result != ISC_R_SUCCESS) { - return (result); + return result; } scratch = currentbuffer(msg); } else { - return (result); + return result; } } } @@ -1165,19 +1165,19 @@ cleanup: isc_hashmap_destroy(&name_map); } - return (result); + return result; } static bool update(dns_section_t section, dns_rdataclass_t rdclass) { if (section == DNS_SECTION_PREREQUISITE) { - return (rdclass == dns_rdataclass_any || - rdclass == dns_rdataclass_none); + return rdclass == dns_rdataclass_any || + rdclass == dns_rdataclass_none; } if (section == DNS_SECTION_UPDATE) { - return (rdclass == dns_rdataclass_any); + return rdclass == dns_rdataclass_any; } - return (false); + return false; } /* @@ -1224,11 +1224,11 @@ auth_signed(dns_namelist_t *section) { } if (auth_dnssec != auth_rrsig) { - return (false); + return false; } } - return (true); + return true; } static isc_result_t @@ -1737,7 +1737,7 @@ cleanup: isc_hashmap_destroy(&name_map); } - return (result); + return result; } isc_result_t @@ -1775,7 +1775,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, isc_buffer_remainingregion(source, &r); if (r.length < DNS_MESSAGE_HEADERLEN) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } msg->id = isc_buffer_getuint16(source); @@ -1804,7 +1804,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, ret = ISC_R_SUCCESS; } if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } msg->question_ok = 1; @@ -1817,7 +1817,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, ret = ISC_R_SUCCESS; } if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } ret = getsection(source, msg, dctx, DNS_SECTION_AUTHORITY, options); @@ -1829,7 +1829,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, ret = ISC_R_SUCCESS; } if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } ret = getsection(source, msg, dctx, DNS_SECTION_ADDITIONAL, options); @@ -1841,7 +1841,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, ret = ISC_R_SUCCESS; } if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } isc_buffer_remainingregion(source, &r); @@ -1855,12 +1855,12 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, truncated: if (ret == ISC_R_UNEXPECTEDEND && ignore_tc) { - return (DNS_R_RECOVERABLE); + return DNS_R_RECOVERABLE; } if (seen_problem) { - return (DNS_R_RECOVERABLE); + return DNS_R_RECOVERABLE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1887,11 +1887,11 @@ dns_message_renderbegin(dns_message_t *msg, dns_compress_t *cctx, */ isc_buffer_availableregion(buffer, &r); if (r.length < DNS_MESSAGE_HEADERLEN) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (r.length - DNS_MESSAGE_HEADERLEN < msg->reserved) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -1901,7 +1901,7 @@ dns_message_renderbegin(dns_message_t *msg, dns_compress_t *cctx, msg->buffer = buffer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1930,7 +1930,7 @@ dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) { msg->buffer = buffer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1950,13 +1950,13 @@ dns_message_renderreserve(dns_message_t *msg, unsigned int space) { if (msg->buffer != NULL) { isc_buffer_availableregion(msg->buffer, &r); if (r.length < (space + msg->reserved)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } } msg->reserved += space; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -1967,7 +1967,7 @@ wrong_priority(dns_rdataset_t *rds, int pass, dns_rdatatype_t preferred_glue) { * If we are not rendering class IN, this ordering is bogus. */ if (rds->rdclass != dns_rdataclass_in) { - return (false); + return false; } switch (rds->type) { @@ -1988,10 +1988,10 @@ wrong_priority(dns_rdataset_t *rds, int pass, dns_rdatatype_t preferred_glue) { } if (pass_needed >= pass) { - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -2004,7 +2004,7 @@ renderset(dns_rdataset_t *rdataset, const dns_name_t *owner_name, * Shrink the space in the buffer by the reserved amount. */ if (target->length - target->used < reserved) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } target->length -= reserved; @@ -2012,7 +2012,7 @@ renderset(dns_rdataset_t *rdataset, const dns_name_t *owner_name, options, countp); target->length += reserved; - return (result); + return result; } static void @@ -2084,7 +2084,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, * Shrink the space in the buffer by the reserved amount. */ if (msg->buffer->length - msg->buffer->used < msg->reserved) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } msg->buffer->length -= msg->reserved; @@ -2123,7 +2123,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, msg->flags |= DNS_MESSAGEFLAG_TC; msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; - return (result); + return result; } if (result == ISC_R_NOSPACE) { msg->flags |= DNS_MESSAGEFLAG_TC; @@ -2133,7 +2133,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, *(msg->buffer) = st; /* rollback */ msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; - return (result); + return result; } update_min_section_ttl(msg, sectionid, rdataset); @@ -2147,7 +2147,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, if (name == NULL) { msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } while (name != NULL) { @@ -2207,7 +2207,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, if (partial && result == ISC_R_NOSPACE) { msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; - return (result); + return result; } if (result != ISC_R_SUCCESS) { INSIST(st.used < 65536); @@ -2217,7 +2217,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; maybe_clear_ad(msg, sectionid); - return (result); + return result; } /* @@ -2251,7 +2251,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2301,7 +2301,7 @@ dns_message_renderend(dns_message_t *msg) { /* * We have an extended rcode but are not using EDNS. */ - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -2325,7 +2325,7 @@ dns_message_renderend(dns_message_t *msg) { result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0); if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE) { - return (result); + return result; } } @@ -2350,7 +2350,7 @@ dns_message_renderend(dns_message_t *msg) { msg->buffer, msg->reserved, 0, &count); msg->counts[DNS_SECTION_ADDITIONAL] += count; if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2369,7 +2369,7 @@ dns_message_renderend(dns_message_t *msg) { if ((cp[-4] != 0) || (cp[-3] != DNS_OPT_PAD) || (cp[-2] != 0) || (cp[-1] != 0)) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -2412,14 +2412,14 @@ dns_message_renderend(dns_message_t *msg) { msg->sig_reserved = 0; result = dns_tsig_sign(msg); if (result != ISC_R_SUCCESS) { - return (result); + return result; } count = 0; result = renderset(msg->tsig, msg->tsigname, msg->cctx, msg->buffer, msg->reserved, 0, &count); msg->counts[DNS_SECTION_ADDITIONAL] += count; if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2431,7 +2431,7 @@ dns_message_renderend(dns_message_t *msg) { msg->sig_reserved = 0; result = dns_dnssec_signmessage(msg, msg->sig0key); if (result != ISC_R_SUCCESS) { - return (result); + return result; } count = 0; /* @@ -2443,7 +2443,7 @@ dns_message_renderend(dns_message_t *msg) { msg->buffer, msg->reserved, 0, &count); msg->counts[DNS_SECTION_ADDITIONAL] += count; if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2454,7 +2454,7 @@ dns_message_renderend(dns_message_t *msg) { msg->buffer = NULL; /* forget about this buffer only on success XXX */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2502,10 +2502,10 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section) { msg->cursors[section] = ISC_LIST_HEAD(msg->sections[section]); if (msg->cursors[section] == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2517,10 +2517,10 @@ dns_message_nextname(dns_message_t *msg, dns_section_t section) { msg->cursors[section] = ISC_LIST_NEXT(msg->cursors[section], link); if (msg->cursors[section] == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2562,9 +2562,9 @@ dns_message_findname(dns_message_t *msg, dns_section_t section, result = findname(&foundname, target, &msg->sections[section]); if (result == ISC_R_NOTFOUND) { - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (name != NULL) { @@ -2575,15 +2575,15 @@ dns_message_findname(dns_message_t *msg, dns_section_t section, * And now look for the type. */ if (type == dns_rdatatype_any) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_message_findtype(foundname, type, covers, rdataset); if (result == ISC_R_NOTFOUND) { - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } - return (result); + return result; } void @@ -2724,7 +2724,7 @@ dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, isc_buffer_remainingregion(&buffer, &r); if (r.length < DNS_MESSAGE_HEADERLEN) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } id = isc_buffer_getuint16(&buffer); @@ -2734,7 +2734,7 @@ dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, SET_IF_NOT_NULL(flagsp, flags); SET_IF_NOT_NULL(idp, id); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2746,7 +2746,7 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) { REQUIRE((msg->flags & DNS_MESSAGEFLAG_QR) == 0); if (!msg->header_ok) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (msg->opcode != dns_opcode_query && msg->opcode != dns_opcode_notify) { @@ -2756,7 +2756,7 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) { clear_from = DNS_SECTION_PREREQUISITE; } else if (want_question_section) { if (!msg->question_ok) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } clear_from = DNS_SECTION_ANSWER; } else { @@ -2793,7 +2793,7 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) { result = dns_message_renderreserve(msg, msg->sig_reserved); if (result != ISC_R_SUCCESS) { msg->sig_reserved = 0; - return (result); + return result; } } if (msg->saved.base != NULL) { @@ -2805,7 +2805,7 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) { msg->free_saved = 0; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_rdataset_t * @@ -2816,7 +2816,7 @@ dns_message_getopt(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); - return (msg->opt); + return msg->opt; } isc_result_t @@ -2851,7 +2851,7 @@ dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) { msgresetopt(msg); if (opt == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_rdataset_first(opt); @@ -2868,11 +2868,11 @@ dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) { msg->opt = opt; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns__message_putassociatedrdataset(msg, &opt); - return (result); + return result; } dns_rdataset_t * @@ -2885,7 +2885,7 @@ dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner) { REQUIRE(owner == NULL || *owner == NULL); SET_IF_NOT_NULL(owner, msg->tsigname); - return (msg->tsig); + return msg->tsig; } isc_result_t @@ -2915,11 +2915,11 @@ dns_message_settsigkey(dns_message_t *msg, dns_tsigkey_t *key) { if (result != ISC_R_SUCCESS) { dns_tsigkey_detach(&msg->tsigkey); msg->sig_reserved = 0; - return (result); + return result; } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_tsigkey_t * @@ -2930,7 +2930,7 @@ dns_message_gettsigkey(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); - return (msg->tsigkey); + return msg->tsigkey; } void @@ -2978,19 +2978,19 @@ dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx, REQUIRE(querytsig != NULL && *querytsig == NULL); if (msg->tsig == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_rdataset_first(msg->tsig); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(msg->tsig, &rdata); dns_rdata_toregion(&rdata, &r); isc_buffer_allocate(mctx, querytsig, r.length); isc_buffer_putmem(*querytsig, r.base, r.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_rdataset_t * @@ -3013,7 +3013,7 @@ dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner) { *owner = msg->sig0name; } } - return (msg->sig0); + return msg->sig0; } isc_result_t @@ -3055,17 +3055,17 @@ dns_message_setsig0key(dns_message_t *msg, dst_key_t *key) { result = dst_key_sigsize(key, &x); if (result != ISC_R_SUCCESS) { msg->sig_reserved = 0; - return (result); + return result; } msg->sig_reserved = 27 + r.length + x; result = dns_message_renderreserve(msg, msg->sig_reserved); if (result != ISC_R_SUCCESS) { msg->sig_reserved = 0; - return (result); + return result; } msg->sig0key = key; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dst_key_t * @@ -3076,7 +3076,7 @@ dns_message_getsig0key(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); - return (msg->sig0key); + return msg->sig0key; } void @@ -3099,11 +3099,11 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) { REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTPARSE); if (msg->tsig == NULL && msg->sig0 == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (msg->verify_attempted == 0) { - return (DNS_R_NOTVERIFIEDYET); + return DNS_R_NOTVERIFIEDYET; } if (!dns_name_hasbuffer(signer)) { @@ -3122,7 +3122,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) { result = dns_rdata_tostruct(&rdata, &sig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (msg->verified_sig && msg->sig0status == dns_rcode_noerror) { @@ -3176,7 +3176,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) { } } - return (result); + return result; } void @@ -3267,7 +3267,7 @@ dns_message_checksig_async(dns_message_t *msg, dns_view_t *view, dns_message_clonebuffer(msg); isc_helper_run(loop, checksig_run, chsigctx); - return (DNS_R_WAIT); + return DNS_R_WAIT; } isc_result_t @@ -3277,7 +3277,7 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) { REQUIRE(DNS_MESSAGE_VALID(msg)); if (msg->tsigkey == NULL && msg->tsig == NULL && msg->sig0 == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } INSIST(msg->saved.base != NULL); @@ -3288,9 +3288,9 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) { dns_message_dumpsig(msg, "dns_message_checksig#1"); #endif /* ifdef SKAN_MSG_DEBUG */ if (view != NULL) { - return (dns_view_checksig(view, &msgb, msg)); + return dns_view_checksig(view, &msgb, msg); } else { - return (dns_tsig_verify(&msgb, msg, NULL, NULL)); + return dns_tsig_verify(&msgb, msg, NULL, NULL); } } else { dns_rdata_t rdata = DNS_RDATA_INIT; @@ -3316,12 +3316,12 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) { * meta-records are in the prerequisite and update sections. */ if (rdata.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } result = dns_rdata_tostruct(&rdata, &sig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&keyset); @@ -3381,7 +3381,7 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) { dns_rdataset_disassociate(&keyset); } dns_rdata_freestruct(&sig); - return (result); + return result; } } @@ -3500,7 +3500,7 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section, cleanup: msg->indent.count = saved_count; - return (result); + return result; } static isc_result_t @@ -3516,7 +3516,7 @@ render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { */ if (isc_buffer_remaininglength(ecsbuf) < 4) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } family = isc_buffer_getuint16(ecsbuf); addrlen = isc_buffer_getuint8(ecsbuf); @@ -3524,11 +3524,11 @@ render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { addrbytes = (addrlen + 7) / 8; if (isc_buffer_remaininglength(ecsbuf) < addrbytes) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } if (addrbytes > sizeof(addr)) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } for (i = 0; i < addrbytes; i++) { @@ -3538,24 +3538,24 @@ render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { switch (family) { case 0: if (addrlen != 0U || scopelen != 0U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } strlcpy(addr_text, "0", sizeof(addr_text)); break; case 1: if (addrlen > 32 || scopelen > 32) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } inet_ntop(AF_INET, addr, addr_text, sizeof(addr_text)); break; case 2: if (addrlen > 128 || scopelen > 128) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } inet_ntop(AF_INET6, addr, addr_text, sizeof(addr_text)); break; default: - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } ADD_STRING(target, " "); @@ -3566,7 +3566,7 @@ render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { result = ISC_R_SUCCESS; cleanup: - return (result); + return result; } static isc_result_t @@ -3603,7 +3603,7 @@ render_llq(isc_buffer_t *optbuf, isc_buffer_t *target) { snprintf(buf, sizeof(buf), "%u", u); ADD_STRING(target, buf); cleanup: - return (result); + return result; } static isc_result_t @@ -3620,11 +3620,11 @@ render_nameopt(isc_buffer_t *optbuf, isc_buffer_t *target) { ADD_STRING(target, " \""); ADD_STRING(target, namebuf); ADD_STRING(target, "\""); - return (result); + return result; } result = ISC_R_FAILURE; cleanup: - return (result); + return result; } static const char *option_names[] = { @@ -4059,7 +4059,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, cleanup: msg->indent.count = saved_count; - return (result); + return result; } isc_result_t @@ -4083,15 +4083,15 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, REQUIRE(VALID_NAMED_PSEUDOSECTION(section)); if ((dns_master_styleflags(style) & DNS_STYLEFLAG_YAML) != 0) { - return (dns_message_pseudosectiontoyaml(msg, section, style, - flags, target)); + return dns_message_pseudosectiontoyaml(msg, section, style, + flags, target); } switch (section) { case DNS_PSEUDOSECTION_OPT: ps = dns_message_getopt(msg); if (ps == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if ((flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { INDENT(style); @@ -4122,7 +4122,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, result = dns_rdataset_first(ps); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -4164,7 +4164,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, if (optlen == 18U) { result = render_llq(&optbuf, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ADD_STRING(target, "\n"); continue; @@ -4209,7 +4209,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, isc_buffer_add(&ecsbuf, optlen); result = render_ecs(&ecsbuf, target); if (result == ISC_R_NOSPACE) { - return (result); + return result; } if (result == ISC_R_SUCCESS) { isc_buffer_forward(&optbuf, optlen); @@ -4227,7 +4227,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, result = dns_ttl_totext(secs, true, true, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ADD_STRING(target, ")\n"); continue; @@ -4420,7 +4420,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, } if (isc_buffer_availablelength(target) < optlen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } for (i = 0; i < optlen; i++) { if (isprint(optdata[i]) || @@ -4440,11 +4440,11 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, } ADD_STRING(target, "\n"); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case DNS_PSEUDOSECTION_TSIG: ps = dns_message_gettsig(msg, &name); if (ps == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } INDENT(style); if ((flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { @@ -4457,11 +4457,11 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, { ADD_STRING(target, "\n"); } - return (result); + return result; case DNS_PSEUDOSECTION_SIG0: ps = dns_message_getsig0(msg, &name); if (ps == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } INDENT(style); if ((flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { @@ -4474,11 +4474,11 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, { ADD_STRING(target, "\n"); } - return (result); + return result; } result = ISC_R_UNEXPECTED; cleanup: - return (result); + return result; } isc_result_t @@ -4491,7 +4491,7 @@ dns_message_headertotext(dns_message_t *msg, const dns_master_style_t *style, REQUIRE(target != NULL); if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) != 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (dns_master_styleflags(style) & DNS_STYLEFLAG_YAML) { @@ -4503,7 +4503,7 @@ dns_message_headertotext(dns_message_t *msg, const dns_master_style_t *style, ADD_STRING(target, "status: "); result = dns_rcode_totext(msg->rcode, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ADD_STRING(target, "\n"); INDENT(style); @@ -4589,7 +4589,7 @@ dns_message_headertotext(dns_message_t *msg, const dns_master_style_t *style, ADD_STRING(target, ", status: "); result = dns_rcode_totext(msg->rcode, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ADD_STRING(target, ", id: "); snprintf(buf, sizeof(buf), "%6u", msg->id); @@ -4659,7 +4659,7 @@ dns_message_headertotext(dns_message_t *msg, const dns_master_style_t *style, } cleanup: - return (result); + return result; } isc_result_t @@ -4672,54 +4672,54 @@ dns_message_totext(dns_message_t *msg, const dns_master_style_t *style, result = dns_message_headertotext(msg, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_pseudosectiontotext(msg, DNS_PSEUDOSECTION_OPT, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_sectiontotext(msg, DNS_SECTION_QUESTION, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_sectiontotext(msg, DNS_SECTION_ANSWER, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_sectiontotext(msg, DNS_SECTION_AUTHORITY, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_sectiontotext(msg, DNS_SECTION_ADDITIONAL, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_pseudosectiontotext(msg, DNS_PSEUDOSECTION_TSIG, style, flags, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_pseudosectiontotext(msg, DNS_PSEUDOSECTION_SIG0, style, flags, target); - return (result); + return result; } isc_region_t * dns_message_getrawmessage(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); - return (&msg->saved); + return &msg->saved; } void @@ -4749,7 +4749,7 @@ dns_message_settimeadjust(dns_message_t *msg, int timeadjust) { int dns_message_gettimeadjust(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); - return (msg->timeadjust); + return msg->timeadjust; } isc_result_t @@ -4757,10 +4757,10 @@ dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target) { REQUIRE(opcode < 16); if (isc_buffer_availablelength(target) < strlen(opcodetext[opcode])) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(target, opcodetext[opcode]); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -4918,13 +4918,13 @@ dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp, dns_rdatalist_tordataset(rdatalist, rdataset); *rdatasetp = rdataset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_message_puttemprdata(message, &rdata); dns_message_puttemprdataset(message, &rdataset); dns_message_puttemprdatalist(message, &rdatalist); - return (result); + return result; } void @@ -5008,11 +5008,11 @@ rdataset_soa_min(dns_rdataset_t *rds, dns_ttl_t *ttlp) { if (rdata.type == dns_rdatatype_soa) { *ttlp = ISC_MIN(rds->ttl, dns_soa_getminimum(&rdata)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -5020,7 +5020,7 @@ message_authority_soa_min(dns_message_t *msg, dns_ttl_t *ttlp) { isc_result_t result; if (msg->counts[DNS_SECTION_AUTHORITY] == 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (result = dns_message_firstname(msg, DNS_SECTION_AUTHORITY); @@ -5039,12 +5039,12 @@ message_authority_soa_min(dns_message_t *msg, dns_ttl_t *ttlp) { result = rdataset_soa_min(rds, ttlp); if (result == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -5054,11 +5054,11 @@ dns_message_minttl(dns_message_t *msg, const dns_section_t sectionid, REQUIRE(pttl != NULL); if (!msg->minttl[sectionid].is_set) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *pttl = msg->minttl[sectionid].ttl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -5070,10 +5070,10 @@ dns_message_response_minttl(dns_message_t *msg, dns_ttl_t *pttl) { result = dns_message_minttl(msg, DNS_SECTION_ANSWER, pttl); if (result != ISC_R_SUCCESS) { - return (message_authority_soa_min(msg, pttl)); + return message_authority_soa_min(msg, pttl); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/name.c b/lib/dns/name.c index 32770402ba..2b2f1aacd8 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -104,13 +104,13 @@ dns_name_isvalid(const dns_name_t *name) { unsigned int offset, count, length, nlabels; if (!DNS_NAME_VALID(name)) { - return (false); + return false; } if (name->length > DNS_NAME_MAXWIRE || name->labels > DNS_NAME_MAXLABELS) { - return (false); + return false; } ndata = name->ndata; @@ -122,17 +122,17 @@ dns_name_isvalid(const dns_name_t *name) { while (offset != length) { count = *ndata; if (count > DNS_NAME_LABELLEN) { - return (false); + return false; } if (offsets != NULL && offsets[nlabels] != offset) { - return (false); + return false; } nlabels++; offset += count + 1; ndata += count + 1; if (offset > length) { - return (false); + return false; } if (count == 0) { @@ -141,10 +141,10 @@ dns_name_isvalid(const dns_name_t *name) { } if (nlabels != name->labels || offset != name->length) { - return (false); + return false; } - return (true); + return true; } bool @@ -156,10 +156,10 @@ dns_name_hasbuffer(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); if (name->buffer != NULL) { - return (true); + return true; } - return (false); + return false; } bool @@ -170,7 +170,7 @@ dns_name_isabsolute(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); - return (name->attributes.absolute); + return name->attributes.absolute; } #define hyphenchar(c) ((c) == 0x2d) @@ -196,7 +196,7 @@ dns_name_ismailbox(const dns_name_t *name) { * Root label. */ if (name->length == 1) { - return (true); + return true; } ndata = name->ndata; @@ -205,12 +205,12 @@ dns_name_ismailbox(const dns_name_t *name) { while (n--) { ch = *ndata++; if (!domainchar(ch)) { - return (false); + return false; } } if (ndata == name->ndata + name->length) { - return (false); + return false; } /* @@ -224,17 +224,17 @@ dns_name_ismailbox(const dns_name_t *name) { ch = *ndata++; if (first || n == 0) { if (!borderchar(ch)) { - return (false); + return false; } } else { if (!middlechar(ch)) { - return (false); + return false; } } first = false; } } - return (true); + return true; } bool @@ -251,7 +251,7 @@ dns_name_ishostname(const dns_name_t *name, bool wildcard) { * Root label. */ if (name->length == 1) { - return (true); + return true; } /* @@ -273,17 +273,17 @@ dns_name_ishostname(const dns_name_t *name, bool wildcard) { ch = *ndata++; if (first || n == 0) { if (!borderchar(ch)) { - return (false); + return false; } } else { if (!middlechar(ch)) { - return (false); + return false; } } first = false; } } - return (true); + return true; } bool @@ -300,11 +300,11 @@ dns_name_iswildcard(const dns_name_t *name) { if (name->length >= 2) { ndata = name->ndata; if (ndata[0] == 1 && ndata[1] == '*') { - return (true); + return true; } } - return (false); + return false; } bool @@ -335,19 +335,19 @@ dns_name_internalwildcard(const dns_name_t *name) { count = *ndata++; INSIST(count <= DNS_NAME_LABELLEN); if (count == 1 && *ndata == '*') { - return (true); + return true; } ndata += count; label++; } - return (false); + return false; } uint32_t dns_name_hash(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); - return (isc_hash32(name->ndata, name->length, false)); + return isc_hash32(name->ndata, name->length, false); } dns_namereln_t @@ -383,7 +383,7 @@ dns_name_fullcompare(const dns_name_t *name1, const dns_name_t *name2, if (name1 == name2) { *orderp = 0; *nlabelsp = name1->labels; - return (dns_namereln_equal); + return dns_namereln_equal; } SETUP_OFFSETS(name1, offsets1, odata1); @@ -440,7 +440,7 @@ dns_name_fullcompare(const dns_name_t *name1, const dns_name_t *name2, namereln = dns_namereln_equal; } *nlabelsp = nlabels; - return (namereln); + return namereln; done: *nlabelsp = nlabels; @@ -448,7 +448,7 @@ done: namereln = dns_namereln_commonancestor; } - return (namereln); + return namereln; } int @@ -468,7 +468,7 @@ dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) { (void)dns_name_fullcompare(name1, name2, &order, &nlabels); - return (order); + return order; } bool @@ -492,16 +492,16 @@ dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) { REQUIRE((name1->attributes.absolute) == (name2->attributes.absolute)); if (name1 == name2) { - return (true); + return true; } length = name1->length; if (length != name2->length) { - return (false); + return false; } /* label lengths are < 64 so tolower() does not affect them */ - return (isc_ascii_lowerequal(name1->ndata, name2->ndata, length)); + return isc_ascii_lowerequal(name1->ndata, name2->ndata, length); } bool @@ -523,14 +523,14 @@ dns_name_caseequal(const dns_name_t *name1, const dns_name_t *name2) { REQUIRE((name1->attributes.absolute) == (name2->attributes.absolute)); if (name1->length != name2->length) { - return (false); + return false; } if (memcmp(name1->ndata, name2->ndata, name1->length) != 0) { - return (false); + return false; } - return (true); + return true; } int @@ -547,8 +547,8 @@ dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2) { REQUIRE(name2->attributes.absolute); /* label lengths are < 64 so tolower() does not affect them */ - return (isc_ascii_lowercmp(name1->ndata, name2->ndata, - ISC_MIN(name1->length, name2->length))); + return isc_ascii_lowercmp(name1->ndata, name2->ndata, + ISC_MIN(name1->length, name2->length)); } bool @@ -570,10 +570,10 @@ dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) { if (namereln == dns_namereln_subdomain || namereln == dns_namereln_equal) { - return (true); + return true; } - return (false); + return false; } bool @@ -594,9 +594,9 @@ dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) { if (dns_name_fullcompare(name, &tname, &order, &nlabels) == dns_namereln_subdomain) { - return (true); + return true; } - return (false); + return false; } void @@ -840,7 +840,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, */ if (c == '.') { if (tlen != 0) { - return (DNS_R_EMPTYLABEL); + return DNS_R_EMPTYLABEL; } labels++; *ndata++ = 0; @@ -867,13 +867,13 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, } state = ft_ordinary; if (nrem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } FALLTHROUGH; case ft_ordinary: if (c == '.') { if (count == 0) { - return (DNS_R_EMPTYLABEL); + return DNS_R_EMPTYLABEL; } *label = count; labels++; @@ -891,7 +891,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, state = ft_escape; } else { if (count >= DNS_NAME_LABELLEN) { - return (DNS_R_LABELTOOLONG); + return DNS_R_LABELTOOLONG; } count++; if (downcase) { @@ -908,7 +908,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, * This looks like a bitstring label, which * was deprecated. Intentionally drop it. */ - return (DNS_R_BADLABELTYPE); + return DNS_R_BADLABELTYPE; } state = ft_escape; POST(state); @@ -916,7 +916,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, case ft_escape: if (!isdigit((unsigned char)c)) { if (count >= DNS_NAME_LABELLEN) { - return (DNS_R_LABELTOOLONG); + return DNS_R_LABELTOOLONG; } count++; if (downcase) { @@ -934,16 +934,16 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, FALLTHROUGH; case ft_escdecimal: if (!isdigit((unsigned char)c)) { - return (DNS_R_BADESCAPE); + return DNS_R_BADESCAPE; } value = 10 * value + c - '0'; digits++; if (digits == 3) { if (value > 255) { - return (DNS_R_BADESCAPE); + return DNS_R_BADESCAPE; } if (count >= DNS_NAME_LABELLEN) { - return (DNS_R_LABELTOOLONG); + return DNS_R_LABELTOOLONG; } count++; if (downcase) { @@ -963,11 +963,11 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, if (!done) { if (nrem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } INSIST(tlen == 0); if (state != ft_ordinary && state != ft_at) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (state == ft_ordinary) { INSIST(count != 0); @@ -979,7 +979,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, } if (origin != NULL) { if (nrem < origin->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } label = origin->ndata; n1 = origin->length; @@ -1020,7 +1020,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, isc_buffer_forward(source, tused); isc_buffer_add(target, name->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1058,7 +1058,7 @@ dns_name_totext(const dns_name_t *name, unsigned int options, * Special handling for an empty name. */ if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -1082,7 +1082,7 @@ dns_name_totext(const dns_name_t *name, unsigned int options, * Special handling for the root label. */ if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } saw_root = true; @@ -1124,7 +1124,7 @@ dns_name_totext(const dns_name_t *name, unsigned int options, case 0x3B: /* ';' */ case 0x5C: /* '\\' */ if (trem < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tdata++ = '\\'; *tdata++ = c; @@ -1136,7 +1136,7 @@ dns_name_totext(const dns_name_t *name, unsigned int options, default: if (c > 0x20 && c < 0x7f) { if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tdata++ = c; ndata++; @@ -1144,7 +1144,7 @@ dns_name_totext(const dns_name_t *name, unsigned int options, nlen--; } else { if (trem < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tdata++ = 0x5c; *tdata++ = 0x30 + @@ -1171,14 +1171,14 @@ dns_name_totext(const dns_name_t *name, unsigned int options, * needed in the final output. */ if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tdata++ = '.'; trem--; } if (nlen != 0 && trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (!saw_root || omit_final_dot) { @@ -1191,10 +1191,10 @@ dns_name_totext(const dns_name_t *name, unsigned int options, isc_buffer_add(target, tlen - trem); if (totext_filter_proc != NULL) { - return ((totext_filter_proc)(target, oused)); + return (totext_filter_proc)(target, oused); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1228,7 +1228,7 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, * Special handling for the root label. */ if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } omit_final_dot = false; @@ -1259,7 +1259,7 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, c == 0x5F) /* underscore */ { if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* downcase */ if (c >= 0x41 && c <= 0x5A) { @@ -1271,7 +1271,7 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, nlen--; } else { if (trem < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } snprintf(tdata, trem, "%%%02X", c); tdata += 3; @@ -1293,14 +1293,14 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, * needed in the final output. */ if (trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tdata++ = '.'; trem--; } if (nlen != 0 && trem == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (omit_final_dot) { @@ -1309,7 +1309,7 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, isc_buffer_add(target, tlen - trem); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1343,7 +1343,7 @@ dns_name_downcase(const dns_name_t *source, dns_name_t *name, if (source->length > (target->length - target->used)) { MAKE_EMPTY(name); - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* label lengths are < 64 so tolower() does not affect them */ @@ -1362,7 +1362,7 @@ dns_name_downcase(const dns_name_t *source, dns_name_t *name, isc_buffer_add(target, name->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1517,16 +1517,16 @@ dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source, cursor += label_len; name_len += label_len + 1; if (name_len > name_max) { - return (name_max == DNS_NAME_MAXWIRE - ? DNS_R_NAMETOOLONG - : ISC_R_NOSPACE); + return name_max == DNS_NAME_MAXWIRE + ? DNS_R_NAMETOOLONG + : ISC_R_NOSPACE; } else if (label_len == 0) { goto root_label; } } else if (label_len < 192) { - return (DNS_R_BADLABELTYPE); + return DNS_R_BADLABELTYPE; } else if (!dns_decompress_getpermitted(dctx)) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } else if (cursor < source_max) { /* * Compression pointer. Ensure it does not loop. @@ -1540,7 +1540,7 @@ dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source, const uint32_t lo = *cursor++; const uint8_t *pointer = source_buf + (256 * hi + lo); if (pointer >= marker) { - return (DNS_R_BADPOINTER); + return DNS_R_BADPOINTER; } const uint32_t copy_len = (cursor - 2) - marker; uint8_t *const dest = name_buf + name_len - copy_len; @@ -1550,7 +1550,7 @@ dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source, cursor = marker = pointer; } } - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; root_label:; /* * Copy labels almost like we do for compression pointers, @@ -1567,7 +1567,7 @@ root_label:; name->length = name_len; isc_buffer_add(target, name_len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1598,10 +1598,10 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, */ if (compress && name_coff != NULL && *name_coff < 0x4000) { if (isc_buffer_availablelength(target) < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16(target, *name_coff | 0xc000); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (name->offsets == NULL) { @@ -1633,7 +1633,7 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, if (prefix_length > 0) { if (isc_buffer_availablelength(target) < prefix_length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(isc_buffer_used(target), name->ndata, prefix_length); isc_buffer_add(target, prefix_length); @@ -1644,12 +1644,12 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, *name_coff = suffix_coff; } if (isc_buffer_availablelength(target) < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16(target, suffix_coff | 0xc000); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1717,11 +1717,11 @@ dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix, } if (length > DNS_NAME_MAXWIRE) { MAKE_EMPTY(name); - return (DNS_R_NAMETOOLONG); + return DNS_R_NAMETOOLONG; } if (length > nrem) { MAKE_EMPTY(name); - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (copy_suffix) { @@ -1752,7 +1752,7 @@ dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix, isc_buffer_add(target, name->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1852,7 +1852,7 @@ dns_name_size(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); if (!name->attributes.dynamic) { - return (0); + return 0; } size = name->length; @@ -1860,7 +1860,7 @@ dns_name_size(const dns_name_t *name) { size += name->labels; } - return (size); + return size; } isc_result_t @@ -1884,12 +1884,12 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) { result = dns_name_downcase(name, &downname, &buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_usedregion(&buffer, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } bool @@ -1900,7 +1900,7 @@ dns_name_dynamic(const dns_name_t *name) { * Returns whether there is dynamic memory associated with this name. */ - return (name->attributes.dynamic); + return name->attributes.dynamic; } isc_result_t @@ -1919,12 +1919,12 @@ dns_name_print(const dns_name_t *name, FILE *stream) { isc_buffer_init(&b, t, sizeof(t)); result = dns_name_totext(name, 0, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_usedregion(&b, &r); fprintf(stream, "%.*s", (int)r.length, (char *)r.base); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1934,17 +1934,17 @@ dns_name_settotextfilter(dns_name_totextfilter_t *proc) { */ if (totext_filter_proc != NULL && proc != NULL) { if (totext_filter_proc == proc) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } if (proc == NULL && totext_filter_proc != NULL) { totext_filter_proc = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } totext_filter_proc = proc; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1983,7 +1983,7 @@ dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) { isc_buffer_init(&buf, txt, sizeof(txt)); result = dns_name_totext(name, 0, &buf); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_usedregion(&buf, ®); @@ -1992,7 +1992,7 @@ dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) { p[reg.length] = '\0'; *target = p; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2016,13 +2016,13 @@ dns_name_fromstring(dns_name_t *target, const char *src, result = dns_name_fromtext(name, &buf, origin, options, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (name != target) { dns_name_dupwithoffsets(name, mctx, target); } - return (result); + return result; } void @@ -2096,12 +2096,12 @@ dns_name_isdnssd(const dns_name_t *name) { dns_name_getlabelsequence(name, 0, 3, &prefix); for (i = 0; i < (sizeof(dns_sd) / sizeof(dns_sd[0])); i++) { if (dns_name_equal(&prefix, &dns_sd[i])) { - return (true); + return true; } } } - return (false); + return false; } static unsigned char inaddr10_offsets[] = { 0, 3, 11, 16 }; @@ -2156,10 +2156,10 @@ dns_name_isrfc1918(const dns_name_t *name) { for (i = 0; i < (sizeof(rfc1918names) / sizeof(*rfc1918names)); i++) { if (dns_name_issubdomain(name, &rfc1918names[i])) { - return (true); + return true; } } - return (false); + return false; } static unsigned char ulaoffsets[] = { 0, 2, 4, 8, 13 }; @@ -2176,10 +2176,10 @@ dns_name_isula(const dns_name_t *name) { for (i = 0; i < (sizeof(ulanames) / sizeof(*ulanames)); i++) { if (dns_name_issubdomain(name, &ulanames[i])) { - return (true); + return true; } } - return (false); + return false; } bool @@ -2190,7 +2190,7 @@ dns_name_istat(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); if (name->labels < 1) { - return (false); + return false; } ndata = name->ndata; @@ -2203,13 +2203,13 @@ dns_name_istat(const dns_name_t *name) { * label length consistent with a trust-anchor-telemetry label. */ if ((len < 8) || (len - 3) % 5 != 0) { - return (false); + return false; } if (ndata[0] != '_' || isc_ascii_tolower(ndata[1]) != 't' || isc_ascii_tolower(ndata[2]) != 'a') { - return (false); + return false; } ndata += 3; len -= 3; @@ -2220,12 +2220,12 @@ dns_name_istat(const dns_name_t *name) { !isc_hex_char(ndata[2]) || !isc_hex_char(ndata[3]) || !isc_hex_char(ndata[4])) { - return (false); + return false; } ndata += 5; len -= 5; } - return (true); + return true; } bool @@ -2236,7 +2236,7 @@ dns_name_isdnssvcb(const dns_name_t *name) { REQUIRE(DNS_NAME_VALID(name)); if (name->labels < 1 || name->length < 5) { - return (false); + return false; } ndata = name->ndata; @@ -2245,7 +2245,7 @@ dns_name_isdnssvcb(const dns_name_t *name) { ndata++; if (len < 2 || ndata[0] != '_') { - return (false); + return false; } if (isdigit(ndata[1]) && name->labels > 1) { char buf[sizeof("65000")]; @@ -2256,13 +2256,13 @@ dns_name_isdnssvcb(const dns_name_t *name) { * Do we have a valid _port label? */ if (len > 6U || (ndata[1] == '0' && len != 2)) { - return (false); + return false; } memcpy(buf, ndata + 1, len - 1); buf[len - 1] = 0; port = strtol(buf, &endp, 10); if (*endp != 0 || port < 0 || port > 0xffff) { - return (false); + return false; } /* @@ -2276,10 +2276,10 @@ dns_name_isdnssvcb(const dns_name_t *name) { } if (len == 4U && strncasecmp((const char *)ndata, "_dns", 4) == 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -2294,13 +2294,13 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad) { REQUIRE(DNS_NAME_VALID(rad)); if (name->labels < rad->labels + 4U || name->length < 4U) { - return (false); + return false; } if (name->ndata[0] != 3 || name->ndata[1] != '_' || tolower(name->ndata[2]) != 'e' || tolower(name->ndata[3]) != 'r') { - return (false); + return false; } dns_name_init(&suffix, offsets); @@ -2309,7 +2309,7 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad) { if (suffix.ndata[0] != 3 || suffix.ndata[1] != '_' || tolower(suffix.ndata[2]) != 'e' || tolower(suffix.ndata[3]) != 'r') { - return (false); + return false; } /* type list */ @@ -2318,16 +2318,16 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad) { memmove(labelbuf, suffix.ndata + 1, *suffix.ndata); labelbuf[*suffix.ndata] = 0; if (strlen(labelbuf) != *suffix.ndata) { - return (false); + return false; } l = labelbuf; do { v = strtoul(l, &end, 10); if (v > 0xffff || (*end != 0 && *end != '-') || end == l) { - return (false); + return false; } if (last != ULONG_MAX && v <= last) { - return (false); + return false; } last = v; if (*end == '-') { @@ -2341,12 +2341,12 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad) { memmove(labelbuf, suffix.ndata + 1, *suffix.ndata); labelbuf[*suffix.ndata] = 0; if (strlen(labelbuf) != *suffix.ndata) { - return (false); + return false; } v = strtoul(labelbuf, &end, 10); if (v > 0xfff || *end != 0) { - return (false); + return false; } - return (dns_name_issubdomain(name, rad)); + return dns_name_issubdomain(name, rad); } diff --git a/lib/dns/nametree.c b/lib/dns/nametree.c index 24c51d504c..9b50bca34c 100644 --- a/lib/dns/nametree.c +++ b/lib/dns/nametree.c @@ -128,7 +128,7 @@ newnode(isc_mem_t *mctx, const dns_name_t *name) { dns_name_dupwithoffsets(name, mctx, &node->name); - return (node); + return node; } static bool @@ -137,9 +137,9 @@ matchbit(unsigned char *bits, uint32_t val) { unsigned int mask = 1 << (val % 8); if (len <= bits[0] && (bits[len - 1] & mask) != 0) { - return (true); + return true; } - return (false); + return false; } isc_result_t @@ -208,7 +208,7 @@ dns_nametree_add(dns_nametree_t *nametree, const dns_name_t *name, out: dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(nametree->table, &qp); - return (result); + return result; } isc_result_t @@ -243,7 +243,7 @@ dns_nametree_delete(dns_nametree_t *nametree, const dns_name_t *name) { dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(nametree->table, &qp); - return (result); + return result; } isc_result_t @@ -264,7 +264,7 @@ dns_nametree_find(dns_nametree_t *nametree, const dns_name_t *name, } dns_qpread_destroy(nametree->table, &qpr); - return (result); + return result; } bool @@ -298,7 +298,7 @@ dns_nametree_covered(dns_nametree_t *nametree, const dns_name_t *name, } dns_qpread_destroy(nametree->table, &qpr); - return (ret); + return ret; } static void @@ -319,7 +319,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { dns_ntnode_t *ntnode = pval; - return (dns_qpkey_fromname(key, &ntnode->name)); + return dns_qpkey_fromname(key, &ntnode->name); } static void diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index 43e29c80e4..16d88d64b3 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -47,7 +47,7 @@ atomic_getuint8(isc_buffer_t *b) { atomic_uchar *cp = isc_buffer_current(b); uint8_t ret = atomic_load_relaxed(cp); isc_buffer_forward(b, 1); - return (ret); + return ret; } static isc_result_t @@ -68,7 +68,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { */ isc_buffer_availableregion(buffer, &ar); if (ar.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } count = dns_rdataset_count(rdataset); INSIST(count <= 65535); @@ -81,7 +81,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { INSIST(r.length <= 65535); isc_buffer_availableregion(buffer, &ar); if (ar.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* * Copy the rdata length to the buffer. @@ -92,24 +92,24 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { */ result = isc_buffer_copyregion(buffer, &r); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_reset(&rdata); result = dns_rdataset_next(rdataset); } if (result != ISC_R_NOMORE) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl, dns_rdataset_t *addedrdataset) { - return (addoptout(message, cache, node, covers, now, minttl, maxttl, - false, false, addedrdataset)); + return addoptout(message, cache, node, covers, now, minttl, maxttl, + false, false, addedrdataset); } isc_result_t @@ -117,8 +117,8 @@ dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl, bool optout, dns_rdataset_t *addedrdataset) { - return (addoptout(message, cache, node, covers, now, minttl, maxttl, - optout, true, addedrdataset)); + return addoptout(message, cache, node, covers, now, minttl, maxttl, + optout, true, addedrdataset); } static isc_result_t @@ -208,14 +208,14 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, result = isc_buffer_copyregion(&buffer, &r); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* * Copy the type to the buffer. */ isc_buffer_availableregion(&buffer, &r); if (r.length < 3) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16(&buffer, rdataset->type); @@ -228,11 +228,11 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, result = copy_rdataset(rdataset, &buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (next >= DNS_NCACHE_RDATA) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } dns_rdata_init(&rdata[next]); isc_buffer_remainingregion(&buffer, &r); @@ -252,7 +252,7 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, result = dns_message_nextname(message, DNS_SECTION_AUTHORITY); } if (result != ISC_R_NOMORE) { - return (result); + return result; } if (trust == 0xffff) { @@ -288,8 +288,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, ncrdataset.attributes |= DNS_RDATASETATTR_OPTOUT; } - return (dns_db_addrdataset(cache, node, NULL, now, &ncrdataset, 0, - addedrdataset)); + return dns_db_addrdataset(cache, node, NULL, now, &ncrdataset, 0, + addedrdataset); } isc_result_t @@ -414,14 +414,14 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx, *countp = count; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; rollback: dns_compress_rollback(cctx, savedbuffer.used); *countp = 0; *target = savedbuffer; - return (result); + return result; } static void @@ -438,7 +438,7 @@ rdataset_first(dns_rdataset_t *rdataset) { count = raw[0] * 256 + raw[1]; if (count == 0) { rdataset->ncache.iter_pos = NULL; - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* * iter_count is the number of rdata beyond the cursor position, @@ -446,7 +446,7 @@ rdataset_first(dns_rdataset_t *rdataset) { */ rdataset->ncache.iter_pos = raw + 2; rdataset->ncache.iter_count = count - 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -459,13 +459,13 @@ rdataset_next(dns_rdataset_t *rdataset) { count = rdataset->ncache.iter_count; if (count == 0) { rdataset->ncache.iter_pos = NULL; - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } length = raw[0] * 256 + raw[1]; rdataset->ncache.iter_pos = raw + 2 + length; rdataset->ncache.iter_count = count - 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -496,7 +496,7 @@ rdataset_count(dns_rdataset_t *rdataset) { raw = rdataset->ncache.raw; count = raw[0] * 256 + raw[1]; - return (count); + return count; } static void @@ -566,10 +566,10 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, } dns_rdataset_disassociate(&rclone); if (result == ISC_R_NOMORE) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(remaining.length != 0); @@ -584,7 +584,7 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, rdataset->ncache.iter_pos = NULL; rdataset->ncache.iter_count = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -660,10 +660,10 @@ dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, } dns_rdataset_disassociate(&rclone); if (result == ISC_R_NOMORE) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(remaining.length != 0); @@ -678,7 +678,7 @@ dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, rdataset->ncache.iter_pos = NULL; rdataset->ncache.iter_count = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c index 01f4840345..8e34772dca 100644 --- a/lib/dns/nsec.c +++ b/lib/dns/nsec.c @@ -59,7 +59,7 @@ dns_nsec_isset(const unsigned char *array, unsigned int type) { shift = 7 - (type % 8); mask = 1 << shift; - return ((byte & mask) != 0); + return (byte & mask) != 0; } unsigned int @@ -70,7 +70,7 @@ dns_nsec_compressbitmap(unsigned char *map, const unsigned char *raw, int octet; if (raw == NULL) { - return (0); + return 0; } for (window = 0; window < 256; window++) { @@ -95,7 +95,7 @@ dns_nsec_compressbitmap(unsigned char *map, const unsigned char *raw, map += octet + 1; raw += 32; } - return ((unsigned int)(map - start)); + return (unsigned int)(map - start); } isc_result_t @@ -130,7 +130,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, rdsiter = NULL; result = dns_db_allrdatasets(db, node, version, 0, 0, &rdsiter); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; result = dns_rdatasetiter_next(rdsiter)) @@ -165,7 +165,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_rdatasetiter_destroy(&rdsiter); if (result != ISC_R_NOMORE) { - return (result); + return result; } nsec_bits += dns_nsec_compressbitmap(nsec_bits, bm, max_type); @@ -174,7 +174,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, INSIST(r.length <= DNS_NSEC_BUFFERSIZE); dns_rdata_fromregion(rdata, dns_db_class(db), dns_rdatatype_nsec, &r); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -206,7 +206,7 @@ failure: if (dns_rdataset_isassociated(&rdataset)) { dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } bool @@ -244,7 +244,7 @@ dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type) { break; } dns_rdata_freestruct(&nsecstruct); - return (present); + return present; } isc_result_t @@ -261,7 +261,7 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, dns_diff_t *diff, result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, version, dns_rdatatype_dnskey, 0, @@ -272,7 +272,7 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, dns_diff_t *diff, *answer = false; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; result = dns_rdataset_next(&rdataset)) @@ -323,7 +323,7 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, dns_diff_t *diff, *answer = false; result = ISC_R_SUCCESS; } - return (result); + return result; } /*% @@ -355,7 +355,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, result = dns_rdataset_first(nsecset); if (result != ISC_R_SUCCESS) { (*logit)(arg, ISC_LOG_DEBUG(3), "failure processing NSEC set"); - return (result); + return result; } dns_rdataset_current(nsecset, &rdata); @@ -365,7 +365,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, { (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC missing RRSIG and/or NSEC from type map"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } #endif @@ -378,7 +378,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC does not cover name, before NSEC"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (order == 0) { @@ -398,7 +398,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring parent nsec"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } } else if (atparent && ns && soa) { /* @@ -406,7 +406,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * It can not be legitimately used here. */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring child nsec"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (type == dns_rdatatype_cname || type == dns_rdatatype_nxt || type == dns_rdatatype_nsec || type == dns_rdatatype_key || @@ -417,10 +417,10 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, (*logit)(arg, ISC_LOG_DEBUG(3), "nsec proves name exists (owner) data=%d", *data); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC proves CNAME exists"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (relation == dns_namereln_subdomain && @@ -434,7 +434,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * It can not be legitimately used here. */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring parent nsec"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (relation == dns_namereln_subdomain && @@ -442,19 +442,19 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, { (*logit)(arg, ISC_LOG_DEBUG(3), "nsec proves covered by dname"); *exists = false; - return (DNS_R_DNAME); + return DNS_R_DNAME; } result = dns_rdata_tostruct(&rdata, &nsec, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } relation = dns_name_fullcompare(&nsec.next, name, &order, &nlabels); if (order == 0) { dns_rdata_freestruct(&nsec); (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring nsec matches next name"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (order < 0 && !dns_name_issubdomain(nsecname, &nsec.next)) { @@ -464,7 +464,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_rdata_freestruct(&nsec); (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring nsec because name is past end of range"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (order > 0 && relation == dns_namereln_subdomain) { @@ -473,7 +473,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_rdata_freestruct(&nsec); *exists = true; *data = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (wild != NULL) { dns_name_t common; @@ -493,13 +493,13 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_rdata_freestruct(&nsec); (*logit)(arg, ISC_LOG_DEBUG(3), "failure generating wildcard name"); - return (result); + return result; } } dns_rdata_freestruct(&nsec); (*logit)(arg, ISC_LOG_DEBUG(3), "nsec range ok"); *exists = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -523,10 +523,10 @@ dns_nsec_requiredtypespresent(dns_rdataset_t *nsecset) { !dns_nsec_typepresent(&rdata, dns_rdatatype_rrsig)) { dns_rdataset_disassociate(&rdataset); - return (false); + return false; } found = true; } dns_rdataset_disassociate(&rdataset); - return (found); + return found; } diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index e92557e002..e8567f7d43 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -120,7 +120,7 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, rdsiter = NULL; result = dns_db_allrdatasets(db, node, version, 0, 0, &rdsiter); if (result != ISC_R_SUCCESS) { - return (result); + return result; } found = found_ns = need_rrsig = false; for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; @@ -180,7 +180,7 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_rdatasetiter_destroy(&rdsiter); if (result != ISC_R_NOMORE) { - return (result); + return result; } collapse_bitmap: @@ -189,7 +189,7 @@ collapse_bitmap: INSIST(r.length <= DNS_NSEC3_BUFFERSIZE); dns_rdata_fromregion(rdata, dns_db_class(db), dns_rdatatype_nsec3, &r); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -227,16 +227,16 @@ dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) { break; } dns_rdata_freestruct(&nsec3); - return (present); + return present; } isc_result_t dns_nsec3_generate_salt(unsigned char *salt, size_t saltlen) { if (saltlen > 255U) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_nonce_buf(salt, saltlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -268,7 +268,7 @@ dns_nsec3_hashname(dns_fixedname_t *result, (int)saltlength, downcased->ndata, downcased->length); if (len == 0U) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } SET_IF_NOT_NULL(hash_length, len); @@ -281,26 +281,26 @@ dns_nsec3_hashname(dns_fixedname_t *result, /* convert the hex to a domain name */ dns_fixedname_init(result); - return (dns_name_fromtext(dns_fixedname_name(result), &namebuffer, - origin, 0, NULL)); + return dns_name_fromtext(dns_fixedname_name(result), &namebuffer, + origin, 0, NULL); } unsigned int dns_nsec3_hashlength(dns_hash_t hash) { switch (hash) { case dns_hash_sha1: - return (ISC_SHA1_DIGESTLENGTH); + return ISC_SHA1_DIGESTLENGTH; } - return (0); + return 0; } bool dns_nsec3_supportedhash(dns_hash_t hash) { switch (hash) { case dns_hash_sha1: - return (true); + return true; } - return (false); + return false; } /*% @@ -330,7 +330,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, ISC_LIST_UNLINK(temp_diff.tuples, *tuple, link); if (result != ISC_R_SUCCESS) { dns_difftuple_free(tuple); - return (result); + return result; } /* @@ -341,7 +341,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, /* * Do not clear temp_diff. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -357,10 +357,10 @@ name_exists(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, result = dns_db_findnode(db, name, false, &node); if (result == ISC_R_NOTFOUND) { *exists = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_allrdatasets(db, node, version, 0, (isc_stdtime_t)0, @@ -382,7 +382,7 @@ name_exists(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } static bool @@ -393,9 +393,9 @@ match_nsec3param(const dns_rdata_nsec3_t *nsec3, nsec3->salt_length == nsec3param->salt_length && !memcmp(nsec3->salt, nsec3param->salt, nsec3->salt_length)) { - return (true); + return true; } - return (false); + return false; } /*% @@ -413,10 +413,10 @@ delnsec3(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, result = dns_db_findnsec3node(db, name, false, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -459,7 +459,7 @@ failure: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } static bool @@ -468,7 +468,7 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) { isc_result_t result; if (REMOVE(param->data[1])) { - return (true); + return true; } dns_rdataset_init(&rdataset); @@ -504,11 +504,11 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) { } if (CREATE(rdata.data[1]) && !CREATE(param->data[1])) { dns_rdataset_disassociate(&rdataset); - return (true); + return true; } } dns_rdataset_disassociate(&rdataset); - return (false); + return false; } static isc_result_t @@ -528,7 +528,7 @@ find_nsec3(dns_rdata_nsec3_t *nsec3, dns_rdataset_t *rdataset, } } failure: - return (result); + return result; } isc_result_t @@ -893,7 +893,7 @@ failure: if (newnode != NULL) { dns_db_detachnode(db, &newnode); } - return (result); + return result; } /*% @@ -916,7 +916,7 @@ dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, */ result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, version, @@ -924,10 +924,10 @@ dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, NULL); dns_db_detachnode(db, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -962,7 +962,7 @@ failure: dns_db_detachnode(db, &node); } - return (result); + return result; } bool @@ -977,7 +977,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, * NSEC3PARAM records from DNSKEY pointers. */ if (src->length < 1 || src->data[0] != 0) { - return (false); + return false; } isc_buffer_init(&buf1, src->data + 1, src->length - 1); @@ -988,7 +988,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, dns_rdatatype_nsec3param, &buf1, DNS_DECOMPRESS_NEVER, &buf2); - return (result == ISC_R_SUCCESS); + return result == ISC_R_SUCCESS; } void @@ -1051,7 +1051,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } isc_result_t @@ -1066,10 +1066,10 @@ dns_nsec3param_salttotext(dns_rdata_nsec3param_t *nsec3param, char *dst, if (nsec3param->salt_length == 0) { if (dstlen < 2U) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strlcpy(dst, "-", dstlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } r.base = nsec3param->salt; @@ -1078,15 +1078,15 @@ dns_nsec3param_salttotext(dns_rdata_nsec3param_t *nsec3param, char *dst, result = isc_hex_totext(&r, 2, "", &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (isc_buffer_availablelength(&b) < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(&b, 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1108,7 +1108,7 @@ dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver, result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -1215,7 +1215,7 @@ failure: dns_rdataset_disassociate(&rdataset); } dns_db_detachnode(db, &node); - return (result); + return result; } isc_result_t @@ -1236,7 +1236,7 @@ dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, */ result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, version, type, 0, 0, &prdataset, @@ -1332,7 +1332,7 @@ failure: dns_db_detachnode(db, &node); } - return (result); + return result; } /*% @@ -1356,19 +1356,19 @@ deleteit(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, result == DNS_R_ZONECUT) { *yesno = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result == DNS_R_GLUE || result == DNS_R_DNAME || result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) { *yesno = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* * Silence compiler. */ *yesno = true; - return (result); + return result; } isc_result_t @@ -1644,13 +1644,13 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } isc_result_t dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_diff_t *diff) { - return (dns_nsec3_delnsec3sx(db, version, name, 0, diff)); + return dns_nsec3_delnsec3sx(db, version, name, 0, diff); } isc_result_t @@ -1669,7 +1669,7 @@ dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, */ result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, version, @@ -1759,13 +1759,13 @@ failure: dns_db_detachnode(db, &node); } - return (result); + return result; } isc_result_t dns_nsec3_active(dns_db_t *db, dns_dbversion_t *version, bool complete, bool *answer) { - return (dns_nsec3_activex(db, version, complete, 0, answer)); + return dns_nsec3_activex(db, version, complete, 0, answer); } isc_result_t @@ -1782,7 +1782,7 @@ dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete, result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, version, @@ -1795,7 +1795,7 @@ dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete, if (result != ISC_R_SUCCESS) { dns_db_detachnode(db, &node); - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; result = dns_rdataset_next(&rdataset)) @@ -1814,7 +1814,7 @@ dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete, if (result == ISC_R_SUCCESS) { dns_db_detachnode(db, &node); *answer = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result == ISC_R_NOMORE) { *answer = false; @@ -1824,7 +1824,7 @@ try_private: if (privatetype == 0 || complete) { dns_db_detachnode(db, &node); *answer = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_db_findrdataset(db, node, version, privatetype, 0, 0, &rdataset, NULL); @@ -1832,10 +1832,10 @@ try_private: dns_db_detachnode(db, &node); if (result == ISC_R_NOTFOUND) { *answer = false; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; @@ -1868,12 +1868,12 @@ try_private: result = ISC_R_SUCCESS; } - return (result); + return result; } unsigned int dns_nsec3_maxiterations(void) { - return (DNS_NSEC3_MAXITERATIONS); + return DNS_NSEC3_MAXITERATIONS; } isc_result_t @@ -1917,14 +1917,14 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, result = dns_rdataset_first(nsec3set); if (result != ISC_R_SUCCESS) { (*logit)(arg, ISC_LOG_DEBUG(3), "failure processing NSEC3 set"); - return (result); + return result; } dns_rdataset_current(nsec3set, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } (*logit)(arg, ISC_LOG_DEBUG(3), "looking for relevant NSEC3"); @@ -1936,7 +1936,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * NSEC3 records must have two or more labels to be valid. */ if (zlabels < 2) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* @@ -1949,7 +1949,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * If not below the zone name we can ignore this record. */ if (!dns_name_issubdomain(name, zone)) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* @@ -1962,14 +1962,14 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, } if (!dns_name_equal(zone, zonename)) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* * Are we only looking for the most enclosing zone? */ if (exists == NULL || data == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1980,7 +1980,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, if (unknown != NULL) { *unknown = true; } - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* @@ -1991,14 +1991,14 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, isc_buffer_init(&buffer, owner, sizeof(owner)); result = isc_base32hex_decoderegion(&hashlabel, &buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* * The hash lengths should match. If not ignore the record. */ if (isc_buffer_usedlength(&buffer) != nsec3.next_length) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* @@ -2020,7 +2020,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, * If there are too many iterations reject the NSEC3 record. */ if (nsec3.iterations > DNS_NSEC3_MAXITERATIONS) { - return (DNS_R_NSEC3ITERRANGE); + return DNS_R_NSEC3ITERRANGE; } length = isc_iterated_hash(hash, nsec3.hash, nsec3.iterations, @@ -2033,7 +2033,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring NSEC bad length %u vs %u", length, nsec3.next_length); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } order = memcmp(hash, owner, length); @@ -2054,7 +2054,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring parent NSEC3"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } } else if (atparent && ns && soa) { /* @@ -2063,7 +2063,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring child NSEC3"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (type == dns_rdatatype_cname || type == dns_rdatatype_nxt || @@ -2077,11 +2077,11 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, "NSEC3 proves name exists (owner) " "data=%d", *data); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC3 proves CNAME exists"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } if (order == 0 && @@ -2095,7 +2095,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ (*logit)(arg, ISC_LOG_DEBUG(3), "ignoring parent NSEC3"); - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } /* @@ -2123,7 +2123,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_name_format(qname, namebuf, sizeof(namebuf)); (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC3 at super-domain %s", namebuf); - return (answer); + return answer; } /* @@ -2174,5 +2174,5 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, } first = false; } - return (answer); + return answer; } diff --git a/lib/dns/nta.c b/lib/dns/nta.c index 91f322f341..51b99efdfd 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -304,7 +304,7 @@ dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, bool force, REQUIRE(VALID_NTATABLE(ntatable)); if (atomic_load(&ntatable->shuttingdown)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RWLOCK(&ntatable->rwlock, isc_rwlocktype_write); @@ -341,7 +341,7 @@ dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, bool force, dns_qpmulti_commit(ntatable->table, &qp); RWUNLOCK(&ntatable->rwlock, isc_rwlocktype_write); - return (result); + return result; } isc_result_t @@ -363,7 +363,7 @@ dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) { dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(ntatable->table, &qp); - return (result); + return result; } static void @@ -445,7 +445,7 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now, done: RWUNLOCK(&ntatable->rwlock, isc_rwlocktype_read); dns_qpread_destroy(ntatable->table, &qpr); - return (answer); + return answer; } static isc_result_t @@ -454,11 +454,11 @@ putstr(isc_buffer_t **b, const char *str) { result = isc_buffer_reserve(*b, strlen(str)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putstr(*b, str); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -515,7 +515,7 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, const char *view, cleanup: dns_qpread_destroy(ntatable->table, &qpr); RWUNLOCK(&ntatable->rwlock, isc_rwlocktype_read); - return (result); + return result; } isc_result_t @@ -573,7 +573,7 @@ dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) { result = ISC_R_NOTFOUND; } - return (result); + return result; } static void @@ -648,7 +648,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { dns__nta_t *nta = pval; - return (dns_qpkey_fromname(key, &nta->name)); + return dns_qpkey_fromname(key, &nta->name); } static void diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index c94c8fb0a3..b693bc3789 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -104,22 +104,22 @@ dst__openssl_fromlabel_provider(int key_base_id, const char *label, } err: OSSL_STORE_close(ctx); - return (ret); + return ret; #else UNUSED(key_base_id); UNUSED(label); UNUSED(pin); UNUSED(ppub); UNUSED(ppriv); - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; #endif } isc_result_t dst__openssl_fromlabel(int key_base_id, const char *label, const char *pin, EVP_PKEY **ppub, EVP_PKEY **ppriv) { - return (dst__openssl_fromlabel_provider(key_base_id, label, pin, ppub, - ppriv)); + return dst__openssl_fromlabel_provider(key_base_id, label, pin, ppub, + ppriv); } bool @@ -128,27 +128,27 @@ dst__openssl_keypair_compare(const dst_key_t *key1, const dst_key_t *key2) { EVP_PKEY *pkey2 = key2->keydata.pkeypair.pub; if (pkey1 == pkey2) { - return (true); + return true; } else if (pkey1 == NULL || pkey2 == NULL) { - return (false); + return false; } /* `EVP_PKEY_eq` checks only the public components and parameters. */ if (EVP_PKEY_eq(pkey1, pkey2) != 1) { - return (false); + return false; } /* The private key presence must be same for keys to match. */ if ((key1->keydata.pkeypair.priv != NULL) != (key2->keydata.pkeypair.priv != NULL)) { - return (false); + return false; } - return (true); + return true; } bool dst__openssl_keypair_isprivate(const dst_key_t *key) { - return (key->keydata.pkeypair.priv != NULL); + return key->keydata.pkeypair.priv != NULL; } void diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c index 09bfb6dd27..be3a8a43ff 100644 --- a/lib/dns/opensslecdsa_link.c +++ b/lib/dns/opensslecdsa_link.c @@ -79,11 +79,11 @@ opensslecdsa_set_deterministic(EVP_PKEY_CTX *pctx, unsigned int key_alg) { params[2] = OSSL_PARAM_construct_end(); if (EVP_PKEY_CTX_set_params(pctx, params) != 1) { - return (dst__openssl_toresult2("EVP_PKEY_CTX_set_params", - DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult2("EVP_PKEY_CTX_set_params", + DST_R_OPENSSLFAILURE); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* OPENSSL_VERSION_NUMBER >= 0x30200000L */ @@ -92,9 +92,9 @@ opensslecdsa_valid_key_alg(unsigned int key_alg) { switch (key_alg) { case DST_ALG_ECDSA256: case DST_ALG_ECDSA384: - return (true); + return true; default: - return (false); + return false; } } @@ -102,9 +102,9 @@ static int opensslecdsa_key_alg_to_group_nid(unsigned int key_alg) { switch (key_alg) { case DST_ALG_ECDSA256: - return (NID_X9_62_prime256v1); + return NID_X9_62_prime256v1; case DST_ALG_ECDSA384: - return (NID_secp384r1); + return NID_secp384r1; default: UNREACHABLE(); } @@ -114,9 +114,9 @@ static size_t opensslecdsa_key_alg_to_publickey_size(unsigned int key_alg) { switch (key_alg) { case DST_ALG_ECDSA256: - return (DNS_KEY_ECDSA256SIZE); + return DNS_KEY_ECDSA256SIZE; case DST_ALG_ECDSA384: - return (DNS_KEY_ECDSA384SIZE); + return DNS_KEY_ECDSA384SIZE; default: UNREACHABLE(); } @@ -130,13 +130,13 @@ static EC_POINT * opensslecdsa_generate_public_key(const EC_GROUP *group, const BIGNUM *privkey) { EC_POINT *pubkey = EC_POINT_new(group); if (pubkey == NULL) { - return (NULL); + return NULL; } if (EC_POINT_mul(group, pubkey, privkey, NULL, NULL, NULL) != 1) { EC_POINT_free(pubkey); - return (NULL); + return NULL; } - return (pubkey); + return pubkey; } static int @@ -149,7 +149,7 @@ BN_bn2bin_fixed(const BIGNUM *bn, unsigned char *buf, int size) { *buf++ = 0; } BN_bn2bin(bn, buf); - return (size); + return size; } #if OPENSSL_VERSION_NUMBER >= 0x30000000L @@ -158,9 +158,9 @@ static const char * opensslecdsa_key_alg_to_group_name(unsigned int key_alg) { switch (key_alg) { case DST_ALG_ECDSA256: - return ("prime256v1"); + return "prime256v1"; case DST_ALG_ECDSA384: - return ("secp384r1"); + return "secp384r1"; default: UNREACHABLE(); } @@ -279,7 +279,7 @@ err: EC_POINT_free(pubkey); EC_GROUP_free(group); - return (ret); + return ret; } static bool @@ -299,7 +299,7 @@ opensslecdsa_extract_public_key_params(const dst_key_t *key, unsigned char *dst, } BN_clear_free(x); BN_clear_free(y); - return (ret); + return ret; } #endif @@ -370,7 +370,7 @@ err: EC_POINT_free(pubkey); EC_KEY_free(eckey); EVP_PKEY_free(pkey); - return (ret); + return ret; } static bool @@ -386,16 +386,16 @@ opensslecdsa_extract_public_key_legacy(const dst_key_t *key, unsigned char *dst, size_t len; if (group == NULL || pub == NULL) { - return (false); + return false; } len = EC_POINT_point2oct(group, pub, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof(buf), NULL); if (len == dstlen + 1) { memmove(dst, buf + 1, dstlen); - return (true); + return true; } - return (false); + return false; } #endif @@ -405,14 +405,14 @@ opensslecdsa_extract_public_key(const dst_key_t *key, unsigned char *dst, size_t dstlen) { #if OPENSSL_VERSION_NUMBER >= 0x30000000L if (opensslecdsa_extract_public_key_params(key, dst, dstlen)) { - return (true); + return true; } #else if (opensslecdsa_extract_public_key_legacy(key, dst, dstlen)) { - return (true); + return true; } #endif - return (false); + return false; } static isc_result_t @@ -424,16 +424,16 @@ opensslecdsa_create_pkey(unsigned int key_alg, bool private, ret = opensslecdsa_create_pkey_params(key_alg, private, key, key_len, retkey); if (ret != ISC_R_FAILURE) { - return (ret); + return ret; } #else ret = opensslecdsa_create_pkey_legacy(key_alg, private, key, key_len, retkey); if (ret == ISC_R_SUCCESS) { - return (ret); + return ret; } #endif - return (DST_R_OPENSSLFAILURE); + return DST_R_OPENSSLFAILURE; } #if OPENSSL_VERSION_NUMBER >= 0x30000000L @@ -494,7 +494,7 @@ opensslecdsa_generate_pkey_with_uri(int group_nid, const char *label, err: EVP_PKEY_CTX_free(ctx); - return (ret); + return ret; } static isc_result_t @@ -507,8 +507,8 @@ opensslecdsa_generate_pkey(unsigned int key_alg, const char *label, int status; if (label != NULL) { - return (opensslecdsa_generate_pkey_with_uri(group_nid, label, - retkey)); + return opensslecdsa_generate_pkey_with_uri(group_nid, label, + retkey); } /* Generate the key's parameters. */ @@ -557,7 +557,7 @@ opensslecdsa_generate_pkey(unsigned int key_alg, const char *label, err: EVP_PKEY_free(params_pkey); EVP_PKEY_CTX_free(ctx); - return (ret); + return ret; } static isc_result_t @@ -566,12 +566,12 @@ opensslecdsa_validate_pkey_group(unsigned int key_alg, EVP_PKEY *pkey) { char gname[64]; if (EVP_PKEY_get_group_name(pkey, gname, sizeof(gname), NULL) != 1) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } if (strcmp(gname, groupname) != 0) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -581,12 +581,12 @@ opensslecdsa_extract_private_key(const dst_key_t *key, unsigned char *buf, BIGNUM *priv = NULL; if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv) != 1) { - return (false); + return false; } BN_bn2bin_fixed(priv, buf, buflen); BN_clear_free(priv); - return (true); + return true; } #else @@ -629,7 +629,7 @@ opensslecdsa_generate_pkey(unsigned int key_alg, const char *label, err: EC_KEY_free(eckey); EVP_PKEY_free(pkey); - return (ret); + return ret; } static isc_result_t @@ -638,16 +638,16 @@ opensslecdsa_validate_pkey_group(unsigned int key_alg, EVP_PKEY *pkey) { int group_nid; if (eckey == NULL) { - return (dst__openssl_toresult(DST_R_INVALIDPRIVATEKEY)); + return dst__openssl_toresult(DST_R_INVALIDPRIVATEKEY); } group_nid = opensslecdsa_key_alg_to_group_nid(key_alg); if (EC_GROUP_get_curve_name(EC_KEY_get0_group(eckey)) != group_nid) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -659,17 +659,17 @@ opensslecdsa_extract_private_key(const dst_key_t *key, unsigned char *buf, eckey = EVP_PKEY_get0_EC_KEY(key->keydata.pkeypair.priv); if (eckey == NULL) { ERR_clear_error(); - return (false); + return false; } privkey = EC_KEY_get0_private_key(eckey); if (privkey == NULL) { ERR_clear_error(); - return (false); + return false; } BN_bn2bin_fixed(privkey, buf, buflen); - return (true); + return true; } #endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ @@ -726,7 +726,7 @@ opensslecdsa_createctx(dst_key_t *key, dst_context_t *dctx) { dctx->ctxdata.evp_md_ctx = evp_md_ctx; err: - return (ret); + return ret; } static void @@ -769,7 +769,7 @@ opensslecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) { } err: - return (ret); + return ret; } static isc_result_t @@ -831,7 +831,7 @@ err: isc_mem_put(dctx->mctx, sigder, sigder_alloced); } - return (ret); + return ret; } static isc_result_t @@ -911,7 +911,7 @@ err: isc_mem_put(dctx->mctx, sigder, sigder_alloced); } - return (ret); + return ret; } static isc_result_t @@ -925,13 +925,13 @@ opensslecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { ret = opensslecdsa_generate_pkey(key->key_alg, key->label, &pkey); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } key->key_size = EVP_PKEY_bits(pkey); key->keydata.pkeypair.priv = pkey; key->keydata.pkeypair.pub = pkey; - return (ret); + return ret; } static isc_result_t @@ -956,7 +956,7 @@ opensslecdsa_todns(const dst_key_t *key, isc_buffer_t *data) { ret = ISC_R_SUCCESS; err: - return (ret); + return ret; } static isc_result_t @@ -988,7 +988,7 @@ opensslecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) { ret = ISC_R_SUCCESS; err: - return (ret); + return ret; } static isc_result_t @@ -1036,7 +1036,7 @@ opensslecdsa_tofile(const dst_key_t *key, const char *directory) { err: isc_safe_memwipe(buf, keylen); - return (ret); + return ret; } static isc_result_t @@ -1129,7 +1129,7 @@ err: dst__privstruct_free(&priv, key->mctx); isc_safe_memwipe(&priv, sizeof(priv)); - return (ret); + return ret; } static isc_result_t @@ -1165,7 +1165,7 @@ opensslecdsa_fromlabel(dst_key_t *key, const char *label, const char *pin) { err: EVP_PKEY_free(privpkey); EVP_PKEY_free(pubpkey); - return (ret); + return ret; } static dst_func_t opensslecdsa_functions = { diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c index c666c0349a..09ac4e1d59 100644 --- a/lib/dns/openssleddsa_link.c +++ b/lib/dns/openssleddsa_link.c @@ -63,7 +63,7 @@ openssleddsa_alg_info(unsigned int key_alg) { .key_size = DNS_KEY_ED25519SIZE, .sig_size = DNS_SIG_ED25519SIZE, }; - return (&ed25519_alginfo); + return &ed25519_alginfo; } #if HAVE_OPENSSL_ED448 if (key_alg == DST_ALG_ED448) { @@ -73,10 +73,10 @@ openssleddsa_alg_info(unsigned int key_alg) { .key_size = DNS_KEY_ED448SIZE, .sig_size = DNS_SIG_ED448SIZE, }; - return (&ed448_alginfo); + return &ed448_alginfo; } #endif /* HAVE_OPENSSL_ED448 */ - return (NULL); + return NULL; } static isc_result_t @@ -88,7 +88,7 @@ raw_key_to_ossl(const eddsa_alginfo_t *alginfo, int private, ret = (private ? DST_R_INVALIDPRIVATEKEY : DST_R_INVALIDPUBLICKEY); if (*key_len < len) { - return (ret); + return ret; } if (private) { @@ -97,11 +97,11 @@ raw_key_to_ossl(const eddsa_alginfo_t *alginfo, int private, *pkey = EVP_PKEY_new_raw_public_key(pkey_type, NULL, key, len); } if (*pkey == NULL) { - return (dst__openssl_toresult(ret)); + return dst__openssl_toresult(ret); } *key_len = len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -119,7 +119,7 @@ openssleddsa_createctx(dst_key_t *key, dst_context_t *dctx) { isc_buffer_allocate(dctx->mctx, &buf, 64); dctx->ctxdata.generic = buf; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -149,7 +149,7 @@ openssleddsa_adddata(dst_context_t *dctx, const isc_region_t *data) { result = isc_buffer_copyregion(buf, data); if (result == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } length = isc_buffer_length(buf) + data->length + 64; @@ -160,7 +160,7 @@ openssleddsa_adddata(dst_context_t *dctx, const isc_region_t *data) { isc_buffer_free(&buf); dctx->ctxdata.generic = nbuf; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -178,7 +178,7 @@ openssleddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { REQUIRE(alginfo != NULL); if (ctx == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } siglen = alginfo->sig_size; @@ -207,7 +207,7 @@ err: isc_buffer_free(&buf); dctx->ctxdata.generic = NULL; - return (ret); + return ret; } static isc_result_t @@ -224,7 +224,7 @@ openssleddsa_verify(dst_context_t *dctx, const isc_region_t *sig) { REQUIRE(alginfo != NULL); if (ctx == NULL) { - return (dst__openssl_toresult(ISC_R_NOMEMORY)); + return dst__openssl_toresult(ISC_R_NOMEMORY); } if (sig->length != alginfo->sig_size) { @@ -259,7 +259,7 @@ err: isc_buffer_free(&buf); dctx->ctxdata.generic = NULL; - return (ret); + return ret; } static isc_result_t @@ -276,8 +276,8 @@ openssleddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { ctx = EVP_PKEY_CTX_new_id(alginfo->nid, NULL); if (ctx == NULL) { - return (dst__openssl_toresult2("EVP_PKEY_CTX_new_id", - DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult2("EVP_PKEY_CTX_new_id", + DST_R_OPENSSLFAILURE); } status = EVP_PKEY_keygen_init(ctx); @@ -299,7 +299,7 @@ openssleddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { err: EVP_PKEY_CTX_free(ctx); - return (ret); + return ret; } static isc_result_t @@ -315,15 +315,15 @@ openssleddsa_todns(const dst_key_t *key, isc_buffer_t *data) { len = alginfo->key_size; isc_buffer_availableregion(data, &r); if (r.length < len) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (EVP_PKEY_get_raw_public_key(pkey, r.base, &len) != 1) { - return (dst__openssl_toresult(ISC_R_FAILURE)); + return dst__openssl_toresult(ISC_R_FAILURE); } isc_buffer_add(data, len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -338,19 +338,19 @@ openssleddsa_fromdns(dst_key_t *key, isc_buffer_t *data) { isc_buffer_remainingregion(data, &r); if (r.length == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = r.length; ret = raw_key_to_ossl(alginfo, 0, r.base, &len, &pkey); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } isc_buffer_forward(data, len); key->keydata.pkeypair.pub = pkey; key->key_size = len * 8; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -365,12 +365,12 @@ openssleddsa_tofile(const dst_key_t *key, const char *directory) { REQUIRE(alginfo != NULL); if (key->keydata.pkeypair.pub == NULL) { - return (DST_R_NULLKEY); + return DST_R_NULLKEY; } if (key->external) { priv.nelements = 0; - return (dst__privstruct_writefile(key, &priv, directory)); + return dst__privstruct_writefile(key, &priv, directory); } i = 0; @@ -403,7 +403,7 @@ err: if (buf != NULL) { isc_mem_put(key->mctx, buf, len); } - return (ret); + return ret; } static isc_result_t @@ -494,7 +494,7 @@ err: EVP_PKEY_free(pkey); dst__privstruct_free(&priv, mctx); isc_safe_memwipe(&priv, sizeof(priv)); - return (ret); + return ret; } static isc_result_t @@ -522,7 +522,7 @@ openssleddsa_fromlabel(dst_key_t *key, const char *label, const char *pin) { err: EVP_PKEY_free(privpkey); EVP_PKEY_free(pubpkey); - return (ret); + return ret; } static dst_func_t openssleddsa_functions = { @@ -637,7 +637,7 @@ err: EVP_MD_CTX_destroy(evp_md_ctx); } ERR_clear_error(); - return (ret); + return ret; } void diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index b245e76d88..9662e7c93a 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -59,7 +59,7 @@ opensslrsa_components_get(const dst_key_t *key, rsa_components_t *c, EVP_PKEY *priv = key->keydata.pkeypair.priv; if (private && priv == NULL) { - return (DST_R_INVALIDPRIVATEKEY); + return DST_R_INVALIDPRIVATEKEY; } /* * NOTE: Errors regarding private compoments are ignored. @@ -75,17 +75,17 @@ opensslrsa_components_get(const dst_key_t *key, rsa_components_t *c, if (EVP_PKEY_get_bn_param(pub, OSSL_PKEY_PARAM_RSA_E, (BIGNUM **)&c->e) != 1) { - return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult(DST_R_OPENSSLFAILURE); } c->bnfree = true; if (EVP_PKEY_get_bn_param(pub, OSSL_PKEY_PARAM_RSA_N, (BIGNUM **)&c->n) != 1) { - return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult(DST_R_OPENSSLFAILURE); } if (!private) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } (void)EVP_PKEY_get_bn_param(priv, OSSL_PKEY_PARAM_RSA_D, (BIGNUM **)&c->d); @@ -100,26 +100,26 @@ opensslrsa_components_get(const dst_key_t *key, rsa_components_t *c, (void)EVP_PKEY_get_bn_param(priv, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, (BIGNUM **)&c->iqmp); ERR_clear_error(); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else const RSA *rsa = EVP_PKEY_get0_RSA(pub); if (rsa == NULL) { - return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult(DST_R_OPENSSLFAILURE); } RSA_get0_key(rsa, &c->n, &c->e, &c->d); if (c->e == NULL || c->n == NULL) { - return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult(DST_R_OPENSSLFAILURE); } if (!private) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } rsa = EVP_PKEY_get0_RSA(priv); if (rsa == NULL) { - return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); + return dst__openssl_toresult(DST_R_OPENSSLFAILURE); } RSA_get0_factors(rsa, &c->p, &c->q); RSA_get0_crt_params(rsa, &c->dmp1, &c->dmq1, &c->iqmp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } @@ -152,9 +152,9 @@ opensslrsa_valid_key_alg(unsigned int key_alg) { case DST_ALG_NSEC3RSASHA1: case DST_ALG_RSASHA256: case DST_ALG_RSASHA512: - return (true); + return true; default: - return (false); + return false; } } @@ -175,19 +175,19 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) { case DST_ALG_NSEC3RSASHA1: /* From RFC 3110 */ if (dctx->key->key_size > 4096) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } break; case DST_ALG_RSASHA256: /* From RFC 5702 */ if (dctx->key->key_size < 512 || dctx->key->key_size > 4096) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } break; case DST_ALG_RSASHA512: /* From RFC 5702 */ if (dctx->key->key_size < 1024 || dctx->key->key_size > 4096) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } break; default: @@ -196,7 +196,7 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) { evp_md_ctx = EVP_MD_CTX_create(); if (evp_md_ctx == NULL) { - return (dst__openssl_toresult(ISC_R_NOMEMORY)); + return dst__openssl_toresult(ISC_R_NOMEMORY); } switch (dctx->key->key_alg) { @@ -216,12 +216,12 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) { if (!EVP_DigestInit_ex(evp_md_ctx, type, NULL)) { EVP_MD_CTX_destroy(evp_md_ctx); - return (dst__openssl_toresult3( - dctx->category, "EVP_DigestInit_ex", ISC_R_FAILURE)); + return dst__openssl_toresult3( + dctx->category, "EVP_DigestInit_ex", ISC_R_FAILURE); } dctx->ctxdata.evp_md_ctx = evp_md_ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -249,10 +249,10 @@ opensslrsa_adddata(dst_context_t *dctx, const isc_region_t *data) { evp_md_ctx = dctx->ctxdata.evp_md_ctx; if (!EVP_DigestUpdate(evp_md_ctx, data->base, data->length)) { - return (dst__openssl_toresult3( - dctx->category, "EVP_DigestUpdate", ISC_R_FAILURE)); + return dst__openssl_toresult3( + dctx->category, "EVP_DigestUpdate", ISC_R_FAILURE); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -273,17 +273,17 @@ opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { isc_buffer_availableregion(sig, &r); if (r.length < (unsigned int)EVP_PKEY_size(pkey)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (!EVP_SignFinal(evp_md_ctx, r.base, &siglen, pkey)) { - return (dst__openssl_toresult3(dctx->category, "EVP_SignFinal", - ISC_R_FAILURE)); + return dst__openssl_toresult3(dctx->category, "EVP_SignFinal", + ISC_R_FAILURE); } isc_buffer_add(sig, siglen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -294,7 +294,7 @@ opensslrsa_check_exponent_bits(EVP_PKEY *pkey, int maxbits) { if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &e) == 1) { int bits = BN_num_bits(e); BN_free(e); - return (bits < maxbits); + return bits < maxbits; } #else const RSA *rsa = EVP_PKEY_get0_RSA(pkey); @@ -302,11 +302,11 @@ opensslrsa_check_exponent_bits(EVP_PKEY *pkey, int maxbits) { const BIGNUM *ce = NULL; RSA_get0_key(rsa, NULL, &ce, NULL); if (ce != NULL) { - return (BN_num_bits(ce) < maxbits); + return BN_num_bits(ce) < maxbits; } } #endif - return (false); + return false; } static isc_result_t @@ -324,25 +324,24 @@ opensslrsa_verify2(dst_context_t *dctx, int maxbits, const isc_region_t *sig) { pkey = key->keydata.pkeypair.pub; if (maxbits != 0 && !opensslrsa_check_exponent_bits(pkey, maxbits)) { - return (DST_R_VERIFYFAILURE); + return DST_R_VERIFYFAILURE; } status = EVP_VerifyFinal(evp_md_ctx, sig->base, sig->length, pkey); switch (status) { case 1: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case 0: - return (dst__openssl_toresult(DST_R_VERIFYFAILURE)); + return dst__openssl_toresult(DST_R_VERIFYFAILURE); default: - return (dst__openssl_toresult3(dctx->category, - "EVP_VerifyFinal", - DST_R_VERIFYFAILURE)); + return dst__openssl_toresult3(dctx->category, "EVP_VerifyFinal", + DST_R_VERIFYFAILURE); } } static isc_result_t opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) { - return (opensslrsa_verify2(dctx, 0, sig)); + return opensslrsa_verify2(dctx, 0, sig); } #if OPENSSL_VERSION_NUMBER < 0x30000000L @@ -356,7 +355,7 @@ progress_cb(int p, int n, BN_GENCB *cb) { if (fptr != NULL) { fptr(p); } - return (1); + return 1; } static isc_result_t @@ -399,7 +398,7 @@ err: EVP_PKEY_free(pkey); RSA_free(rsa); BN_GENCB_free(cb); - return (ret); + return ret; } static isc_result_t @@ -475,7 +474,7 @@ err: EVP_PKEY_free(pkey); RSA_free(rsa); opensslrsa_components_free(c); - return (ret); + return ret; } #else static int @@ -487,7 +486,7 @@ progress_cb(EVP_PKEY_CTX *ctx) { int p = EVP_PKEY_CTX_get_keygen_info(ctx, 0); fptr(p); } - return (1); + return 1; } static isc_result_t @@ -532,7 +531,7 @@ opensslrsa_generate_pkey_with_uri(size_t key_size, const char *label, ret = ISC_R_SUCCESS; err: EVP_PKEY_CTX_free(ctx); - return (ret); + return ret; } static isc_result_t @@ -542,8 +541,8 @@ opensslrsa_generate_pkey(unsigned int key_size, const char *label, BIGNUM *e, isc_result_t ret; if (label != NULL) { - return (opensslrsa_generate_pkey_with_uri(key_size, label, - retkey)); + return opensslrsa_generate_pkey_with_uri(key_size, label, + retkey); } ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL); @@ -575,7 +574,7 @@ opensslrsa_generate_pkey(unsigned int key_size, const char *label, BIGNUM *e, ret = ISC_R_SUCCESS; err: EVP_PKEY_CTX_free(ctx); - return (ret); + return ret; } static isc_result_t @@ -667,7 +666,7 @@ err: EVP_PKEY_CTX_free(ctx); OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); - return (ret); + return ret; } #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ @@ -728,7 +727,7 @@ opensslrsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { err: EVP_PKEY_free(pkey); BN_free(e); - return (ret); + return ret; } static isc_result_t @@ -780,7 +779,7 @@ opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) { ret = ISC_R_SUCCESS; err: opensslrsa_components_free(&c); - return (ret); + return ret; } static isc_result_t @@ -831,7 +830,7 @@ opensslrsa_fromdns(dst_key_t *key, isc_buffer_t *data) { err: opensslrsa_components_free(&c); - return (ret); + return ret; } static isc_result_t @@ -843,7 +842,7 @@ opensslrsa_tofile(const dst_key_t *key, const char *directory) { rsa_components_t c = { 0 }; if (key->external) { - return (dst__privstruct_writefile(key, &priv, directory)); + return dst__privstruct_writefile(key, &priv, directory); } ret = opensslrsa_components_get(key, &c, true); @@ -945,7 +944,7 @@ err: } opensslrsa_components_free(&c); - return (ret); + return ret; } static isc_result_t @@ -1092,7 +1091,7 @@ err: dst__privstruct_free(&priv, mctx); isc_safe_memwipe(&priv, sizeof(priv)); - return (ret); + return ret; } static isc_result_t @@ -1120,7 +1119,7 @@ opensslrsa_fromlabel(dst_key_t *key, const char *label, const char *pin) { err: EVP_PKEY_free(privpkey); EVP_PKEY_free(pubpkey); - return (ret); + return ret; } static dst_func_t opensslrsa_functions = { @@ -1278,7 +1277,7 @@ err: EVP_PKEY_free(pkey); EVP_MD_CTX_destroy(evp_md_ctx); ERR_clear_error(); - return (ret); + return ret; } void diff --git a/lib/dns/order.c b/lib/dns/order.c index 477576c9e7..1a012679a1 100644 --- a/lib/dns/order.c +++ b/lib/dns/order.c @@ -63,7 +63,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) { isc_mem_attach(mctx, &order->mctx); order->magic = DNS_ORDER_MAGIC; *orderp = order; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -87,15 +87,15 @@ dns_order_add(dns_order_t *order, const dns_name_t *name, ent->mode = mode; ISC_LINK_INIT(ent, link); ISC_LIST_INITANDAPPEND(order->ents, ent, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool match(const dns_name_t *name1, const dns_name_t *name2) { if (dns_name_iswildcard(name2)) { - return (dns_name_matcheswildcard(name1, name2)); + return dns_name_matcheswildcard(name1, name2); } - return (dns_name_equal(name1, name2)); + return dns_name_equal(name1, name2); } unsigned int @@ -116,10 +116,10 @@ dns_order_find(dns_order_t *order, const dns_name_t *name, continue; } if (match(name, dns_fixedname_name(&ent->name))) { - return (ent->mode); + return ent->mode; } } - return (DNS_RDATASETATTR_NONE); + return DNS_RDATASETATTR_NONE; } void diff --git a/lib/dns/peer.c b/lib/dns/peer.c index 41bd2426fa..a7b56258b9 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -125,7 +125,7 @@ dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) { *list = l; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -231,7 +231,7 @@ dns_peerlist_peerbyaddr(dns_peerlist_t *servers, const isc_netaddr_t *addr, res = ISC_R_NOTFOUND; } - return (res); + return res; } isc_result_t @@ -242,7 +242,7 @@ dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) { dns_peer_attach(p, retval); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -261,7 +261,7 @@ dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *addr, dns_peer_t **peerptr) { UNREACHABLE(); } - return (dns_peer_newprefix(mem, addr, prefixlen, peerptr)); + return dns_peer_newprefix(mem, addr, prefixlen, peerptr); } isc_result_t @@ -287,7 +287,7 @@ dns_peer_newprefix(isc_mem_t *mem, const isc_netaddr_t *addr, *peerptr = peer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -478,7 +478,7 @@ dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) { *retval = peer->key; } - return (peer->key == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS); + return peer->key == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS; } isc_result_t @@ -494,7 +494,7 @@ dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval) { peer->key = *keyval; *keyval = NULL; - return (exists ? ISC_R_EXISTS : ISC_R_SUCCESS); + return exists ? ISC_R_EXISTS : ISC_R_SUCCESS; } isc_result_t @@ -510,7 +510,7 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) { result = dns_name_fromtext(dns_fixedname_name(&fname), &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } name = isc_mem_get(peer->mem, sizeof(dns_name_t)); @@ -523,5 +523,5 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) { isc_mem_put(peer->mem, name, sizeof(dns_name_t)); } - return (result); + return result; } diff --git a/lib/dns/private.c b/lib/dns/private.c index a6bd714e8c..b1718fbdb1 100644 --- a/lib/dns/private.c +++ b/lib/dns/private.c @@ -80,7 +80,7 @@ ignore(dns_rdata_t *param, dns_rdataset_t *privateset) { * doesn't matter if we are removing this one. */ if (CREATE(rdata.data[1])) { - return (false); + return false; } if (rdata.data[0] != param->data[0] || rdata.data[2] != param->data[2] || @@ -96,11 +96,11 @@ ignore(dns_rdata_t *param, dns_rdataset_t *privateset) { * the caller that it will be removed. */ if (NONSEC(rdata.data[1])) { - return (false); + return false; } - return (true); + return true; } - return (false); + return false; } isc_result_t @@ -330,7 +330,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } isc_result_t @@ -338,7 +338,7 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { isc_result_t result; if (private->length < 5) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (private->data[0] == 0) { @@ -406,11 +406,11 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { snprintf(keybuf, sizeof(keybuf), "key %d/%s", keyid, algbuf); isc_buffer_putstr(buf, keybuf); } else { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_buffer_putuint8(buf, 0); result = ISC_R_SUCCESS; failure: - return (result); + return result; } diff --git a/lib/dns/qp.c b/lib/dns/qp.c index bab8db89b7..888d8f5653 100644 --- a/lib/dns/qp.c +++ b/lib/dns/qp.c @@ -219,7 +219,7 @@ dns_qpkey_fromname(dns_qpkey_t key, const dns_name_t *name) { if (name->labels == 0) { key[0] = SHIFT_NOBYTE; - return (0); + return 0; } if (name->offsets == NULL) { @@ -246,7 +246,7 @@ dns_qpkey_fromname(dns_qpkey_t key, const dns_name_t *name) { /* mark end with a double NOBYTE */ key[len] = SHIFT_NOBYTE; ENSURE(len < sizeof(dns_qpkey_t)); - return (len); + return len; } void @@ -353,10 +353,10 @@ qpkey_compare(const dns_qpkey_t key_a, const size_t keylen_a, if (qpkey_bit(key_a, keylen_a, offset) != qpkey_bit(key_b, keylen_b, offset)) { - return (offset); + return offset; } } - return (QPKEY_EQUAL); + return QPKEY_EQUAL; } /*********************************************************************** @@ -377,7 +377,7 @@ qpkey_compare(const dns_qpkey_t key_a, const size_t keylen_a, static size_t chunk_size_raw(void) { size_t size = (size_t)sysconf(_SC_PAGE_SIZE); - return (ISC_MAX(size, QP_CHUNK_BYTES)); + return ISC_MAX(size, QP_CHUNK_BYTES); } static void * @@ -387,9 +387,9 @@ chunk_get_raw(dns_qp_t *qp) { void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); RUNTIME_CHECK(ptr != MAP_FAILED); - return (ptr); + return ptr; } else { - return (isc_mem_allocate(qp->mctx, QP_CHUNK_BYTES)); + return isc_mem_allocate(qp->mctx, QP_CHUNK_BYTES); } } @@ -405,9 +405,9 @@ chunk_free_raw(dns_qp_t *qp, void *ptr) { static void * chunk_shrink_raw(dns_qp_t *qp, void *ptr, size_t bytes) { if (qp->write_protect) { - return (ptr); + return ptr; } else { - return (isc_mem_reallocate(qp->mctx, ptr, bytes)); + return isc_mem_reallocate(qp->mctx, ptr, bytes); } } @@ -450,9 +450,9 @@ cells_immutable(dns_qp_t *qp, dns_qpref_t ref) { dns_qpchunk_t chunk = ref_chunk(ref); dns_qpcell_t cell = ref_cell(ref); if (chunk == qp->bump) { - return (cell < qp->fender); + return cell < qp->fender; } else { - return (qp->usage[chunk].immutable); + return qp->usage[chunk].immutable; } } @@ -474,7 +474,7 @@ chunk_alloc(dns_qp_t *qp, dns_qpchunk_t chunk, dns_qpweight_t size) { if (qp->write_protect) { TRACE("chunk %u base %p", chunk, qp->base->ptr[chunk]); } - return (make_ref(chunk, 0)); + return make_ref(chunk, 0); } /* @@ -522,12 +522,12 @@ alloc_slow(dns_qp_t *qp, dns_qpweight_t size) { for (chunk = 0; chunk < qp->chunk_max; chunk++) { if (!qp->usage[chunk].exists) { - return (chunk_alloc(qp, chunk, size)); + return chunk_alloc(qp, chunk, size); } } ENSURE(chunk == qp->chunk_max); realloc_chunk_arrays(qp, GROWTH_FACTOR(chunk)); - return (chunk_alloc(qp, chunk, size)); + return chunk_alloc(qp, chunk, size); } /* @@ -549,9 +549,9 @@ alloc_twigs(dns_qp_t *qp, dns_qpweight_t size) { if (cell + size <= QP_CHUNK_SIZE) { qp->usage[chunk].used += size; qp->used_count += size; - return (make_ref(chunk, cell)); + return make_ref(chunk, cell); } else { - return (alloc_slow(qp, size)); + return alloc_slow(qp, size); } } @@ -577,10 +577,10 @@ free_twigs(dns_qp_t *qp, dns_qpref_t twigs, dns_qpweight_t size) { if (cells_immutable(qp, twigs)) { qp->hold_count += size; ENSURE(qp->free_count >= qp->hold_count); - return (false); + return false; } else { zero_twigs(ref_ptr(qp, twigs), size); - return (true); + return true; } } @@ -608,7 +608,7 @@ attach_twigs(dns_qp_t *qp, dns_qpnode_t *twigs, dns_qpweight_t size) { */ static inline dns_qpcell_t chunk_usage(dns_qp_t *qp, dns_qpchunk_t chunk) { - return (qp->usage[chunk].used - qp->usage[chunk].free); + return qp->usage[chunk].used - qp->usage[chunk].free; } /* @@ -852,7 +852,7 @@ evacuate(dns_qp_t *qp, dns_qpnode_t *n) { attach_twigs(qp, new_twigs, size); } - return (new_ref); + return new_ref; } /* @@ -867,7 +867,7 @@ make_root_mutable(dns_qp_t *qp) { if (cells_immutable(qp, qp->root_ref)) { qp->root_ref = evacuate(qp, MOVABLE_ROOT(qp)); } - return (ref_ptr(qp, qp->root_ref)); + return ref_ptr(qp, qp->root_ref); } static inline void @@ -922,7 +922,7 @@ compact_recursive(dns_qp_t *qp, dns_qpnode_t *parent) { } *child = make_node(branch_index(child), new_grandtwigs); } - return (twigs_ref); + return twigs_ref; } static void @@ -1007,7 +1007,7 @@ squash_twigs(dns_qp_t *qp, dns_qpref_t twigs, dns_qpweight_t size) { qp->compact_all = true; } } - return (destroyed); + return destroyed; } /*********************************************************************** @@ -1045,7 +1045,7 @@ dns_qp_memusage(dns_qp_t *qp) { qp->chunk_max * sizeof(qp->base->ptr[0]) + qp->chunk_max * sizeof(qp->usage[0]); - return (memusage); + return memusage; } dns_qp_memusage_t @@ -1065,7 +1065,7 @@ dns_qpmulti_memusage(dns_qpmulti_t *multi) { } UNLOCK(&multi->mutex); - return (memusage); + return memusage; } void @@ -1114,7 +1114,7 @@ transaction_open(dns_qpmulti_t *multi, dns_qp_t **qptp) { qp->hold_count = qp->free_count; *qptp = qp; - return (qp); + return qp; } /* @@ -1320,7 +1320,7 @@ reader_open(dns_qpmulti_t *multi, dns_qpreadable_t qpr) { } else { multi = unpack_reader(qp, reader); } - return (multi); + return multi; } /* @@ -1583,7 +1583,7 @@ dns_qp_insert(dns_qp_t *qp, void *pval, uint32_t ival) { attach_leaf(qp, new_twigs); qp->leaf_count++; qp->root_ref = new_ref; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1607,7 +1607,7 @@ dns_qp_insert(dns_qp_t *qp, void *pval, uint32_t ival) { old_keylen = leaf_qpkey(qp, n, old_key); offset = qpkey_compare(new_key, new_keylen, old_key, old_keylen); if (offset == QPKEY_EQUAL) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } new_bit = qpkey_bit(new_key, new_keylen, offset); old_bit = qpkey_bit(old_key, old_keylen, offset); @@ -1648,7 +1648,7 @@ newbranch: attach_leaf(qp, &new_leaf); qp->leaf_count++; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; growbranch: INSIST(!branch_has_twig(n, new_bit)); @@ -1680,7 +1680,7 @@ growbranch: } qp->leaf_count++; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1690,7 +1690,7 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key, REQUIRE(search_keylen < sizeof(dns_qpkey_t)); if (get_root(qp) == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_qpshift_t bit = 0; /* suppress warning */ @@ -1700,7 +1700,7 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key, prefetch_twigs(qp, n); bit = branch_keybit(n, search_key, search_keylen); if (!branch_has_twig(n, bit)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } make_twigs_mutable(qp, n); parent = n; @@ -1712,7 +1712,7 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key, if (qpkey_compare(search_key, search_keylen, found_key, found_keylen) != QPKEY_EQUAL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } SET_IF_NOT_NULL(pval_r, leaf_pval(n)); @@ -1726,7 +1726,7 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key, INSIST(n == get_root(qp)); free_twigs(qp, qp->root_ref, 1); qp->root_ref = INVALID_REF; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* step back to parent node */ @@ -1755,7 +1755,7 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key, squash_twigs(qp, ref + size - 1, 1); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1763,7 +1763,7 @@ dns_qp_deletename(dns_qp_t *qp, const dns_name_t *name, void **pval_r, uint32_t *ival_r) { dns_qpkey_t key; size_t keylen = dns_qpkey_fromname(key, name); - return (dns_qp_deletekey(qp, key, keylen, pval_r, ival_r)); + return dns_qp_deletekey(qp, key, keylen, pval_r, ival_r); } /*********************************************************************** @@ -1799,7 +1799,7 @@ unsigned int dns_qpchain_length(dns_qpchain_t *chain) { REQUIRE(QPCHAIN_VALID(chain)); - return (chain->len); + return chain->len; } void @@ -1846,7 +1846,7 @@ last_twig(dns_qpiter_t *qpi, bool forward) { max = branch_twigs_size(parent) - 1; } } - return (pos == max); + return pos == max; } /* @@ -1868,7 +1868,7 @@ iterate(bool forward, dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, node = get_root(qp); if (node == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } do { @@ -1896,7 +1896,7 @@ iterate(bool forward, dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, * the iterator, then return ISC_R_NOMORE. */ dns_qpiter_init(qpi->qp, qpi); - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -1932,19 +1932,19 @@ iterate(bool forward, dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, SET_IF_NOT_NULL(pval_r, leaf_pval(node)); SET_IF_NOT_NULL(ival_r, leaf_ival(node)); maybe_set_name(qpi->qp, node, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_qpiter_next(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, uint32_t *ival_r) { - return (iterate(true, qpi, name, pval_r, ival_r)); + return iterate(true, qpi, name, pval_r, ival_r); } isc_result_t dns_qpiter_prev(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, uint32_t *ival_r) { - return (iterate(false, qpi, name, pval_r, ival_r)); + return iterate(false, qpi, name, pval_r, ival_r); } isc_result_t @@ -1956,13 +1956,13 @@ dns_qpiter_current(dns_qpiter_t *qpi, dns_name_t *name, void **pval_r, node = qpi->stack[qpi->sp]; if (node == NULL || is_branch(node)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } SET_IF_NOT_NULL(pval_r, leaf_pval(node)); SET_IF_NOT_NULL(ival_r, leaf_ival(node)); maybe_set_name(qpi->qp, node, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*********************************************************************** @@ -1984,14 +1984,14 @@ dns_qp_getkey(dns_qpreadable_t qpr, const dns_qpkey_t search_key, n = get_root(qp); if (n == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } while (is_branch(n)) { prefetch_twigs(qp, n); bit = branch_keybit(n, search_key, search_keylen); if (!branch_has_twig(n, bit)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } n = branch_twig_ptr(qp, n, bit); } @@ -2000,12 +2000,12 @@ dns_qp_getkey(dns_qpreadable_t qpr, const dns_qpkey_t search_key, if (qpkey_compare(search_key, search_keylen, found_key, found_keylen) != QPKEY_EQUAL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } SET_IF_NOT_NULL(pval_r, leaf_pval(n)); SET_IF_NOT_NULL(ival_r, leaf_ival(n)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2013,7 +2013,7 @@ dns_qp_getname(dns_qpreadable_t qpr, const dns_name_t *name, void **pval_r, uint32_t *ival_r) { dns_qpkey_t key; size_t keylen = dns_qpkey_fromname(key, name); - return (dns_qp_getkey(qpr, key, keylen, pval_r, ival_r)); + return dns_qp_getkey(qpr, key, keylen, pval_r, ival_r); } static inline void @@ -2053,7 +2053,7 @@ anyleaf(dns_qpreader_t *qp, dns_qpnode_t *n) { while (is_branch(n)) { n = branch_twigs(qp, n); } - return (n); + return n; } static inline int @@ -2061,9 +2061,9 @@ twig_offset(dns_qpnode_t *n, dns_qpshift_t sbit, dns_qpshift_t kbit, dns_qpshift_t fbit) { dns_qpweight_t pos = branch_twig_pos(n, sbit); if (branch_has_twig(n, sbit)) { - return (pos - (kbit < fbit)); + return pos - (kbit < fbit); } - return (pos - 1); + return pos - 1; } /* @@ -2218,7 +2218,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, n = get_root(qp); if (n == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } iter->stack[0] = n; @@ -2306,7 +2306,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, SET_IF_NOT_NULL(pval_r, leaf_pval(n)); SET_IF_NOT_NULL(ival_r, leaf_ival(n)); maybe_set_name(qp, n, foundname); - return (result); + return result; } /* @@ -2320,7 +2320,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, SET_IF_NOT_NULL(pval_r, leaf_pval(n)); SET_IF_NOT_NULL(ival_r, leaf_ival(n)); maybe_set_name(qp, n, foundname); - return (DNS_R_PARTIALMATCH); + return DNS_R_PARTIALMATCH; } else { /* * oops, during the search we found and added @@ -2332,7 +2332,7 @@ dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, } /* nothing was found at all */ - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /**********************************************************************/ diff --git a/lib/dns/qp_p.h b/lib/dns/qp_p.h index a6cf41f996..d7c65131e7 100644 --- a/lib/dns/qp_p.h +++ b/lib/dns/qp_p.h @@ -196,17 +196,17 @@ STATIC_ASSERT(6 <= QP_CHUNK_LOG && QP_CHUNK_LOG <= 20, static inline dns_qpref_t make_ref(dns_qpchunk_t chunk, dns_qpcell_t cell) { - return (QP_CHUNK_SIZE * chunk + cell); + return QP_CHUNK_SIZE * chunk + cell; } static inline dns_qpchunk_t ref_chunk(dns_qpref_t ref) { - return (ref / QP_CHUNK_SIZE); + return ref / QP_CHUNK_SIZE; } static inline dns_qpcell_t ref_cell(dns_qpref_t ref) { - return (ref % QP_CHUNK_SIZE); + return ref % QP_CHUNK_SIZE; } /* @@ -330,8 +330,8 @@ typedef struct qp_rcuctx { static inline bool qpbase_unref(dns_qpreadable_t qpr) { dns_qpreader_t *qp = dns_qpreader(qpr); - return (qp->base != NULL && - isc_refcount_decrement(&qp->base->refcount) == 1); + return qp->base != NULL && + isc_refcount_decrement(&qp->base->refcount) == 1; } /* @@ -341,7 +341,7 @@ qpbase_unref(dns_qpreadable_t qpr) { static inline dns_qpnode_t * ref_ptr(dns_qpreadable_t qpr, dns_qpref_t ref) { dns_qpreader_t *qp = dns_qpreader(qpr); - return (qp->base->ptr[ref_chunk(ref)] + ref_cell(ref)); + return qp->base->ptr[ref_chunk(ref)] + ref_cell(ref); } /*********************************************************************** @@ -544,7 +544,7 @@ static inline uint64_t node64(dns_qpnode_t *n) { uint64_t lo = n->biglo; uint64_t hi = n->bighi; - return (lo | (hi << 32)); + return lo | (hi << 32); } /* @@ -552,7 +552,7 @@ node64(dns_qpnode_t *n) { */ static inline uint32_t node32(dns_qpnode_t *n) { - return (n->small); + return n->small; } /* @@ -560,11 +560,11 @@ node32(dns_qpnode_t *n) { */ static inline dns_qpnode_t make_node(uint64_t big, uint32_t small) { - return ((dns_qpnode_t){ + return (dns_qpnode_t){ .biglo = (uint32_t)(big), .bighi = (uint32_t)(big >> 32), .small = small, - }); + }; } /* @@ -573,7 +573,7 @@ make_node(uint64_t big, uint32_t small) { */ static inline void * node_pointer(dns_qpnode_t *n) { - return ((void *)(uintptr_t)(node64(n) & ~TAG_MASK)); + return (void *)(uintptr_t)(node64(n) & ~TAG_MASK); } /* @@ -581,7 +581,7 @@ node_pointer(dns_qpnode_t *n) { */ static inline uint32_t node_tag(dns_qpnode_t *n) { - return (n->biglo & TAG_MASK); + return n->biglo & TAG_MASK; } /* @@ -589,7 +589,7 @@ node_tag(dns_qpnode_t *n) { */ static inline bool is_branch(dns_qpnode_t *n) { - return (n->biglo & BRANCH_TAG); + return n->biglo & BRANCH_TAG; } /* leaf nodes *********************************************************/ @@ -599,7 +599,7 @@ is_branch(dns_qpnode_t *n) { */ static inline void * leaf_pval(dns_qpnode_t *n) { - return (node_pointer(n)); + return node_pointer(n); } /* @@ -607,7 +607,7 @@ leaf_pval(dns_qpnode_t *n) { */ static inline uint32_t leaf_ival(dns_qpnode_t *n) { - return (node32(n)); + return node32(n); } /* @@ -617,7 +617,7 @@ static inline dns_qpnode_t make_leaf(const void *pval, uint32_t ival) { dns_qpnode_t leaf = make_node((uintptr_t)pval, ival); REQUIRE(node_tag(&leaf) == LEAF_TAG); - return (leaf); + return leaf; } /* branch nodes *******************************************************/ @@ -633,7 +633,7 @@ make_leaf(const void *pval, uint32_t ival) { */ static inline uint64_t branch_index(dns_qpnode_t *n) { - return (node64(n)); + return node64(n); } /* @@ -641,7 +641,7 @@ branch_index(dns_qpnode_t *n) { */ static inline dns_qpref_t branch_twigs_ref(dns_qpnode_t *n) { - return (node32(n)); + return node32(n); } /* @@ -651,9 +651,9 @@ branch_twigs_ref(dns_qpnode_t *n) { static inline dns_qpshift_t qpkey_bit(const dns_qpkey_t key, size_t len, size_t offset) { if (offset < len) { - return (key[offset]); + return key[offset]; } else { - return (SHIFT_NOBYTE); + return SHIFT_NOBYTE; } } @@ -662,7 +662,7 @@ qpkey_bit(const dns_qpkey_t key, size_t len, size_t offset) { */ static inline size_t branch_key_offset(dns_qpnode_t *n) { - return ((size_t)(branch_index(n) >> SHIFT_OFFSET)); + return (size_t)(branch_index(n) >> SHIFT_OFFSET); } /* @@ -670,7 +670,7 @@ branch_key_offset(dns_qpnode_t *n) { */ static inline dns_qpshift_t branch_keybit(dns_qpnode_t *n, const dns_qpkey_t key, size_t len) { - return (qpkey_bit(key, len, branch_key_offset(n))); + return qpkey_bit(key, len, branch_key_offset(n)); } /* @@ -679,7 +679,7 @@ branch_keybit(dns_qpnode_t *n, const dns_qpkey_t key, size_t len) { */ static inline dns_qpnode_t * branch_twigs(dns_qpreadable_t qpr, dns_qpnode_t *n) { - return (ref_ptr(qpr, branch_twigs_ref(n))); + return ref_ptr(qpr, branch_twigs_ref(n)); } /* @@ -699,9 +699,9 @@ static inline dns_qpnode_t * get_root(dns_qpreadable_t qpr) { dns_qpreader_t *qp = dns_qpreader(qpr); if (qp->root_ref == INVALID_REF) { - return (NULL); + return NULL; } else { - return (ref_ptr(qp, qp->root_ref)); + return ref_ptr(qp, qp->root_ref); } } @@ -734,7 +734,7 @@ static inline dns_qpweight_t branch_count_bitmap_before(dns_qpnode_t *n, dns_qpshift_t bit) { uint64_t mask = (1ULL << bit) - 1 - TAG_MASK; uint64_t bitmap = branch_index(n) & mask; - return ((dns_qpweight_t)__builtin_popcountll(bitmap)); + return (dns_qpweight_t)__builtin_popcountll(bitmap); } /* @@ -745,7 +745,7 @@ branch_count_bitmap_before(dns_qpnode_t *n, dns_qpshift_t bit) { */ static inline dns_qpweight_t branch_twigs_size(dns_qpnode_t *n) { - return (branch_count_bitmap_before(n, SHIFT_OFFSET)); + return branch_count_bitmap_before(n, SHIFT_OFFSET); } /* @@ -753,7 +753,7 @@ branch_twigs_size(dns_qpnode_t *n) { */ static inline dns_qpweight_t branch_twig_pos(dns_qpnode_t *n, dns_qpshift_t bit) { - return (branch_count_bitmap_before(n, bit)); + return branch_count_bitmap_before(n, bit); } /* @@ -761,7 +761,7 @@ branch_twig_pos(dns_qpnode_t *n, dns_qpshift_t bit) { */ static inline dns_qpnode_t * branch_twig_ptr(dns_qpreadable_t qpr, dns_qpnode_t *n, dns_qpshift_t bit) { - return (ref_ptr(qpr, branch_twigs_ref(n) + branch_twig_pos(n, bit))); + return ref_ptr(qpr, branch_twigs_ref(n) + branch_twig_pos(n, bit)); } /* @@ -769,7 +769,7 @@ branch_twig_ptr(dns_qpreadable_t qpr, dns_qpnode_t *n, dns_qpshift_t bit) { */ static inline bool branch_has_twig(dns_qpnode_t *n, dns_qpshift_t bit) { - return (branch_index(n) & (1ULL << bit)); + return branch_index(n) & (1ULL << bit); } /* twig logistics *****************************************************/ @@ -833,10 +833,10 @@ make_reader(dns_qpnode_t *reader, dns_qpmulti_t *multi) { static inline bool reader_valid(dns_qpnode_t *reader) { - return (reader != NULL && // - node_tag(&reader[0]) == READER_TAG && - node_tag(&reader[1]) == READER_TAG && - node32(&reader[0]) == QPREADER_MAGIC); + return reader != NULL && // + node_tag(&reader[0]) == READER_TAG && + node_tag(&reader[1]) == READER_TAG && + node32(&reader[0]) == QPREADER_MAGIC; } /* @@ -857,7 +857,7 @@ unpack_reader(dns_qpreader_t *qp, dns_qpnode_t *reader) { .root_ref = node32(&reader[1]), .base = base, }; - return (multi); + return multi; } /*********************************************************************** @@ -883,14 +883,14 @@ leaf_qpkey(dns_qpreadable_t qpr, dns_qpnode_t *n, dns_qpkey_t key) { size_t len = qp->methods->makekey(key, qp->uctx, leaf_pval(n), leaf_ival(n)); INSIST(len < sizeof(dns_qpkey_t)); - return (len); + return len; } static inline char * triename(dns_qpreadable_t qpr, char *buf, size_t size) { dns_qpreader_t *qp = dns_qpreader(qpr); qp->methods->triename(qp->uctx, buf, size); - return (buf); + return buf; } #define TRIENAME(qp) \ @@ -909,7 +909,7 @@ triename(dns_qpreadable_t qpr, char *buf, size_t size) { */ static inline bool qp_common_character(uint8_t byte) { - return (('-' <= byte && byte <= '9') || ('_' <= byte && byte <= 'z')); + return ('-' <= byte && byte <= '9') || ('_' <= byte && byte <= 'z'); } /* diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c index 8cd92b8ee3..3d890c3133 100644 --- a/lib/dns/qpcache.c +++ b/lib/dns/qpcache.c @@ -322,7 +322,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { qpcnode_t *data = pval; - return (dns_qpkey_fromname(key, &data->name)); + return dns_qpkey_fromname(key, &data->name); } static void @@ -451,7 +451,7 @@ need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) { DNS_SLABHEADERATTR_ANCIENT | DNS_SLABHEADERATTR_ZEROTTL)) != 0) { - return (false); + return false; } #if DNS_QPDB_LIMITLRUUPDATE @@ -464,18 +464,18 @@ need_headerupdate(dns_slabheader_t *header, isc_stdtime_t now) { * Glue records are updated if at least DNS_QPDB_LRUUPDATE_GLUE * seconds have passed since the previous update time. */ - return (header->last_used + DNS_QPDB_LRUUPDATE_GLUE <= now); + return header->last_used + DNS_QPDB_LRUUPDATE_GLUE <= now; } /* * Other records are updated if DNS_QPDB_LRUUPDATE_REGULAR seconds * have passed. */ - return (header->last_used + DNS_QPDB_LRUUPDATE_REGULAR <= now); + return header->last_used + DNS_QPDB_LRUUPDATE_REGULAR <= now; #else UNUSED(now); - return (true); + return true; #endif /* if DNS_QPDB_LIMITLRUUPDATE */ } @@ -714,7 +714,7 @@ decref(qpcache_t *qpdb, qpcnode_t *node, isc_rwlocktype_t *nlocktypep, } qpcnode_unref(node); - return (no_reference); + return no_reference; } /* Upgrade the lock? */ @@ -730,7 +730,7 @@ decref(qpcache_t *qpdb, qpcnode_t *node, isc_rwlocktype_t *nlocktypep, if (refs > 1) { qpcnode_unref(node); - return (false); + return false; } INSIST(refs == 1); @@ -815,7 +815,7 @@ restore_locks: } qpcnode_unref(node); - return (true); + return true; } static void @@ -1134,9 +1134,9 @@ setup_delegation(qpc_search_t *search, dns_dbnode_t **nodep, } if (type == dns_rdatatype_dname) { - return (DNS_R_DNAME); + return DNS_R_DNAME; } - return (DNS_R_DELEGATION); + return DNS_R_DELEGATION; } static bool @@ -1184,7 +1184,7 @@ check_stale_header(qpcnode_t *node, dns_slabheader_t *header, DNS_SLABHEADER_SETATTR( header, DNS_SLABHEADERATTR_STALE_WINDOW); - return (false); + return false; } else if ((search->options & DNS_DBFIND_STALETIMEOUT) != 0) { @@ -1192,9 +1192,9 @@ check_stale_header(qpcnode_t *node, dns_slabheader_t *header, * We want stale RRset due to timeout, so we * don't skip it. */ - return (false); + return false; } - return ((search->options & DNS_DBFIND_STALEOK) == 0); + return (search->options & DNS_DBFIND_STALEOK) == 0; } /* @@ -1240,9 +1240,9 @@ check_stale_header(qpcnode_t *node, dns_slabheader_t *header, } else { *header_prev = header; } - return (true); + return true; } - return (false); + return false; } static isc_result_t @@ -1305,7 +1305,7 @@ check_zonecut(qpcnode_t *node, void *arg DNS__DB_FLARG) { NODE_UNLOCK(lock, &nlocktype); - return (result); + return result; } static isc_result_t @@ -1419,7 +1419,7 @@ find_deepest_zonecut(qpc_search_t *search, qpcnode_t *node, } } - return (result); + return result; } /* @@ -1452,7 +1452,7 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name, result = dns_qp_lookup(search->qpdb->nsec, name, NULL, &iter, NULL, (void **)&node, NULL); if (result != DNS_R_PARTIALMATCH) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } fname = dns_fixedname_initname(&fixed); @@ -1465,7 +1465,7 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name, */ result = dns_qpiter_current(&iter, predecessor, NULL, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -1475,7 +1475,7 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name, result = dns_qp_getname(search->qpdb->tree, predecessor, (void **)&node, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_copy(&node->name, fname); @@ -1525,7 +1525,7 @@ find_coveringnsec(qpc_search_t *search, const dns_name_t *name, result = ISC_R_NOTFOUND; } NODE_UNLOCK(lock, &nlocktype); - return (result); + return result; } static isc_result_t @@ -1970,7 +1970,7 @@ tree_exit: } update_cachestats(search.qpdb, result); - return (result); + return result; } static isc_result_t @@ -2145,7 +2145,7 @@ tree_exit: result = ISC_R_SUCCESS; } - return (result); + return result; } static isc_result_t @@ -2231,7 +2231,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, NODE_UNLOCK(lock, &nlocktype); if (found == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (NEGATIVE(found)) { @@ -2247,7 +2247,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, update_cachestats(qpdb, result); - return (result); + return result; } static isc_result_t @@ -2258,7 +2258,7 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(stats != NULL); isc_stats_attach(stats, &qpdb->cachestats); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static dns_stats_t * @@ -2267,7 +2267,7 @@ getrrsetstats(dns_db_t *db) { REQUIRE(VALID_QPDB(qpdb)); - return (qpdb->rrsetstats); + return qpdb->rrsetstats; } static isc_result_t @@ -2278,7 +2278,7 @@ setservestalettl(dns_db_t *db, dns_ttl_t ttl) { /* currently no bounds checking. 0 means disable. */ qpdb->common.serve_stale_ttl = ttl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2288,7 +2288,7 @@ getservestalettl(dns_db_t *db, dns_ttl_t *ttl) { REQUIRE(VALID_QPDB(qpdb)); *ttl = qpdb->common.serve_stale_ttl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2299,7 +2299,7 @@ setservestalerefresh(dns_db_t *db, uint32_t interval) { /* currently no bounds checking. 0 means disable. */ qpdb->serve_stale_refresh = interval; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2309,7 +2309,7 @@ getservestalerefresh(dns_db_t *db, uint32_t *interval) { REQUIRE(VALID_QPDB(qpdb)); *interval = qpdb->serve_stale_refresh; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2330,11 +2330,11 @@ expiredata(dns_db_t *db, dns_dbnode_t *node, void *data) { static size_t rdataset_size(dns_slabheader_t *header) { if (!NONEXISTENT(header)) { - return (dns_rdataslab_size((unsigned char *)header, - sizeof(*header))); + return dns_rdataslab_size((unsigned char *)header, + sizeof(*header)); } - return (sizeof(*header)); + return sizeof(*header); } static size_t @@ -2364,7 +2364,7 @@ expire_lru_headers(qpcache_t *qpdb, unsigned int locknum, purged += header_size; } - return (purged); + return purged; } /*% @@ -2443,7 +2443,7 @@ ttl_sooner(void *v1, void *v2) { dns_slabheader_t *h1 = v1; dns_slabheader_t *h2 = v2; - return (h1->ttl < h2->ttl); + return h1->ttl < h2->ttl; } /*% @@ -2675,7 +2675,7 @@ new_qpcnode(qpcache_t *qpdb, const dns_name_t *name) { fprintf(stderr, "new_qpcnode:%s:%s:%d:%p->references = 1\n", __func__, __FILE__, __LINE__ + 1, name); #endif - return (newdata); + return newdata; } static isc_result_t @@ -2711,7 +2711,7 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, unlock: TREE_UNLOCK(&qpdb->tree_lock, &tlocktype); - return (result); + return result; } static void @@ -2804,7 +2804,7 @@ createiterator(dns_db_t *db, unsigned int options ISC_ATTR_UNUSED, dns_qpiter_init(qpdb->tree, &qpdbiter->iter); *iteratorp = (dns_dbiterator_t *)qpdbiter; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2839,25 +2839,25 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, *iteratorp = (dns_rdatasetiter_t *)iterator; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool overmaxtype(qpcache_t *qpdb, uint32_t ntypes) { if (qpdb->maxtypepername == 0) { - return (false); + return false; } - return (ntypes >= qpdb->maxtypepername); + return ntypes >= qpdb->maxtypepername; } static bool prio_header(dns_slabheader_t *header) { if (NEGATIVE(header) && prio_type(DNS_TYPEPAIR_COVERS(header->type))) { - return (true); + return true; } - return (prio_type(header->type)); + return prio_type(header->type); } static isc_result_t @@ -2963,7 +2963,7 @@ add(qpcache_t *qpdb, qpcnode_t *qpnode, addedrdataset DNS__DB_FLARG_PASS); } - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* * The new rdataset is better. Expire the @@ -3014,7 +3014,7 @@ find_header: */ if (header_nx && newheader_nx) { dns_slabheader_destroy(&newheader); - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* @@ -3032,7 +3032,7 @@ find_header: nlocktype, tlocktype, addedrdataset DNS__DB_FLARG_PASS); } - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* @@ -3086,7 +3086,7 @@ find_header: nlocktype, tlocktype, addedrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3148,7 +3148,7 @@ find_header: nlocktype, tlocktype, addedrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (loading) { @@ -3217,7 +3217,7 @@ find_header: */ if (newheader_nx) { dns_slabheader_destroy(&newheader); - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } idx = HEADERNODE(newheader)->locknum; @@ -3299,7 +3299,7 @@ find_header: addedrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -3338,7 +3338,7 @@ cleanup: dns_rdataset_disassociate(&neg); dns_rdataset_disassociate(&negsig); - return (result); + return result; } static isc_result_t @@ -3376,7 +3376,7 @@ addclosest(isc_mem_t *mctx, dns_slabheader_t *newheader, uint32_t maxrrperset, cleanup: dns_rdataset_disassociate(&neg); dns_rdataset_disassociate(&negsig); - return (result); + return result; } static void @@ -3412,7 +3412,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, ®ion, sizeof(dns_slabheader_t), qpdb->maxrrperset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } name = dns_fixedname_initname(&fixed); @@ -3451,7 +3451,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, qpdb->maxrrperset, rdataset); if (result != ISC_R_SUCCESS) { dns_slabheader_destroy(&newheader); - return (result); + return result; } } if ((rdataset->attributes & DNS_RDATASETATTR_CLOSEST) != 0) { @@ -3459,7 +3459,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, qpdb->maxrrperset, rdataset); if (result != ISC_R_SUCCESS) { dns_slabheader_destroy(&newheader); - return (result); + return result; } } @@ -3559,7 +3559,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } INSIST(tlocktype == isc_rwlocktype_none); - return (result); + return result; } static isc_result_t @@ -3575,10 +3575,10 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(version == NULL); if (type == dns_rdatatype_any) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (type == dns_rdatatype_rrsig && covers == 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } newheader = dns_slabheader_new(db, node); @@ -3592,7 +3592,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_rwlocktype_none DNS__DB_FLARG_PASS); NODE_UNLOCK(&qpdb->node_locks[qpnode->locknum].lock, &nlocktype); - return (result); + return result; } static unsigned int @@ -3616,7 +3616,7 @@ nodecount(dns_db_t *db, dns_dbtree_t tree) { } TREE_UNLOCK(&qpdb->tree_lock, &tlocktype); - return (mu.leaves); + return mu.leaves; } static isc_result_t @@ -3638,7 +3638,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { result = ISC_R_NOTFOUND; } - return (result); + return result; } static void @@ -3754,7 +3754,7 @@ dns__qpcache_create(isc_mem_t *mctx, const dns_name_t *origin, *dbp = (dns_db_t *)qpdb; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3783,14 +3783,14 @@ iterator_active(qpcache_t *qpdb, qpc_rditer_t *iterator, * Is this a "this rdataset doesn't exist" record? */ if (NONEXISTENT(header)) { - return (false); + return false; } /* * If this header is still active then return it. */ if (ACTIVE(header, iterator->common.now)) { - return (true); + return true; } /* @@ -3798,9 +3798,9 @@ iterator_active(qpcache_t *qpdb, qpc_rditer_t *iterator, * too old don't return it. */ if (!STALEOK(iterator) || (iterator->common.now > stale_ttl)) { - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -3840,10 +3840,10 @@ rdatasetiter_first(dns_rdatasetiter_t *it DNS__DB_FLARG) { iterator->current = header; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -3859,7 +3859,7 @@ rdatasetiter_next(dns_rdatasetiter_t *it DNS__DB_FLARG) { header = iterator->current; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } NODE_RDLOCK(&qpdb->node_locks[qpnode->locknum].lock, &nlocktype); @@ -3928,10 +3928,10 @@ rdatasetiter_next(dns_rdatasetiter_t *it DNS__DB_FLARG) { iterator->current = header; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -4058,7 +4058,7 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { @@ -4085,7 +4085,7 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { ENSURE(!qpdbiter->paused); } - return (result); + return result; } static isc_result_t @@ -4099,7 +4099,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { @@ -4121,7 +4121,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4136,7 +4136,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { @@ -4157,7 +4157,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, qpdbiter->result = (result == DNS_R_PARTIALMATCH) ? ISC_R_SUCCESS : result; - return (result); + return result; } static isc_result_t @@ -4168,7 +4168,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(qpdbiter->node != NULL); if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { @@ -4189,7 +4189,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4200,7 +4200,7 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(qpdbiter->node != NULL); if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { @@ -4221,7 +4221,7 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4246,7 +4246,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, qpdbiter->tree_locked DNS__DB_FLARG_PASS); *nodep = (dns_dbnode_t *)qpdbiter->node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4259,11 +4259,11 @@ dbiterator_pause(dns_dbiterator_t *iterator) { qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } if (qpdbiter->paused) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } qpdbiter->paused = true; @@ -4273,7 +4273,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) { } INSIST(qpdbiter->tree_locked == isc_rwlocktype_none); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4281,11 +4281,11 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { qpc_dbit_t *qpdbiter = (qpc_dbit_t *)iterator; if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } dns_name_copy(dns_rootname, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c index ef58c7da6b..9ee1fe3e01 100644 --- a/lib/dns/qpzone.c +++ b/lib/dns/qpzone.c @@ -363,10 +363,10 @@ resign_sooner(void *v1, void *v2) { dns_slabheader_t *h1 = v1; dns_slabheader_t *h2 = v2; - return (h1->resign < h2->resign || - (h1->resign == h2->resign && h1->resign_lsb < h2->resign_lsb) || - (h1->resign == h2->resign && h1->resign_lsb == h2->resign_lsb && - h2->type == DNS_SIGTYPE(dns_rdatatype_soa))); + return h1->resign < h2->resign || + (h1->resign == h2->resign && h1->resign_lsb < h2->resign_lsb) || + (h1->resign == h2->resign && h1->resign_lsb == h2->resign_lsb && + h2->type == DNS_SIGTYPE(dns_rdatatype_soa)); } /*% @@ -540,7 +540,7 @@ new_qpznode(qpzonedb_t *qpdb, const dns_name_t *name) { fprintf(stderr, "new_qpznode:%s:%s:%d:%p->references = 1\n", __func__, __FILE__, __LINE__ + 1, name); #endif - return (newdata); + return newdata; } static qpz_version_t * @@ -561,7 +561,7 @@ allocate_version(isc_mem_t *mctx, uint32_t serial, unsigned int references, isc_rwlock_init(&version->rwlock); isc_refcount_init(&version->references, references); - return (version); + return version; } isc_result_t @@ -651,7 +651,7 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, if (result != ISC_R_SUCCESS) { INSIST(result != ISC_R_EXISTS); free_qpdb(qpdb, false); - return (result); + return result; } /* @@ -668,7 +668,7 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, if (result != ISC_R_SUCCESS) { INSIST(result != ISC_R_EXISTS); free_qpdb(qpdb, false); - return (result); + return result; } /* @@ -682,7 +682,7 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, *dbp = (dns_db_t *)qpdb; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1204,7 +1204,7 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) { *versionp = (dns_dbversion_t *)version; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1582,17 +1582,17 @@ findrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, } if (found == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool delegating_type(qpzonedb_t *qpdb, qpznode_t *node, dns_typepair_t type) { - return (type == dns_rdatatype_dname || - (type == dns_rdatatype_ns && - (node != qpdb->origin || IS_STUB(qpdb)))); + return type == dns_rdatatype_dname || + (type == dns_rdatatype_ns && + (node != qpdb->origin || IS_STUB(qpdb))); } static void @@ -1674,7 +1674,7 @@ cname_and_other(qpznode_t *node, uint32_t serial) { * with priority types, we know there will not be a * CNAME, and are safe to skip the rest. */ - return (false); + return false; } rdtype = DNS_TYPEPAIR_TYPE(header->type); @@ -1713,11 +1713,11 @@ cname_and_other(qpznode_t *node, uint32_t serial) { } if (cname && other) { - return (true); + return true; } } - return (false); + return false; } static qpz_changed_t * @@ -1736,15 +1736,15 @@ add_changed(dns_slabheader_t *header, qpz_version_t *version DNS__DB_FLARG) { newref(qpdb, node DNS__DB_FLARG_PASS); RWUNLOCK(&qpdb->lock, isc_rwlocktype_write); - return (changed); + return changed; } static uint64_t recordsize(dns_slabheader_t *header, unsigned int namelen) { - return (dns_rdataslab_rdatasize((unsigned char *)header, - sizeof(*header)) + - sizeof(dns_ttl_t) + sizeof(dns_rdatatype_t) + - sizeof(dns_rdataclass_t) + namelen); + return dns_rdataslab_rdatasize((unsigned char *)header, + sizeof(*header)) + + sizeof(dns_ttl_t) + sizeof(dns_rdatatype_t) + + sizeof(dns_rdataclass_t) + namelen; } static void @@ -1875,7 +1875,7 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename, } } else { dns_slabheader_destroy(&newheader); - return (result); + return result; } } @@ -1932,7 +1932,7 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename, */ if (NONEXISTENT(newheader)) { dns_slabheader_destroy(&newheader); - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } if (RESIGN(newheader)) { @@ -1972,7 +1972,7 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename, ntypes >= qpdb->maxtypepername) { dns_slabheader_destroy(&newheader); - return (DNS_R_TOOMANYRECORDS); + return DNS_R_TOOMANYRECORDS; } INSIST(newheader->down == NULL); @@ -1999,7 +1999,7 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename, * Check if the node now contains CNAME and other data. */ if (cname_and_other(node, version->serial)) { - return (DNS_R_CNAMEANDOTHER); + return DNS_R_CNAMEANDOTHER; } if (addedrdataset != NULL) { @@ -2007,7 +2007,7 @@ add(qpzonedb_t *qpdb, qpznode_t *node, const dns_name_t *nodename, addedrdataset DNS__DB_FLARG_PASS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2076,7 +2076,7 @@ loading_addrdataset(void *arg, const dns_name_t *name, if (rdataset->type == dns_rdatatype_soa && !dns_name_equal(name, &qpdb->common.origin)) { - return (DNS_R_NOTZONETOP); + return DNS_R_NOTZONETOP; } if (rdataset->type != dns_rdatatype_nsec3 && @@ -2090,14 +2090,14 @@ loading_addrdataset(void *arg, const dns_name_t *name, /* * NS owners cannot legally be wild cards. */ - return (DNS_R_INVALIDNS); + return DNS_R_INVALIDNS; } if (rdataset->type == dns_rdatatype_nsec3) { /* * NSEC3 owners cannot legally be wild cards. */ - return (DNS_R_INVALIDNSEC3); + return DNS_R_INVALIDNSEC3; } wildcardmagic(qpdb, loadctx->tree, name); @@ -2108,7 +2108,7 @@ loading_addrdataset(void *arg, const dns_name_t *name, ®ion, sizeof(dns_slabheader_t), qpdb->maxrrperset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } newheader = (dns_slabheader_t *)region.base; @@ -2145,7 +2145,7 @@ loading_addrdataset(void *arg, const dns_name_t *name, result = ISC_R_SUCCESS; } - return (result); + return result; } static void @@ -2202,7 +2202,7 @@ beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { callbacks->commit = loading_commit; callbacks->add_private = loadctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2239,7 +2239,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { isc_mem_put(qpdb->common.mctx, loadctx, sizeof(*loadctx)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -2255,7 +2255,7 @@ issecure(dns_db_t *db) { secure = qpdb->current_version->secure; RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); - return (secure); + return secure; } static isc_result_t @@ -2297,7 +2297,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *dbversion, dns_hash_t *hash, } RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); - return (result); + return result; } static isc_result_t @@ -2324,7 +2324,7 @@ getsize(dns_db_t *db, dns_dbversion_t *dbversion, uint64_t *records, RWUNLOCK(&version->rwlock, isc_rwlocktype_read); RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); - return (result); + return result; } static isc_result_t @@ -2373,7 +2373,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) { } NODE_UNLOCK(&qpdb->node_locks[HEADERNODE(header)->locknum].lock, &nlocktype); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2394,7 +2394,7 @@ getsigningtime(dns_db_t *db, isc_stdtime_t *resign, dns_name_t *foundname, header = isc_heap_element(qpdb->heap, 1); if (header == NULL) { RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } locknum = HEADERNODE(header)->locknum; RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); @@ -2422,7 +2422,7 @@ again: RWUNLOCK(&qpdb->lock, isc_rwlocktype_read); NODE_UNLOCK(&qpdb->node_locks[locknum].lock, &nlocktype); - return (result); + return result; } static isc_result_t @@ -2434,7 +2434,7 @@ setgluecachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(stats != NULL); isc_stats_attach(stats, &qpdb->gluecachestats); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2457,7 +2457,7 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create, if (result != ISC_R_SUCCESS) { if (!create) { dns_qpread_destroy(dbtree, &qpr); - return (result); + return result; } node = new_qpznode(qpdb, name); @@ -2489,7 +2489,7 @@ findnodeintree(qpzonedb_t *qpdb, const dns_name_t *name, bool create, *nodep = (dns_dbnode_t *)node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2499,8 +2499,8 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(VALID_QPZONE(qpdb)); - return (findnodeintree(qpdb, name, create, false, - nodep DNS__DB_FLARG_PASS)); + return findnodeintree(qpdb, name, create, false, + nodep DNS__DB_FLARG_PASS); } static isc_result_t @@ -2510,8 +2510,8 @@ findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, REQUIRE(VALID_QPZONE(qpdb)); - return (findnodeintree(qpdb, name, create, true, - nodep DNS__DB_FLARG_PASS)); + return findnodeintree(qpdb, name, create, true, + nodep DNS__DB_FLARG_PASS); } static bool @@ -2545,11 +2545,11 @@ matchparams(dns_slabheader_t *header, qpz_search_t *search) { memcmp(nsec3.salt, search->version->salt, nsec3.salt_length) == 0) { - return (true); + return true; } dns_rdata_reset(&rdata); } - return (false); + return false; } static isc_result_t @@ -2607,9 +2607,9 @@ setup_delegation(qpz_search_t *search, dns_dbnode_t **nodep, } if (type == dns_rdatatype_dname) { - return (DNS_R_DNAME); + return DNS_R_DNAME; } - return (DNS_R_DELEGATION); + return DNS_R_DELEGATION; } typedef enum { FORWARD, BACK } direction_t; @@ -2663,10 +2663,10 @@ step(qpz_search_t *search, dns_qpiter_t *it, direction_t direction, if (nextname != NULL) { dns_name_copy(nodename, nextname); } - return (true); + return true; } - return (false); + return false; } static bool @@ -2685,10 +2685,10 @@ activeempty(qpz_search_t *search, dns_qpiter_t *it, const dns_name_t *current) { isc_result_t result = dns_qpiter_next(it, NULL, NULL, NULL); if (result != ISC_R_SUCCESS) { /* An ENT at the end of the zone is impossible */ - return (false); + return false; } - return (step(search, it, FORWARD, next) && - dns_name_issubdomain(next, current)); + return step(search, it, FORWARD, next) && + dns_name_issubdomain(next, current); } static bool @@ -2735,7 +2735,7 @@ wildcard_blocked(qpz_search_t *search, const dns_name_t *qname, if (!check_prev && !check_next) { /* No predecessor or successor was found at all? */ - return (false); + return false; } dns_name_clone(qname, &rname); @@ -2750,7 +2750,7 @@ wildcard_blocked(qpz_search_t *search, const dns_name_t *qname, if ((check_prev && dns_name_issubdomain(prev, &rname)) || (check_next && dns_name_issubdomain(next, &rname))) { - return (true); + return true; } /* @@ -2760,7 +2760,7 @@ wildcard_blocked(qpz_search_t *search, const dns_name_t *qname, dns_name_getlabelsequence(&rname, 1, n - 1, &rname); } while (!dns_name_equal(&rname, &tname)); - return (false); + return false; } static isc_result_t @@ -2850,7 +2850,7 @@ find_wildcard(qpz_search_t *search, qpznode_t **nodep, if (wildcard_blocked(search, qname, wname)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -2883,7 +2883,7 @@ find_wildcard(qpz_search_t *search, qpznode_t **nodep, } } - return (result); + return result; } /* @@ -2902,7 +2902,7 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search, if (type == dns_rdatatype_nsec3) { result = dns_qpiter_prev(&search->iter, name, (void **)nodep, NULL); - return (result); + return result; } dns_qpmulti_query(search->qpdb->nsec, &qpr); @@ -2970,7 +2970,7 @@ previous_closest_nsec(dns_rdatatype_t type, qpz_search_t *search, } dns_qpread_destroy(search->qpdb->nsec, &qpr); - return (result); + return result; } /* @@ -3008,7 +3008,7 @@ find_closest_nsec(qpz_search_t *search, dns_dbnode_t **nodep, */ result = dns_qpiter_current(&search->iter, name, (void **)&node, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } again: do { @@ -3145,7 +3145,7 @@ again: result = DNS_R_BADDB; } - return (result); + return result; } static isc_result_t @@ -3272,7 +3272,7 @@ check_zonecut(qpznode_t *node, void *arg DNS__DB_FLARG) { NODE_UNLOCK(&(search->qpdb->node_locks[node->locknum].lock), &nlocktype); - return (result); + return result; } static isc_result_t @@ -3681,7 +3681,7 @@ found: newref(search.qpdb, node DNS__DB_FLARG_PASS); *nodep = (dns_dbnode_t *)node; } - if ((search.version->secure && !search.version->havensec3)) { + if (search.version->secure && !search.version->havensec3) { bindrdataset(search.qpdb, node, nsecheader, 0, rdataset DNS__DB_FLARG_PASS); if (nsecsig != NULL) { @@ -3790,7 +3790,7 @@ tree_exit: closeversion(db, &version, false DNS__DB_FLARG_PASS); } - return (result); + return result; } static isc_result_t @@ -3824,7 +3824,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, newref(qpdb, node DNS__DB_FLARG_PASS); *iteratorp = (dns_rdatasetiter_t *)iterator; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -3913,7 +3913,7 @@ nodecount(dns_db_t *db, dns_dbtree_t tree) { UNREACHABLE(); } - return (mu.leaves); + return mu.leaves; } static void @@ -3946,7 +3946,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { newref(qpdb, qpdb->origin DNS__DB_FLARG_PASS); *nodep = (dns_dbnode_t *)qpdb->origin; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -4035,10 +4035,10 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { qrditer->current = header; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4054,7 +4054,7 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { header = qrditer->current; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } NODE_RDLOCK(&qpdb->node_locks[node->locknum].lock, &nlocktype); @@ -4106,10 +4106,10 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { qrditer->current = header; if (header == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -4196,7 +4196,7 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS); @@ -4245,7 +4245,7 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->node = NULL; } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4259,7 +4259,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS); @@ -4318,7 +4318,7 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { qpdbiter->node = NULL; } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4332,7 +4332,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, qpdbiter->result != DNS_R_PARTIALMATCH && qpdbiter->result != ISC_R_NOMORE) { - return (qpdbiter->result); + return qpdbiter->result; } dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS); @@ -4381,7 +4381,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, qpdbiter->result = (result == DNS_R_PARTIALMATCH) ? ISC_R_SUCCESS : result; - return (result); + return result; } static isc_result_t @@ -4393,7 +4393,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(qpdbiter->node != NULL); if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS); @@ -4429,7 +4429,7 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4441,7 +4441,7 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { REQUIRE(qpdbiter->node != NULL); if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } dereference_iter_node(qpdbiter DNS__DB_FLARG_PASS); @@ -4488,7 +4488,7 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { } qpdbiter->result = result; - return (result); + return result; } static isc_result_t @@ -4509,12 +4509,12 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, *nodep = (dns_dbnode_t *)qpdbiter->node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator ISC_ATTR_UNUSED) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4522,11 +4522,11 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { qpdb_dbiterator_t *qpdbiter = (qpdb_dbiterator_t *)iterator; if (qpdbiter->result != ISC_R_SUCCESS) { - return (qpdbiter->result); + return qpdbiter->result; } dns_name_copy(dns_rootname, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4565,7 +4565,7 @@ createiterator(dns_db_t *db, unsigned int options, dns_qpiter_init(iter->nsnap, &iter->nsec3iter); *iteratorp = (dns_dbiterator_t *)iter; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4590,21 +4590,21 @@ addrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, * SOA records are only allowed at top of zone. */ if (rdataset->type == dns_rdatatype_soa && node != qpdb->origin) { - return (DNS_R_NOTZONETOP); + return DNS_R_NOTZONETOP; } - REQUIRE(((node->nsec == DNS_DB_NSEC_NSEC3 && - (rdataset->type == dns_rdatatype_nsec3 || - rdataset->covers == dns_rdatatype_nsec3)) || - (node->nsec != DNS_DB_NSEC_NSEC3 && - rdataset->type != dns_rdatatype_nsec3 && - rdataset->covers != dns_rdatatype_nsec3))); + REQUIRE((node->nsec == DNS_DB_NSEC_NSEC3 && + (rdataset->type == dns_rdatatype_nsec3 || + rdataset->covers == dns_rdatatype_nsec3)) || + (node->nsec != DNS_DB_NSEC_NSEC3 && + rdataset->type != dns_rdatatype_nsec3 && + rdataset->covers != dns_rdatatype_nsec3)); result = dns_rdataslab_fromrdataset(rdataset, qpdb->common.mctx, ®ion, sizeof(dns_slabheader_t), qpdb->maxrrperset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_copy(&node->name, name); @@ -4689,7 +4689,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, dns_qpmulti_commit(qpdb->nsec, &nsec); } - return (result); + return result; } static isc_result_t @@ -4712,19 +4712,19 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, REQUIRE(VALID_QPZONE(qpdb)); REQUIRE(version != NULL && version->qpdb == qpdb); - REQUIRE(((node->nsec == DNS_DB_NSEC_NSEC3 && - (rdataset->type == dns_rdatatype_nsec3 || - rdataset->covers == dns_rdatatype_nsec3)) || - (node->nsec != DNS_DB_NSEC_NSEC3 && - rdataset->type != dns_rdatatype_nsec3 && - rdataset->covers != dns_rdatatype_nsec3))); + REQUIRE((node->nsec == DNS_DB_NSEC_NSEC3 && + (rdataset->type == dns_rdatatype_nsec3 || + rdataset->covers == dns_rdatatype_nsec3)) || + (node->nsec != DNS_DB_NSEC_NSEC3 && + rdataset->type != dns_rdatatype_nsec3 && + rdataset->covers != dns_rdatatype_nsec3)); dns_name_copy(&node->name, nodename); result = dns_rdataslab_fromrdataset(rdataset, qpdb->common.mctx, ®ion, sizeof(dns_slabheader_t), 0); if (result != ISC_R_SUCCESS) { - return (result); + return result; } newheader = (dns_slabheader_t *)region.base; @@ -4880,7 +4880,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, unlock: NODE_UNLOCK(&qpdb->node_locks[node->locknum].lock, &nlocktype); - return (result); + return result; } static isc_result_t @@ -4899,10 +4899,10 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, REQUIRE(version != NULL && version->qpdb == qpdb); if (type == dns_rdatatype_any) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (type == dns_rdatatype_rrsig && covers == 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } newheader = dns_slabheader_new(db, (dns_dbnode_t *)node); @@ -4917,7 +4917,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *dbnode, dns_dbversion_t *dbversion, result = add(qpdb, node, nodename, version, newheader, DNS_DBADD_FORCE, false, NULL, 0 DNS__DB_FLARG_PASS); NODE_UNLOCK(&qpdb->node_locks[node->locknum].lock, &nlocktype); - return (result); + return result; } static isc_result_t @@ -4933,7 +4933,7 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { NODE_RDLOCK(&qpdb->node_locks[qpnode->locknum].lock, &nlocktype); dns_name_copy(&qpnode->name, name); NODE_UNLOCK(&qpdb->node_locks[qpnode->locknum].lock, &nlocktype); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static dns_glue_t * @@ -4944,7 +4944,7 @@ new_gluelist(isc_mem_t *mctx, dns_name_t *name) { dns_name_copy(name, gluename); - return (glue); + return glue; } static isc_result_t @@ -5071,7 +5071,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, (dns_dbnode_t **)&node_aaaa DNS__DB_FLARG_PASS); } - return (result); + return result; } #define IS_REQUIRED_GLUE(r) (((r)->attributes & DNS_RDATASETATTR_REQUIRED) != 0) @@ -5175,7 +5175,7 @@ newglue(dns_db_t *db, qpz_version_t *version, qpznode_t *node, (void)dns_rdataset_additionaldata(rdataset, dns_rootname, glue_nsdname_cb, &ctx); - return (ctx.glue_list); + return ctx.glue_list; } static dns_gluenode_t * @@ -5189,7 +5189,7 @@ new_gluenode(dns_db_t *db, qpz_version_t *version, qpznode_t *node, isc_mem_attach(db->mctx, &gluenode->mctx); qpznode_attach(node, &gluenode->node); - return (gluenode); + return gluenode; } static void @@ -5242,7 +5242,7 @@ free_gluenode(dns_gluenode_t *gluenode) { static uint32_t qpznode_hash(const qpznode_t *node) { const uintptr_t key = (uintptr_t)node; - return (isc_hash32(&key, sizeof(key), true)); + return isc_hash32(&key, sizeof(key), true); } static int @@ -5251,19 +5251,19 @@ qpznode_match(struct cds_lfht_node *ht_node, const void *key) { caa_container_of(ht_node, dns_gluenode_t, ht_node); const qpznode_t *node = key; - return (gluenode->node == node); + return gluenode->node == node; } static uint32_t gluenode_hash(const dns_gluenode_t *gluenode) { - return (qpznode_hash(gluenode->node)); + return qpznode_hash(gluenode->node); } static int gluenode_match(struct cds_lfht_node *ht_node, const void *key) { const dns_gluenode_t *gluenode = key; - return (qpznode_match(ht_node, gluenode->node)); + return qpznode_match(ht_node, gluenode->node); } static void @@ -5435,7 +5435,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { qpznode_t *data = pval; - return (dns_qpkey_fromname(key, &data->name)); + return dns_qpkey_fromname(key, &data->name); } static void diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index 07d9c92b03..6c957e870c 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -191,12 +191,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -210,7 +210,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, if (!isdigit((unsigned char)source->base[0]) || source->length > NUMBERSIZE - 1) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } /* @@ -221,7 +221,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, v = snprintf(buffer, sizeof(buffer), "%.*s", (int)source->length, source->base); if (v < 0 || (unsigned int)v != source->length) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } INSIST(buffer[source->length] == '\0'); @@ -230,13 +230,13 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, result = isc_parse_uint32(&n, buffer, 16); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (n > max) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *valuep = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -247,7 +247,7 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, result = maybe_numeric(valuep, source, max, false); if (result != ISC_R_BADNUMBER) { - return (result); + return result; } for (i = 0; table[i].name != NULL; i++) { @@ -257,10 +257,10 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, strncasecmp(source->base, table[i].name, n) == 0) { *valuep = table[i].value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (DNS_R_UNKNOWN); + return DNS_R_UNKNOWN; } static isc_result_t @@ -270,12 +270,12 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, char buf[sizeof("4294967296")]; while (table[i].name != NULL) { if (table[i].value == value) { - return (str_totext(table[i].name, target)); + return str_totext(table[i].name, target); } i++; } snprintf(buf, sizeof(buf), "%u", value); - return (str_totext(buf, target)); + return str_totext(buf, target); } isc_result_t @@ -283,12 +283,12 @@ dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, rcodes, 0xffff)); *rcodep = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target) { - return (dns_mnemonic_totext(rcode, target, rcodes)); + return dns_mnemonic_totext(rcode, target, rcodes); } isc_result_t @@ -296,12 +296,12 @@ dns_tsigrcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, tsigrcodes, 0xffff)); *rcodep = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_tsigrcode_totext(dns_rcode_t rcode, isc_buffer_t *target) { - return (dns_mnemonic_totext(rcode, target, tsigrcodes)); + return dns_mnemonic_totext(rcode, target, tsigrcodes); } isc_result_t @@ -309,12 +309,12 @@ dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, certs, 0xffff)); *certp = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { - return (dns_mnemonic_totext(cert, target, certs)); + return dns_mnemonic_totext(cert, target, certs); } isc_result_t @@ -322,12 +322,12 @@ dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secalgs, 0xff)); *secalgp = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) { - return (dns_mnemonic_totext(secalg, target, secalgs)); + return dns_mnemonic_totext(secalg, target, secalgs); } void @@ -351,12 +351,12 @@ dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secprotos, 0xff)); *secprotop = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target) { - return (dns_mnemonic_totext(secproto, target, secprotos)); + return dns_mnemonic_totext(secproto, target, secprotos); } isc_result_t @@ -364,7 +364,7 @@ dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, hashalgs, 0xff)); *hashalg = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -379,10 +379,10 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) { result = maybe_numeric(&value, source, 0xffff, true); if (result == ISC_R_SUCCESS) { *flagsp = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_BADNUMBER) { - return (result); + return result; } text = source->base; @@ -403,7 +403,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) { } } if (p->name == NULL) { - return (DNS_R_UNKNOWNFLAG); + return DNS_R_UNKNOWNFLAG; } value |= p->value; #ifdef notyet @@ -418,7 +418,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) { } } *flagsp = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -426,12 +426,12 @@ dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, dsdigests, 0xff)); *dsdigestp = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_dsdigest_totext(dns_dsdigest_t dsdigest, isc_buffer_t *target) { - return (dns_mnemonic_totext(dsdigest, target, dsdigests)); + return dns_mnemonic_totext(dsdigest, target, dsdigests); } void @@ -494,7 +494,7 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { val = strtoul(buf, &endp, 10); if (*endp == '\0' && val <= 0xffff) { *classp = (dns_rdataclass_t)val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } break; @@ -515,26 +515,26 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { #undef COMPARE - return (DNS_R_UNKNOWN); + return DNS_R_UNKNOWN; } isc_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) { switch (rdclass) { case dns_rdataclass_any: - return (str_totext("ANY", target)); + return str_totext("ANY", target); case dns_rdataclass_chaos: - return (str_totext("CH", target)); + return str_totext("CH", target); case dns_rdataclass_hs: - return (str_totext("HS", target)); + return str_totext("HS", target); case dns_rdataclass_in: - return (str_totext("IN", target)); + return str_totext("IN", target); case dns_rdataclass_none: - return (str_totext("NONE", target)); + return str_totext("NONE", target); case dns_rdataclass_reserved0: - return (str_totext("RESERVED0", target)); + return str_totext("RESERVED0", target); default: - return (dns_rdataclass_tounknowntext(rdclass, target)); + return dns_rdataclass_tounknowntext(rdclass, target); } } @@ -543,7 +543,7 @@ dns_rdataclass_tounknowntext(dns_rdataclass_t rdclass, isc_buffer_t *target) { char buf[sizeof("CLASS65535")]; snprintf(buf, sizeof(buf), "CLASS%u", rdclass); - return (str_totext(buf, target)); + return str_totext(buf, target); } void diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 4f81fbfb3a..db7351a0cd 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -371,16 +371,16 @@ locator_pton(const char *src, unsigned char *dst) { val <<= 4; val |= (ch - hexval); if (++seen_xdigits > 4) { - return (0); + return 0; } continue; } if (ch == ':') { if (!seen_xdigits) { - return (0); + return 0; } if (tp + NS_INT16SZ > endp) { - return (0); + return 0; } *tp++ = (unsigned char)(val >> 8) & 0xff; *tp++ = (unsigned char)val & 0xff; @@ -388,20 +388,20 @@ locator_pton(const char *src, unsigned char *dst) { val = 0; continue; } - return (0); + return 0; } if (seen_xdigits) { if (tp + NS_INT16SZ > endp) { - return (0); + return 0; } *tp++ = (unsigned char)(val >> 8) & 0xff; *tp++ = (unsigned char)val & 0xff; } if (tp != endp) { - return (0); + return 0; } memmove(dst, tmp, NS_LOCATORSZ); - return (1); + return 1; } static void @@ -420,13 +420,13 @@ mem_maybedup(isc_mem_t *mctx, void *source, size_t length) { REQUIRE(source != NULL); if (mctx == NULL) { - return (source); + return source; } copy = isc_mem_allocate(mctx, length); memmove(copy, source, length); - return (copy); + return copy; } static isc_result_t @@ -464,7 +464,7 @@ typemap_fromtext(isc_lex_t *lexer, isc_buffer_t *target, bool allow_empty) { } while (1); isc_lex_ungettoken(lexer, &token); if (!allow_empty && first) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } for (window = 0; window < 256; window++) { @@ -494,7 +494,7 @@ typemap_fromtext(isc_lex_t *lexer, isc_buffer_t *target, bool allow_empty) { RETERR(uint8_tobuffer(octet + 1, target)); RETERR(mem_tobuffer(target, &bm[window * 32], octet + 1)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -541,7 +541,7 @@ typemap_totext(isc_region_t *sr, dns_rdata_textctx_t *tctx, } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -589,12 +589,12 @@ typemap_test(isc_region_t *sr, bool allow_empty) { first = false; } if (i != sr->length) { - return (DNS_R_EXTRADATA); + return DNS_R_EXTRADATA; } if (!allow_empty && first) { RETERR(DNS_R_FORMERR); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -610,7 +610,7 @@ check_private(isc_buffer_t *source, dns_secalg_t alg) { */ isc_buffer_activeregion(source, &sr); if (sr.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } } else if (alg == DNS_KEYALG_PRIVATEOID) { /* @@ -630,10 +630,10 @@ check_private(isc_buffer_t *source, dns_secalg_t alg) { ASN1_OBJECT_free(obj); /* There should be a public key or signature after the OID. */ if (in >= sr.base + sr.length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #include "code.h" @@ -710,11 +710,11 @@ dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2)); if (rdata1->rdclass != rdata2->rdclass) { - return (rdata1->rdclass < rdata2->rdclass ? -1 : 1); + return rdata1->rdclass < rdata2->rdclass ? -1 : 1; } if (rdata1->type != rdata2->type) { - return (rdata1->type < rdata2->type ? -1 : 1); + return rdata1->type < rdata2->type ? -1 : 1; } COMPARESWITCH @@ -727,7 +727,7 @@ dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { dns_rdata_toregion(rdata2, &r2); result = isc_region_compare(&r1, &r2); } - return (result); + return result; } int @@ -743,11 +743,11 @@ dns_rdata_casecompare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2)); if (rdata1->rdclass != rdata2->rdclass) { - return (rdata1->rdclass < rdata2->rdclass ? -1 : 1); + return rdata1->rdclass < rdata2->rdclass ? -1 : 1; } if (rdata1->type != rdata2->type) { - return (rdata1->type < rdata2->type ? -1 : 1); + return rdata1->type < rdata2->type ? -1 : 1; } CASECOMPARESWITCH @@ -760,7 +760,7 @@ dns_rdata_casecompare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { dns_rdata_toregion(rdata2, &r2); result = isc_region_compare(&r1, &r2); } - return (result); + return result; } /*** @@ -813,7 +813,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, REQUIRE(target != NULL); if (type == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } ss = *source; @@ -861,7 +861,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, *source = ss; *target = st; } - return (result); + return result; } isc_result_t @@ -880,7 +880,7 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, */ if ((rdata->flags & DNS_RDATA_UPDATE) != 0) { INSIST(rdata->length == 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } st = *target; @@ -890,17 +890,17 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, if (use_default) { isc_buffer_availableregion(target, &tr); if (tr.length < rdata->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, rdata->data, rdata->length); isc_buffer_add(target, rdata->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { *target = st; dns_compress_rollback(cctx, target->used); } - return (result); + return result; } /* @@ -917,7 +917,7 @@ rdata_validate(isc_buffer_t *src, isc_buffer_t *dest, dns_rdataclass_t rdclass, result = dns_rdata_fromwire(NULL, rdclass, type, src, DNS_DECOMPRESS_NEVER, dest); - return (result); + return result; } static isc_result_t @@ -928,13 +928,13 @@ unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_token_t token; if (type == 0 || dns_rdatatype_ismeta(type)) { - return (DNS_R_METATYPE); + return DNS_R_METATYPE; } RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number, false)); if (token.value.as_ulong > 65535U) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_allocate(mctx, &buf, token.value.as_ulong); @@ -962,11 +962,11 @@ unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type, } isc_buffer_free(&buf); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: isc_buffer_free(&buf); - return (result); + return result; } isc_result_t @@ -1012,7 +1012,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, name = isc_lex_getsourcename(lexer); line = isc_lex_getsourceline(lexer); fromtext_error(callback, callbacks, name, line, NULL, result); - return (result); + return result; } unknown = false; @@ -1101,7 +1101,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, if (result != ISC_R_SUCCESS) { *target = st; } - return (result); + return result; } static isc_result_t @@ -1114,7 +1114,7 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, strlcpy(buf, "\\# ", sizeof(buf)); result = str_totext(buf, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_toregion(rdata, &sr); @@ -1122,7 +1122,7 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, snprintf(buf, sizeof(buf), "%u", sr.length); result = str_totext(buf, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (sr.length != 0U) { @@ -1133,7 +1133,7 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (tctx->width == 0) { /* No splitting */ @@ -1148,7 +1148,7 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, result = str_totext(" )", target); } } - return (result); + return result; } static isc_result_t @@ -1166,11 +1166,11 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, */ if ((rdata->flags & DNS_RDATA_UPDATE) != 0) { INSIST(rdata->length == 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if ((tctx->flags & DNS_STYLEFLAG_UNKNOWNFORMAT) != 0) { - return (unknown_totext(rdata, tctx, target)); + return unknown_totext(rdata, tctx, target); } cur = isc_buffer_usedlength(target); @@ -1185,7 +1185,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, result = unknown_totext(rdata, tctx, target); } - return (result); + return result; } isc_result_t @@ -1202,7 +1202,7 @@ dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin, tctx.flags = 0; tctx.width = 60; tctx.linebreak = " "; - return (rdata_totext(rdata, &tctx, target)); + return rdata_totext(rdata, &tctx, target); } isc_result_t @@ -1233,7 +1233,7 @@ dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin, } tctx.linebreak = " "; } - return (rdata_totext(rdata, &tctx, target)); + return rdata_totext(rdata, &tctx, target); } isc_result_t @@ -1272,7 +1272,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, if (result != ISC_R_SUCCESS) { *target = st; } - return (result); + return result; } isc_result_t @@ -1290,7 +1290,7 @@ dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { (void)NULL; } - return (result); + return result; } void @@ -1323,7 +1323,7 @@ dns_rdata_additionaldata(dns_rdata_t *rdata, const dns_name_t *owner, result = ISC_R_SUCCESS; } - return (result); + return result; } isc_result_t @@ -1347,7 +1347,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { result = (digest)(arg, &r); } - return (result); + return result; } bool @@ -1356,7 +1356,7 @@ dns_rdata_checkowner(const dns_name_t *name, dns_rdataclass_t rdclass, bool result; CHECKOWNERSWITCH - return (result); + return result; } bool @@ -1365,16 +1365,16 @@ dns_rdata_checknames(dns_rdata_t *rdata, const dns_name_t *owner, bool result; CHECKNAMESSWITCH - return (result); + return result; } unsigned int dns_rdatatype_attributes(dns_rdatatype_t type) { RDATATYPE_ATTRIBUTE_SW if (type >= (dns_rdatatype_t)128 && type <= (dns_rdatatype_t)255) { - return (DNS_RDATATYPEATTR_UNKNOWN | DNS_RDATATYPEATTR_META); + return DNS_RDATATYPEATTR_UNKNOWN | DNS_RDATATYPEATTR_META; } - return (DNS_RDATATYPEATTR_UNKNOWN); + return DNS_RDATATYPEATTR_UNKNOWN; } isc_result_t @@ -1386,7 +1386,7 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) { n = source->length; if (n == 0) { - return (DNS_R_UNKNOWN); + return DNS_R_UNKNOWN; } a = isc_ascii_tolower(source->base[0]); @@ -1417,18 +1417,18 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) { val = strtoul(buf, &endp, 10); if (*endp == '\0' && val <= 0xffff) { *typep = (dns_rdatatype_t)val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (DNS_R_UNKNOWN); + return DNS_R_UNKNOWN; } isc_result_t dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) { RDATATYPE_TOTEXT_SW - return (dns_rdatatype_tounknowntext(type, target)); + return dns_rdatatype_tounknowntext(type, target); } isc_result_t @@ -1436,7 +1436,7 @@ dns_rdatatype_tounknowntext(dns_rdatatype_t type, isc_buffer_t *target) { char buf[sizeof("TYPE65535")]; snprintf(buf, sizeof(buf), "TYPE%u", type); - return (str_totext(buf, target)); + return str_totext(buf, target); } void @@ -1471,7 +1471,7 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size) { static unsigned int name_length(const dns_name_t *name) { - return (name->length); + return name->length; } static isc_result_t @@ -1497,7 +1497,7 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, if (quote) { if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '"'; tl--; @@ -1508,7 +1508,7 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, */ if (*sp < (quote ? ' ' : '!') || *sp >= 0x7f) { if (tl < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '\\'; *tp++ = '0' + ((*sp / 100) % 10); @@ -1528,7 +1528,7 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, (!comma && !quote && (*sp == '@' || *sp == ';'))) { if (tl < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '\\'; tl--; @@ -1539,7 +1539,7 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, */ if (comma && (*sp == ',' || *sp == '\\')) { if (tl < ((*sp == '\\') ? 3 : 2)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '\\'; tl--; @@ -1550,14 +1550,14 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, } } if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = *sp++; tl--; } if (quote) { if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '"'; tl--; @@ -1565,12 +1565,12 @@ commatxt_totext(isc_region_t *source, bool quote, bool comma, } isc_buffer_add(target, (unsigned int)(tp - (char *)region.base)); isc_region_consume(source, *source->base + 1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t txt_totext(isc_region_t *source, bool quote, isc_buffer_t *target) { - return (commatxt_totext(source, quote, false, target)); + return commatxt_totext(source, quote, false, target); } static isc_result_t @@ -1589,7 +1589,7 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { t = tregion.base; nrem = tregion.length; if (nrem < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* * Length byte. @@ -1607,25 +1607,25 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { if (escape && (d = decvalue((char)c)) != -1) { c = d; if (n == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } n--; if ((d = decvalue(*s++)) != -1) { c = c * 10 + d; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (n == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } n--; if ((d = decvalue(*s++)) != -1) { c = c * 10 + d; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (c > 255) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } else if (!escape && c == '\\') { escape = true; @@ -1652,8 +1652,8 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { } comma_escape = false; if (nrem == 0) { - return ((tregion.length <= 256U) ? ISC_R_NOSPACE - : DNS_R_SYNTAX); + return (tregion.length <= 256U) ? ISC_R_NOSPACE + : DNS_R_SYNTAX; } *t++ = c; nrem--; @@ -1663,7 +1663,7 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { * Incomplete escape processing? */ if (escape || (comma && comma_escape)) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (comma) { @@ -1672,7 +1672,7 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { * in the middle ("h1,,h2" or "h1\,\,h2"). */ if ((t - tregion.base - 1) == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* @@ -1684,18 +1684,18 @@ commatxt_fromtext(isc_textregion_t *source, bool comma, isc_buffer_t *target) { * Disallow empty ALPN at end ("h1," or "h1\,"). */ if (seen_comma && source->length == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } *tregion.base = (unsigned char)(t - tregion.base - 1); isc_buffer_add(target, *tregion.base + 1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { - return (commatxt_fromtext(source, false, target)); + return commatxt_fromtext(source, false, target); } static isc_result_t @@ -1706,16 +1706,16 @@ txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) { isc_buffer_activeregion(source, &sregion); if (sregion.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } n = *sregion.base + 1; if (n > sregion.length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_availableregion(target, &tregion); if (n > tregion.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (tregion.base != sregion.base) { @@ -1723,7 +1723,7 @@ txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) { } isc_buffer_forward(source, n); isc_buffer_add(target, n); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1743,7 +1743,7 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) { tl = region.length; if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '"'; tl--; @@ -1754,7 +1754,7 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) { while (n--) { if (*sp < ' ' || *sp >= 0x7f) { if (tl < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '\\'; *tp++ = '0' + ((*sp / 100) % 10); @@ -1767,13 +1767,13 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) { /* double quote, backslash */ if (*sp == '"' || *sp == '\\') { if (tl < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '\\'; tl--; } if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = *sp++; tl--; @@ -1781,13 +1781,13 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) { isc_region_consume(source, n0 + 1); } while (source->length != 0); if (tl < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } *tp++ = '"'; tl--; POST(tl); isc_buffer_add(target, (unsigned int)(tp - (char *)region.base)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1809,7 +1809,7 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { t0 = t = tregion.base; nrem = tregion.length; if (nrem < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } while (n != 0) { @@ -1818,25 +1818,25 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { if (escape && (d = decvalue((char)c)) != -1) { c = d; if (n == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } n--; if ((d = decvalue(*s++)) != -1) { c = c * 10 + d; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (n == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } n--; if ((d = decvalue(*s++)) != -1) { c = c * 10 + d; } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (c > 255) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } else if (!escape && c == '\\') { escape = true; @@ -1850,12 +1850,12 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { } } if (escape) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } isc_buffer_add(target, (unsigned int)(t - t0)); } while (n != 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -1888,11 +1888,11 @@ name_prefix(dns_name_t *name, const dns_name_t *origin, dns_name_t *target) { } dns_name_getlabelsequence(name, 0, l1 - l2, target); - return (true); + return true; return_false: *target = *name; - return (false); + return false; } static isc_result_t @@ -1904,12 +1904,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1918,10 +1918,10 @@ inet_totext(int af, uint32_t flags, isc_region_t *src, isc_buffer_t *target) { /* Note - inet_ntop doesn't do size checking on its input. */ if (inet_ntop(af, src->base, tmpbuf, sizeof(tmpbuf)) == NULL) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (strlen(tmpbuf) > isc_buffer_availablelength(target)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putstr(target, tmpbuf); @@ -1934,19 +1934,19 @@ inet_totext(int af, uint32_t flags, isc_region_t *src, isc_buffer_t *target) { isc_buffer_usedregion(target, &r); if (r.length > 0 && r.base[r.length - 1] == ':') { if (isc_buffer_availablelength(target) == 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(target, (const unsigned char *)"0", 1); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool buffer_empty(isc_buffer_t *source) { - return ((source->current == source->active) ? true : false); + return (source->current == source->active) ? true : false; } static void @@ -1962,10 +1962,10 @@ uint32_tobuffer(uint32_t value, isc_buffer_t *target) { isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint32(target, value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1973,14 +1973,14 @@ uint16_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xffff) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_availableregion(target, ®ion); if (region.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint16(target, (uint16_t)value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1988,21 +1988,21 @@ uint8_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xff) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_availableregion(target, ®ion); if (region.length < 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(target, (uint8_t)value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t name_tobuffer(const dns_name_t *name, isc_buffer_t *target) { isc_region_t r; dns_name_toregion(name, &r); - return (isc_buffer_copyregion(target, &r)); + return isc_buffer_copyregion(target, &r); } static uint32_t @@ -2014,7 +2014,7 @@ uint32_fromregion(isc_region_t *region) { value |= (uint32_t)region->base[1] << 16; value |= (uint32_t)region->base[2] << 8; value |= (uint32_t)region->base[3]; - return (value); + return value; } static uint16_t @@ -2022,21 +2022,21 @@ uint16_consume_fromregion(isc_region_t *region) { uint16_t r = uint16_fromregion(region); isc_region_consume(region, 2); - return (r); + return r; } static uint16_t uint16_fromregion(isc_region_t *region) { REQUIRE(region->length >= 2); - return ((region->base[0] << 8) | region->base[1]); + return (region->base[0] << 8) | region->base[1]; } static uint8_t uint8_fromregion(isc_region_t *region) { REQUIRE(region->length >= 1); - return (region->base[0]); + return region->base[0]; } static uint8_t @@ -2044,7 +2044,7 @@ uint8_consume_fromregion(isc_region_t *region) { uint8_t r = uint8_fromregion(region); isc_region_consume(region, 1); - return (r); + return r; } static isc_result_t @@ -2052,36 +2052,36 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; if (length == 0U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_buffer_availableregion(target, &tr); if (length > tr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (tr.base != base) { memmove(tr.base, base, length); } isc_buffer_add(target, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int hexvalue(char value) { int hexval = isc_hex_char(value); if (hexval == 0) { - return (-1); + return -1; } else { - return (value - hexval); + return value - hexval; } } static int decvalue(char value) { if (isdigit((unsigned char)value)) { - return (value - '0'); + return value - '0'; } else { - return (-1); + return -1; } } @@ -2191,26 +2191,26 @@ fromtext_error(void (*callback)(dns_rdatacallbacks_t *, const char *, ...), dns_rdatatype_t dns_rdata_covers(dns_rdata_t *rdata) { if (rdata->type == dns_rdatatype_rrsig) { - return (covers_rrsig(rdata)); + return covers_rrsig(rdata); } - return (covers_sig(rdata)); + return covers_sig(rdata); } bool dns_rdatatype_ismeta(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_META) != 0) { - return (true); + return true; } - return (false); + return false; } bool dns_rdatatype_issingleton(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_SINGLETON) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -2218,9 +2218,9 @@ dns_rdatatype_notquestion(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_NOTQUESTION) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -2228,26 +2228,26 @@ dns_rdatatype_questiononly(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_QUESTIONONLY) != 0) { - return (true); + return true; } - return (false); + return false; } bool dns_rdatatype_atcname(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ATCNAME) != 0) { - return (true); + return true; } - return (false); + return false; } bool dns_rdatatype_atparent(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ATPARENT) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -2255,9 +2255,9 @@ dns_rdatatype_followadditional(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_FOLLOWADDITIONAL) != 0) { - return (true); + return true; } - return (false); + return false; } bool @@ -2265,24 +2265,24 @@ dns_rdataclass_ismeta(dns_rdataclass_t rdclass) { if (rdclass == dns_rdataclass_reserved0 || rdclass == dns_rdataclass_none || rdclass == dns_rdataclass_any) { - return (true); + return true; } - return (false); /* Assume it is not a meta class. */ + return false; /* Assume it is not a meta class. */ } bool dns_rdatatype_isdnssec(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_DNSSEC) != 0) { - return (true); + return true; } - return (false); + return false; } bool dns_rdatatype_iskeymaterial(dns_rdatatype_t type) { - return (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds); + return type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || + type == dns_rdatatype_cds; } bool @@ -2290,17 +2290,17 @@ dns_rdatatype_iszonecutauth(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ZONECUTAUTH) != 0) { - return (true); + return true; } - return (false); + return false; } bool dns_rdatatype_isknown(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_UNKNOWN) == 0) { - return (true); + return true; } - return (false); + return false; } void @@ -2357,36 +2357,36 @@ dns_rdata_updateop(dns_rdata_t *rdata, dns_section_t section) { case dns_rdataclass_none: switch (rdata->type) { case dns_rdatatype_any: - return ("domain doesn't exist"); + return "domain doesn't exist"; default: - return ("rrset doesn't exist"); + return "rrset doesn't exist"; } case dns_rdataclass_any: switch (rdata->type) { case dns_rdatatype_any: - return ("domain exists"); + return "domain exists"; default: - return ("rrset exists (value independent)"); + return "rrset exists (value independent)"; } default: - return ("rrset exists (value dependent)"); + return "rrset exists (value dependent)"; } case DNS_SECTION_UPDATE: switch (rdata->rdclass) { case dns_rdataclass_none: - return ("delete"); + return "delete"; case dns_rdataclass_any: switch (rdata->type) { case dns_rdatatype_any: - return ("delete all rrsets"); + return "delete all rrsets"; default: - return ("delete rrset"); + return "delete rrset"; } default: - return ("add"); + return "add"; } } - return ("invalid"); + return "invalid"; } static bool @@ -2405,10 +2405,10 @@ svcb_ishttp(const char *s, size_t len) { for (size_t i = 0; i < ARRAY_SIZE(http); i++) { if (len == http[i].len && memcmp(s, http[i].value, len) == 0) { - return (true); + return true; } } - return (false); + return false; } static bool @@ -2429,16 +2429,16 @@ svcb_hashttp(isc_textregion_t *alpn) { isc_textregion_consume(alpn, 1); if (c == ',') { if (svcb_ishttp(s, (alpn->base - s) - 1)) { - return (true); + return true; } s = alpn->base; } } if (svcb_ishttp(s, (alpn->base - s))) { - return (true); + return true; } } - return (false); + return false; } isc_result_t @@ -2458,7 +2458,7 @@ dns_rdata_checksvcb(const dns_name_t *owner, const dns_rdata_t *rdata) { * Check that Alias Mode records don't have SvcParamKeys. */ if (svcb.priority == 0 && svcb.svclen != 0) { - return (DNS_R_HAVEPARMKEYS); + return DNS_R_HAVEPARMKEYS; } if (dns_name_isdnssvcb(owner)) { @@ -2478,7 +2478,7 @@ dns_rdata_checksvcb(const dns_name_t *owner, const dns_rdata_t *rdata) { isc_region_consume(&r, len); } if (key != SVCB_ALPN_KEY) { - return (DNS_R_NOALPN); + return DNS_R_NOALPN; } alpn = (isc_textregion_t){ .base = (char *)r.base, .length = len }; @@ -2496,9 +2496,9 @@ dns_rdata_checksvcb(const dns_name_t *owner, const dns_rdata_t *rdata) { isc_region_consume(&r, len); } if (key != SVCB_DOHPATH_KEY) { - return (DNS_R_NODOHPATH); + return DNS_R_NODOHPATH; } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index e92fe60697..0d6704164a 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -128,7 +128,7 @@ fromtext_any_tsig(ARGS_FROMTEXT) { /* * Other Data. */ - return (isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong)); + return isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong); } static isc_result_t @@ -247,9 +247,9 @@ totext_any_tsig(ARGS_TOTEXT) { * Other. */ if (tctx->width == 0) { /* No splitting */ - return (isc_base64_totext(&sr, 60, "", target)); + return isc_base64_totext(&sr, 60, "", target); } else { - return (isc_base64_totext(&sr, 60, " ", target)); + return isc_base64_totext(&sr, 60, " ", target); } } @@ -278,7 +278,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) { * Time Signed + Fudge. */ if (sr.length < 8) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 8)); isc_region_consume(&sr, 8); @@ -288,11 +288,11 @@ fromwire_any_tsig(ARGS_FROMWIRE) { * Signature Length + Signature. */ if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } n = uint16_fromregion(&sr); if (sr.length < n + 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, n + 2)); isc_region_consume(&sr, n + 2); @@ -302,7 +302,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) { * Original ID + Error. */ if (sr.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 4)); isc_region_consume(&sr, 4); @@ -312,14 +312,14 @@ fromwire_any_tsig(ARGS_FROMWIRE) { * Other Length + Other. */ if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } n = uint16_fromregion(&sr); if (sr.length < n + 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, n + 2); - return (mem_tobuffer(target, sr.base, n + 2)); + return mem_tobuffer(target, sr.base, n + 2); } static isc_result_t @@ -338,7 +338,7 @@ towire_any_tsig(ARGS_TOWIRE) { dns_name_fromregion(&name, &sr); RETERR(dns_name_towire(&name, cctx, target, NULL)); isc_region_consume(&sr, name_length(&name)); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -364,11 +364,11 @@ compare_any_tsig(ARGS_COMPARE) { dns_name_fromregion(&name2, &r2); order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -392,7 +392,7 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) { isc_buffer_availableregion(target, &tr); if (tr.length < 6 + 2 + 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -419,7 +419,7 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) { isc_buffer_availableregion(target, &tr); if (tr.length < 2 + 2 + 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -440,7 +440,7 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) { /* * Other Data. */ - return (mem_tobuffer(target, tsig->other, tsig->otherlen)); + return mem_tobuffer(target, tsig->other, tsig->otherlen); } static isc_result_t @@ -525,7 +525,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) { tsig->other = mem_maybedup(mctx, sr.base, tsig->otherlen); tsig->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -560,7 +560,7 @@ additionaldata_any_tsig(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -572,7 +572,7 @@ digest_any_tsig(ARGS_DIGEST) { UNUSED(digest); UNUSED(arg); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static bool @@ -585,7 +585,7 @@ checkowner_any_tsig(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -597,12 +597,12 @@ checknames_any_tsig(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_any_tsig(ARGS_COMPARE) { - return (compare_any_tsig(rdata1, rdata2)); + return compare_any_tsig(rdata1, rdata2); } #endif /* RDATA_ANY_255_TSIG_250_C */ diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c index 1e68680a13..814a4c9b6f 100644 --- a/lib/dns/rdata/ch_3/a_1.c +++ b/lib/dns/rdata/ch_3/a_1.c @@ -61,7 +61,7 @@ fromtext_ch_a(ARGS_FROMTEXT) { if (token.value.as_ulong > 0xffffU) { RETTOK(ISC_R_RANGE); } - return (uint16_tobuffer(token.value.as_ulong, target)); + return uint16_tobuffer(token.value.as_ulong, target); } static isc_result_t @@ -91,7 +91,7 @@ totext_ch_a(ARGS_TOTEXT) { snprintf(buf, sizeof(buf), "%o", addr); /* note octal */ RETERR(str_totext(" ", target)); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -115,17 +115,17 @@ fromwire_ch_a(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (tregion.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 2); isc_buffer_forward(source, 2); isc_buffer_add(target, 2); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -151,12 +151,12 @@ towire_ch_a(ARGS_TOWIRE) { isc_buffer_availableregion(target, &tregion); if (tregion.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 2); isc_buffer_add(target, 2); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int @@ -187,14 +187,14 @@ compare_ch_a(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } order = memcmp(region1.base, region2.base, 2); if (order != 0) { order = (order < 0) ? -1 : 1; } - return (order); + return order; } static isc_result_t @@ -213,7 +213,7 @@ fromstruct_ch_a(ARGS_FROMSTRUCT) { dns_name_toregion(&a->ch_addr_dom, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); - return (uint16_tobuffer(ntohs(a->ch_addr), target)); + return uint16_tobuffer(ntohs(a->ch_addr), target); } static isc_result_t @@ -240,7 +240,7 @@ tostruct_ch_a(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &a->ch_addr_dom); a->ch_addr = htons(uint16_fromregion(®ion)); a->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -268,7 +268,7 @@ additionaldata_ch_a(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -284,7 +284,7 @@ digest_ch_a(ARGS_DIGEST) { dns_name_fromregion(&name, &r); isc_region_consume(&r, name_length(&name)); RETERR(dns_name_digest(&name, digest, arg)); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -294,7 +294,7 @@ checkowner_ch_a(ARGS_CHECKOWNER) { UNUSED(type); - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -314,14 +314,14 @@ checknames_ch_a(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_ch_a(ARGS_COMPARE) { - return (compare_ch_a(rdata1, rdata2)); + return compare_ch_a(rdata1, rdata2); } #endif /* RDATA_CH_3_A_1_C */ diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index e4a78a020e..00c046cd3e 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -62,7 +62,7 @@ fromtext_afsdb(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -87,7 +87,7 @@ totext_afsdb(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -108,15 +108,15 @@ fromwire_afsdb(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_availableregion(target, &tr); if (tr.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } memmove(tr.base, sr.base, 2); isc_buffer_forward(source, 2); isc_buffer_add(target, 2); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -133,7 +133,7 @@ towire_afsdb(ARGS_TOWIRE) { isc_buffer_availableregion(target, &tr); dns_rdata_toregion(rdata, &sr); if (tr.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, sr.base, 2); isc_region_consume(&sr, 2); @@ -142,7 +142,7 @@ towire_afsdb(ARGS_TOWIRE) { dns_name_init(&name, offsets); dns_name_fromregion(&name, &sr); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -161,7 +161,7 @@ compare_afsdb(ARGS_COMPARE) { result = memcmp(rdata1->data, rdata2->data, 2); if (result != 0) { - return (result < 0 ? -1 : 1); + return result < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -176,7 +176,7 @@ compare_afsdb(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -194,7 +194,7 @@ fromstruct_afsdb(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(afsdb->subtype, target)); dns_name_toregion(&afsdb->server, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -223,7 +223,7 @@ tostruct_afsdb(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &afsdb->server); afsdb->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -256,7 +256,7 @@ additionaldata_afsdb(ARGS_ADDLDATA) { isc_region_consume(®ion, 2); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -274,7 +274,7 @@ digest_afsdb(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -286,7 +286,7 @@ checkowner_afsdb(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -306,13 +306,13 @@ checknames_afsdb(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_afsdb(ARGS_COMPARE) { - return (compare_afsdb(rdata1, rdata2)); + return compare_afsdb(rdata1, rdata2); } #endif /* RDATA_GENERIC_AFSDB_18_C */ diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c index fccd297fca..49821162dc 100644 --- a/lib/dns/rdata/generic/amtrelay_260.c +++ b/lib/dns/rdata/generic/amtrelay_260.c @@ -69,11 +69,11 @@ fromtext_amtrelay(ARGS_FROMTEXT) { gateway = token.value.as_ulong; if (gateway == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (gateway > 3) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } /* @@ -89,11 +89,11 @@ fromtext_amtrelay(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case 2: if (inet_pton(AF_INET6, DNS_AS_STR(token), addr6) != 1) { @@ -101,11 +101,11 @@ fromtext_amtrelay(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 16) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, addr6, 16); isc_buffer_add(target, 16); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case 3: dns_name_init(&name, NULL); @@ -113,8 +113,8 @@ fromtext_amtrelay(ARGS_FROMTEXT) { if (origin == NULL) { origin = dns_rootname; } - return (dns_name_fromtext(&name, &buffer, origin, options, - target)); + return dns_name_fromtext(&name, &buffer, origin, options, + target); default: UNREACHABLE(); } @@ -136,7 +136,7 @@ totext_amtrelay(ARGS_TOTEXT) { REQUIRE(rdata->length >= 2); if ((rdata->data[1] & 0x7f) > 3U) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } /* @@ -166,20 +166,20 @@ totext_amtrelay(ARGS_TOTEXT) { case 0: break; case 1: - return (inet_totext(AF_INET, tctx->flags, ®ion, target)); + return inet_totext(AF_INET, tctx->flags, ®ion, target); case 2: - return (inet_totext(AF_INET6, tctx->flags, ®ion, target)); + return inet_totext(AF_INET6, tctx->flags, ®ion, target); case 3: dns_name_init(&name, NULL); dns_name_fromregion(&name, ®ion); - return (dns_name_totext(&name, 0, target)); + return dns_name_totext(&name, 0, target); default: UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -196,40 +196,40 @@ fromwire_amtrelay(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } switch (region.base[1] & 0x7f) { case 0: if (region.length != 2) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 1: if (region.length != 6) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 2: if (region.length != 18) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 3: RETERR(mem_tobuffer(target, region.base, 2)); isc_buffer_forward(source, 2); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); default: isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } } @@ -243,7 +243,7 @@ towire_amtrelay(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -260,7 +260,7 @@ compare_amtrelay(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -283,23 +283,23 @@ fromstruct_amtrelay(ARGS_FROMSTRUCT) { switch (amtrelay->gateway_type) { case 0: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case 1: n = ntohl(amtrelay->in_addr.s_addr); - return (uint32_tobuffer(n, target)); + return uint32_tobuffer(n, target); case 2: - return (mem_tobuffer(target, amtrelay->in6_addr.s6_addr, 16)); + return mem_tobuffer(target, amtrelay->in6_addr.s6_addr, 16); break; case 3: dns_name_toregion(&amtrelay->gateway, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); break; default: - return (mem_tobuffer(target, amtrelay->data, amtrelay->length)); + return mem_tobuffer(target, amtrelay->data, amtrelay->length); } } @@ -361,7 +361,7 @@ tostruct_amtrelay(ARGS_TOSTRUCT) { amtrelay->length = region.length; } amtrelay->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -395,7 +395,7 @@ additionaldata_amtrelay(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -405,7 +405,7 @@ digest_amtrelay(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_amtrelay); dns_rdata_toregion(rdata, ®ion); - return ((digest)(arg, ®ion)); + return (digest)(arg, ®ion); } static bool @@ -417,7 +417,7 @@ checkowner_amtrelay(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -428,7 +428,7 @@ checknames_amtrelay(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -450,7 +450,7 @@ casecompare_amtrelay(ARGS_COMPARE) { if (memcmp(region1.base, region2.base, 2) != 0 || (region1.base[1] & 0x7f) != 3) { - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } dns_name_init(&name1, NULL); @@ -462,7 +462,7 @@ casecompare_amtrelay(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } #endif /* RDATA_GENERIC_AMTRELAY_260_C */ diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c index 8c7c8d0789..c32c008144 100644 --- a/lib/dns/rdata/generic/avc_258.c +++ b/lib/dns/rdata/generic/avc_258.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_avc(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_avc); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_avc(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_avc); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_avc(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_avc); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -44,7 +44,7 @@ towire_avc(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -58,14 +58,14 @@ compare_avc(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_avc(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_avc); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -79,7 +79,7 @@ tostruct_avc(ARGS_TOSTRUCT) { avc->common.rdtype = rdata->type; ISC_LINK_INIT(&avc->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -101,7 +101,7 @@ additionaldata_avc(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -112,7 +112,7 @@ digest_avc(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -124,7 +124,7 @@ checkowner_avc(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -135,11 +135,11 @@ checknames_avc(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_avc(ARGS_COMPARE) { - return (compare_avc(rdata1, rdata2)); + return compare_avc(rdata1, rdata2); } #endif /* RDATA_GENERIC_AVC_258_C */ diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c index a6eee8e574..9a543c5530 100644 --- a/lib/dns/rdata/generic/caa_257.c +++ b/lib/dns/rdata/generic/caa_257.c @@ -324,7 +324,7 @@ fromtext_caa(ARGS_FROMTEXT) { RETERR(DNS_R_SYNTAX); } RETERR(multitxt_fromtext(&token.value.as_textregion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -358,7 +358,7 @@ totext_caa(ARGS_TOTEXT) { * Value */ RETERR(multitxt_totext(®ion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -377,7 +377,7 @@ fromwire_caa(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* @@ -408,7 +408,7 @@ fromwire_caa(ARGS_FROMWIRE) { * Tag + Value */ isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -422,7 +422,7 @@ towire_caa(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -439,7 +439,7 @@ compare_caa(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -485,7 +485,7 @@ fromstruct_caa(ARGS_FROMSTRUCT) { */ region.base = caa->value; region.length = caa->value_len; - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -530,7 +530,7 @@ tostruct_caa(ARGS_TOSTRUCT) { caa->value = mem_maybedup(mctx, sr.base, sr.length); caa->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -564,7 +564,7 @@ additionaldata_caa(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -577,7 +577,7 @@ digest_caa(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -589,7 +589,7 @@ checkowner_caa(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -602,12 +602,12 @@ checknames_caa(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_caa(ARGS_COMPARE) { - return (compare_caa(rdata1, rdata2)); + return compare_caa(rdata1, rdata2); } #endif /* GENERIC_CAA_257_C */ diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c index 3da66d69d2..6a6e79dfd0 100644 --- a/lib/dns/rdata/generic/cdnskey_60.c +++ b/lib/dns/rdata/generic/cdnskey_60.c @@ -24,7 +24,7 @@ static isc_result_t fromtext_cdnskey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_cdnskey); - return (generic_fromtext_key(CALL_FROMTEXT)); + return generic_fromtext_key(CALL_FROMTEXT); } static isc_result_t @@ -32,14 +32,14 @@ totext_cdnskey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_cdnskey); - return (generic_totext_key(CALL_TOTEXT)); + return generic_totext_key(CALL_TOTEXT); } static isc_result_t fromwire_cdnskey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_cdnskey); - return (generic_fromwire_key(CALL_FROMWIRE)); + return generic_fromwire_key(CALL_FROMWIRE); } static isc_result_t @@ -52,7 +52,7 @@ towire_cdnskey(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -70,14 +70,14 @@ compare_cdnskey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_cdnskey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_cdnskey); - return (generic_fromstruct_key(CALL_FROMSTRUCT)); + return generic_fromstruct_key(CALL_FROMSTRUCT); } static isc_result_t @@ -92,7 +92,7 @@ tostruct_cdnskey(ARGS_TOSTRUCT) { dnskey->common.rdtype = rdata->type; ISC_LINK_INIT(&dnskey->common, link); - return (generic_tostruct_key(CALL_TOSTRUCT)); + return generic_tostruct_key(CALL_TOSTRUCT); } static void @@ -114,7 +114,7 @@ additionaldata_cdnskey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -126,7 +126,7 @@ digest_cdnskey(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -138,7 +138,7 @@ checkowner_cdnskey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -150,7 +150,7 @@ checknames_cdnskey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -158,7 +158,7 @@ casecompare_cdnskey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensitively. */ - return (compare_cdnskey(rdata1, rdata2)); + return compare_cdnskey(rdata1, rdata2); } #endif /* RDATA_GENERIC_CDNSKEY_60_C */ diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c index 7c64158bf0..b4abb7adc1 100644 --- a/lib/dns/rdata/generic/cds_59.c +++ b/lib/dns/rdata/generic/cds_59.c @@ -24,7 +24,7 @@ static isc_result_t fromtext_cds(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_cds); - return (generic_fromtext_ds(CALL_FROMTEXT)); + return generic_fromtext_ds(CALL_FROMTEXT); } static isc_result_t @@ -32,14 +32,14 @@ totext_cds(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_cds); - return (generic_totext_ds(CALL_TOTEXT)); + return generic_totext_ds(CALL_TOTEXT); } static isc_result_t fromwire_cds(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_cds); - return (generic_fromwire_ds(CALL_FROMWIRE)); + return generic_fromwire_ds(CALL_FROMWIRE); } static isc_result_t @@ -52,7 +52,7 @@ towire_cds(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -68,14 +68,14 @@ compare_cds(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_cds(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_cds); - return (generic_fromstruct_ds(CALL_FROMSTRUCT)); + return generic_fromstruct_ds(CALL_FROMSTRUCT); } static isc_result_t @@ -93,7 +93,7 @@ tostruct_cds(ARGS_TOSTRUCT) { cds->common.rdtype = rdata->type; ISC_LINK_INIT(&cds->common, link); - return (generic_tostruct_ds(CALL_TOSTRUCT)); + return generic_tostruct_ds(CALL_TOSTRUCT); } static void @@ -122,7 +122,7 @@ additionaldata_cds(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -133,7 +133,7 @@ digest_cds(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -145,7 +145,7 @@ checkowner_cds(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -156,12 +156,12 @@ checknames_cds(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_cds(ARGS_COMPARE) { - return (compare_cds(rdata1, rdata2)); + return compare_cds(rdata1, rdata2); } #endif /* RDATA_GENERIC_CDS_59_C */ diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index 92d62dbb1c..89bf6b2a68 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -58,7 +58,7 @@ fromtext_cert(ARGS_FROMTEXT) { RETTOK(dns_secalg_fromtext(&secalg, &token.value.as_textregion)); RETERR(mem_tobuffer(target, &secalg, 1)); - return (isc_base64_tobuffer(lexer, target, -2)); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -112,7 +112,7 @@ totext_cert(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -127,11 +127,11 @@ fromwire_cert(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 6) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -144,7 +144,7 @@ towire_cert(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -160,7 +160,7 @@ compare_cert(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -179,7 +179,7 @@ fromstruct_cert(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(cert->key_tag, target)); RETERR(uint8_tobuffer(cert->algorithm, target)); - return (mem_tobuffer(target, cert->certificate, cert->length)); + return mem_tobuffer(target, cert->certificate, cert->length); } static isc_result_t @@ -207,7 +207,7 @@ tostruct_cert(ARGS_TOSTRUCT) { cert->certificate = mem_maybedup(mctx, region.base, region.length); cert->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -236,7 +236,7 @@ additionaldata_cert(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -247,7 +247,7 @@ digest_cert(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -259,7 +259,7 @@ checkowner_cert(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -270,11 +270,11 @@ checknames_cert(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_cert(ARGS_COMPARE) { - return (compare_cert(rdata1, rdata2)); + return compare_cert(rdata1, rdata2); } #endif /* RDATA_GENERIC_CERT_37_C */ diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index 59fa54f328..962117f9d7 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -38,7 +38,7 @@ fromtext_cname(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -59,7 +59,7 @@ totext_cname(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -74,7 +74,7 @@ fromwire_cname(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -92,7 +92,7 @@ towire_cname(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -117,7 +117,7 @@ compare_cname(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -134,7 +134,7 @@ fromstruct_cname(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&cname->cname, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -157,7 +157,7 @@ tostruct_cname(ARGS_TOSTRUCT) { dns_name_init(&cname->cname, NULL); name_duporclone(&name, mctx, &cname->cname); cname->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -183,7 +183,7 @@ additionaldata_cname(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_cname); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -197,7 +197,7 @@ digest_cname(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -209,7 +209,7 @@ checkowner_cname(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -220,12 +220,12 @@ checknames_cname(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_cname(ARGS_COMPARE) { - return (compare_cname(rdata1, rdata2)); + return compare_cname(rdata1, rdata2); } #endif /* RDATA_GENERIC_CNAME_5_C */ diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c index 311ba00cea..0b23a57fce 100644 --- a/lib/dns/rdata/generic/csync_62.c +++ b/lib/dns/rdata/generic/csync_62.c @@ -44,7 +44,7 @@ fromtext_csync(ARGS_FROMTEXT) { RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* Type Map */ - return (typemap_fromtext(lexer, target, true)); + return typemap_fromtext(lexer, target, true); } static isc_result_t @@ -78,7 +78,7 @@ totext_csync(ARGS_TOTEXT) { if (sr.length > 0) { RETERR(str_totext(" ", target)); } - return (typemap_totext(&sr, NULL, target)); + return typemap_totext(&sr, NULL, target); } static isc_result_t @@ -96,7 +96,7 @@ fromwire_csync(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 6) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 6)); @@ -107,7 +107,7 @@ fromwire_csync(ARGS_FROMWIRE) { RETERR(mem_tobuffer(target, sr.base, sr.length)); isc_buffer_forward(source, sr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -117,7 +117,7 @@ towire_csync(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -133,7 +133,7 @@ compare_csync(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -156,7 +156,7 @@ fromstruct_csync(ARGS_FROMSTRUCT) { region.base = csync->typebits; region.length = csync->len; RETERR(typemap_test(®ion, true)); - return (mem_tobuffer(target, csync->typebits, csync->len)); + return mem_tobuffer(target, csync->typebits, csync->len); } static isc_result_t @@ -183,7 +183,7 @@ tostruct_csync(ARGS_TOSTRUCT) { csync->len = region.length; csync->typebits = mem_maybedup(mctx, region.base, region.length); csync->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -212,7 +212,7 @@ additionaldata_csync(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -222,7 +222,7 @@ digest_csync(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_csync); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -234,7 +234,7 @@ checkowner_csync(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -245,7 +245,7 @@ checknames_csync(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -261,6 +261,6 @@ casecompare_csync(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } #endif /* RDATA_GENERIC_CSYNC_62_C */ diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c index faf95000a9..b932e8af65 100644 --- a/lib/dns/rdata/generic/dlv_32769.c +++ b/lib/dns/rdata/generic/dlv_32769.c @@ -24,7 +24,7 @@ static isc_result_t fromtext_dlv(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_dlv); - return (generic_fromtext_ds(CALL_FROMTEXT)); + return generic_fromtext_ds(CALL_FROMTEXT); } static isc_result_t @@ -32,14 +32,14 @@ totext_dlv(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_dlv); - return (generic_totext_ds(CALL_TOTEXT)); + return generic_totext_ds(CALL_TOTEXT); } static isc_result_t fromwire_dlv(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_dlv); - return (generic_fromwire_ds(CALL_FROMWIRE)); + return generic_fromwire_ds(CALL_FROMWIRE); } static isc_result_t @@ -52,7 +52,7 @@ towire_dlv(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -68,14 +68,14 @@ compare_dlv(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_dlv(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_dlv); - return (generic_fromstruct_ds(CALL_FROMSTRUCT)); + return generic_fromstruct_ds(CALL_FROMSTRUCT); } static isc_result_t @@ -89,7 +89,7 @@ tostruct_dlv(ARGS_TOSTRUCT) { dlv->common.rdtype = rdata->type; ISC_LINK_INIT(&dlv->common, link); - return (generic_tostruct_ds(CALL_TOSTRUCT)); + return generic_tostruct_ds(CALL_TOSTRUCT); } static void @@ -118,7 +118,7 @@ additionaldata_dlv(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -129,7 +129,7 @@ digest_dlv(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -141,7 +141,7 @@ checkowner_dlv(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -152,12 +152,12 @@ checknames_dlv(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_dlv(ARGS_COMPARE) { - return (compare_dlv(rdata1, rdata2)); + return compare_dlv(rdata1, rdata2); } #endif /* RDATA_GENERIC_DLV_32769_C */ diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index 1e913be4de..bb72c28a85 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -39,7 +39,7 @@ fromtext_dname(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -60,7 +60,7 @@ totext_dname(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -75,7 +75,7 @@ fromwire_dname(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -92,7 +92,7 @@ towire_dname(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -117,7 +117,7 @@ compare_dname(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -134,7 +134,7 @@ fromstruct_dname(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&dname->dname, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -157,7 +157,7 @@ tostruct_dname(ARGS_TOSTRUCT) { dns_name_init(&dname->dname, NULL); name_duporclone(&name, mctx, &dname->dname); dname->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -184,7 +184,7 @@ additionaldata_dname(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -198,7 +198,7 @@ digest_dname(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -210,7 +210,7 @@ checkowner_dname(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -221,11 +221,11 @@ checknames_dname(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_dname(ARGS_COMPARE) { - return (compare_dname(rdata1, rdata2)); + return compare_dname(rdata1, rdata2); } #endif /* RDATA_GENERIC_DNAME_39_C */ diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c index 2df1e77e0f..aff39df4a6 100644 --- a/lib/dns/rdata/generic/dnskey_48.c +++ b/lib/dns/rdata/generic/dnskey_48.c @@ -24,7 +24,7 @@ static isc_result_t fromtext_dnskey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_dnskey); - return (generic_fromtext_key(CALL_FROMTEXT)); + return generic_fromtext_key(CALL_FROMTEXT); } static isc_result_t @@ -32,14 +32,14 @@ totext_dnskey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_dnskey); - return (generic_totext_key(CALL_TOTEXT)); + return generic_totext_key(CALL_TOTEXT); } static isc_result_t fromwire_dnskey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_dnskey); - return (generic_fromwire_key(CALL_FROMWIRE)); + return generic_fromwire_key(CALL_FROMWIRE); } static isc_result_t @@ -53,7 +53,7 @@ towire_dnskey(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -71,14 +71,14 @@ compare_dnskey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_dnskey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_dnskey); - return (generic_fromstruct_key(CALL_FROMSTRUCT)); + return generic_fromstruct_key(CALL_FROMSTRUCT); } static isc_result_t @@ -93,7 +93,7 @@ tostruct_dnskey(ARGS_TOSTRUCT) { dnskey->common.rdtype = rdata->type; ISC_LINK_INIT(&dnskey->common, link); - return (generic_tostruct_key(CALL_TOSTRUCT)); + return generic_tostruct_key(CALL_TOSTRUCT); } static void @@ -115,7 +115,7 @@ additionaldata_dnskey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -127,7 +127,7 @@ digest_dnskey(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -139,7 +139,7 @@ checkowner_dnskey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -151,7 +151,7 @@ checknames_dnskey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -159,7 +159,7 @@ casecompare_dnskey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensitively. */ - return (compare_dnskey(rdata1, rdata2)); + return compare_dnskey(rdata1, rdata2); } #endif /* RDATA_GENERIC_DNSKEY_48_C */ diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c index 442149d29a..6bfbc10d8e 100644 --- a/lib/dns/rdata/generic/doa_259.c +++ b/lib/dns/rdata/generic/doa_259.c @@ -64,10 +64,10 @@ fromtext_doa(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); if (strcmp(DNS_AS_STR(token), "-") == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { isc_lex_ungettoken(lexer, &token); - return (isc_base64_tobuffer(lexer, target, -1)); + return isc_base64_tobuffer(lexer, target, -1); } } @@ -119,9 +119,9 @@ totext_doa(ARGS_TOTEXT) { * DOA-DATA */ if (region.length == 0) { - return (str_totext("-", target)); + return str_totext("-", target); } else { - return (isc_base64_totext(®ion, 60, "", target)); + return isc_base64_totext(®ion, 60, "", target); } } @@ -141,18 +141,18 @@ fromwire_doa(ARGS_FROMWIRE) { * zero length. */ if (region.length < 4 + 4 + 1 + 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* * Check whether DOA-MEDIA-TYPE length is not malformed. */ if (region.base[9] > region.length - 10) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static isc_result_t @@ -166,7 +166,7 @@ towire_doa(ARGS_TOWIRE) { REQUIRE(rdata->length != 0); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -184,7 +184,7 @@ compare_doa(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -201,7 +201,7 @@ fromstruct_doa(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(doa->location, target)); RETERR(uint8_tobuffer(doa->mediatype_len, target)); RETERR(mem_tobuffer(target, doa->mediatype, doa->mediatype_len)); - return (mem_tobuffer(target, doa->data, doa->data_len)); + return mem_tobuffer(target, doa->data, doa->data_len); } static isc_result_t @@ -259,7 +259,7 @@ tostruct_doa(ARGS_TOSTRUCT) { doa->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -292,7 +292,7 @@ additionaldata_doa(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -303,7 +303,7 @@ digest_doa(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -315,7 +315,7 @@ checkowner_doa(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_doa); - return (true); + return true; } static bool @@ -326,12 +326,12 @@ checknames_doa(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_doa); - return (true); + return true; } static int casecompare_doa(ARGS_COMPARE) { - return (compare_doa(rdata1, rdata2)); + return compare_doa(rdata1, rdata2); } #endif /* RDATA_GENERIC_DOA_259_C */ diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c index 2af212333a..ebbb0b55b1 100644 --- a/lib/dns/rdata/generic/ds_43.c +++ b/lib/dns/rdata/generic/ds_43.c @@ -79,14 +79,14 @@ generic_fromtext_ds(ARGS_FROMTEXT) { length = -2; break; } - return (isc_hex_tobuffer(lexer, target, length)); + return isc_hex_tobuffer(lexer, target, length); } static isc_result_t fromtext_ds(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ds); - return (generic_fromtext_ds(CALL_FROMTEXT)); + return generic_fromtext_ds(CALL_FROMTEXT); } static isc_result_t @@ -145,7 +145,7 @@ generic_totext_ds(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -153,7 +153,7 @@ totext_ds(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_ds); - return (generic_totext_ds(CALL_TOTEXT)); + return generic_totext_ds(CALL_TOTEXT); } static isc_result_t @@ -177,7 +177,7 @@ generic_fromwire_ds(ARGS_FROMWIRE) { (sr.base[3] == DNS_DSDIGEST_SHA384 && sr.length < 4 + ISC_SHA384_DIGESTLENGTH)) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* @@ -194,14 +194,14 @@ generic_fromwire_ds(ARGS_FROMWIRE) { } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t fromwire_ds(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ds); - return (generic_fromwire_ds(CALL_FROMWIRE)); + return generic_fromwire_ds(CALL_FROMWIRE); } static isc_result_t @@ -214,7 +214,7 @@ towire_ds(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -230,7 +230,7 @@ compare_ds(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -260,14 +260,14 @@ generic_fromstruct_ds(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(ds->algorithm, target)); RETERR(uint8_tobuffer(ds->digest_type, target)); - return (mem_tobuffer(target, ds->digest, ds->length)); + return mem_tobuffer(target, ds->digest, ds->length); } static isc_result_t fromstruct_ds(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ds); - return (generic_fromstruct_ds(CALL_FROMSTRUCT)); + return generic_fromstruct_ds(CALL_FROMSTRUCT); } static isc_result_t @@ -293,7 +293,7 @@ generic_tostruct_ds(ARGS_TOSTRUCT) { ds->digest = mem_maybedup(mctx, region.base, region.length); ds->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -307,7 +307,7 @@ tostruct_ds(ARGS_TOSTRUCT) { ds->common.rdtype = rdata->type; ISC_LINK_INIT(&ds->common, link); - return (generic_tostruct_ds(CALL_TOSTRUCT)); + return generic_tostruct_ds(CALL_TOSTRUCT); } static void @@ -336,7 +336,7 @@ additionaldata_ds(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -347,7 +347,7 @@ digest_ds(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -359,7 +359,7 @@ checkowner_ds(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -370,12 +370,12 @@ checknames_ds(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_ds(ARGS_COMPARE) { - return (compare_ds(rdata1, rdata2)); + return compare_ds(rdata1, rdata2); } #endif /* RDATA_GENERIC_DS_43_C */ diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c index 8dfdc74c5a..944316a73c 100644 --- a/lib/dns/rdata/generic/eui48_108.c +++ b/lib/dns/rdata/generic/eui48_108.c @@ -40,7 +40,7 @@ fromtext_eui48(ARGS_FROMTEXT) { if (n != 6 || l0 > 255U || l1 > 255U || l2 > 255U || l3 > 255U || l4 > 255U || l5 > 255U) { - return (DNS_R_BADEUI); + return DNS_R_BADEUI; } eui48[0] = l0; @@ -49,7 +49,7 @@ fromtext_eui48(ARGS_FROMTEXT) { eui48[3] = l3; eui48[4] = l4; eui48[5] = l5; - return (mem_tobuffer(target, eui48, sizeof(eui48))); + return mem_tobuffer(target, eui48, sizeof(eui48)); } static isc_result_t @@ -64,7 +64,7 @@ totext_eui48(ARGS_TOTEXT) { (void)snprintf(buf, sizeof(buf), "%02x-%02x-%02x-%02x-%02x-%02x", rdata->data[0], rdata->data[1], rdata->data[2], rdata->data[3], rdata->data[4], rdata->data[5]); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -79,10 +79,10 @@ fromwire_eui48(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length != 6) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sregion.length); - return (mem_tobuffer(target, sregion.base, sregion.length)); + return mem_tobuffer(target, sregion.base, sregion.length); } static isc_result_t @@ -92,7 +92,7 @@ towire_eui48(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -108,7 +108,7 @@ compare_eui48(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -123,7 +123,7 @@ fromstruct_eui48(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, eui48->eui48, sizeof(eui48->eui48))); + return mem_tobuffer(target, eui48->eui48, sizeof(eui48->eui48)); } static isc_result_t @@ -141,7 +141,7 @@ tostruct_eui48(ARGS_TOSTRUCT) { ISC_LINK_INIT(&eui48->common, link); memmove(eui48->eui48, rdata->data, rdata->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -164,7 +164,7 @@ additionaldata_eui48(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -176,7 +176,7 @@ digest_eui48(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -188,7 +188,7 @@ checkowner_eui48(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -200,12 +200,12 @@ checknames_eui48(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_eui48(ARGS_COMPARE) { - return (compare_eui48(rdata1, rdata2)); + return compare_eui48(rdata1, rdata2); } #endif /* RDATA_GENERIC_EUI48_108_C */ diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c index 2c25319e30..1df86ce085 100644 --- a/lib/dns/rdata/generic/eui64_109.c +++ b/lib/dns/rdata/generic/eui64_109.c @@ -40,7 +40,7 @@ fromtext_eui64(ARGS_FROMTEXT) { if (n != 8 || l0 > 255U || l1 > 255U || l2 > 255U || l3 > 255U || l4 > 255U || l5 > 255U || l6 > 255U || l7 > 255U) { - return (DNS_R_BADEUI); + return DNS_R_BADEUI; } eui64[0] = l0; @@ -51,7 +51,7 @@ fromtext_eui64(ARGS_FROMTEXT) { eui64[5] = l5; eui64[6] = l6; eui64[7] = l7; - return (mem_tobuffer(target, eui64, sizeof(eui64))); + return mem_tobuffer(target, eui64, sizeof(eui64)); } static isc_result_t @@ -67,7 +67,7 @@ totext_eui64(ARGS_TOTEXT) { buf, sizeof(buf), "%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x", rdata->data[0], rdata->data[1], rdata->data[2], rdata->data[3], rdata->data[4], rdata->data[5], rdata->data[6], rdata->data[7]); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -82,10 +82,10 @@ fromwire_eui64(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length != 8) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sregion.length); - return (mem_tobuffer(target, sregion.base, sregion.length)); + return mem_tobuffer(target, sregion.base, sregion.length); } static isc_result_t @@ -95,7 +95,7 @@ towire_eui64(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -111,7 +111,7 @@ compare_eui64(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -126,7 +126,7 @@ fromstruct_eui64(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, eui64->eui64, sizeof(eui64->eui64))); + return mem_tobuffer(target, eui64->eui64, sizeof(eui64->eui64)); } static isc_result_t @@ -144,7 +144,7 @@ tostruct_eui64(ARGS_TOSTRUCT) { ISC_LINK_INIT(&eui64->common, link); memmove(eui64->eui64, rdata->data, rdata->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -167,7 +167,7 @@ additionaldata_eui64(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -179,7 +179,7 @@ digest_eui64(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -191,7 +191,7 @@ checkowner_eui64(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -203,12 +203,12 @@ checknames_eui64(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_eui64(ARGS_COMPARE) { - return (compare_eui64(rdata1, rdata2)); + return compare_eui64(rdata1, rdata2); } #endif /* RDATA_GENERIC_EUI64_109_C */ diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index 38729801a0..181293c345 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -36,7 +36,7 @@ fromtext_gpos(ARGS_FROMTEXT) { isc_tokentype_qstring, false)); RETTOK(txt_fromtext(&token.value.as_textregion, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_gpos(ARGS_TOTEXT) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -74,7 +74,7 @@ fromwire_gpos(ARGS_FROMWIRE) { for (i = 0; i < 3; i++) { RETERR(txt_fromwire(source, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -84,7 +84,7 @@ towire_gpos(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -100,7 +100,7 @@ compare_gpos(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -120,7 +120,7 @@ fromstruct_gpos(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(gpos->lat_len, target)); RETERR(mem_tobuffer(target, gpos->latitude, gpos->lat_len)); RETERR(uint8_tobuffer(gpos->alt_len, target)); - return (mem_tobuffer(target, gpos->altitude, gpos->alt_len)); + return mem_tobuffer(target, gpos->altitude, gpos->alt_len); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_gpos(ARGS_TOSTRUCT) { } gpos->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -191,7 +191,7 @@ additionaldata_gpos(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -202,7 +202,7 @@ digest_gpos(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -214,7 +214,7 @@ checkowner_gpos(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -225,12 +225,12 @@ checknames_gpos(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_gpos(ARGS_COMPARE) { - return (compare_gpos(rdata1, rdata2)); + return compare_gpos(rdata1, rdata2); } #endif /* RDATA_GENERIC_GPOS_27_C */ diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index a447019cfc..3c7d12fb63 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -33,7 +33,7 @@ fromtext_hinfo(ARGS_FROMTEXT) { isc_tokentype_qstring, false)); RETTOK(txt_fromtext(&token.value.as_textregion, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -48,7 +48,7 @@ totext_hinfo(ARGS_TOTEXT) { dns_rdata_toregion(rdata, ®ion); RETERR(txt_totext(®ion, true, target)); RETERR(str_totext(" ", target)); - return (txt_totext(®ion, true, target)); + return txt_totext(®ion, true, target); } static isc_result_t @@ -60,7 +60,7 @@ fromwire_hinfo(ARGS_FROMWIRE) { UNUSED(rdclass); RETERR(txt_fromwire(source, target)); - return (txt_fromwire(source, target)); + return txt_fromwire(source, target); } static isc_result_t @@ -70,7 +70,7 @@ towire_hinfo(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_hinfo); REQUIRE(rdata->length != 0); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -86,7 +86,7 @@ compare_hinfo(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -104,7 +104,7 @@ fromstruct_hinfo(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(hinfo->cpu_len, target)); RETERR(mem_tobuffer(target, hinfo->cpu, hinfo->cpu_len)); RETERR(uint8_tobuffer(hinfo->os_len, target)); - return (mem_tobuffer(target, hinfo->os, hinfo->os_len)); + return mem_tobuffer(target, hinfo->os, hinfo->os_len); } static isc_result_t @@ -130,7 +130,7 @@ tostruct_hinfo(ARGS_TOSTRUCT) { isc_region_consume(®ion, 1); hinfo->os = mem_maybedup(mctx, region.base, hinfo->os_len); hinfo->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -161,7 +161,7 @@ additionaldata_hinfo(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -172,7 +172,7 @@ digest_hinfo(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -184,7 +184,7 @@ checkowner_hinfo(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -195,10 +195,10 @@ checknames_hinfo(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_hinfo(ARGS_COMPARE) { - return (compare_hinfo(rdata1, rdata2)); + return compare_hinfo(rdata1, rdata2); } diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index 5ee1d297a3..f3a7076885 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -113,7 +113,7 @@ fromtext_hip(ARGS_FROMTEXT) { */ isc_lex_ungettoken(lexer, &token); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -186,7 +186,7 @@ totext_hip(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -231,7 +231,7 @@ fromwire_hip(ARGS_FROMWIRE) { dns_name_init(&name, NULL); RETERR(dns_name_fromwire(&name, source, dctx, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -244,7 +244,7 @@ towire_hip(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -260,7 +260,7 @@ compare_hip(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -294,7 +294,7 @@ fromstruct_hip(ARGS_FROMSTRUCT) { /* initialize the names */ } - return (mem_tobuffer(target, hip->servers, hip->servers_len)); + return mem_tobuffer(target, hip->servers, hip->servers_len); } static isc_result_t @@ -338,7 +338,7 @@ tostruct_hip(ARGS_TOSTRUCT) { hip->offset = hip->servers_len; hip->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -368,7 +368,7 @@ additionaldata_hip(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -378,7 +378,7 @@ digest_hip(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_hip); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -390,7 +390,7 @@ checkowner_hip(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -401,16 +401,16 @@ checknames_hip(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } isc_result_t dns_rdata_hip_first(dns_rdata_hip_t *hip) { if (hip->servers_len == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } hip->offset = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -419,7 +419,7 @@ dns_rdata_hip_next(dns_rdata_hip_t *hip) { dns_name_t name; if (hip->offset >= hip->servers_len) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } region.base = hip->servers + hip->offset; @@ -428,7 +428,7 @@ dns_rdata_hip_next(dns_rdata_hip_t *hip) { dns_name_fromregion(&name, ®ion); hip->offset += name.length; INSIST(hip->offset <= hip->servers_len); - return (hip->offset < hip->servers_len ? ISC_R_SUCCESS : ISC_R_NOMORE); + return hip->offset < hip->servers_len ? ISC_R_SUCCESS : ISC_R_NOMORE; } void @@ -467,7 +467,7 @@ casecompare_hip(ARGS_COMPARE) { INSIST(r2.length > 4); order = memcmp(r1.base, r2.base, 4); if (order != 0) { - return (order); + return order; } hit_len = uint8_fromregion(&r1); @@ -480,7 +480,7 @@ casecompare_hip(ARGS_COMPARE) { INSIST(r2.length >= (unsigned int)(hit_len + key_len)); order = memcmp(r1.base, r2.base, hit_len + key_len); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, hit_len + key_len); isc_region_consume(&r2, hit_len + key_len); @@ -492,11 +492,11 @@ casecompare_hip(ARGS_COMPARE) { dns_name_fromregion(&name2, &r2); order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); } - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c index 10c954fd0d..d29dd0cf20 100644 --- a/lib/dns/rdata/generic/ipseckey_45.c +++ b/lib/dns/rdata/generic/ipseckey_45.c @@ -86,7 +86,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); @@ -98,7 +98,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 16) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, addr6, 16); isc_buffer_add(target, 16); @@ -118,7 +118,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) { /* * Public key. */ - return (isc_base64_tobuffer(lexer, target, -2)); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -135,7 +135,7 @@ totext_ipseckey(ARGS_TOTEXT) { dns_name_init(&name, NULL); if (rdata->data[1] > 3U) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { @@ -208,7 +208,7 @@ totext_ipseckey(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -227,30 +227,30 @@ fromwire_ipseckey(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 3) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } switch (region.base[1]) { case 0: if (region.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 1: if (region.length < 8) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 2: if (region.length < 20) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); case 3: RETERR(mem_tobuffer(target, region.base, 3)); @@ -259,12 +259,12 @@ fromwire_ipseckey(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); isc_buffer_forward(source, region.length); if (region.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } } @@ -278,7 +278,7 @@ towire_ipseckey(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -295,7 +295,7 @@ compare_ipseckey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -313,7 +313,7 @@ fromstruct_ipseckey(ARGS_FROMSTRUCT) { UNUSED(rdclass); if (ipseckey->gateway_type > 3U) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } RETERR(uint8_tobuffer(ipseckey->precedence, target)); @@ -339,7 +339,7 @@ fromstruct_ipseckey(ARGS_FROMSTRUCT) { break; } - return (mem_tobuffer(target, ipseckey->key, ipseckey->keylength)); + return mem_tobuffer(target, ipseckey->key, ipseckey->keylength); } static isc_result_t @@ -402,7 +402,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) { } ipseckey->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -436,7 +436,7 @@ additionaldata_ipseckey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -446,7 +446,7 @@ digest_ipseckey(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_ipseckey); dns_rdata_toregion(rdata, ®ion); - return ((digest)(arg, ®ion)); + return (digest)(arg, ®ion); } static bool @@ -458,7 +458,7 @@ checkowner_ipseckey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -469,7 +469,7 @@ checknames_ipseckey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -491,7 +491,7 @@ casecompare_ipseckey(ARGS_COMPARE) { if (memcmp(region1.base, region2.base, 3) != 0 || region1.base[1] != 3) { - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } dns_name_init(&name1, NULL); @@ -505,13 +505,13 @@ casecompare_ipseckey(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); isc_region_consume(®ion2, name_length(&name2)); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } #endif /* RDATA_GENERIC_IPSECKEY_45_C */ diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index a118e63bc9..67069a0473 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -42,10 +42,10 @@ fromtext_isdn(ARGS_FROMTEXT) { token.type != isc_tokentype_qstring) { isc_lex_ungettoken(lexer, &token); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETTOK(txt_fromtext(&token.value.as_textregion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -60,10 +60,10 @@ totext_isdn(ARGS_TOTEXT) { dns_rdata_toregion(rdata, ®ion); RETERR(txt_totext(®ion, true, target)); if (region.length == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETERR(str_totext(" ", target)); - return (txt_totext(®ion, true, target)); + return txt_totext(®ion, true, target); } static isc_result_t @@ -76,9 +76,9 @@ fromwire_isdn(ARGS_FROMWIRE) { RETERR(txt_fromwire(source, target)); if (buffer_empty(source)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (txt_fromwire(source, target)); + return txt_fromwire(source, target); } static isc_result_t @@ -88,7 +88,7 @@ towire_isdn(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_isdn); REQUIRE(rdata->length != 0); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -104,7 +104,7 @@ compare_isdn(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -122,10 +122,10 @@ fromstruct_isdn(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(isdn->isdn_len, target)); RETERR(mem_tobuffer(target, isdn->isdn, isdn->isdn_len)); if (isdn->subaddress == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETERR(uint8_tobuffer(isdn->subaddress_len, target)); - return (mem_tobuffer(target, isdn->subaddress, isdn->subaddress_len)); + return mem_tobuffer(target, isdn->subaddress, isdn->subaddress_len); } static isc_result_t @@ -159,7 +159,7 @@ tostruct_isdn(ARGS_TOSTRUCT) { } isdn->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -190,7 +190,7 @@ additionaldata_isdn(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -201,7 +201,7 @@ digest_isdn(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -213,7 +213,7 @@ checkowner_isdn(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -224,12 +224,12 @@ checknames_isdn(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_isdn(ARGS_COMPARE) { - return (compare_isdn(rdata1, rdata2)); + return compare_isdn(rdata1, rdata2); } #endif /* RDATA_GENERIC_ISDN_20_C */ diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index d1ab0ad030..12b5095553 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -37,10 +37,10 @@ generic_key_nokey(dns_rdatatype_t type, unsigned int flags) { case dns_rdatatype_cdnskey: case dns_rdatatype_dnskey: case dns_rdatatype_rkey: - return (false); + return false; case dns_rdatatype_key: default: - return ((flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY); + return (flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY; } } @@ -80,7 +80,7 @@ generic_fromtext_key(ARGS_FROMTEXT) { /* No Key? */ if (generic_key_nokey(type, flags)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -104,7 +104,7 @@ generic_fromtext_key(ARGS_FROMTEXT) { RETERR(check_private(&b, alg)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -151,7 +151,7 @@ generic_totext_key(ARGS_TOTEXT) { /* No Key? */ if (generic_key_nokey(rdata->type, flags)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0 && @@ -223,7 +223,7 @@ generic_totext_key(ARGS_TOTEXT) { snprintf(buf, sizeof(buf), "%u", dst_region_computeid(&tmpr)); RETERR(str_totext(buf, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -237,12 +237,12 @@ generic_fromwire_key(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } flags = (sr.base[0] << 8) | sr.base[1]; if (type == dns_rdatatype_rkey && flags != 0U) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } algorithm = sr.base[3]; @@ -251,10 +251,10 @@ generic_fromwire_key(ARGS_FROMWIRE) { isc_buffer_forward(source, 4); if (generic_key_nokey(type, flags)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (sr.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (algorithm == DNS_KEYALG_PRIVATEDNS || @@ -266,14 +266,14 @@ generic_fromwire_key(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t fromtext_key(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_key); - return (generic_fromtext_key(CALL_FROMTEXT)); + return generic_fromtext_key(CALL_FROMTEXT); } static isc_result_t @@ -281,14 +281,14 @@ totext_key(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_key); - return (generic_totext_key(CALL_TOTEXT)); + return generic_totext_key(CALL_TOTEXT); } static isc_result_t fromwire_key(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_key); - return (generic_fromwire_key(CALL_FROMWIRE)); + return generic_fromwire_key(CALL_FROMWIRE); } static isc_result_t @@ -302,7 +302,7 @@ towire_key(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -320,7 +320,7 @@ compare_key(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -348,7 +348,7 @@ generic_fromstruct_key(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(key->algorithm, target)); /* Data */ - return (mem_tobuffer(target, key->data, key->datalen)); + return mem_tobuffer(target, key->data, key->datalen); } static isc_result_t @@ -382,7 +382,7 @@ generic_tostruct_key(ARGS_TOSTRUCT) { key->datalen = sr.length; key->data = mem_maybedup(mctx, sr.base, key->datalen); key->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -405,7 +405,7 @@ static isc_result_t fromstruct_key(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_key); - return (generic_fromstruct_key(CALL_FROMSTRUCT)); + return generic_fromstruct_key(CALL_FROMSTRUCT); } static isc_result_t @@ -420,7 +420,7 @@ tostruct_key(ARGS_TOSTRUCT) { key->common.rdtype = rdata->type; ISC_LINK_INIT(&key->common, link); - return (generic_tostruct_key(CALL_TOSTRUCT)); + return generic_tostruct_key(CALL_TOSTRUCT); } static void @@ -443,7 +443,7 @@ additionaldata_key(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -455,7 +455,7 @@ digest_key(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -467,7 +467,7 @@ checkowner_key(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -479,12 +479,12 @@ checknames_key(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_key(ARGS_COMPARE) { - return (compare_key(rdata1, rdata2)); + return compare_key(rdata1, rdata2); } #endif /* RDATA_GENERIC_KEY_25_C */ diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index b6b21e7c95..4a34ee4daa 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -75,15 +75,15 @@ fromtext_keydata(ARGS_FROMTEXT) { /* Do we have a placeholder KEYDATA record? */ if (flags == 0 && proto == 0 && alg == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* No Key? */ if ((flags & 0xc000) == 0xc000) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (isc_base64_tobuffer(lexer, target, -2)); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -99,7 +99,7 @@ totext_keydata(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_keydata); if ((tctx->flags & DNS_STYLEFLAG_KEYDATA) == 0 || rdata->length < 16) { - return (unknown_totext(rdata, tctx, target)); + return unknown_totext(rdata, tctx, target); } dns_rdata_toregion(rdata, &sr); @@ -156,12 +156,12 @@ totext_keydata(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0) { RETERR(str_totext(" ; placeholder", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* No Key? */ if ((flags & 0xc000) == 0xc000) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* key */ @@ -244,7 +244,7 @@ totext_keydata(ARGS_TOTEXT) { } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -259,7 +259,7 @@ fromwire_keydata(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -271,7 +271,7 @@ towire_keydata(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -285,7 +285,7 @@ compare_keydata(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -319,7 +319,7 @@ fromstruct_keydata(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(keydata->algorithm, target)); /* Data */ - return (mem_tobuffer(target, keydata->data, keydata->datalen)); + return mem_tobuffer(target, keydata->data, keydata->datalen); } static isc_result_t @@ -339,7 +339,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Refresh timer */ if (sr.length < 4) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->refresh = uint32_fromregion(&sr); isc_region_consume(&sr, 4); @@ -347,7 +347,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Add hold-down */ if (sr.length < 4) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->addhd = uint32_fromregion(&sr); isc_region_consume(&sr, 4); @@ -355,7 +355,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Remove hold-down */ if (sr.length < 4) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->removehd = uint32_fromregion(&sr); isc_region_consume(&sr, 4); @@ -363,7 +363,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Flags */ if (sr.length < 2) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->flags = uint16_fromregion(&sr); isc_region_consume(&sr, 2); @@ -371,7 +371,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Protocol */ if (sr.length < 1) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->protocol = uint8_fromregion(&sr); isc_region_consume(&sr, 1); @@ -379,7 +379,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { /* Algorithm */ if (sr.length < 1) { /* Not KEYDATA */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } keydata->algorithm = uint8_fromregion(&sr); isc_region_consume(&sr, 1); @@ -388,7 +388,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { keydata->datalen = sr.length; keydata->data = mem_maybedup(mctx, sr.base, keydata->datalen); keydata->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -417,7 +417,7 @@ additionaldata_keydata(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -428,7 +428,7 @@ digest_keydata(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -440,7 +440,7 @@ checkowner_keydata(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -451,12 +451,12 @@ checknames_keydata(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_keydata(ARGS_COMPARE) { - return (compare_keydata(rdata1, rdata2)); + return compare_keydata(rdata1, rdata2); } #endif /* GENERIC_KEYDATA_65533_C */ diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c index 616a5a3032..a9358eab70 100644 --- a/lib/dns/rdata/generic/l32_105.c +++ b/lib/dns/rdata/generic/l32_105.c @@ -49,11 +49,11 @@ fromtext_l32(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -75,7 +75,7 @@ totext_l32(ARGS_TOTEXT) { RETERR(str_totext(" ", target)); - return (inet_totext(AF_INET, tctx->flags, ®ion, target)); + return inet_totext(AF_INET, tctx->flags, ®ion, target); } static isc_result_t @@ -90,10 +90,10 @@ fromwire_l32(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length != 6) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sregion.length); - return (mem_tobuffer(target, sregion.base, sregion.length)); + return mem_tobuffer(target, sregion.base, sregion.length); } static isc_result_t @@ -103,7 +103,7 @@ towire_l32(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -119,7 +119,7 @@ compare_l32(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -137,7 +137,7 @@ fromstruct_l32(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(l32->pref, target)); n = ntohl(l32->l32.s_addr); - return (uint32_tobuffer(n, target)); + return uint32_tobuffer(n, target); } static isc_result_t @@ -160,7 +160,7 @@ tostruct_l32(ARGS_TOSTRUCT) { l32->pref = uint16_fromregion(®ion); n = uint32_fromregion(®ion); l32->l32.s_addr = htonl(n); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -183,7 +183,7 @@ additionaldata_l32(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -195,7 +195,7 @@ digest_l32(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -207,7 +207,7 @@ checkowner_l32(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -219,12 +219,12 @@ checknames_l32(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_l32(ARGS_COMPARE) { - return (compare_l32(rdata1, rdata2)); + return compare_l32(rdata1, rdata2); } #endif /* RDATA_GENERIC_L32_105_C */ diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c index 37dace548d..946a33bf33 100644 --- a/lib/dns/rdata/generic/l64_106.c +++ b/lib/dns/rdata/generic/l64_106.c @@ -46,7 +46,7 @@ fromtext_l64(ARGS_FROMTEXT) { if (locator_pton(DNS_AS_STR(token), locator) != 1) { RETTOK(DNS_R_SYNTAX); } - return (mem_tobuffer(target, locator, NS_LOCATORSZ)); + return mem_tobuffer(target, locator, NS_LOCATORSZ); } static isc_result_t @@ -73,7 +73,7 @@ totext_l64(ARGS_TOTEXT) { region.base[2] << 8 | region.base[3], region.base[4] << 8 | region.base[5], region.base[6] << 8 | region.base[7]); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -88,10 +88,10 @@ fromwire_l64(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length != 10) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sregion.length); - return (mem_tobuffer(target, sregion.base, sregion.length)); + return mem_tobuffer(target, sregion.base, sregion.length); } static isc_result_t @@ -101,7 +101,7 @@ towire_l64(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -117,7 +117,7 @@ compare_l64(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_l64(ARGS_FROMSTRUCT) { UNUSED(rdclass); RETERR(uint16_tobuffer(l64->pref, target)); - return (mem_tobuffer(target, l64->l64, sizeof(l64->l64))); + return mem_tobuffer(target, l64->l64, sizeof(l64->l64)); } static isc_result_t @@ -154,7 +154,7 @@ tostruct_l64(ARGS_TOSTRUCT) { dns_rdata_toregion(rdata, ®ion); l64->pref = uint16_fromregion(®ion); memmove(l64->l64, region.base, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -177,7 +177,7 @@ additionaldata_l64(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -189,7 +189,7 @@ digest_l64(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -201,7 +201,7 @@ checkowner_l64(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -213,12 +213,12 @@ checknames_l64(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_l64(ARGS_COMPARE) { - return (compare_l64(rdata1, rdata2)); + return compare_l64(rdata1, rdata2); } #endif /* RDATA_GENERIC_L64_106_C */ diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index a35a303a1f..ec4238624f 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -29,10 +29,10 @@ loc_getdecimal(const char *str, unsigned long max, size_t precision, char units, value = strtoul(str, &e, 10); if (*e != 0 && *e != '.' && *e != units) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (value > max) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } ok = e != str; if (*e == '.') { @@ -42,7 +42,7 @@ loc_getdecimal(const char *str, unsigned long max, size_t precision, char units, break; } if ((tmp = decvalue(*e++)) < 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } ok = true; value *= 10; @@ -60,10 +60,10 @@ loc_getdecimal(const char *str, unsigned long max, size_t precision, char units, e++; } if (!ok || *e != 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } *valuep = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -80,10 +80,10 @@ loc_getprecision(const char *str, unsigned char *valuep) { m = strtoul(str, &e, 10); if (*e != 0 && *e != '.' && *e != 'm') { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (m > 90000000) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } cm = 0; ok = e != str; @@ -94,7 +94,7 @@ loc_getprecision(const char *str, unsigned char *valuep) { break; } if ((tmp = decvalue(*e++)) < 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } ok = true; cm *= 10; @@ -108,7 +108,7 @@ loc_getprecision(const char *str, unsigned char *valuep) { e++; } if (!ok || *e != 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* @@ -130,7 +130,7 @@ loc_getprecision(const char *str, unsigned char *valuep) { exp = 0; } *valuep = (man << 4) + exp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -139,20 +139,20 @@ get_degrees(isc_lex_t *lexer, isc_token_t *token, unsigned long *d) { false)); *d = token->value.as_ulong; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t check_coordinate(unsigned long d, unsigned long m, unsigned long s, unsigned long maxd) { if (d > maxd || m > 59U) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } if (d == maxd && (m != 0 || s != 0)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -162,7 +162,7 @@ get_minutes(isc_lex_t *lexer, isc_token_t *token, unsigned long *m) { *m = token->value.as_ulong; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -171,7 +171,7 @@ get_seconds(isc_lex_t *lexer, isc_token_t *token, unsigned long *s) { false)); RETERR(loc_getdecimal(DNS_AS_STR(*token), 59, 3, '\0', s)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -183,19 +183,19 @@ get_direction(isc_lex_t *lexer, isc_token_t *token, const char *directions, DNS_AS_STR(*token)[1] == 0) { *direction = DNS_AS_STR(*token)[0]; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (DNS_AS_STR(*token)[0] == directions[0] && DNS_AS_STR(*token)[1] == 0) { *direction = DNS_AS_STR(*token)[0]; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } *direction = 0; isc_lex_ungettoken(lexer, token); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -256,7 +256,7 @@ done: *mp = m; *sp = s; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -277,7 +277,7 @@ loc_getlatitude(isc_lex_t *lexer, unsigned long *latitude) { UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -298,7 +298,7 @@ loc_getlongitude(isc_lex_t *lexer, unsigned long *longitude) { UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -324,7 +324,7 @@ loc_getaltitude(isc_lex_t *lexer, unsigned long *altitude) { *altitude = 10000000 + cm; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -336,26 +336,26 @@ loc_getoptionalprecision(isc_lex_t *lexer, unsigned char *valuep) { if (token.type == isc_tokentype_eol || token.type == isc_tokentype_eof) { isc_lex_ungettoken(lexer, &token); - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } RETTOK(loc_getprecision(DNS_AS_STR(token), valuep)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t loc_getsize(isc_lex_t *lexer, unsigned char *sizep) { - return (loc_getoptionalprecision(lexer, sizep)); + return loc_getoptionalprecision(lexer, sizep); } static isc_result_t loc_gethorizontalprecision(isc_lex_t *lexer, unsigned char *hpp) { - return (loc_getoptionalprecision(lexer, hpp)); + return loc_getoptionalprecision(lexer, hpp); } static isc_result_t loc_getverticalprecision(isc_lex_t *lexer, unsigned char *vpp) { - return (loc_getoptionalprecision(lexer, vpp)); + return loc_getoptionalprecision(lexer, vpp); } /* The LOC record is expressed in a master file in the following format: @@ -432,7 +432,7 @@ encode: RETERR(uint32_tobuffer(longitude, target)); RETERR(uint32_tobuffer(altitude, target)); - return (result); + return result; } static isc_result_t @@ -465,7 +465,7 @@ totext_loc(ARGS_TOTEXT) { dns_rdata_toregion(rdata, &sr); if (sr.base[0] != 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } REQUIRE(rdata->length == 16); @@ -551,7 +551,7 @@ totext_loc(ARGS_TOTEXT) { east ? "E" : "W", below ? "-" : "", altitude / 100, altitude % 100, sbuf, hbuf, vbuf); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -569,15 +569,15 @@ fromwire_loc(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (sr.base[0] != 0) { /* Treat as unknown. */ isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } if (sr.length < 16) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* @@ -588,7 +588,7 @@ fromwire_loc(ARGS_FROMWIRE) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; /* * Horizontal precision. @@ -604,7 +604,7 @@ fromwire_loc(ARGS_FROMWIRE) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; /* * Vertical precision. @@ -620,7 +620,7 @@ fromwire_loc(ARGS_FROMWIRE) { if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } isc_region_consume(&sr, 4); @@ -632,7 +632,7 @@ fromwire_loc(ARGS_FROMWIRE) { if (latitude < (0x80000000UL - 90 * 3600000) || latitude > (0x80000000UL + 90 * 3600000)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_region_consume(&sr, 4); @@ -643,7 +643,7 @@ fromwire_loc(ARGS_FROMWIRE) { if (longitude < (0x80000000UL - 180 * 3600000) || longitude > (0x80000000UL + 180 * 3600000)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* @@ -653,7 +653,7 @@ fromwire_loc(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, 16); - return (mem_tobuffer(target, sr.base, 16)); + return mem_tobuffer(target, sr.base, 16); } static isc_result_t @@ -663,7 +663,7 @@ towire_loc(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_loc); REQUIRE(rdata->length != 0); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -679,7 +679,7 @@ compare_loc(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -696,42 +696,42 @@ fromstruct_loc(ARGS_FROMSTRUCT) { UNUSED(rdclass); if (loc->v.v0.version != 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } RETERR(uint8_tobuffer(loc->v.v0.version, target)); c = loc->v.v0.size; if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint8_tobuffer(loc->v.v0.size, target)); c = loc->v.v0.horizontal; if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint8_tobuffer(loc->v.v0.horizontal, target)); c = loc->v.v0.vertical; if ((c & 0xf) > 9 || ((c >> 4) & 0xf) > 9 || ((c >> 4) & 0xf) == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint8_tobuffer(loc->v.v0.vertical, target)); if (loc->v.v0.latitude < (0x80000000UL - 90 * 3600000) || loc->v.v0.latitude > (0x80000000UL + 90 * 3600000)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint32_tobuffer(loc->v.v0.latitude, target)); if (loc->v.v0.longitude < (0x80000000UL - 180 * 3600000) || loc->v.v0.longitude > (0x80000000UL + 180 * 3600000)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint32_tobuffer(loc->v.v0.longitude, target)); - return (uint32_tobuffer(loc->v.v0.altitude, target)); + return uint32_tobuffer(loc->v.v0.altitude, target); } static isc_result_t @@ -749,7 +749,7 @@ tostruct_loc(ARGS_TOSTRUCT) { dns_rdata_toregion(rdata, &r); version = uint8_fromregion(&r); if (version != 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } loc->common.rdclass = rdata->rdclass; @@ -770,7 +770,7 @@ tostruct_loc(ARGS_TOSTRUCT) { isc_region_consume(&r, 4); loc->v.v0.altitude = uint32_fromregion(&r); isc_region_consume(&r, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -793,7 +793,7 @@ additionaldata_loc(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -804,7 +804,7 @@ digest_loc(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -816,7 +816,7 @@ checkowner_loc(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -827,12 +827,12 @@ checknames_loc(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_loc(ARGS_COMPARE) { - return (compare_loc(rdata1, rdata2)); + return compare_loc(rdata1, rdata2); } #endif /* RDATA_GENERIC_LOC_29_C */ diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c index 62fb73b068..c2c53d1ef4 100644 --- a/lib/dns/rdata/generic/lp_107.c +++ b/lib/dns/rdata/generic/lp_107.c @@ -47,7 +47,7 @@ fromtext_lp(ARGS_FROMTEXT) { if (origin == NULL) { origin = dns_rootname; } - return (dns_name_fromtext(&name, &buffer, origin, options, target)); + return dns_name_fromtext(&name, &buffer, origin, options, target); } static isc_result_t @@ -76,7 +76,7 @@ totext_lp(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -95,11 +95,11 @@ fromwire_lp(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -109,7 +109,7 @@ towire_lp(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -126,7 +126,7 @@ compare_lp(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -144,7 +144,7 @@ fromstruct_lp(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(lp->pref, target)); dns_name_toregion(&lp->lp, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -169,7 +169,7 @@ tostruct_lp(ARGS_TOSTRUCT) { dns_name_init(&lp->lp, NULL); name_duporclone(&name, mctx, &lp->lp); lp->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -205,9 +205,9 @@ additionaldata_lp(ARGS_ADDLDATA) { result = (add)(arg, &name, dns_rdatatype_l32, NULL DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return ((add)(arg, &name, dns_rdatatype_l64, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_l64, NULL DNS__DB_FILELINE); } static isc_result_t @@ -217,7 +217,7 @@ digest_lp(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_lp); dns_rdata_toregion(rdata, ®ion); - return ((digest)(arg, ®ion)); + return (digest)(arg, ®ion); } static bool @@ -229,7 +229,7 @@ checkowner_lp(ARGS_CHECKOWNER) { UNUSED(name); UNUSED(wildcard); - return (true); + return true; } static bool @@ -239,7 +239,7 @@ checknames_lp(ARGS_CHECKNAMES) { UNUSED(bad); UNUSED(owner); - return (true); + return true; } static int @@ -258,7 +258,7 @@ casecompare_lp(ARGS_COMPARE) { order = memcmp(rdata1->data, rdata2->data, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -273,7 +273,7 @@ casecompare_lp(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } #endif /* RDATA_GENERIC_LP_107_C */ diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index e149c29011..2823611a79 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -37,7 +37,7 @@ fromtext_mb(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_mb(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -73,7 +73,7 @@ fromwire_mb(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -91,7 +91,7 @@ towire_mb(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -116,7 +116,7 @@ compare_mb(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_mb(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&mb->mb, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_mb(ARGS_TOSTRUCT) { dns_name_init(&mb->mb, NULL); name_duporclone(&name, mctx, &mb->mb); mb->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -187,7 +187,7 @@ additionaldata_mb(ARGS_ADDLDATA) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -201,7 +201,7 @@ digest_mb(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -212,7 +212,7 @@ checkowner_mb(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (dns_name_ismailbox(name)); + return dns_name_ismailbox(name); } static bool @@ -223,12 +223,12 @@ checknames_mb(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_mb(ARGS_COMPARE) { - return (compare_mb(rdata1, rdata2)); + return compare_mb(rdata1, rdata2); } #endif /* RDATA_GENERIC_MB_7_C */ diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index f9319014c4..471473ac78 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -37,7 +37,7 @@ fromtext_md(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_md(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -73,7 +73,7 @@ fromwire_md(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -91,7 +91,7 @@ towire_md(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -116,7 +116,7 @@ compare_md(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_md(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&md->md, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_md(ARGS_TOSTRUCT) { dns_name_init(&md->md, NULL); name_duporclone(&name, mctx, &md->md); md->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -188,7 +188,7 @@ additionaldata_md(ARGS_ADDLDATA) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -202,7 +202,7 @@ digest_md(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -214,7 +214,7 @@ checkowner_md(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -225,12 +225,12 @@ checknames_md(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_md(ARGS_COMPARE) { - return (compare_md(rdata1, rdata2)); + return compare_md(rdata1, rdata2); } #endif /* RDATA_GENERIC_MD_3_C */ diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index e4ba81659a..726534232c 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -37,7 +37,7 @@ fromtext_mf(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_mf(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -73,7 +73,7 @@ fromwire_mf(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -91,7 +91,7 @@ towire_mf(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -116,7 +116,7 @@ compare_mf(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_mf(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&mf->mf, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_mf(ARGS_TOSTRUCT) { dns_name_init(&mf->mf, NULL); name_duporclone(&name, mctx, &mf->mf); mf->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -187,7 +187,7 @@ additionaldata_mf(ARGS_ADDLDATA) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -201,7 +201,7 @@ digest_mf(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -213,7 +213,7 @@ checkowner_mf(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -224,12 +224,12 @@ checknames_mf(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_mf(ARGS_COMPARE) { - return (compare_mf(rdata1, rdata2)); + return compare_mf(rdata1, rdata2); } #endif /* RDATA_GENERIC_MF_4_C */ diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index ca80a883d6..26c2981b3c 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -37,7 +37,7 @@ fromtext_mg(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_mg(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -73,7 +73,7 @@ fromwire_mg(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -91,7 +91,7 @@ towire_mg(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -116,7 +116,7 @@ compare_mg(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_mg(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&mg->mg, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_mg(ARGS_TOSTRUCT) { dns_name_init(&mg->mg, NULL); name_duporclone(&name, mctx, &mg->mg); mg->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -182,7 +182,7 @@ additionaldata_mg(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(owner); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -196,7 +196,7 @@ digest_mg(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -207,7 +207,7 @@ checkowner_mg(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (dns_name_ismailbox(name)); + return dns_name_ismailbox(name); } static bool @@ -218,12 +218,12 @@ checknames_mg(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_mg(ARGS_COMPARE) { - return (compare_mg(rdata1, rdata2)); + return compare_mg(rdata1, rdata2); } #endif /* RDATA_GENERIC_MG_8_C */ diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index 5c98f46085..afd1160aca 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -52,7 +52,7 @@ fromtext_minfo(ARGS_FROMTEXT) { warn_badname(&name, lexer, callbacks); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -88,7 +88,7 @@ totext_minfo(ARGS_TOTEXT) { opts = name_prefix(&email, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -107,7 +107,7 @@ fromwire_minfo(ARGS_FROMWIRE) { dns_name_init(&email, NULL); RETERR(dns_name_fromwire(&rmail, source, dctx, target)); - return (dns_name_fromwire(&email, source, dctx, target)); + return dns_name_fromwire(&email, source, dctx, target); } static isc_result_t @@ -136,7 +136,7 @@ towire_minfo(ARGS_TOWIRE) { dns_name_fromregion(&rmail, ®ion); isc_region_consume(®ion, rmail.length); - return (dns_name_towire(&rmail, cctx, target, NULL)); + return dns_name_towire(&rmail, cctx, target, NULL); } static int @@ -164,7 +164,7 @@ compare_minfo(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); @@ -177,7 +177,7 @@ compare_minfo(ARGS_COMPARE) { dns_name_fromregion(&name2, ®ion2); order = dns_name_rdatacompare(&name1, &name2); - return (order); + return order; } static isc_result_t @@ -196,7 +196,7 @@ fromstruct_minfo(ARGS_FROMSTRUCT) { dns_name_toregion(&minfo->rmailbox, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); dns_name_toregion(&minfo->emailbox, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -224,7 +224,7 @@ tostruct_minfo(ARGS_TOSTRUCT) { dns_name_init(&minfo->emailbox, NULL); name_duporclone(&name, mctx, &minfo->emailbox); minfo->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -252,7 +252,7 @@ additionaldata_minfo(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -268,13 +268,13 @@ digest_minfo(ARGS_DIGEST) { dns_name_fromregion(&name, &r); result = dns_name_digest(&name, digest, arg); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_region_consume(&r, name_length(&name)); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -286,7 +286,7 @@ checkowner_minfo(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -305,7 +305,7 @@ checknames_minfo(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } isc_region_consume(®ion, name_length(&name)); dns_name_fromregion(&name, ®ion); @@ -313,14 +313,14 @@ checknames_minfo(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_minfo(ARGS_COMPARE) { - return (compare_minfo(rdata1, rdata2)); + return compare_minfo(rdata1, rdata2); } #endif /* RDATA_GENERIC_MINFO_14_C */ diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index b0e4200b6a..6c1758d212 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -37,7 +37,7 @@ fromtext_mr(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_mr(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -73,7 +73,7 @@ fromwire_mr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -91,7 +91,7 @@ towire_mr(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -116,7 +116,7 @@ compare_mr(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_mr(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&mr->mr, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_mr(ARGS_TOSTRUCT) { dns_name_init(&mr->mr, NULL); name_duporclone(&name, mctx, &mr->mr); mr->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -182,7 +182,7 @@ additionaldata_mr(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -196,7 +196,7 @@ digest_mr(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -208,7 +208,7 @@ checkowner_mr(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -219,12 +219,12 @@ checknames_mr(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_mr(ARGS_COMPARE) { - return (compare_mr(rdata1, rdata2)); + return compare_mr(rdata1, rdata2); } #endif /* RDATA_GENERIC_MR_9_C */ diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index c772ec2f30..8baa31a293 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -29,7 +29,7 @@ check_mx(isc_token_t *token) { struct in6_addr addr6; if (strlcpy(tmp, DNS_AS_STR(*token), sizeof(tmp)) >= sizeof(tmp)) { - return (true); + return true; } if (tmp[strlen(tmp) - 1] == '.') { @@ -38,10 +38,10 @@ check_mx(isc_token_t *token) { if (inet_pton(AF_INET, tmp, &addr) == 1 || inet_pton(AF_INET6, tmp, &addr6) == 1) { - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -93,7 +93,7 @@ fromtext_mx(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -122,7 +122,7 @@ totext_mx(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -141,11 +141,11 @@ fromwire_mx(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -166,7 +166,7 @@ towire_mx(ARGS_TOWIRE) { dns_name_init(&name, offsets); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -185,7 +185,7 @@ compare_mx(ARGS_COMPARE) { order = memcmp(rdata1->data, rdata2->data, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -200,7 +200,7 @@ compare_mx(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -218,7 +218,7 @@ fromstruct_mx(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(mx->pref, target)); dns_name_toregion(&mx->mx, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -243,7 +243,7 @@ tostruct_mx(ARGS_TOSTRUCT) { dns_name_init(&mx->mx, NULL); name_duporclone(&name, mctx, &mx->mx); mx->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -284,23 +284,23 @@ additionaldata_mx(ARGS_ADDLDATA) { dns_name_fromregion(&name, ®ion); if (dns_name_equal(&name, dns_rootname)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_fixedname_init(&fixed); result = dns_name_concatenate(&port25, &name, dns_fixedname_name(&fixed), NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa, - NULL DNS__DB_FILELINE)); + return (add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa, + NULL DNS__DB_FILELINE); } static isc_result_t @@ -317,7 +317,7 @@ digest_mx(ARGS_DIGEST) { RETERR((digest)(arg, &r1)); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -327,7 +327,7 @@ checkowner_mx(ARGS_CHECKOWNER) { UNUSED(type); UNUSED(rdclass); - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -347,14 +347,14 @@ checknames_mx(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_mx(ARGS_COMPARE) { - return (compare_mx(rdata1, rdata2)); + return compare_mx(rdata1, rdata2); } #endif /* RDATA_GENERIC_MX_15_C */ diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c index f12713a883..2c1a5c7773 100644 --- a/lib/dns/rdata/generic/naptr_35.c +++ b/lib/dns/rdata/generic/naptr_35.c @@ -38,7 +38,7 @@ txt_valid_regex(const unsigned char *txt) { len = *txt++; if (len == 0U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } delim = *txt++; @@ -61,14 +61,14 @@ txt_valid_regex(const unsigned char *txt) { case '\\': case 'i': case 0: - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } cp = regex; while (len-- > 0) { c = *txt++; if (c == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (c == delim && !replace) { replace = true; @@ -77,7 +77,7 @@ txt_valid_regex(const unsigned char *txt) { flags = true; continue; } else if (c == delim) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* * Flags are not escaped. @@ -87,7 +87,7 @@ txt_valid_regex(const unsigned char *txt) { case 'i': continue; default: - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } if (!replace) { @@ -95,17 +95,17 @@ txt_valid_regex(const unsigned char *txt) { } if (c == '\\') { if (len == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } c = *txt++; if (c == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } len--; if (replace) { switch (c) { case '0': - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; case '1': if (nsub < 1) { nsub = 1; @@ -159,14 +159,14 @@ txt_valid_regex(const unsigned char *txt) { } } if (!flags) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } *cp = '\0'; n = isc_regex_validate(regex); if (n < 0 || nsub > (unsigned int)n) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -236,7 +236,7 @@ fromtext_naptr(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -298,7 +298,7 @@ totext_naptr(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -321,7 +321,7 @@ fromwire_naptr(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 4)); isc_buffer_forward(source, 4); @@ -346,7 +346,7 @@ fromwire_naptr(ARGS_FROMWIRE) { /* * Replacement. */ - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -389,7 +389,7 @@ towire_naptr(ARGS_TOWIRE) { */ dns_name_init(&name, offsets); dns_name_fromregion(&name, &sr); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -414,7 +414,7 @@ compare_naptr(ARGS_COMPARE) { */ order = memcmp(region1.base, region2.base, 4); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(®ion1, 4); isc_region_consume(®ion2, 4); @@ -425,7 +425,7 @@ compare_naptr(ARGS_COMPARE) { len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); @@ -436,7 +436,7 @@ compare_naptr(ARGS_COMPARE) { len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); @@ -447,7 +447,7 @@ compare_naptr(ARGS_COMPARE) { len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); @@ -461,7 +461,7 @@ compare_naptr(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -489,7 +489,7 @@ fromstruct_naptr(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(naptr->regexp_len, target)); RETERR(mem_tobuffer(target, naptr->regexp, naptr->regexp_len)); dns_name_toregion(&naptr->replacement, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -541,7 +541,7 @@ tostruct_naptr(ARGS_TOSTRUCT) { dns_name_init(&naptr->replacement, NULL); name_duporclone(&name, mctx, &naptr->replacement); naptr->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -622,10 +622,10 @@ additionaldata_naptr(ARGS_ADDLDATA) { dns_name_fromregion(&name, &sr); if (atype != 0) { - return ((add)(arg, &name, atype, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, atype, NULL DNS__DB_FILELINE); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -674,7 +674,7 @@ digest_naptr(ARGS_DIGEST) { r1.length = length; result = (digest)(arg, &r1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -684,7 +684,7 @@ digest_naptr(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -696,7 +696,7 @@ checkowner_naptr(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -707,12 +707,12 @@ checknames_naptr(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_naptr(ARGS_COMPARE) { - return (compare_naptr(rdata1, rdata2)); + return compare_naptr(rdata1, rdata2); } #endif /* RDATA_GENERIC_NAPTR_35_C */ diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c index 2ae714aa5d..f0e76d23af 100644 --- a/lib/dns/rdata/generic/nid_104.c +++ b/lib/dns/rdata/generic/nid_104.c @@ -46,7 +46,7 @@ fromtext_nid(ARGS_FROMTEXT) { if (locator_pton(DNS_AS_STR(token), locator) != 1) { RETTOK(DNS_R_SYNTAX); } - return (mem_tobuffer(target, locator, NS_LOCATORSZ)); + return mem_tobuffer(target, locator, NS_LOCATORSZ); } static isc_result_t @@ -73,7 +73,7 @@ totext_nid(ARGS_TOTEXT) { region.base[2] << 8 | region.base[3], region.base[4] << 8 | region.base[5], region.base[6] << 8 | region.base[7]); - return (str_totext(buf, target)); + return str_totext(buf, target); } static isc_result_t @@ -88,10 +88,10 @@ fromwire_nid(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length != 10) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sregion.length); - return (mem_tobuffer(target, sregion.base, sregion.length)); + return mem_tobuffer(target, sregion.base, sregion.length); } static isc_result_t @@ -101,7 +101,7 @@ towire_nid(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -117,7 +117,7 @@ compare_nid(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -133,7 +133,7 @@ fromstruct_nid(ARGS_FROMSTRUCT) { UNUSED(rdclass); RETERR(uint16_tobuffer(nid->pref, target)); - return (mem_tobuffer(target, nid->nid, sizeof(nid->nid))); + return mem_tobuffer(target, nid->nid, sizeof(nid->nid)); } static isc_result_t @@ -154,7 +154,7 @@ tostruct_nid(ARGS_TOSTRUCT) { dns_rdata_toregion(rdata, ®ion); nid->pref = uint16_fromregion(®ion); memmove(nid->nid, region.base, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -177,7 +177,7 @@ additionaldata_nid(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -189,7 +189,7 @@ digest_nid(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -201,7 +201,7 @@ checkowner_nid(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -213,12 +213,12 @@ checknames_nid(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_nid(ARGS_COMPARE) { - return (compare_nid(rdata1, rdata2)); + return compare_nid(rdata1, rdata2); } #endif /* RDATA_GENERIC_NID_104_C */ diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c index 8e0fae1400..8bed8637d3 100644 --- a/lib/dns/rdata/generic/ninfo_56.c +++ b/lib/dns/rdata/generic/ninfo_56.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_ninfo(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ninfo); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_ninfo(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_ninfo); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_ninfo(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ninfo); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -44,7 +44,7 @@ towire_ninfo(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -58,14 +58,14 @@ compare_ninfo(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_ninfo(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ninfo); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -79,7 +79,7 @@ tostruct_ninfo(ARGS_TOSTRUCT) { ninfo->common.rdtype = rdata->type; ISC_LINK_INIT(&ninfo->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -101,7 +101,7 @@ additionaldata_ninfo(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -112,7 +112,7 @@ digest_ninfo(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -124,7 +124,7 @@ checkowner_ninfo(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -135,12 +135,12 @@ checknames_ninfo(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_ninfo(ARGS_COMPARE) { - return (compare_ninfo(rdata1, rdata2)); + return compare_ninfo(rdata1, rdata2); } isc_result_t @@ -148,7 +148,7 @@ dns_rdata_ninfo_first(dns_rdata_ninfo_t *ninfo) { REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); - return (generic_txt_first(ninfo)); + return generic_txt_first(ninfo); } isc_result_t @@ -156,7 +156,7 @@ dns_rdata_ninfo_next(dns_rdata_ninfo_t *ninfo) { REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); - return (generic_txt_next(ninfo)); + return generic_txt_next(ninfo); } isc_result_t @@ -165,6 +165,6 @@ dns_rdata_ninfo_current(dns_rdata_ninfo_t *ninfo, REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); - return (generic_txt_current(ninfo, string)); + return generic_txt_current(ninfo, string); } #endif /* RDATA_GENERIC_NINFO_56_C */ diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index e16f2df4ec..1ddbd1b831 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -48,7 +48,7 @@ fromtext_ns(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -69,7 +69,7 @@ totext_ns(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -84,7 +84,7 @@ fromwire_ns(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -102,7 +102,7 @@ towire_ns(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -127,7 +127,7 @@ compare_ns(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -144,7 +144,7 @@ fromstruct_ns(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&ns->name, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -167,7 +167,7 @@ tostruct_ns(ARGS_TOSTRUCT) { dns_name_init(&ns->name, NULL); name_duporclone(&name, mctx, &ns->name); ns->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -198,7 +198,7 @@ additionaldata_ns(ARGS_ADDLDATA) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -212,7 +212,7 @@ digest_ns(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -224,7 +224,7 @@ checkowner_ns(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -243,14 +243,14 @@ checknames_ns(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_ns(ARGS_COMPARE) { - return (compare_ns(rdata1, rdata2)); + return compare_ns(rdata1, rdata2); } #endif /* RDATA_GENERIC_NS_2_C */ diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c index 463cc4d9cd..ffdc184783 100644 --- a/lib/dns/rdata/generic/nsec3_50.c +++ b/lib/dns/rdata/generic/nsec3_50.c @@ -102,7 +102,7 @@ fromtext_nsec3(ARGS_FROMTEXT) { RETERR(uint8_tobuffer(isc_buffer_usedlength(&b), target)); RETERR(mem_tobuffer(target, &buf, isc_buffer_usedlength(&b))); - return (typemap_fromtext(lexer, target, true)); + return typemap_fromtext(lexer, target, true); } static isc_result_t @@ -178,7 +178,7 @@ totext_nsec3(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -222,7 +222,7 @@ fromwire_nsec3(ARGS_FROMWIRE) { RETERR(mem_tobuffer(target, rr.base, rr.length)); isc_buffer_forward(source, rr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -235,7 +235,7 @@ towire_nsec3(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -251,7 +251,7 @@ compare_nsec3(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -280,7 +280,7 @@ fromstruct_nsec3(ARGS_FROMSTRUCT) { region.base = nsec3->typebits; region.length = nsec3->len; RETERR(typemap_test(®ion, true)); - return (mem_tobuffer(target, nsec3->typebits, nsec3->len)); + return mem_tobuffer(target, nsec3->typebits, nsec3->len); } static isc_result_t @@ -315,7 +315,7 @@ tostruct_nsec3(ARGS_TOSTRUCT) { nsec3->len = region.length; nsec3->typebits = mem_maybedup(mctx, region.base, region.length); nsec3->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -350,7 +350,7 @@ additionaldata_nsec3(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -360,7 +360,7 @@ digest_nsec3(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_nsec3); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -382,10 +382,10 @@ checkowner_nsec3(ARGS_CHECKOWNER) { isc_region_consume(&label, 1); isc_buffer_init(&buffer, owner, sizeof(owner)); if (isc_base32hexnp_decoderegion(&label, &buffer) == ISC_R_SUCCESS) { - return (true); + return true; } - return (false); + return false; } static bool @@ -396,12 +396,12 @@ checknames_nsec3(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_nsec3(ARGS_COMPARE) { - return (compare_nsec3(rdata1, rdata2)); + return compare_nsec3(rdata1, rdata2); } #endif /* RDATA_GENERIC_NSEC3_50_C */ diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c index 3c8682b6e6..5e7615e6d9 100644 --- a/lib/dns/rdata/generic/nsec3param_51.c +++ b/lib/dns/rdata/generic/nsec3param_51.c @@ -87,7 +87,7 @@ fromtext_nsec3param(ARGS_FROMTEXT) { RETERR(isc_hex_decodestring(DNS_AS_STR(token), target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -137,7 +137,7 @@ totext_nsec3param(ARGS_TOTEXT) { RETERR(str_totext("-", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -167,7 +167,7 @@ fromwire_nsec3param(ARGS_FROMWIRE) { isc_region_consume(&sr, saltlen); RETERR(mem_tobuffer(target, rr.base, rr.length)); isc_buffer_forward(source, rr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -180,7 +180,7 @@ towire_nsec3param(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -196,7 +196,7 @@ compare_nsec3param(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -216,7 +216,7 @@ fromstruct_nsec3param(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(nsec3param->iterations, target)); RETERR(uint8_tobuffer(nsec3param->salt_length, target)); RETERR(mem_tobuffer(target, nsec3param->salt, nsec3param->salt_length)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -245,7 +245,7 @@ tostruct_nsec3param(ARGS_TOSTRUCT) { isc_region_consume(®ion, nsec3param->salt_length); nsec3param->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -274,7 +274,7 @@ additionaldata_nsec3param(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -284,7 +284,7 @@ digest_nsec3param(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_nsec3param); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -296,7 +296,7 @@ checkowner_nsec3param(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -307,12 +307,12 @@ checknames_nsec3param(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_nsec3param(ARGS_COMPARE) { - return (compare_nsec3param(rdata1, rdata2)); + return compare_nsec3param(rdata1, rdata2); } #endif /* RDATA_GENERIC_NSEC3PARAM_51_C */ diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c index a8838126ae..e8660e2b85 100644 --- a/lib/dns/rdata/generic/nsec_47.c +++ b/lib/dns/rdata/generic/nsec_47.c @@ -48,7 +48,7 @@ fromtext_nsec(ARGS_FROMTEXT) { } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (typemap_fromtext(lexer, target, false)); + return typemap_fromtext(lexer, target, false); } static isc_result_t @@ -72,7 +72,7 @@ totext_nsec(ARGS_TOTEXT) { if (sr.length > 0) { RETERR(str_totext(" ", target)); } - return (typemap_totext(&sr, NULL, target)); + return typemap_totext(&sr, NULL, target); } static isc_result_t @@ -94,7 +94,7 @@ fromwire_nsec(ARGS_FROMWIRE) { RETERR(typemap_test(&sr, false)); RETERR(mem_tobuffer(target, sr.base, sr.length)); isc_buffer_forward(source, sr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -113,7 +113,7 @@ towire_nsec(ARGS_TOWIRE) { isc_region_consume(&sr, name_length(&name)); RETERR(dns_name_towire(&name, cctx, target, NULL)); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -129,7 +129,7 @@ compare_nsec(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -152,7 +152,7 @@ fromstruct_nsec(ARGS_FROMSTRUCT) { region.base = nsec->typebits; region.length = nsec->len; RETERR(typemap_test(®ion, false)); - return (mem_tobuffer(target, nsec->typebits, nsec->len)); + return mem_tobuffer(target, nsec->typebits, nsec->len); } static isc_result_t @@ -179,7 +179,7 @@ tostruct_nsec(ARGS_TOSTRUCT) { nsec->len = region.length; nsec->typebits = mem_maybedup(mctx, region.base, region.length); nsec->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -209,7 +209,7 @@ additionaldata_nsec(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -219,7 +219,7 @@ digest_nsec(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_nsec); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -231,7 +231,7 @@ checkowner_nsec(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -242,7 +242,7 @@ checknames_nsec(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -270,12 +270,12 @@ casecompare_nsec(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); isc_region_consume(®ion2, name_length(&name2)); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } #endif /* RDATA_GENERIC_NSEC_47_C */ diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index 522c4aabb9..bde61b682d 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -28,14 +28,14 @@ fromtext_null(ARGS_FROMTEXT) { UNUSED(target); UNUSED(callbacks); - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } static isc_result_t totext_null(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_null); - return (unknown_totext(rdata, tctx, target)); + return unknown_totext(rdata, tctx, target); } static isc_result_t @@ -50,7 +50,7 @@ fromwire_null(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -59,7 +59,7 @@ towire_null(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -73,7 +73,7 @@ compare_null(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -89,7 +89,7 @@ fromstruct_null(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, null->data, null->length)); + return mem_tobuffer(target, null->data, null->length); } static isc_result_t @@ -108,7 +108,7 @@ tostruct_null(ARGS_TOSTRUCT) { null->length = r.length; null->data = mem_maybedup(mctx, r.base, r.length); null->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -137,7 +137,7 @@ additionaldata_null(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -148,7 +148,7 @@ digest_null(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -160,7 +160,7 @@ checkowner_null(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -171,12 +171,12 @@ checknames_null(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_null(ARGS_COMPARE) { - return (compare_null(rdata1, rdata2)); + return compare_null(rdata1, rdata2); } #endif /* RDATA_GENERIC_NULL_10_C */ diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index 6b09aa68c5..97019f9a55 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -72,7 +72,7 @@ fromtext_nxt(ARGS_FROMTEXT) { * NXT is only specified for types 1..127. */ if (covered < 1 || covered > 127) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } if (first || covered > maxcovered) { maxcovered = covered; @@ -82,10 +82,10 @@ fromtext_nxt(ARGS_FROMTEXT) { } while (1); isc_lex_ungettoken(lexer, &token); if (first) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } n = (maxcovered + 8) / 8; - return (mem_tobuffer(target, bm, n)); + return mem_tobuffer(target, bm, n); } static isc_result_t @@ -131,7 +131,7 @@ totext_nxt(ARGS_TOTEXT) { } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -153,11 +153,11 @@ fromwire_nxt(ARGS_FROMWIRE) { if (sr.length > 0 && ((sr.base[0] & 0x80) != 0 || sr.length > 16 || sr.base[sr.length - 1] == 0)) { - return (DNS_R_BADBITMAP); + return DNS_R_BADBITMAP; } RETERR(mem_tobuffer(target, sr.base, sr.length)); isc_buffer_forward(source, sr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -176,7 +176,7 @@ towire_nxt(ARGS_TOWIRE) { isc_region_consume(&sr, name_length(&name)); RETERR(dns_name_towire(&name, cctx, target, NULL)); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -201,13 +201,13 @@ compare_nxt(ARGS_COMPARE) { dns_name_fromregion(&name2, &r2); order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -231,7 +231,7 @@ fromstruct_nxt(ARGS_FROMSTRUCT) { dns_name_toregion(&nxt->next, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); - return (mem_tobuffer(target, nxt->typebits, nxt->len)); + return mem_tobuffer(target, nxt->typebits, nxt->len); } static isc_result_t @@ -258,7 +258,7 @@ tostruct_nxt(ARGS_TOSTRUCT) { nxt->len = region.length; nxt->typebits = mem_maybedup(mctx, region.base, region.length); nxt->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -288,7 +288,7 @@ additionaldata_nxt(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -304,11 +304,11 @@ digest_nxt(ARGS_DIGEST) { dns_name_fromregion(&name, &r); result = dns_name_digest(&name, digest, arg); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_region_consume(&r, name_length(&name)); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -320,7 +320,7 @@ checkowner_nxt(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -331,11 +331,11 @@ checknames_nxt(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_nxt(ARGS_COMPARE) { - return (compare_nxt(rdata1, rdata2)); + return compare_nxt(rdata1, rdata2); } #endif /* RDATA_GENERIC_NXT_30_C */ diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c index 5c8c3c7359..9b51b1f4ca 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.c +++ b/lib/dns/rdata/generic/openpgpkey_61.c @@ -29,7 +29,7 @@ fromtext_openpgpkey(ARGS_FROMTEXT) { /* * Keyring. */ - return (isc_base64_tobuffer(lexer, target, -2)); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -63,7 +63,7 @@ totext_openpgpkey(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -81,10 +81,10 @@ fromwire_openpgpkey(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -97,7 +97,7 @@ towire_openpgpkey(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -113,7 +113,7 @@ compare_openpgpkey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -132,7 +132,7 @@ fromstruct_openpgpkey(ARGS_FROMSTRUCT) { /* * Keyring. */ - return (mem_tobuffer(target, sig->keyring, sig->length)); + return mem_tobuffer(target, sig->keyring, sig->length); } static isc_result_t @@ -156,7 +156,7 @@ tostruct_openpgpkey(ARGS_TOSTRUCT) { sig->length = sr.length; sig->keyring = mem_maybedup(mctx, sr.base, sig->length); sig->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -185,7 +185,7 @@ additionaldata_openpgpkey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -196,7 +196,7 @@ digest_openpgpkey(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -208,7 +208,7 @@ checkowner_openpgpkey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -219,7 +219,7 @@ checknames_openpgpkey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -236,7 +236,7 @@ casecompare_openpgpkey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } #endif /* RDATA_GENERIC_OPENPGPKEY_61_C */ diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index 84bbe1cc7f..5c81b1546c 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -38,7 +38,7 @@ fromtext_opt(ARGS_FROMTEXT) { UNUSED(target); UNUSED(callbacks); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t @@ -88,7 +88,7 @@ totext_opt(ARGS_TOTEXT) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -112,12 +112,12 @@ fromwire_opt(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } total = 0; while (sregion.length != 0) { if (sregion.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } opt = uint16_fromregion(&sregion); isc_region_consume(&sregion, 2); @@ -125,18 +125,18 @@ fromwire_opt(ARGS_FROMWIRE) { isc_region_consume(&sregion, 2); total += 4; if (sregion.length < length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } switch (opt) { case DNS_OPT_LLQ: if (length != 18U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; case DNS_OPT_UL: if (length != 4U && length != 8U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; @@ -147,7 +147,7 @@ fromwire_opt(ARGS_FROMWIRE) { uint8_t addrbytes; if (length < 4) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } family = uint16_fromregion(&sregion); isc_region_consume(&sregion, 2); @@ -168,32 +168,32 @@ fromwire_opt(ARGS_FROMWIRE) { * family is unknown. */ if (addrlen != 0U || scope != 0U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } break; case 1: if (addrlen > 32U || scope > 32U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } break; case 2: if (addrlen > 128U || scope > 128U) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } break; default: - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } addrbytes = (addrlen + 7) / 8; if (addrbytes + 4 != length) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } if (addrbytes != 0U && (addrlen % 8) != 0) { uint8_t bits = ~0U << (8 - (addrlen % 8)); bits &= sregion.base[addrbytes - 1]; if (bits != sregion.base[addrbytes - 1]) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } } isc_region_consume(&sregion, addrbytes); @@ -204,7 +204,7 @@ fromwire_opt(ARGS_FROMWIRE) { * Request has zero length. Response is 32 bits. */ if (length != 0 && length != 4) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; @@ -214,23 +214,23 @@ fromwire_opt(ARGS_FROMWIRE) { * Client + server cookie is 8 + [8..32]. */ if (length != 8 && (length < 16 || length > 40)) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; case DNS_OPT_KEY_TAG: if (length == 0 || (length % 2) != 0) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; case DNS_OPT_EDE: if (length < 2) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } /* UTF-8 Byte Order Mark is not permitted. RFC 5198 */ if (isc_utf8_bom(sregion.base + 2, length - 2)) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } /* * The EXTRA-TEXT field is specified as UTF-8, and @@ -238,7 +238,7 @@ fromwire_opt(ARGS_FROMWIRE) { * according to RFC 3269 security considerations. */ if (!isc_utf8_valid(sregion.base + 2, length - 2)) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; @@ -246,14 +246,14 @@ fromwire_opt(ARGS_FROMWIRE) { FALLTHROUGH; case DNS_OPT_SERVER_TAG: if (length != 2) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; case DNS_OPT_REPORT_CHANNEL: /* A domain name in wire format. RFC 9567 */ if (length == 0 || length > DNS_NAME_MAXWIRE) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_buffer_init(&b, sregion.base, length); isc_buffer_add(&b, length); @@ -262,7 +262,7 @@ fromwire_opt(ARGS_FROMWIRE) { if (result != ISC_R_SUCCESS || name->length != length || !dns_name_isabsolute(name)) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } isc_region_consume(&sregion, length); break; @@ -276,13 +276,13 @@ fromwire_opt(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (tregion.length < total) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, total); isc_buffer_forward(source, total); isc_buffer_add(target, total); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -291,7 +291,7 @@ towire_opt(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -305,7 +305,7 @@ compare_opt(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -330,15 +330,15 @@ fromstruct_opt(ARGS_FROMSTRUCT) { length = uint16_fromregion(®ion); isc_region_consume(®ion, 2); if (region.length < length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_region_consume(®ion, length); } if (region.length != 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (mem_tobuffer(target, opt->options, opt->length)); + return mem_tobuffer(target, opt->options, opt->length); } static isc_result_t @@ -358,7 +358,7 @@ tostruct_opt(ARGS_TOSTRUCT) { opt->options = mem_maybedup(mctx, r.base, r.length); opt->offset = 0; opt->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -387,7 +387,7 @@ additionaldata_opt(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -402,7 +402,7 @@ digest_opt(ARGS_DIGEST) { UNUSED(digest); UNUSED(arg); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static bool @@ -413,7 +413,7 @@ checkowner_opt(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (dns_name_equal(name, dns_rootname)); + return dns_name_equal(name, dns_rootname); } static bool @@ -424,12 +424,12 @@ checknames_opt(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_opt(ARGS_COMPARE) { - return (compare_opt(rdata1, rdata2)); + return compare_opt(rdata1, rdata2); } isc_result_t @@ -439,11 +439,11 @@ dns_rdata_opt_first(dns_rdata_opt_t *opt) { REQUIRE(opt->options != NULL || opt->length == 0); if (opt->length == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } opt->offset = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -463,9 +463,9 @@ dns_rdata_opt_next(dns_rdata_opt_t *opt) { INSIST(opt->offset + 4 + length <= opt->length); opt->offset = opt->offset + 4 + length; if (opt->offset == opt->length) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -489,7 +489,7 @@ dns_rdata_opt_current(dns_rdata_opt_t *opt, dns_rdata_opt_opcode_t *opcode) { opcode->data = r.base; INSIST(opt->offset + 4 + opcode->length <= opt->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* RDATA_GENERIC_OPT_41_C */ diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c index fa7982fb7a..811d31cf78 100644 --- a/lib/dns/rdata/generic/proforma.c +++ b/lib/dns/rdata/generic/proforma.c @@ -25,7 +25,7 @@ static isc_result_t fromtext_ #(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t totext_ #(ARGS_TOTEXT) { @@ -33,7 +33,7 @@ static isc_result_t totext_ #(ARGS_TOTEXT) { REQUIRE(rdata->rdclass == #); REQUIRE(rdata->length != 0); /* XXX */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t fromwire_ #(ARGS_FROMWIRE) { @@ -43,7 +43,7 @@ static isc_result_t fromwire_ #(ARGS_FROMWIRE) { /* see RFC 3597 */ dctx = dns_decompress_setpermitted(dctx, false); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t towire_ #(ARGS_TOWIRE) { @@ -54,7 +54,7 @@ static isc_result_t towire_ #(ARGS_TOWIRE) { /* see RFC 3597 */ dns_compress_setpermitted(cctx, false); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static int compare_ #(ARGS_COMPARE) { @@ -70,7 +70,7 @@ static int compare_ #(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_ #(ARGS_FROMSTRUCT) { @@ -82,7 +82,7 @@ static isc_result_t fromstruct_ #(ARGS_FROMSTRUCT) { REQUIRE(#->common.rdtype == dns_rdatatype_proforma.ctype); REQUIRE(#->common.rdclass == rdclass); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t tostruct_ #(ARGS_TOSTRUCT) { @@ -90,7 +90,7 @@ static isc_result_t tostruct_ #(ARGS_TOSTRUCT) { REQUIRE(rdata->rdclass == #); REQUIRE(rdata->length != 0); /* XXX */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static void freestruct_ #(ARGS_FREESTRUCT) { @@ -109,7 +109,7 @@ static isc_result_t additionaldata_ #(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t digest_ #(ARGS_DIGEST) { @@ -120,7 +120,7 @@ static isc_result_t digest_ #(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool checkowner_ #(ARGS_CHECKOWNER) { @@ -132,7 +132,7 @@ static bool checkowner_ #(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool checknames_ #(ARGS_CHECKNAMES) { @@ -143,7 +143,7 @@ static bool checknames_ #(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_ #(ARGS_COMPARE) { @@ -159,7 +159,7 @@ static int casecompare_ #(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } #endif /* RDATA_GENERIC_#_#_C */ diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 1c3d633a74..faf45aecf7 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -50,7 +50,7 @@ fromtext_ptr(ARGS_FROMTEXT) { warn_badname(&name, lexer, callbacks); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -71,7 +71,7 @@ totext_ptr(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -86,7 +86,7 @@ fromwire_ptr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -104,7 +104,7 @@ towire_ptr(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -129,7 +129,7 @@ compare_ptr(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -146,7 +146,7 @@ fromstruct_ptr(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&ptr->ptr, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -169,7 +169,7 @@ tostruct_ptr(ARGS_TOSTRUCT) { dns_name_init(&ptr->ptr, NULL); name_duporclone(&name, mctx, &ptr->ptr); ptr->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -196,7 +196,7 @@ additionaldata_ptr(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -210,7 +210,7 @@ digest_ptr(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -222,7 +222,7 @@ checkowner_ptr(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; @@ -248,11 +248,11 @@ checknames_ptr(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_ptr); if (rdata->rdclass != dns_rdataclass_in) { - return (true); + return true; } if (dns_name_isdnssd(owner)) { - return (true); + return true; } if (dns_name_issubdomain(owner, &in_addr_arpa) || @@ -266,14 +266,14 @@ checknames_ptr(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } } - return (true); + return true; } static int casecompare_ptr(ARGS_COMPARE) { - return (compare_ptr(rdata1, rdata2)); + return compare_ptr(rdata1, rdata2); } #endif /* RDATA_GENERIC_PTR_12_C */ diff --git a/lib/dns/rdata/generic/resinfo_261.c b/lib/dns/rdata/generic/resinfo_261.c index c5cc584381..7c18c40211 100644 --- a/lib/dns/rdata/generic/resinfo_261.c +++ b/lib/dns/rdata/generic/resinfo_261.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_resinfo(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_resinfo); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_resinfo(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_resinfo); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_resinfo(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_resinfo); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -44,7 +44,7 @@ towire_resinfo(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -58,14 +58,14 @@ compare_resinfo(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_resinfo(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_resinfo); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -80,7 +80,7 @@ tostruct_resinfo(ARGS_TOSTRUCT) { resinfo->common.rdtype = rdata->type; ISC_LINK_INIT(&resinfo->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -102,7 +102,7 @@ additionaldata_resinfo(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -113,7 +113,7 @@ digest_resinfo(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -125,7 +125,7 @@ checkowner_resinfo(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -136,11 +136,11 @@ checknames_resinfo(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_resinfo(ARGS_COMPARE) { - return (compare_resinfo(rdata1, rdata2)); + return compare_resinfo(rdata1, rdata2); } #endif /* RDATA_GENERIC_RESINFO_261_C */ diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c index 20cd0f0141..4ed504fd2a 100644 --- a/lib/dns/rdata/generic/rkey_57.c +++ b/lib/dns/rdata/generic/rkey_57.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_rkey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_rkey); - return (generic_fromtext_key(CALL_FROMTEXT)); + return generic_fromtext_key(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_rkey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_rkey); - return (generic_totext_key(CALL_TOTEXT)); + return generic_totext_key(CALL_TOTEXT); } static isc_result_t fromwire_rkey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_rkey); - return (generic_fromwire_key(CALL_FROMWIRE)); + return generic_fromwire_key(CALL_FROMWIRE); } static isc_result_t @@ -49,7 +49,7 @@ towire_rkey(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -67,14 +67,14 @@ compare_rkey(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_rkey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_rkey); - return (generic_fromstruct_key(CALL_FROMSTRUCT)); + return generic_fromstruct_key(CALL_FROMSTRUCT); } static isc_result_t @@ -89,7 +89,7 @@ tostruct_rkey(ARGS_TOSTRUCT) { rkey->common.rdtype = rdata->type; ISC_LINK_INIT(&rkey->common, link); - return (generic_tostruct_key(CALL_TOSTRUCT)); + return generic_tostruct_key(CALL_TOSTRUCT); } static void @@ -111,7 +111,7 @@ additionaldata_rkey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -123,7 +123,7 @@ digest_rkey(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -135,7 +135,7 @@ checkowner_rkey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -147,7 +147,7 @@ checknames_rkey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -155,7 +155,7 @@ casecompare_rkey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensitively. */ - return (compare_rkey(rdata1, rdata2)); + return compare_rkey(rdata1, rdata2); } #endif /* RDATA_GENERIC_RKEY_57_C */ diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index 440ad341ea..c52d6c0e1f 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -54,7 +54,7 @@ fromtext_rp(ARGS_FROMTEXT) { warn_badname(&name, lexer, callbacks); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -90,7 +90,7 @@ totext_rp(ARGS_TOTEXT) { opts = name_prefix(&email, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -109,7 +109,7 @@ fromwire_rp(ARGS_FROMWIRE) { dns_name_init(&email, NULL); RETERR(dns_name_fromwire(&rmail, source, dctx, target)); - return (dns_name_fromwire(&email, source, dctx, target)); + return dns_name_fromwire(&email, source, dctx, target); } static isc_result_t @@ -137,7 +137,7 @@ towire_rp(ARGS_TOWIRE) { dns_name_fromregion(&rmail, ®ion); isc_region_consume(®ion, rmail.length); - return (dns_name_towire(&rmail, cctx, target, NULL)); + return dns_name_towire(&rmail, cctx, target, NULL); } static int @@ -165,7 +165,7 @@ compare_rp(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); @@ -177,7 +177,7 @@ compare_rp(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -196,7 +196,7 @@ fromstruct_rp(ARGS_FROMSTRUCT) { dns_name_toregion(&rp->mail, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); dns_name_toregion(&rp->text, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -223,7 +223,7 @@ tostruct_rp(ARGS_TOSTRUCT) { dns_name_init(&rp->text, NULL); name_duporclone(&name, mctx, &rp->text); rp->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -251,7 +251,7 @@ additionaldata_rp(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -271,7 +271,7 @@ digest_rp(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -283,7 +283,7 @@ checkowner_rp(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -302,13 +302,13 @@ checknames_rp(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_rp(ARGS_COMPARE) { - return (compare_rp(rdata1, rdata2)); + return compare_rp(rdata1, rdata2); } #endif /* RDATA_GENERIC_RP_17_C */ diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c index 062e38f954..b948f8bc86 100644 --- a/lib/dns/rdata/generic/rrsig_46.c +++ b/lib/dns/rdata/generic/rrsig_46.c @@ -172,7 +172,7 @@ fromtext_rrsig(ARGS_FROMTEXT) { RETERR(check_private(&b, alg)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -289,7 +289,7 @@ totext_rrsig(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -316,7 +316,7 @@ fromwire_rrsig(ARGS_FROMWIRE) { * key footprint: 2 */ if (sr.length < 18) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } algorithm = sr.base[2]; @@ -335,7 +335,7 @@ fromwire_rrsig(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 1) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (algorithm == DNS_KEYALG_PRIVATEDNS || @@ -346,7 +346,7 @@ fromwire_rrsig(ARGS_FROMWIRE) { } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -383,7 +383,7 @@ towire_rrsig(ARGS_TOWIRE) { /* * Signature. */ - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -399,7 +399,7 @@ compare_rrsig(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -458,7 +458,7 @@ fromstruct_rrsig(ARGS_FROMSTRUCT) { /* * Signature. */ - return (mem_tobuffer(target, sig->signature, sig->siglen)); + return mem_tobuffer(target, sig->signature, sig->siglen); } static isc_result_t @@ -531,7 +531,7 @@ tostruct_rrsig(ARGS_TOSTRUCT) { sig->siglen = sr.length; sig->signature = mem_maybedup(mctx, sr.base, sig->siglen); sig->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -561,7 +561,7 @@ additionaldata_rrsig(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -572,7 +572,7 @@ digest_rrsig(ARGS_DIGEST) { UNUSED(digest); UNUSED(arg); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static dns_rdatatype_t @@ -585,7 +585,7 @@ covers_rrsig(dns_rdata_t *rdata) { dns_rdata_toregion(rdata, &r); type = uint16_fromregion(&r); - return (type); + return type; } static bool @@ -597,7 +597,7 @@ checkowner_rrsig(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -608,7 +608,7 @@ checknames_rrsig(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int @@ -634,7 +634,7 @@ casecompare_rrsig(ARGS_COMPARE) { r2.length = 18; order = isc_region_compare(&r1, &r2); if (order != 0) { - return (order); + return order; } dns_name_init(&name1, NULL); @@ -647,13 +647,13 @@ casecompare_rrsig(ARGS_COMPARE) { dns_name_fromregion(&name2, &r2); order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } #endif /* RDATA_GENERIC_RRSIG_46_C */ diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index 89ff01491c..4807e50c34 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -57,7 +57,7 @@ fromtext_rt(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -84,7 +84,7 @@ totext_rt(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -105,15 +105,15 @@ fromwire_rt(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (tregion.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } memmove(tregion.base, sregion.base, 2); isc_buffer_forward(source, 2); isc_buffer_add(target, 2); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -130,7 +130,7 @@ towire_rt(ARGS_TOWIRE) { isc_buffer_availableregion(target, &tr); dns_rdata_toregion(rdata, ®ion); if (tr.length < 2) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, region.base, 2); isc_region_consume(®ion, 2); @@ -139,7 +139,7 @@ towire_rt(ARGS_TOWIRE) { dns_name_init(&name, offsets); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -158,7 +158,7 @@ compare_rt(ARGS_COMPARE) { order = memcmp(rdata1->data, rdata2->data, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -173,7 +173,7 @@ compare_rt(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -191,7 +191,7 @@ fromstruct_rt(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(rt->preference, target)); dns_name_toregion(&rt->host, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -217,7 +217,7 @@ tostruct_rt(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &rt->host); rt->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -253,13 +253,13 @@ additionaldata_rt(ARGS_ADDLDATA) { result = (add)(arg, &name, dns_rdatatype_x25, NULL DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = (add)(arg, &name, dns_rdatatype_isdn, NULL DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -276,11 +276,11 @@ digest_rt(ARGS_DIGEST) { r1.length = 2; result = (digest)(arg, &r1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -292,7 +292,7 @@ checkowner_rt(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -312,14 +312,14 @@ checknames_rt(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_rt(ARGS_COMPARE) { - return (compare_rt(rdata1, rdata2)); + return compare_rt(rdata1, rdata2); } #endif /* RDATA_GENERIC_RT_21_C */ diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index b67f1efa63..f96814913d 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -136,7 +136,7 @@ fromtext_sig(ARGS_FROMTEXT) { RETERR(check_private(&b, alg)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -253,7 +253,7 @@ totext_sig(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -280,7 +280,7 @@ fromwire_sig(ARGS_FROMWIRE) { * key footprint: 2 */ if (sr.length < 18) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } algorithm = sr.base[2]; @@ -299,7 +299,7 @@ fromwire_sig(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (algorithm == DNS_KEYALG_PRIVATEDNS || @@ -310,7 +310,7 @@ fromwire_sig(ARGS_FROMWIRE) { } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -347,7 +347,7 @@ towire_sig(ARGS_TOWIRE) { /* * Signature. */ - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -373,7 +373,7 @@ compare_sig(ARGS_COMPARE) { r2.length = 18; order = isc_region_compare(&r1, &r2); if (order != 0) { - return (order); + return order; } dns_name_init(&name1, NULL); @@ -386,13 +386,13 @@ compare_sig(ARGS_COMPARE) { dns_name_fromregion(&name2, &r2); order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -451,7 +451,7 @@ fromstruct_sig(ARGS_FROMSTRUCT) { /* * Signature. */ - return (mem_tobuffer(target, sig->signature, sig->siglen)); + return mem_tobuffer(target, sig->signature, sig->siglen); } static isc_result_t @@ -524,7 +524,7 @@ tostruct_sig(ARGS_TOSTRUCT) { sig->siglen = sr.length; sig->signature = mem_maybedup(mctx, sr.base, sig->siglen); sig->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -554,7 +554,7 @@ additionaldata_sig(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -565,7 +565,7 @@ digest_sig(ARGS_DIGEST) { UNUSED(digest); UNUSED(arg); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static dns_rdatatype_t @@ -578,7 +578,7 @@ covers_sig(dns_rdata_t *rdata) { dns_rdata_toregion(rdata, &r); type = uint16_fromregion(&r); - return (type); + return type; } static bool @@ -590,7 +590,7 @@ checkowner_sig(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -601,11 +601,11 @@ checknames_sig(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_sig(ARGS_COMPARE) { - return (compare_sig(rdata1, rdata2)); + return compare_sig(rdata1, rdata2); } #endif /* RDATA_GENERIC_SIG_24_C */ diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c index caabeb14c6..1b0b5cc6e2 100644 --- a/lib/dns/rdata/generic/sink_40.c +++ b/lib/dns/rdata/generic/sink_40.c @@ -54,7 +54,7 @@ fromtext_sink(ARGS_FROMTEXT) { } RETERR(uint8_tobuffer(token.value.as_ulong, target)); - return (isc_base64_tobuffer(lexer, target, -1)); + return isc_base64_tobuffer(lexer, target, -1); } static isc_result_t @@ -79,7 +79,7 @@ totext_sink(ARGS_TOTEXT) { RETERR(str_totext(buf, target)); if (sr.length == 0U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* data */ @@ -100,7 +100,7 @@ totext_sink(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -115,12 +115,12 @@ fromwire_sink(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 3) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, sr.length)); isc_buffer_forward(source, sr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -130,7 +130,7 @@ towire_sink(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -146,7 +146,7 @@ compare_sink(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -171,7 +171,7 @@ fromstruct_sink(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(sink->subcoding, target)); /* Data */ - return (mem_tobuffer(target, sink->data, sink->datalen)); + return mem_tobuffer(target, sink->data, sink->datalen); } static isc_result_t @@ -205,7 +205,7 @@ tostruct_sink(ARGS_TOSTRUCT) { sink->datalen = sr.length; sink->data = mem_maybedup(mctx, sr.base, sink->datalen); sink->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -234,7 +234,7 @@ additionaldata_sink(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -245,7 +245,7 @@ digest_sink(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -257,7 +257,7 @@ checkowner_sink(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -268,11 +268,11 @@ checknames_sink(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_sink(ARGS_COMPARE) { - return (compare_sink(rdata1, rdata2)); + return compare_sink(rdata1, rdata2); } #endif /* RDATA_GENERIC_SINK_40_C */ diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c index ce154a0914..ea947770db 100644 --- a/lib/dns/rdata/generic/smimea_53.c +++ b/lib/dns/rdata/generic/smimea_53.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_smimea(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_smimea); - return (generic_fromtext_tlsa(CALL_FROMTEXT)); + return generic_fromtext_tlsa(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_smimea(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_smimea); - return (generic_totext_tlsa(CALL_TOTEXT)); + return generic_totext_tlsa(CALL_TOTEXT); } static isc_result_t fromwire_smimea(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_smimea); - return (generic_fromwire_tlsa(CALL_FROMWIRE)); + return generic_fromwire_tlsa(CALL_FROMWIRE); } static isc_result_t @@ -48,7 +48,7 @@ towire_smimea(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -64,14 +64,14 @@ compare_smimea(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_smimea(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_smimea); - return (generic_fromstruct_tlsa(CALL_FROMSTRUCT)); + return generic_fromstruct_tlsa(CALL_FROMSTRUCT); } static isc_result_t @@ -86,7 +86,7 @@ tostruct_smimea(ARGS_TOSTRUCT) { smimea->common.rdtype = rdata->type; ISC_LINK_INIT(&smimea->common, link); - return (generic_tostruct_tlsa(CALL_TOSTRUCT)); + return generic_tostruct_tlsa(CALL_TOSTRUCT); } static void @@ -108,7 +108,7 @@ additionaldata_smimea(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -119,7 +119,7 @@ digest_smimea(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -131,7 +131,7 @@ checkowner_smimea(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -142,12 +142,12 @@ checknames_smimea(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_smimea(ARGS_COMPARE) { - return (compare_smimea(rdata1, rdata2)); + return compare_smimea(rdata1, rdata2); } #endif /* RDATA_GENERIC_SMIMEA_53_C */ diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 42c229f285..1e8fa4ee0f 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -73,7 +73,7 @@ fromtext_soa(ARGS_FROMTEXT) { RETERR(uint32_tobuffer(n, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static const char *soa_fieldnames[5] = { "serial", "refresh", "retry", "expire", @@ -154,7 +154,7 @@ totext_soa(ARGS_TOTEXT) { RETERR(str_totext(")", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -181,17 +181,17 @@ fromwire_soa(ARGS_FROMWIRE) { isc_buffer_availableregion(target, &tregion); if (sregion.length < 20) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (tregion.length < 20) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 20); isc_buffer_forward(source, 20); isc_buffer_add(target, 20); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -223,12 +223,12 @@ towire_soa(ARGS_TOWIRE) { isc_buffer_availableregion(target, &tregion); if (tregion.length < 20) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 20); isc_buffer_add(target, 20); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int @@ -256,7 +256,7 @@ compare_soa(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); @@ -270,13 +270,13 @@ compare_soa(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); isc_region_consume(®ion2, name_length(&name2)); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -300,7 +300,7 @@ fromstruct_soa(ARGS_FROMSTRUCT) { RETERR(uint32_tobuffer(soa->refresh, target)); RETERR(uint32_tobuffer(soa->retry, target)); RETERR(uint32_tobuffer(soa->expire, target)); - return (uint32_tobuffer(soa->minimum, target)); + return uint32_tobuffer(soa->minimum, target); } static isc_result_t @@ -345,7 +345,7 @@ tostruct_soa(ARGS_TOSTRUCT) { soa->minimum = uint32_fromregion(®ion); soa->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -373,7 +373,7 @@ additionaldata_soa(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -395,7 +395,7 @@ digest_soa(ARGS_DIGEST) { RETERR(dns_name_digest(&name, digest, arg)); isc_region_consume(&r, name_length(&name)); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -407,7 +407,7 @@ checkowner_soa(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -426,7 +426,7 @@ checknames_soa(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } isc_region_consume(®ion, name_length(&name)); dns_name_fromregion(&name, ®ion); @@ -434,14 +434,14 @@ checknames_soa(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_soa(ARGS_COMPARE) { - return (compare_soa(rdata1, rdata2)); + return compare_soa(rdata1, rdata2); } #endif /* RDATA_GENERIC_SOA_6_C */ diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c index 20f939bddb..9347a74624 100644 --- a/lib/dns/rdata/generic/spf_99.c +++ b/lib/dns/rdata/generic/spf_99.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_spf(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_spf); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_spf(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_spf); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_spf(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_spf); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -44,7 +44,7 @@ towire_spf(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -58,14 +58,14 @@ compare_spf(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_spf(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_spf); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -80,7 +80,7 @@ tostruct_spf(ARGS_TOSTRUCT) { spf->common.rdtype = rdata->type; ISC_LINK_INIT(&spf->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -102,7 +102,7 @@ additionaldata_spf(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -113,7 +113,7 @@ digest_spf(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -125,7 +125,7 @@ checkowner_spf(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -136,11 +136,11 @@ checknames_spf(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_spf(ARGS_COMPARE) { - return (compare_spf(rdata1, rdata2)); + return compare_spf(rdata1, rdata2); } #endif /* RDATA_GENERIC_SPF_99_C */ diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c index cb5f2f6e2f..8e523a5a50 100644 --- a/lib/dns/rdata/generic/sshfp_44.c +++ b/lib/dns/rdata/generic/sshfp_44.c @@ -68,7 +68,7 @@ fromtext_sshfp(ARGS_FROMTEXT) { /* * Digest. */ - return (isc_hex_tobuffer(lexer, target, len)); + return isc_hex_tobuffer(lexer, target, len); } static isc_result_t @@ -101,7 +101,7 @@ totext_sshfp(ARGS_TOTEXT) { RETERR(str_totext(buf, target)); if (sr.length == 0U) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -120,7 +120,7 @@ totext_sshfp(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -135,17 +135,17 @@ fromwire_sshfp(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if ((sr.base[1] == 1 && sr.length != ISC_SHA1_DIGESTLENGTH + 2) || (sr.base[1] == 2 && sr.length != ISC_SHA256_DIGESTLENGTH + 2)) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -158,7 +158,7 @@ towire_sshfp(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -174,7 +174,7 @@ compare_sshfp(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -192,7 +192,7 @@ fromstruct_sshfp(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(sshfp->algorithm, target)); RETERR(uint8_tobuffer(sshfp->digest_type, target)); - return (mem_tobuffer(target, sshfp->digest, sshfp->length)); + return mem_tobuffer(target, sshfp->digest, sshfp->length); } static isc_result_t @@ -218,7 +218,7 @@ tostruct_sshfp(ARGS_TOSTRUCT) { sshfp->digest = mem_maybedup(mctx, region.base, region.length); sshfp->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -247,7 +247,7 @@ additionaldata_sshfp(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -258,7 +258,7 @@ digest_sshfp(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -270,7 +270,7 @@ checkowner_sshfp(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -281,12 +281,12 @@ checknames_sshfp(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_sshfp(ARGS_COMPARE) { - return (compare_sshfp(rdata1, rdata2)); + return compare_sshfp(rdata1, rdata2); } #endif /* RDATA_GENERIC_SSHFP_44_C */ diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c index 4a0688ccbc..186190263a 100644 --- a/lib/dns/rdata/generic/ta_32768.c +++ b/lib/dns/rdata/generic/ta_32768.c @@ -22,21 +22,21 @@ static isc_result_t fromtext_ta(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ta); - return (generic_fromtext_ds(CALL_FROMTEXT)); + return generic_fromtext_ds(CALL_FROMTEXT); } static isc_result_t totext_ta(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_ta); - return (generic_totext_ds(CALL_TOTEXT)); + return generic_totext_ds(CALL_TOTEXT); } static isc_result_t fromwire_ta(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ta); - return (generic_fromwire_ds(CALL_FROMWIRE)); + return generic_fromwire_ds(CALL_FROMWIRE); } static isc_result_t @@ -49,7 +49,7 @@ towire_ta(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -65,14 +65,14 @@ compare_ta(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_ta(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ta); - return (generic_fromstruct_ds(CALL_FROMSTRUCT)); + return generic_fromstruct_ds(CALL_FROMSTRUCT); } static isc_result_t @@ -89,7 +89,7 @@ tostruct_ta(ARGS_TOSTRUCT) { ds->common.rdtype = rdata->type; ISC_LINK_INIT(&ds->common, link); - return (generic_tostruct_ds(CALL_TOSTRUCT)); + return generic_tostruct_ds(CALL_TOSTRUCT); } static void @@ -118,7 +118,7 @@ additionaldata_ta(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -129,7 +129,7 @@ digest_ta(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -141,7 +141,7 @@ checkowner_ta(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -152,12 +152,12 @@ checknames_ta(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_ta(ARGS_COMPARE) { - return (compare_ta(rdata1, rdata2)); + return compare_ta(rdata1, rdata2); } #endif /* RDATA_GENERIC_TA_32768_C */ diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c index c27395a7f4..5fd7ef3eed 100644 --- a/lib/dns/rdata/generic/talink_58.c +++ b/lib/dns/rdata/generic/talink_58.c @@ -43,7 +43,7 @@ fromtext_talink(ARGS_FROMTEXT) { target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -77,7 +77,7 @@ totext_talink(ARGS_TOTEXT) { opts = name_prefix(&next, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -96,7 +96,7 @@ fromwire_talink(ARGS_FROMWIRE) { dns_name_init(&next, NULL); RETERR(dns_name_fromwire(&prev, source, dctx, target)); - return (dns_name_fromwire(&next, source, dctx, target)); + return dns_name_fromwire(&next, source, dctx, target); } static isc_result_t @@ -123,7 +123,7 @@ towire_talink(ARGS_TOWIRE) { dns_name_fromregion(&next, &sregion); isc_region_consume(&sregion, name_length(&next)); - return (dns_name_towire(&next, cctx, target, NULL)); + return dns_name_towire(&next, cctx, target, NULL); } static int @@ -139,7 +139,7 @@ compare_talink(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -158,7 +158,7 @@ fromstruct_talink(ARGS_FROMSTRUCT) { dns_name_toregion(&talink->prev, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); dns_name_toregion(&talink->next, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -189,7 +189,7 @@ tostruct_talink(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &talink->next); talink->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -217,7 +217,7 @@ additionaldata_talink(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -227,7 +227,7 @@ digest_talink(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_talink); dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -239,7 +239,7 @@ checkowner_talink(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -249,12 +249,12 @@ checknames_talink(ARGS_CHECKNAMES) { UNUSED(bad); UNUSED(owner); - return (true); + return true; } static int casecompare_talink(ARGS_COMPARE) { - return (compare_talink(rdata1, rdata2)); + return compare_talink(rdata1, rdata2); } #endif /* RDATA_GENERIC_TALINK_58_C */ diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index b2fb112aab..5360b9e467 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -116,7 +116,7 @@ fromtext_tkey(ARGS_FROMTEXT) { /* * Other Data. */ - return (isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong)); + return isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong); } static isc_result_t @@ -241,7 +241,7 @@ totext_tkey(ARGS_TOTEXT) { RETERR(str_totext(" )", target)); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -271,7 +271,7 @@ fromwire_tkey(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 12) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 12)); isc_region_consume(&sr, 12); @@ -281,11 +281,11 @@ fromwire_tkey(ARGS_FROMWIRE) { * Key Length + Key Data. */ if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } n = uint16_fromregion(&sr); if (sr.length < n + 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, n + 2)); isc_region_consume(&sr, n + 2); @@ -295,14 +295,14 @@ fromwire_tkey(ARGS_FROMWIRE) { * Other Length + Other Data. */ if (sr.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } n = uint16_fromregion(&sr); if (sr.length < n + 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, n + 2); - return (mem_tobuffer(target, sr.base, n + 2)); + return mem_tobuffer(target, sr.base, n + 2); } static isc_result_t @@ -324,7 +324,7 @@ towire_tkey(ARGS_TOWIRE) { RETERR(dns_name_towire(&name, cctx, target, NULL)); isc_region_consume(&sr, name_length(&name)); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -351,11 +351,11 @@ compare_tkey(ARGS_COMPARE) { dns_name_fromregion(&name1, &r1); dns_name_fromregion(&name2, &r2); if ((order = dns_name_rdatacompare(&name1, &name2)) != 0) { - return (order); + return order; } isc_region_consume(&r1, name_length(&name1)); isc_region_consume(&r2, name_length(&name2)); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -413,7 +413,7 @@ fromstruct_tkey(ARGS_FROMSTRUCT) { /* * Other data. */ - return (mem_tobuffer(target, tkey->other, tkey->otherlen)); + return mem_tobuffer(target, tkey->other, tkey->otherlen); } static isc_result_t @@ -490,7 +490,7 @@ tostruct_tkey(ARGS_TOSTRUCT) { INSIST(tkey->otherlen <= sr.length); tkey->other = mem_maybedup(mctx, sr.base, tkey->otherlen); tkey->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -522,7 +522,7 @@ additionaldata_tkey(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -533,7 +533,7 @@ digest_tkey(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_tkey); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static bool @@ -545,7 +545,7 @@ checkowner_tkey(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -556,11 +556,11 @@ checknames_tkey(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_tkey(ARGS_COMPARE) { - return (compare_tkey(rdata1, rdata2)); + return compare_tkey(rdata1, rdata2); } #endif /* RDATA_GENERIC_TKEY_249_C */ diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c index 78b79e494b..690c81bb16 100644 --- a/lib/dns/rdata/generic/tlsa_52.c +++ b/lib/dns/rdata/generic/tlsa_52.c @@ -61,7 +61,7 @@ generic_fromtext_tlsa(ARGS_FROMTEXT) { /* * Certificate Association Data. */ - return (isc_hex_tobuffer(lexer, target, -2)); + return isc_hex_tobuffer(lexer, target, -2); } static isc_result_t @@ -116,7 +116,7 @@ generic_totext_tlsa(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -131,32 +131,32 @@ generic_fromwire_tlsa(ARGS_FROMWIRE) { /* Usage(1), Selector(1), Type(1), Data(1+) */ if (sr.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t fromtext_tlsa(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_tlsa); - return (generic_fromtext_tlsa(CALL_FROMTEXT)); + return generic_fromtext_tlsa(CALL_FROMTEXT); } static isc_result_t totext_tlsa(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_tlsa); - return (generic_totext_tlsa(CALL_TOTEXT)); + return generic_totext_tlsa(CALL_TOTEXT); } static isc_result_t fromwire_tlsa(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_tlsa); - return (generic_fromwire_tlsa(CALL_FROMWIRE)); + return generic_fromwire_tlsa(CALL_FROMWIRE); } static isc_result_t @@ -169,7 +169,7 @@ towire_tlsa(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -185,7 +185,7 @@ compare_tlsa(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -203,7 +203,7 @@ generic_fromstruct_tlsa(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(tlsa->selector, target)); RETERR(uint8_tobuffer(tlsa->match, target)); - return (mem_tobuffer(target, tlsa->data, tlsa->length)); + return mem_tobuffer(target, tlsa->data, tlsa->length); } static isc_result_t @@ -231,7 +231,7 @@ generic_tostruct_tlsa(ARGS_TOSTRUCT) { tlsa->data = mem_maybedup(mctx, region.base, region.length); tlsa->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -254,7 +254,7 @@ static isc_result_t fromstruct_tlsa(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_tlsa); - return (generic_fromstruct_tlsa(CALL_FROMSTRUCT)); + return generic_fromstruct_tlsa(CALL_FROMSTRUCT); } static isc_result_t @@ -268,7 +268,7 @@ tostruct_tlsa(ARGS_TOSTRUCT) { tlsa->common.rdtype = rdata->type; ISC_LINK_INIT(&tlsa->common, link); - return (generic_tostruct_tlsa(CALL_TOSTRUCT)); + return generic_tostruct_tlsa(CALL_TOSTRUCT); } static void @@ -290,7 +290,7 @@ additionaldata_tlsa(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -301,7 +301,7 @@ digest_tlsa(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -313,7 +313,7 @@ checkowner_tlsa(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -324,12 +324,12 @@ checknames_tlsa(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_tlsa(ARGS_COMPARE) { - return (compare_tlsa(rdata1, rdata2)); + return compare_tlsa(rdata1, rdata2); } #endif /* RDATA_GENERIC_TLSA_52_C */ diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index ce20249686..f45ac4a8b4 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -48,7 +48,7 @@ generic_fromtext_txt(ARGS_FROMTEXT) { } /* Let upper layer handle eol/eof. */ isc_lex_ungettoken(lexer, &token); - return (strings == 0 ? ISC_R_UNEXPECTEDEND : ISC_R_SUCCESS); + return strings == 0 ? ISC_R_UNEXPECTEDEND : ISC_R_SUCCESS; } static isc_result_t @@ -66,7 +66,7 @@ generic_totext_txt(ARGS_TOTEXT) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -80,17 +80,17 @@ generic_fromwire_txt(ARGS_FROMWIRE) { do { result = txt_fromwire(source, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } while (!buffer_empty(source)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t fromtext_txt(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_txt); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -98,14 +98,14 @@ totext_txt(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_txt); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_txt(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_txt); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -114,7 +114,7 @@ towire_txt(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -128,7 +128,7 @@ compare_txt(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -151,12 +151,12 @@ generic_fromstruct_txt(ARGS_FROMSTRUCT) { length = uint8_fromregion(®ion); isc_region_consume(®ion, 1); if (region.length < length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_region_consume(®ion, length); } - return (mem_tobuffer(target, txt->txt, txt->txt_len)); + return mem_tobuffer(target, txt->txt, txt->txt_len); } static isc_result_t @@ -174,7 +174,7 @@ generic_tostruct_txt(ARGS_TOSTRUCT) { txt->txt = mem_maybedup(mctx, r.base, r.length); txt->offset = 0; txt->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -197,7 +197,7 @@ static isc_result_t fromstruct_txt(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_txt); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -211,7 +211,7 @@ tostruct_txt(ARGS_TOSTRUCT) { txt->common.rdtype = rdata->type; ISC_LINK_INIT(&txt->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -233,7 +233,7 @@ additionaldata_txt(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -244,7 +244,7 @@ digest_txt(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -256,7 +256,7 @@ checkowner_txt(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -267,12 +267,12 @@ checknames_txt(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_txt(ARGS_COMPARE) { - return (compare_txt(rdata1, rdata2)); + return compare_txt(rdata1, rdata2); } static isc_result_t @@ -281,11 +281,11 @@ generic_txt_first(dns_rdata_txt_t *txt) { REQUIRE(txt->txt != NULL || txt->txt_len == 0); if (txt->txt_len == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } txt->offset = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -303,9 +303,9 @@ generic_txt_next(dns_rdata_txt_t *txt) { INSIST(txt->offset + 1 + length <= txt->txt_len); txt->offset = txt->offset + 1 + length; if (txt->offset == txt->txt_len) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -326,7 +326,7 @@ generic_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) { string->data = r.base; INSIST(txt->offset + 1 + string->length <= txt->txt_len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -334,7 +334,7 @@ dns_rdata_txt_first(dns_rdata_txt_t *txt) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); - return (generic_txt_first(txt)); + return generic_txt_first(txt); } isc_result_t @@ -342,7 +342,7 @@ dns_rdata_txt_next(dns_rdata_txt_t *txt) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); - return (generic_txt_next(txt)); + return generic_txt_next(txt); } isc_result_t @@ -350,6 +350,6 @@ dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); - return (generic_txt_current(txt, string)); + return generic_txt_current(txt, string); } #endif /* RDATA_GENERIC_TXT_16_C */ diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c index 985a353975..f74f848336 100644 --- a/lib/dns/rdata/generic/uri_256.c +++ b/lib/dns/rdata/generic/uri_256.c @@ -57,7 +57,7 @@ fromtext_uri(ARGS_FROMTEXT) { RETTOK(DNS_R_SYNTAX); } RETTOK(multitxt_fromtext(&token.value.as_textregion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -93,7 +93,7 @@ totext_uri(ARGS_TOTEXT) { * Target URI */ RETERR(multitxt_totext(®ion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -111,14 +111,14 @@ fromwire_uri(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, ®ion); if (region.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* * Priority, weight and target URI */ isc_buffer_forward(source, region.length); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static isc_result_t @@ -131,7 +131,7 @@ towire_uri(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, ®ion); - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static int @@ -154,7 +154,7 @@ compare_uri(ARGS_COMPARE) { */ order = memcmp(r1.base, r2.base, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(&r1, 2); isc_region_consume(&r2, 2); @@ -164,12 +164,12 @@ compare_uri(ARGS_COMPARE) { */ order = memcmp(r1.base, r2.base, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } isc_region_consume(&r1, 2); isc_region_consume(&r2, 2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -198,7 +198,7 @@ fromstruct_uri(ARGS_FROMSTRUCT) { /* * Target URI */ - return (mem_tobuffer(target, uri->target, uri->tgt_len)); + return mem_tobuffer(target, uri->target, uri->tgt_len); } static isc_result_t @@ -234,7 +234,7 @@ tostruct_uri(ARGS_TOSTRUCT) { uri->tgt_len = sr.length; uri->target = mem_maybedup(mctx, sr.base, sr.length); uri->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -263,7 +263,7 @@ additionaldata_uri(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -274,7 +274,7 @@ digest_uri(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -286,7 +286,7 @@ checkowner_uri(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -297,12 +297,12 @@ checknames_uri(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_uri(ARGS_COMPARE) { - return (compare_uri(rdata1, rdata2)); + return compare_uri(rdata1, rdata2); } #endif /* GENERIC_URI_256_C */ diff --git a/lib/dns/rdata/generic/wallet_262.c b/lib/dns/rdata/generic/wallet_262.c index bff33e423c..106003cc13 100644 --- a/lib/dns/rdata/generic/wallet_262.c +++ b/lib/dns/rdata/generic/wallet_262.c @@ -20,7 +20,7 @@ static isc_result_t fromtext_wallet(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_wallet); - return (generic_fromtext_txt(CALL_FROMTEXT)); + return generic_fromtext_txt(CALL_FROMTEXT); } static isc_result_t @@ -28,14 +28,14 @@ totext_wallet(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_wallet); - return (generic_totext_txt(CALL_TOTEXT)); + return generic_totext_txt(CALL_TOTEXT); } static isc_result_t fromwire_wallet(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_wallet); - return (generic_fromwire_txt(CALL_FROMWIRE)); + return generic_fromwire_txt(CALL_FROMWIRE); } static isc_result_t @@ -44,7 +44,7 @@ towire_wallet(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -58,14 +58,14 @@ compare_wallet(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t fromstruct_wallet(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_wallet); - return (generic_fromstruct_txt(CALL_FROMSTRUCT)); + return generic_fromstruct_txt(CALL_FROMSTRUCT); } static isc_result_t @@ -79,7 +79,7 @@ tostruct_wallet(ARGS_TOSTRUCT) { wallet->common.rdtype = rdata->type; ISC_LINK_INIT(&wallet->common, link); - return (generic_tostruct_txt(CALL_TOSTRUCT)); + return generic_tostruct_txt(CALL_TOSTRUCT); } static void @@ -101,7 +101,7 @@ additionaldata_wallet(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -112,7 +112,7 @@ digest_wallet(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -124,7 +124,7 @@ checkowner_wallet(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -135,12 +135,12 @@ checknames_wallet(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_wallet(ARGS_COMPARE) { - return (compare_wallet(rdata1, rdata2)); + return compare_wallet(rdata1, rdata2); } isc_result_t @@ -148,7 +148,7 @@ dns_rdata_wallet_first(dns_rdata_wallet_t *wallet) { REQUIRE(wallet != NULL); REQUIRE(wallet->common.rdtype == dns_rdatatype_wallet); - return (generic_txt_first(wallet)); + return generic_txt_first(wallet); } isc_result_t @@ -156,7 +156,7 @@ dns_rdata_wallet_next(dns_rdata_wallet_t *wallet) { REQUIRE(wallet != NULL); REQUIRE(wallet->common.rdtype == dns_rdatatype_wallet); - return (generic_txt_next(wallet)); + return generic_txt_next(wallet); } isc_result_t @@ -165,6 +165,6 @@ dns_rdata_wallet_current(dns_rdata_wallet_t *wallet, REQUIRE(wallet != NULL); REQUIRE(wallet->common.rdtype == dns_rdatatype_wallet); - return (generic_txt_current(wallet, string)); + return generic_txt_current(wallet, string); } #endif /* RDATA_GENERIC_WALLET_262_C */ diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 1b04b8b108..4f96d591a8 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -43,7 +43,7 @@ fromtext_x25(ARGS_FROMTEXT) { } } RETTOK(txt_fromtext(&token.value.as_textregion, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -56,7 +56,7 @@ totext_x25(ARGS_TOTEXT) { REQUIRE(rdata->length != 0); dns_rdata_toregion(rdata, ®ion); - return (txt_totext(®ion, true, target)); + return txt_totext(®ion, true, target); } static isc_result_t @@ -72,14 +72,14 @@ fromwire_x25(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length < 5 || sr.base[0] != (sr.length - 1)) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } for (i = 1; i < sr.length; i++) { if (sr.base[i] < 0x30 || sr.base[i] > 0x39) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } - return (txt_fromwire(source, target)); + return txt_fromwire(source, target); } static isc_result_t @@ -89,7 +89,7 @@ towire_x25(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_x25); REQUIRE(rdata->length != 0); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -105,7 +105,7 @@ compare_x25(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -123,17 +123,17 @@ fromstruct_x25(ARGS_FROMSTRUCT) { UNUSED(rdclass); if (x25->x25_len < 4) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } for (i = 0; i < x25->x25_len; i++) { if (!isdigit((unsigned char)x25->x25[i])) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } RETERR(uint8_tobuffer(x25->x25_len, target)); - return (mem_tobuffer(target, x25->x25, x25->x25_len)); + return mem_tobuffer(target, x25->x25, x25->x25_len); } static isc_result_t @@ -154,7 +154,7 @@ tostruct_x25(ARGS_TOSTRUCT) { isc_region_consume(&r, 1); x25->x25 = mem_maybedup(mctx, r.base, x25->x25_len); x25->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -183,7 +183,7 @@ additionaldata_x25(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -194,7 +194,7 @@ digest_x25(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -206,7 +206,7 @@ checkowner_x25(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -217,12 +217,12 @@ checknames_x25(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_x25(ARGS_COMPARE) { - return (compare_x25(rdata1, rdata2)); + return compare_x25(rdata1, rdata2); } #endif /* RDATA_GENERIC_X25_19_C */ diff --git a/lib/dns/rdata/generic/zonemd_63.c b/lib/dns/rdata/generic/zonemd_63.c index ca522a64dd..79c869e5a2 100644 --- a/lib/dns/rdata/generic/zonemd_63.c +++ b/lib/dns/rdata/generic/zonemd_63.c @@ -72,9 +72,9 @@ fromtext_zonemd(ARGS_FROMTEXT) { result = isc_hex_tobuffer(lexer, target, length); /* Minimum length of digest is 12 octets. */ if (isc_buffer_usedlength(target) - isc_buffer_usedlength(&save) < 12) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (result); + return result; } static isc_result_t @@ -137,7 +137,7 @@ totext_zonemd(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -159,7 +159,7 @@ fromwire_zonemd(ARGS_FROMWIRE) { * correct length. */ if (sr.length < 18) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } switch (sr.base[5]) { @@ -174,7 +174,7 @@ fromwire_zonemd(ARGS_FROMWIRE) { } if (digestlen != 0 && sr.length < 6 + digestlen) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* @@ -188,7 +188,7 @@ fromwire_zonemd(ARGS_FROMWIRE) { } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -201,7 +201,7 @@ towire_zonemd(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -217,7 +217,7 @@ compare_zonemd(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -244,7 +244,7 @@ fromstruct_zonemd(ARGS_FROMSTRUCT) { RETERR(uint8_tobuffer(zonemd->scheme, target)); RETERR(uint8_tobuffer(zonemd->digest_type, target)); - return (mem_tobuffer(target, zonemd->digest, zonemd->length)); + return mem_tobuffer(target, zonemd->digest, zonemd->length); } static isc_result_t @@ -272,7 +272,7 @@ tostruct_zonemd(ARGS_TOSTRUCT) { zonemd->digest = mem_maybedup(mctx, region.base, region.length); zonemd->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -301,7 +301,7 @@ additionaldata_zonemd(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -312,7 +312,7 @@ digest_zonemd(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -324,7 +324,7 @@ checkowner_zonemd(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -335,12 +335,12 @@ checknames_zonemd(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_zonemd(ARGS_COMPARE) { - return (compare_zonemd(rdata1, rdata2)); + return compare_zonemd(rdata1, rdata2); } #endif /* RDATA_GENERIC_ZONEMD_63_C */ diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index c9482fa923..706f14dd37 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -40,11 +40,11 @@ fromtext_hs_a(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -58,7 +58,7 @@ totext_hs_a(ARGS_TOTEXT) { UNUSED(tctx); dns_rdata_toregion(rdata, ®ion); - return (inet_totext(AF_INET, tctx->flags, ®ion, target)); + return inet_totext(AF_INET, tctx->flags, ®ion, target); } static isc_result_t @@ -76,16 +76,16 @@ fromwire_hs_a(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (sregion.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (tregion.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 4); isc_buffer_forward(source, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -100,11 +100,11 @@ towire_hs_a(ARGS_TOWIRE) { isc_buffer_availableregion(target, ®ion); if (region.length < rdata->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, rdata->data, rdata->length); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int @@ -123,7 +123,7 @@ compare_hs_a(ARGS_COMPARE) { order = (order < 0) ? -1 : 1; } - return (order); + return order; } static isc_result_t @@ -142,7 +142,7 @@ fromstruct_hs_a(ARGS_FROMSTRUCT) { n = ntohl(a->in_addr.s_addr); - return (uint32_tobuffer(n, target)); + return uint32_tobuffer(n, target); } static isc_result_t @@ -166,7 +166,7 @@ tostruct_hs_a(ARGS_TOSTRUCT) { n = uint32_fromregion(®ion); a->in_addr.s_addr = htonl(n); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -186,7 +186,7 @@ additionaldata_hs_a(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -198,7 +198,7 @@ digest_hs_a(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -211,7 +211,7 @@ checkowner_hs_a(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -223,10 +223,10 @@ checknames_hs_a(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_hs_a(ARGS_COMPARE) { - return (compare_hs_a(rdata1, rdata2)); + return compare_hs_a(rdata1, rdata2); } diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index dd62f284f0..018286f67d 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -72,7 +72,7 @@ fromtext_in_a6(ARGS_FROMTEXT) { } if (prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, @@ -93,7 +93,7 @@ fromtext_in_a6(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -133,7 +133,7 @@ totext_in_a6(ARGS_TOTEXT) { } if (prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETERR(str_totext(" ", target)); @@ -142,7 +142,7 @@ totext_in_a6(ARGS_TOTEXT) { dns_name_fromregion(&name, &sr); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -166,11 +166,11 @@ fromwire_in_a6(ARGS_FROMWIRE) { * Prefix length. */ if (sr.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } prefixlen = sr.base[0]; if (prefixlen > 128) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_region_consume(&sr, 1); RETERR(mem_tobuffer(target, &prefixlen, 1)); @@ -182,22 +182,22 @@ fromwire_in_a6(ARGS_FROMWIRE) { if (prefixlen != 128) { octets = 16 - prefixlen / 8; if (sr.length < octets) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } mask = 0xff >> (prefixlen % 8); if ((sr.base[0] & ~mask) != 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } RETERR(mem_tobuffer(target, sr.base, octets)); isc_buffer_forward(source, octets); } if (prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -222,12 +222,12 @@ towire_in_a6(ARGS_TOWIRE) { isc_region_consume(&sr, octets); if (prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_init(&name, offsets); dns_name_fromregion(&name, &sr); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -254,9 +254,9 @@ compare_in_a6(ARGS_COMPARE) { isc_region_consume(®ion1, 1); isc_region_consume(®ion2, 1); if (prefixlen1 < prefixlen2) { - return (-1); + return -1; } else if (prefixlen1 > prefixlen2) { - return (1); + return 1; } /* * Prefix lengths are equal. @@ -266,15 +266,15 @@ compare_in_a6(ARGS_COMPARE) { if (octets > 0) { order = memcmp(region1.base, region2.base, octets); if (order < 0) { - return (-1); + return -1; } else if (order > 0) { - return (1); + return 1; } /* * Address suffixes are equal. */ if (prefixlen1 == 0) { - return (order); + return order; } isc_region_consume(®ion1, octets); isc_region_consume(®ion2, octets); @@ -284,7 +284,7 @@ compare_in_a6(ARGS_COMPARE) { dns_name_init(&name2, NULL); dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -306,7 +306,7 @@ fromstruct_in_a6(ARGS_FROMSTRUCT) { UNUSED(rdclass); if (a6->prefixlen > 128) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint8_tobuffer(a6->prefixlen, target)); @@ -329,10 +329,10 @@ fromstruct_in_a6(ARGS_FROMSTRUCT) { } if (a6->prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_toregion(&a6->prefix, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -377,7 +377,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &a6->prefix); } a6->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -408,7 +408,7 @@ additionaldata_in_a6(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -429,16 +429,16 @@ digest_in_a6(ARGS_DIGEST) { r1.length = octets; result = (digest)(arg, &r1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (prefixlen == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_region_consume(&r2, octets); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -449,7 +449,7 @@ checkowner_in_a6(ARGS_CHECKOWNER) { UNUSED(type); UNUSED(rdclass); - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -466,7 +466,7 @@ checknames_in_a6(ARGS_CHECKNAMES) { dns_rdata_toregion(rdata, ®ion); prefixlen = uint8_fromregion(®ion); if (prefixlen == 0) { - return (true); + return true; } isc_region_consume(®ion, 1 + 16 - prefixlen / 8); dns_name_init(&name, NULL); @@ -475,14 +475,14 @@ checknames_in_a6(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_in_a6(ARGS_COMPARE) { - return (compare_in_a6(rdata1, rdata2)); + return compare_in_a6(rdata1, rdata2); } #endif /* RDATA_IN_1_A6_38_C */ diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 4dafce0fab..485f85df57 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -43,11 +43,11 @@ fromtext_in_a(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -61,7 +61,7 @@ totext_in_a(ARGS_TOTEXT) { UNUSED(tctx); dns_rdata_toregion(rdata, ®ion); - return (inet_totext(AF_INET, tctx->flags, ®ion, target)); + return inet_totext(AF_INET, tctx->flags, ®ion, target); } static isc_result_t @@ -79,16 +79,16 @@ fromwire_in_a(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (sregion.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (tregion.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 4); isc_buffer_forward(source, 4); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -103,11 +103,11 @@ towire_in_a(ARGS_TOWIRE) { isc_buffer_availableregion(target, ®ion); if (region.length < rdata->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, rdata->data, rdata->length); isc_buffer_add(target, 4); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int @@ -124,7 +124,7 @@ compare_in_a(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -143,7 +143,7 @@ fromstruct_in_a(ARGS_FROMSTRUCT) { n = ntohl(a->in_addr.s_addr); - return (uint32_tobuffer(n, target)); + return uint32_tobuffer(n, target); } static isc_result_t @@ -167,7 +167,7 @@ tostruct_in_a(ARGS_TOSTRUCT) { n = uint32_fromregion(®ion); a->in_addr.s_addr = htonl(n); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -191,7 +191,7 @@ additionaldata_in_a(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -203,7 +203,7 @@ digest_in_a(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -228,7 +228,7 @@ checkowner_in_a(ARGS_CHECKOWNER) { if (dns_name_equal(&gc_msdcs, &prefix) && dns_name_ishostname(&suffix, false)) { - return (true); + return true; } /* @@ -250,12 +250,12 @@ checkowner_in_a(ARGS_CHECKOWNER) { strncasecmp((char *)label.base, "\x09_spf_rate", 10) == 0)) { - return (true); + return true; } } } - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -267,12 +267,12 @@ checknames_in_a(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_a(ARGS_COMPARE) { - return (compare_in_a(rdata1, rdata2)); + return compare_in_a(rdata1, rdata2); } #endif /* RDATA_IN_1_A_1_C */ diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index d1d3c164f5..441085aacc 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -43,11 +43,11 @@ fromtext_in_aaaa(ARGS_FROMTEXT) { } isc_buffer_availableregion(target, ®ion); if (region.length < 16) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, addr, 16); isc_buffer_add(target, 16); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -69,15 +69,15 @@ totext_in_aaaa(ARGS_TOTEXT) { n = snprintf(buf + len, sizeof(buf) - len, "%s%02x%02x", sep, rdata->data[i], rdata->data[i + 1]); if (n < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } len += n; sep = ":"; } - return (str_totext(buf, target)); + return str_totext(buf, target); } dns_rdata_toregion(rdata, ®ion); - return (inet_totext(AF_INET6, tctx->flags, ®ion, target)); + return inet_totext(AF_INET6, tctx->flags, ®ion, target); } static isc_result_t @@ -95,16 +95,16 @@ fromwire_in_aaaa(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); if (sregion.length < 16) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (tregion.length < 16) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tregion.base, sregion.base, 16); isc_buffer_forward(source, 16); isc_buffer_add(target, 16); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -119,11 +119,11 @@ towire_in_aaaa(ARGS_TOWIRE) { isc_buffer_availableregion(target, ®ion); if (region.length < rdata->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, rdata->data, rdata->length); isc_buffer_add(target, 16); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int @@ -140,7 +140,7 @@ compare_in_aaaa(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -156,7 +156,7 @@ fromstruct_in_aaaa(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, aaaa->in6_addr.s6_addr, 16)); + return mem_tobuffer(target, aaaa->in6_addr.s6_addr, 16); } static isc_result_t @@ -179,7 +179,7 @@ tostruct_in_aaaa(ARGS_TOSTRUCT) { INSIST(r.length == 16); memmove(aaaa->in6_addr.s6_addr, r.base, 16); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -203,7 +203,7 @@ additionaldata_in_aaaa(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -215,7 +215,7 @@ digest_in_aaaa(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -239,11 +239,11 @@ checkowner_in_aaaa(ARGS_CHECKOWNER) { if (dns_name_equal(&gc_msdcs, &prefix) && dns_name_ishostname(&suffix, false)) { - return (true); + return true; } } - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -255,11 +255,11 @@ checknames_in_aaaa(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_aaaa(ARGS_COMPARE) { - return (compare_in_aaaa(rdata1, rdata2)); + return compare_in_aaaa(rdata1, rdata2); } #endif /* RDATA_IN_1_AAAA_28_C */ diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c index 7b00b71f15..8bc130fe84 100644 --- a/lib/dns/rdata/in_1/apl_42.c +++ b/lib/dns/rdata/in_1/apl_42.c @@ -111,7 +111,7 @@ fromtext_in_apl(ARGS_FROMTEXT) { */ isc_lex_ungettoken(lexer, &token); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -168,7 +168,7 @@ totext_in_apl(ARGS_TOTEXT) { break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } n = snprintf(txt, sizeof(txt), "/%u", prefix); INSIST(n < (int)sizeof(txt)); @@ -176,7 +176,7 @@ totext_in_apl(ARGS_TOTEXT) { isc_region_consume(&sr, len); sep = " "; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -197,14 +197,14 @@ fromwire_in_apl(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); isc_buffer_availableregion(target, &tr); if (sr.length > tr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } sr2 = sr; /* Zero or more items */ while (sr.length > 0) { if (sr.length < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } afi = uint16_fromregion(&sr); isc_region_consume(&sr, 2); @@ -213,26 +213,26 @@ fromwire_in_apl(ARGS_FROMWIRE) { len = (*sr.base & 0x7f); isc_region_consume(&sr, 1); if (len > sr.length) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } switch (afi) { case 1: if (prefix > 32 || len > 4) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } break; case 2: if (prefix > 128 || len > 16) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } if (len > 0 && sr.base[len - 1] == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_region_consume(&sr, len); } isc_buffer_forward(source, sr2.length); - return (mem_tobuffer(target, sr2.base, sr2.length)); + return mem_tobuffer(target, sr2.base, sr2.length); } static isc_result_t @@ -242,7 +242,7 @@ towire_in_apl(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_apl); REQUIRE(rdata->rdclass == dns_rdataclass_in); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -257,7 +257,7 @@ compare_in_apl(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -275,8 +275,8 @@ fromstruct_in_apl(ARGS_FROMSTRUCT) { isc_buffer_init(&b, apl->apl, apl->apl_len); isc_buffer_add(&b, apl->apl_len); isc_buffer_setactive(&b, apl->apl_len); - return (fromwire_in_apl(rdclass, type, &b, DNS_DECOMPRESS_DEFAULT, - target)); + return fromwire_in_apl(rdclass, type, &b, DNS_DECOMPRESS_DEFAULT, + target); } static isc_result_t @@ -297,7 +297,7 @@ tostruct_in_apl(ARGS_TOSTRUCT) { apl->apl = mem_maybedup(mctx, r.base, r.length); apl->offset = 0; apl->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -330,7 +330,7 @@ dns_rdata_apl_first(dns_rdata_in_apl_t *apl) { * If no APL return ISC_R_NOMORE. */ if (apl->apl == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -341,7 +341,7 @@ dns_rdata_apl_first(dns_rdata_in_apl_t *apl) { INSIST(4 + length <= apl->apl_len); apl->offset = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -357,7 +357,7 @@ dns_rdata_apl_next(dns_rdata_in_apl_t *apl) { * No APL or have already reached the end return ISC_R_NOMORE. */ if (apl->apl == NULL || apl->offset == apl->apl_len) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -374,7 +374,7 @@ dns_rdata_apl_next(dns_rdata_in_apl_t *apl) { INSIST(4 + length + apl->offset <= apl->apl_len); apl->offset += 4 + length; - return ((apl->offset < apl->apl_len) ? ISC_R_SUCCESS : ISC_R_NOMORE); + return (apl->offset < apl->apl_len) ? ISC_R_SUCCESS : ISC_R_NOMORE; } isc_result_t @@ -389,7 +389,7 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) { REQUIRE(apl->offset <= apl->apl_len); if (apl->offset == apl->apl_len) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* @@ -413,12 +413,12 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) { } else { ent->data = NULL; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } unsigned int dns_rdata_apl_count(const dns_rdata_in_apl_t *apl) { - return (apl->apl_len); + return apl->apl_len; } static isc_result_t @@ -431,7 +431,7 @@ additionaldata_in_apl(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -443,7 +443,7 @@ digest_in_apl(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -456,7 +456,7 @@ checkowner_in_apl(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -468,12 +468,12 @@ checknames_in_apl(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_apl(ARGS_COMPARE) { - return (compare_in_apl(rdata1, rdata2)); + return compare_in_apl(rdata1, rdata2); } #endif /* RDATA_IN_1_APL_42_C */ diff --git a/lib/dns/rdata/in_1/atma_34.c b/lib/dns/rdata/in_1/atma_34.c index 7ed338d235..c2749198bd 100644 --- a/lib/dns/rdata/in_1/atma_34.c +++ b/lib/dns/rdata/in_1/atma_34.c @@ -104,7 +104,7 @@ fromtext_in_atma(ARGS_FROMTEXT) { RETTOK(ISC_R_UNEXPECTEDEND); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -135,9 +135,9 @@ totext_in_atma(ARGS_TOTEXT) { RETERR(mem_tobuffer(target, region.base, region.length)); break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -153,19 +153,19 @@ fromwire_in_atma(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (region.base[0] == 1) { unsigned int i; for (i = 1; i < region.length; i++) { if (!isdigit((unsigned char)region.base[i])) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } } RETERR(mem_tobuffer(target, region.base, region.length)); isc_buffer_forward(source, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -176,7 +176,7 @@ towire_in_atma(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -193,7 +193,7 @@ compare_in_atma(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -211,7 +211,7 @@ fromstruct_in_atma(ARGS_FROMSTRUCT) { UNUSED(rdclass); RETERR(mem_tobuffer(target, &atma->format, 1)); - return (mem_tobuffer(target, atma->atma, atma->atma_len)); + return mem_tobuffer(target, atma->atma, atma->atma_len); } static isc_result_t @@ -234,7 +234,7 @@ tostruct_in_atma(ARGS_TOSTRUCT) { atma->atma_len = r.length; atma->atma = mem_maybedup(mctx, r.base, r.length); atma->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -265,7 +265,7 @@ additionaldata_in_atma(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -277,7 +277,7 @@ digest_in_atma(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -290,7 +290,7 @@ checkowner_in_atma(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -302,12 +302,12 @@ checknames_in_atma(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_atma(ARGS_COMPARE) { - return (compare_in_atma(rdata1, rdata2)); + return compare_in_atma(rdata1, rdata2); } #endif /* RDATA_IN_1_atma_22_C */ diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c index 3ad50648e9..8bc7624102 100644 --- a/lib/dns/rdata/in_1/dhcid_49.c +++ b/lib/dns/rdata/in_1/dhcid_49.c @@ -29,7 +29,7 @@ fromtext_in_dhcid(ARGS_FROMTEXT) { UNUSED(options); UNUSED(callbacks); - return (isc_base64_tobuffer(lexer, target, -2)); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -63,7 +63,7 @@ totext_in_dhcid(ARGS_TOTEXT) { RETERR(str_totext(buf, target)); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -79,11 +79,11 @@ fromwire_in_dhcid(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sr); if (sr.length == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } isc_buffer_forward(source, sr.length); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static isc_result_t @@ -97,7 +97,7 @@ towire_in_dhcid(ARGS_TOWIRE) { UNUSED(cctx); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -114,7 +114,7 @@ compare_in_dhcid(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -131,7 +131,7 @@ fromstruct_in_dhcid(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, dhcid->dhcid, dhcid->length)); + return mem_tobuffer(target, dhcid->dhcid, dhcid->length); } static isc_result_t @@ -152,7 +152,7 @@ tostruct_in_dhcid(ARGS_TOSTRUCT) { dhcid->dhcid = mem_maybedup(mctx, region.base, region.length); dhcid->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -183,7 +183,7 @@ additionaldata_in_dhcid(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -195,7 +195,7 @@ digest_in_dhcid(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -208,7 +208,7 @@ checkowner_in_dhcid(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -220,12 +220,12 @@ checknames_in_dhcid(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_dhcid(ARGS_COMPARE) { - return (compare_in_dhcid(rdata1, rdata2)); + return compare_in_dhcid(rdata1, rdata2); } #endif /* RDATA_IN_1_DHCID_49_C */ diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c index 42e0910403..641a60475c 100644 --- a/lib/dns/rdata/in_1/eid_31.c +++ b/lib/dns/rdata/in_1/eid_31.c @@ -29,7 +29,7 @@ fromtext_in_eid(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(callbacks); - return (isc_hex_tobuffer(lexer, target, -2)); + return isc_hex_tobuffer(lexer, target, -2); } static isc_result_t @@ -54,7 +54,7 @@ totext_in_eid(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -70,12 +70,12 @@ fromwire_in_eid(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, region.length)); isc_buffer_forward(source, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -86,7 +86,7 @@ towire_in_eid(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -103,7 +103,7 @@ compare_in_eid(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -120,7 +120,7 @@ fromstruct_in_eid(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, eid->eid, eid->eid_len)); + return mem_tobuffer(target, eid->eid, eid->eid_len); } static isc_result_t @@ -141,7 +141,7 @@ tostruct_in_eid(ARGS_TOSTRUCT) { eid->eid_len = r.length; eid->eid = mem_maybedup(mctx, r.base, r.length); eid->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -172,7 +172,7 @@ additionaldata_in_eid(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -184,7 +184,7 @@ digest_in_eid(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -197,7 +197,7 @@ checkowner_in_eid(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -209,12 +209,12 @@ checknames_in_eid(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_eid(ARGS_COMPARE) { - return (compare_in_eid(rdata1, rdata2)); + return compare_in_eid(rdata1, rdata2); } #endif /* RDATA_IN_1_EID_31_C */ diff --git a/lib/dns/rdata/in_1/https_65.c b/lib/dns/rdata/in_1/https_65.c index af1ad7ff84..b04c1cddb2 100644 --- a/lib/dns/rdata/in_1/https_65.c +++ b/lib/dns/rdata/in_1/https_65.c @@ -27,7 +27,7 @@ fromtext_in_https(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_https); REQUIRE(rdclass == dns_rdataclass_in); - return (generic_fromtext_in_svcb(CALL_FROMTEXT)); + return generic_fromtext_in_svcb(CALL_FROMTEXT); } static isc_result_t @@ -36,7 +36,7 @@ totext_in_https(ARGS_TOTEXT) { REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); - return (generic_totext_in_svcb(CALL_TOTEXT)); + return generic_totext_in_svcb(CALL_TOTEXT); } static isc_result_t @@ -44,7 +44,7 @@ fromwire_in_https(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_https); REQUIRE(rdclass == dns_rdataclass_in); - return (generic_fromwire_in_svcb(CALL_FROMWIRE)); + return generic_fromwire_in_svcb(CALL_FROMWIRE); } static isc_result_t @@ -52,7 +52,7 @@ towire_in_https(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_https); REQUIRE(rdata->length != 0); - return (generic_towire_in_svcb(CALL_TOWIRE)); + return generic_towire_in_svcb(CALL_TOWIRE); } static int @@ -70,7 +70,7 @@ compare_in_https(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -83,7 +83,7 @@ fromstruct_in_https(ARGS_FROMSTRUCT) { REQUIRE(https->common.rdtype == type); REQUIRE(https->common.rdclass == rdclass); - return (generic_fromstruct_in_svcb(CALL_FROMSTRUCT)); + return generic_fromstruct_in_svcb(CALL_FROMSTRUCT); } static isc_result_t @@ -95,7 +95,7 @@ tostruct_in_https(ARGS_TOSTRUCT) { REQUIRE(https != NULL); REQUIRE(rdata->length != 0); - return (generic_tostruct_in_svcb(CALL_TOSTRUCT)); + return generic_tostruct_in_svcb(CALL_TOSTRUCT); } static void @@ -114,7 +114,7 @@ additionaldata_in_https(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_https); REQUIRE(rdata->rdclass == dns_rdataclass_in); - return (generic_additionaldata_in_svcb(CALL_ADDLDATA)); + return generic_additionaldata_in_svcb(CALL_ADDLDATA); } static isc_result_t @@ -125,7 +125,7 @@ digest_in_https(ARGS_DIGEST) { REQUIRE(rdata->rdclass == dns_rdataclass_in); dns_rdata_toregion(rdata, ®ion1); - return ((digest)(arg, ®ion1)); + return (digest)(arg, ®ion1); } static bool @@ -138,7 +138,7 @@ checkowner_in_https(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -146,12 +146,12 @@ checknames_in_https(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_https); REQUIRE(rdata->rdclass == dns_rdataclass_in); - return (generic_checknames_in_svcb(CALL_CHECKNAMES)); + return generic_checknames_in_svcb(CALL_CHECKNAMES); } static int casecompare_in_https(ARGS_COMPARE) { - return (compare_in_https(rdata1, rdata2)); + return compare_in_https(rdata1, rdata2); } isc_result_t @@ -160,7 +160,7 @@ dns_rdata_in_https_first(dns_rdata_in_https_t *https) { REQUIRE(https->common.rdtype == dns_rdatatype_https); REQUIRE(https->common.rdclass == dns_rdataclass_in); - return (generic_rdata_in_svcb_first(https)); + return generic_rdata_in_svcb_first(https); } isc_result_t @@ -169,7 +169,7 @@ dns_rdata_in_https_next(dns_rdata_in_https_t *https) { REQUIRE(https->common.rdtype == dns_rdatatype_https); REQUIRE(https->common.rdclass == dns_rdataclass_in); - return (generic_rdata_in_svcb_next(https)); + return generic_rdata_in_svcb_next(https); } void diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 6c7ef5589f..1328bc3b6a 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -46,7 +46,7 @@ fromtext_in_kx(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -76,7 +76,7 @@ totext_in_kx(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -96,11 +96,11 @@ fromwire_in_kx(ARGS_FROMWIRE) { isc_buffer_activeregion(source, &sregion); if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -121,7 +121,7 @@ towire_in_kx(ARGS_TOWIRE) { dns_name_init(&name, offsets); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -141,7 +141,7 @@ compare_in_kx(ARGS_COMPARE) { order = memcmp(rdata1->data, rdata2->data, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -156,7 +156,7 @@ compare_in_kx(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -175,7 +175,7 @@ fromstruct_in_kx(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(kx->preference, target)); dns_name_toregion(&kx->exchange, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -203,7 +203,7 @@ tostruct_in_kx(ARGS_TOSTRUCT) { dns_name_init(&kx->exchange, NULL); name_duporclone(&name, mctx, &kx->exchange); kx->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -238,7 +238,7 @@ additionaldata_in_kx(ARGS_ADDLDATA) { isc_region_consume(®ion, 2); dns_name_fromregion(&name, ®ion); - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -256,7 +256,7 @@ digest_in_kx(ARGS_DIGEST) { RETERR((digest)(arg, &r1)); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -269,7 +269,7 @@ checkowner_in_kx(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -281,12 +281,12 @@ checknames_in_kx(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_kx(ARGS_COMPARE) { - return (compare_in_kx(rdata1, rdata2)); + return compare_in_kx(rdata1, rdata2); } #endif /* RDATA_IN_1_KX_36_C */ diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c index 852c80a0ea..1841fe8388 100644 --- a/lib/dns/rdata/in_1/nimloc_32.c +++ b/lib/dns/rdata/in_1/nimloc_32.c @@ -29,7 +29,7 @@ fromtext_in_nimloc(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(callbacks); - return (isc_hex_tobuffer(lexer, target, -2)); + return isc_hex_tobuffer(lexer, target, -2); } static isc_result_t @@ -54,7 +54,7 @@ totext_in_nimloc(ARGS_TOTEXT) { if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { RETERR(str_totext(" )", target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -70,12 +70,12 @@ fromwire_in_nimloc(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, region.length)); isc_buffer_forward(source, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -86,7 +86,7 @@ towire_in_nimloc(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -103,7 +103,7 @@ compare_in_nimloc(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -120,7 +120,7 @@ fromstruct_in_nimloc(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, nimloc->nimloc, nimloc->nimloc_len)); + return mem_tobuffer(target, nimloc->nimloc, nimloc->nimloc_len); } static isc_result_t @@ -141,7 +141,7 @@ tostruct_in_nimloc(ARGS_TOSTRUCT) { nimloc->nimloc_len = r.length; nimloc->nimloc = mem_maybedup(mctx, r.base, r.length); nimloc->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -172,7 +172,7 @@ additionaldata_in_nimloc(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -184,7 +184,7 @@ digest_in_nimloc(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -197,7 +197,7 @@ checkowner_in_nimloc(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -209,12 +209,12 @@ checknames_in_nimloc(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_nimloc(ARGS_COMPARE) { - return (compare_in_nimloc(rdata1, rdata2)); + return compare_in_nimloc(rdata1, rdata2); } #endif /* RDATA_IN_1_NIMLOC_32_C */ diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index d155e5713e..7ed384c9ef 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -40,7 +40,7 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) { origin = dns_rootname; } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -62,7 +62,7 @@ totext_in_nsap_ptr(ARGS_TOTEXT) { opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -78,7 +78,7 @@ fromwire_in_nsap_ptr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -96,7 +96,7 @@ towire_in_nsap_ptr(ARGS_TOWIRE) { dns_rdata_toregion(rdata, ®ion); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -122,7 +122,7 @@ compare_in_nsap_ptr(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -140,7 +140,7 @@ fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) { UNUSED(rdclass); dns_name_toregion(&nsap_ptr->owner, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -164,7 +164,7 @@ tostruct_in_nsap_ptr(ARGS_TOSTRUCT) { dns_name_init(&nsap_ptr->owner, NULL); name_duporclone(&name, mctx, &nsap_ptr->owner); nsap_ptr->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -193,7 +193,7 @@ additionaldata_in_nsap_ptr(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -208,7 +208,7 @@ digest_in_nsap_ptr(ARGS_DIGEST) { dns_name_init(&name, NULL); dns_name_fromregion(&name, &r); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -221,7 +221,7 @@ checkowner_in_nsap_ptr(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -233,12 +233,12 @@ checknames_in_nsap_ptr(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_nsap_ptr(ARGS_COMPARE) { - return (compare_in_nsap_ptr(rdata1, rdata2)); + return compare_in_nsap_ptr(rdata1, rdata2); } #endif /* RDATA_IN_1_NSAP_PTR_23_C */ diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index 465dd64c62..208ae94c6c 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -68,7 +68,7 @@ fromtext_in_nsap(ARGS_FROMTEXT) { if (digits != 0 || !valid) { RETTOK(ISC_R_UNEXPECTEDEND); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -89,7 +89,7 @@ totext_in_nsap(ARGS_TOTEXT) { isc_region_consume(®ion, 1); RETERR(str_totext(buf, target)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -105,12 +105,12 @@ fromwire_in_nsap(ARGS_FROMWIRE) { isc_buffer_activeregion(source, ®ion); if (region.length < 1) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, region.length)); isc_buffer_forward(source, region.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -121,7 +121,7 @@ towire_in_nsap(ARGS_TOWIRE) { UNUSED(cctx); - return (mem_tobuffer(target, rdata->data, rdata->length)); + return mem_tobuffer(target, rdata->data, rdata->length); } static int @@ -138,7 +138,7 @@ compare_in_nsap(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -155,7 +155,7 @@ fromstruct_in_nsap(ARGS_FROMSTRUCT) { UNUSED(type); UNUSED(rdclass); - return (mem_tobuffer(target, nsap->nsap, nsap->nsap_len)); + return mem_tobuffer(target, nsap->nsap, nsap->nsap_len); } static isc_result_t @@ -176,7 +176,7 @@ tostruct_in_nsap(ARGS_TOSTRUCT) { nsap->nsap_len = r.length; nsap->nsap = mem_maybedup(mctx, r.base, r.length); nsap->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -207,7 +207,7 @@ additionaldata_in_nsap(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -219,7 +219,7 @@ digest_in_nsap(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -232,7 +232,7 @@ checkowner_in_nsap(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -244,12 +244,12 @@ checknames_in_nsap(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_nsap(ARGS_COMPARE) { - return (compare_in_nsap(rdata1, rdata2)); + return compare_in_nsap(rdata1, rdata2); } #endif /* RDATA_IN_1_NSAP_22_C */ diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index da757806cf..6a3c992645 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -62,7 +62,7 @@ fromtext_in_px(ARGS_FROMTEXT) { dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -107,7 +107,7 @@ totext_in_px(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -130,7 +130,7 @@ fromwire_in_px(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sregion); if (sregion.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); @@ -143,7 +143,7 @@ fromwire_in_px(ARGS_FROMWIRE) { /* * MAPX400. */ - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -177,7 +177,7 @@ towire_in_px(ARGS_TOWIRE) { */ dns_name_init(&name, offsets); dns_name_fromregion(&name, ®ion); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -197,7 +197,7 @@ compare_in_px(ARGS_COMPARE) { order = memcmp(rdata1->data, rdata2->data, 2); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } dns_name_init(&name1, NULL); @@ -214,7 +214,7 @@ compare_in_px(ARGS_COMPARE) { order = dns_name_rdatacompare(&name1, &name2); if (order != 0) { - return (order); + return order; } isc_region_consume(®ion1, name_length(&name1)); @@ -223,7 +223,7 @@ compare_in_px(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -244,7 +244,7 @@ fromstruct_in_px(ARGS_FROMSTRUCT) { dns_name_toregion(&px->map822, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); dns_name_toregion(&px->mapx400, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -278,7 +278,7 @@ tostruct_in_px(ARGS_TOSTRUCT) { name_duporclone(&name, mctx, &px->mapx400); px->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -308,7 +308,7 @@ additionaldata_in_px(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -326,19 +326,19 @@ digest_in_px(ARGS_DIGEST) { r1.length = 2; result = (digest)(arg, &r1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); result = dns_name_digest(&name, digest, arg); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_region_consume(&r2, name_length(&name)); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -351,7 +351,7 @@ checkowner_in_px(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -363,12 +363,12 @@ checknames_in_px(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_px(ARGS_COMPARE) { - return (compare_in_px(rdata1, rdata2)); + return compare_in_px(rdata1, rdata2); } #endif /* RDATA_IN_1_PX_26_C */ diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index 0f33278045..41c24381fd 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -83,7 +83,7 @@ fromtext_in_srv(ARGS_FROMTEXT) { if (!ok && callbacks != NULL) { warn_badname(&name, lexer, callbacks); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -136,7 +136,7 @@ totext_in_srv(ARGS_TOTEXT) { dns_name_fromregion(&name, ®ion); opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT : 0; - return (dns_name_totext(&prefix, opts, target)); + return dns_name_totext(&prefix, opts, target); } static isc_result_t @@ -159,7 +159,7 @@ fromwire_in_srv(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, &sr); if (sr.length < 6) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, sr.base, 6)); isc_buffer_forward(source, 6); @@ -167,7 +167,7 @@ fromwire_in_srv(ARGS_FROMWIRE) { /* * Target. */ - return (dns_name_fromwire(&name, source, dctx, target)); + return dns_name_fromwire(&name, source, dctx, target); } static isc_result_t @@ -192,7 +192,7 @@ towire_in_srv(ARGS_TOWIRE) { */ dns_name_init(&name, offsets); dns_name_fromregion(&name, &sr); - return (dns_name_towire(&name, cctx, target, NULL)); + return dns_name_towire(&name, cctx, target, NULL); } static int @@ -215,7 +215,7 @@ compare_in_srv(ARGS_COMPARE) { */ order = memcmp(rdata1->data, rdata2->data, 6); if (order != 0) { - return (order < 0 ? -1 : 1); + return order < 0 ? -1 : 1; } /* @@ -233,7 +233,7 @@ compare_in_srv(ARGS_COMPARE) { dns_name_fromregion(&name1, ®ion1); dns_name_fromregion(&name2, ®ion2); - return (dns_name_rdatacompare(&name1, &name2)); + return dns_name_rdatacompare(&name1, &name2); } static isc_result_t @@ -254,7 +254,7 @@ fromstruct_in_srv(ARGS_FROMSTRUCT) { RETERR(uint16_tobuffer(srv->weight, target)); RETERR(uint16_tobuffer(srv->port, target)); dns_name_toregion(&srv->target, ®ion); - return (isc_buffer_copyregion(target, ®ion)); + return isc_buffer_copyregion(target, ®ion); } static isc_result_t @@ -284,7 +284,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) { dns_name_init(&srv->target, NULL); name_duporclone(&name, mctx, &srv->target); srv->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -326,12 +326,12 @@ additionaldata_in_srv(ARGS_ADDLDATA) { dns_name_fromregion(&name, ®ion); if (dns_name_equal(&name, dns_rootname)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_fixedname_init(&fixed); @@ -339,17 +339,17 @@ additionaldata_in_srv(ARGS_ADDLDATA) { result = dns_name_fromstring(dns_fixedname_name(&fixed), buf, NULL, 0, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_name_concatenate(dns_fixedname_name(&fixed), &name, dns_fixedname_name(&fixed), NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa, - NULL DNS__DB_FILELINE)); + return (add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa, + NULL DNS__DB_FILELINE); } static isc_result_t @@ -367,7 +367,7 @@ digest_in_srv(ARGS_DIGEST) { RETERR((digest)(arg, &r1)); dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); - return (dns_name_digest(&name, digest, arg)); + return dns_name_digest(&name, digest, arg); } static bool @@ -380,7 +380,7 @@ checkowner_in_srv(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -401,14 +401,14 @@ checknames_in_srv(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static int casecompare_in_srv(ARGS_COMPARE) { - return (compare_in_srv(rdata1, rdata2)); + return compare_in_srv(rdata1, rdata2); } #endif /* RDATA_IN_1_SRV_33_C */ diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c index 871d47f90a..1045cf9c51 100644 --- a/lib/dns/rdata/in_1/svcb_64.c +++ b/lib/dns/rdata/in_1/svcb_64.c @@ -60,16 +60,16 @@ alpn_fromtxt(isc_textregion_t *source, isc_buffer_t *target) { do { RETERR(commatxt_fromtext(&source0, true, target)); } while (source0.length != 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int svckeycmp(const void *a1, const void *a2) { const unsigned char *u1 = a1, *u2 = a2; if (*u1 != *u2) { - return (*u1 - *u2); + return *u1 - *u2; } - return (*(++u1) - *(++u2)); + return *(++u1) - *(++u2); } static isc_result_t @@ -85,11 +85,11 @@ svcsortkeylist(isc_buffer_t *target, unsigned int used) { if (region.base[0] == region.base[2] && region.base[1] == region.base[3]) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } isc_region_consume(®ion, 2); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -101,31 +101,31 @@ svcb_validate(uint16_t key, isc_region_t *region) { switch (sbpr[i].encoding) { case sbpr_port: if (region->length != 2) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } break; case sbpr_ipv4s: if ((region->length % 4) != 0 || region->length == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } break; case sbpr_ipv6s: if ((region->length % 16) != 0 || region->length == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } break; case sbpr_alpn: { if (region->length == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } while (region->length != 0) { size_t l = *region->base + 1; if (l == 1U || l > region->length) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_region_consume(region, l); } @@ -135,7 +135,7 @@ svcb_validate(uint16_t key, isc_region_t *region) { if ((region->length % 2) != 0 || region->length == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* In order? */ while (region->length >= 4) { @@ -145,7 +145,7 @@ svcb_validate(uint16_t key, isc_region_t *region) { region->base[1] >= region->base[3])) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } isc_region_consume(region, 2); } @@ -161,34 +161,34 @@ svcb_validate(uint16_t key, isc_region_t *region) { * MUST contain "{?dns}". */ if (region->length < 7) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* MUST be relative */ if (region->base[0] != '/') { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* MUST be UTF8 */ if (!isc_utf8_valid(region->base, region->length)) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* MUST contain "{?dns}" */ if (strnstr((char *)region->base, "{?dns}", region->length) == NULL) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } break; case sbpr_empty: if (region->length != 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } break; } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -215,32 +215,32 @@ svc_keyfromregion(isc_textregion_t *region, char sep, uint16_t *value, } /* Handle keyXXXXX form. */ if (strncmp(region->base, "key", 3) != 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } isc_textregion_consume(region, 3); /* Disallow [+-]XXXXX which is allowed by strtoul. */ if (region->length == 0 || *region->base == '-' || *region->base == '+') { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* No zero padding. */ if (region->length > 1 && *region->base == '0' && region->base[1] != sep) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } ul = strtoul(region->base, &e, 10); /* Valid number? */ if (e == region->base || (*e != sep && *e != 0)) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (ul > 0xffff) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_textregion_consume(region, e - region->base); finish: if (sep == ',' && region->length == 1) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* Consume separator. */ if (region->length != 0) { @@ -248,7 +248,7 @@ finish: } RETERR(uint16_tobuffer(ul, target)); SET_IF_NOT_NULL(value, ul); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -292,14 +292,14 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { break; case sbpr_port: if (!isdigit((unsigned char)*region->base)) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } ul = strtoul(region->base, &e, 10); if (*e != '\0') { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } if (ul > 0xffff) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } RETERR(uint16_tobuffer(ul, target)); break; @@ -314,7 +314,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { e - tbuf); } if (inet_pton(AF_INET, tbuf, abuf) != 1) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } mem_tobuffer(target, abuf, 4); } while (e != NULL); @@ -330,7 +330,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { e - tbuf); } if (inet_pton(AF_INET6, tbuf, abuf) != 1) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } mem_tobuffer(target, abuf, 16); } while (e != NULL); @@ -340,12 +340,12 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { break; case sbpr_empty: if (region->length != 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } break; case sbpr_keylist: if (region->length == 0) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } used = isc_buffer_usedlength(target); while (region->length != 0) { @@ -374,7 +374,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { default: break; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RETERR(svc_keyfromregion(region, '=', &key, target)); @@ -383,7 +383,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { /* Sanity check keyXXXXX form. */ keyregion.base = isc_buffer_used(target); keyregion.length = 0; - return (svcb_validate(key, &keyregion)); + return svcb_validate(key, &keyregion); } sb = *target; RETERR(uint16_tobuffer(0, target)); /* dummy length */ @@ -393,7 +393,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) { /* Sanity check keyXXXXX form. */ keyregion.base = isc_buffer_used(&sb); keyregion.length = len; - return (svcb_validate(key, &keyregion)); + return svcb_validate(key, &keyregion); } static const char * @@ -405,13 +405,13 @@ svcparamkey(unsigned short value, enum encoding *encoding, char *buf, for (i = 0; i < ARRAY_SIZE(sbpr); i++) { if (sbpr[i].value == value && sbpr[i].initial) { *encoding = sbpr[i].encoding; - return (sbpr[i].name); + return sbpr[i].name; } } n = snprintf(buf, len, "key%u", value); INSIST(n > 0 && (unsigned int)n < len); *encoding = sbpr_text; - return (buf); + return buf; } static isc_result_t @@ -422,7 +422,7 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { bool have_alpn = false; if (isc_buffer_usedlength(target) == used) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -454,18 +454,18 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { if (mankey != 0) { /* Is this the last mandatory key? */ if (key1 != mankey || man.length != 0) { - return (DNS_R_INCONSISTENTRR); + return DNS_R_INCONSISTENTRR; } } else if (key1 == SVCB_MAN_KEY) { /* Lone mandatory field. */ - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } else if (key1 == SVCB_NO_DEFAULT_ALPN_KEY && !have_alpn) { /* Missing required ALPN field. */ - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -479,7 +479,7 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { isc_region_consume(&r1, 2); isc_region_consume(&r1, len2); if (key2 == key1) { - return (DNS_R_DUPLICATE); + return DNS_R_DUPLICATE; } if (key2 < key1) { base1 = base2; @@ -524,7 +524,7 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { have_alpn = true; } else if (key1 == SVCB_NO_DEFAULT_ALPN_KEY && !have_alpn) { /* Missing required ALPN field. */ - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } /* @@ -532,7 +532,7 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { */ if (mankey != 0) { if (key1 > mankey) { - return (DNS_R_INCONSISTENTRR); + return DNS_R_INCONSISTENTRR; } if (key1 == mankey) { if (man.length >= 2) { @@ -555,10 +555,10 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) { mankey = uint16_fromregion(&man); isc_region_consume(&man, 2); if (mankey == SVCB_MAN_KEY) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } } else { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } @@ -627,7 +627,7 @@ generic_fromtext_in_svcb(ARGS_FROMTEXT) { token.type == isc_tokentype_eof) { isc_lex_ungettoken(lexer, &token); - return (svcsortkeys(target, used)); + return svcsortkeys(target, used); } if (token.type != isc_tokentype_string && /* key only */ @@ -648,7 +648,7 @@ fromtext_in_svcb(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(callbacks); - return (generic_fromtext_in_svcb(CALL_FROMTEXT)); + return generic_fromtext_in_svcb(CALL_FROMTEXT); } static isc_result_t @@ -779,7 +779,7 @@ generic_totext_in_svcb(ARGS_TOTEXT) { UNREACHABLE(); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -788,7 +788,7 @@ totext_in_svcb(ARGS_TOTEXT) { REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); - return (generic_totext_in_svcb(CALL_TOTEXT)); + return generic_totext_in_svcb(CALL_TOTEXT); } static isc_result_t @@ -810,7 +810,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { */ isc_buffer_activeregion(source, ®ion); if (region.length < 2) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, 2)); isc_buffer_forward(source, 2); @@ -832,7 +832,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { * SvcParamKey */ if (region.length < 2U) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, 2)); key = uint16_fromregion(®ion); @@ -842,7 +842,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { * Keys must be unique and in order. */ if (!first && key <= lastkey) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -851,7 +851,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { if (mankey != 0) { /* Missing mandatory key? */ if (key > mankey) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (key == mankey) { /* Get next mandatory key. */ @@ -870,7 +870,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { if (key == SVCB_ALPN_KEY) { have_alpn = true; } else if (key == SVCB_NO_DEFAULT_ALPN_KEY && !have_alpn) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } first = false; @@ -880,7 +880,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { * SvcParamValue length. */ if (region.length < 2U) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } RETERR(mem_tobuffer(target, region.base, 2)); len = uint16_fromregion(®ion); @@ -890,7 +890,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { * SvcParamValue. */ if (region.length < len) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* @@ -904,10 +904,10 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { mankey = uint16_fromregion(&man); isc_region_consume(&man, 2); if (mankey == SVCB_MAN_KEY) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } else { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } keyregion = region; @@ -922,10 +922,10 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { * Do we have an outstanding mandatory key? */ if (mankey != 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -933,7 +933,7 @@ fromwire_in_svcb(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_svcb); REQUIRE(rdclass == dns_rdataclass_in); - return (generic_fromwire_in_svcb(CALL_FROMWIRE)); + return generic_fromwire_in_svcb(CALL_FROMWIRE); } static isc_result_t @@ -964,7 +964,7 @@ generic_towire_in_svcb(ARGS_TOWIRE) { /* * SvcParams. */ - return (mem_tobuffer(target, region.base, region.length)); + return mem_tobuffer(target, region.base, region.length); } static isc_result_t @@ -972,7 +972,7 @@ towire_in_svcb(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_svcb); REQUIRE(rdata->length != 0); - return (generic_towire_in_svcb(CALL_TOWIRE)); + return generic_towire_in_svcb(CALL_TOWIRE); } static int @@ -990,7 +990,7 @@ compare_in_svcb(ARGS_COMPARE) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - return (isc_region_compare(®ion1, ®ion2)); + return isc_region_compare(®ion1, ®ion2); } static isc_result_t @@ -1009,7 +1009,7 @@ generic_fromstruct_in_svcb(ARGS_FROMSTRUCT) { dns_name_toregion(&svcb->svcdomain, ®ion); RETERR(isc_buffer_copyregion(target, ®ion)); - return (mem_tobuffer(target, svcb->svc, svcb->svclen)); + return mem_tobuffer(target, svcb->svc, svcb->svclen); } static isc_result_t @@ -1022,7 +1022,7 @@ fromstruct_in_svcb(ARGS_FROMSTRUCT) { REQUIRE(svcb->common.rdtype == type); REQUIRE(svcb->common.rdclass == rdclass); - return (generic_fromstruct_in_svcb(CALL_FROMSTRUCT)); + return generic_fromstruct_in_svcb(CALL_FROMSTRUCT); } static isc_result_t @@ -1055,7 +1055,7 @@ generic_tostruct_in_svcb(ARGS_TOSTRUCT) { svcb->offset = 0; svcb->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1067,7 +1067,7 @@ tostruct_in_svcb(ARGS_TOSTRUCT) { REQUIRE(svcb != NULL); REQUIRE(rdata->length != 0); - return (generic_tostruct_in_svcb(CALL_TOSTRUCT)); + return generic_tostruct_in_svcb(CALL_TOSTRUCT); } static void @@ -1120,11 +1120,11 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) { if (alias || dns_name_equal(owner, dns_rootname) || !dns_name_ishostname(owner, false)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Only lookup address records */ - return ((add)(arg, owner, dns_rdatatype_a, - NULL DNS__DB_FILELINE)); + return (add)(arg, owner, dns_rdatatype_a, + NULL DNS__DB_FILELINE); } /* @@ -1160,7 +1160,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) { * Stop following a potentially infinite CNAME chain. */ if (!done && cnames++ > MAX_CNAMES) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } while (!done); @@ -1176,10 +1176,10 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) { */ if (dns_rdataset_isassociated(&rdataset)) { dns_rdataset_disassociate(&rdataset); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return ((add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE)); + return (add)(arg, &name, dns_rdatatype_a, NULL DNS__DB_FILELINE); } static isc_result_t @@ -1187,7 +1187,7 @@ additionaldata_in_svcb(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_svcb); REQUIRE(rdata->rdclass == dns_rdataclass_in); - return (generic_additionaldata_in_svcb(CALL_ADDLDATA)); + return generic_additionaldata_in_svcb(CALL_ADDLDATA); } static isc_result_t @@ -1198,7 +1198,7 @@ digest_in_svcb(ARGS_DIGEST) { REQUIRE(rdata->rdclass == dns_rdataclass_in); dns_rdata_toregion(rdata, ®ion1); - return ((digest)(arg, ®ion1)); + return (digest)(arg, ®ion1); } static bool @@ -1211,7 +1211,7 @@ checkowner_in_svcb(ARGS_CHECKOWNER) { UNUSED(rdclass); UNUSED(wildcard); - return (true); + return true; } static bool @@ -1232,9 +1232,9 @@ generic_checknames_in_svcb(ARGS_CHECKNAMES) { if (bad != NULL) { dns_name_clone(&name, bad); } - return (false); + return false; } - return (true); + return true; } static bool @@ -1242,21 +1242,21 @@ checknames_in_svcb(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_svcb); REQUIRE(rdata->rdclass == dns_rdataclass_in); - return (generic_checknames_in_svcb(CALL_CHECKNAMES)); + return generic_checknames_in_svcb(CALL_CHECKNAMES); } static int casecompare_in_svcb(ARGS_COMPARE) { - return (compare_in_svcb(rdata1, rdata2)); + return compare_in_svcb(rdata1, rdata2); } static isc_result_t generic_rdata_in_svcb_first(dns_rdata_in_svcb_t *svcb) { if (svcb->svclen == 0) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } svcb->offset = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1265,7 +1265,7 @@ generic_rdata_in_svcb_next(dns_rdata_in_svcb_t *svcb) { size_t len; if (svcb->offset >= svcb->svclen) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } region.base = svcb->svc + svcb->offset; @@ -1275,7 +1275,7 @@ generic_rdata_in_svcb_next(dns_rdata_in_svcb_t *svcb) { len = uint16_fromregion(®ion); INSIST(region.length >= len + 2); svcb->offset += len + 4; - return (svcb->offset >= svcb->svclen ? ISC_R_NOMORE : ISC_R_SUCCESS); + return svcb->offset >= svcb->svclen ? ISC_R_NOMORE : ISC_R_SUCCESS; } static void @@ -1300,7 +1300,7 @@ dns_rdata_in_svcb_first(dns_rdata_in_svcb_t *svcb) { REQUIRE(svcb->common.rdtype == dns_rdatatype_svcb); REQUIRE(svcb->common.rdclass == dns_rdataclass_in); - return (generic_rdata_in_svcb_first(svcb)); + return generic_rdata_in_svcb_first(svcb); } isc_result_t @@ -1309,7 +1309,7 @@ dns_rdata_in_svcb_next(dns_rdata_in_svcb_t *svcb) { REQUIRE(svcb->common.rdtype == dns_rdatatype_svcb); REQUIRE(svcb->common.rdclass == dns_rdataclass_in); - return (generic_rdata_in_svcb_next(svcb)); + return generic_rdata_in_svcb_next(svcb); } void diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 0c9163a2bd..4d6f22db9a 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -40,7 +40,7 @@ mygetprotobyname(const char *name, long *proto) { *proto = pe->p_proto; } UNLOCK(&wks_lock); - return (pe != NULL); + return pe != NULL; } static bool @@ -53,7 +53,7 @@ mygetservbyname(const char *name, const char *proto, long *port) { *port = ntohs(se->s_port); } UNLOCK(&wks_lock); - return (se != NULL); + return se != NULL; } static isc_result_t @@ -94,7 +94,7 @@ fromtext_in_wks(ARGS_FROMTEXT) { CHECKTOK(DNS_R_BADDOTTEDQUAD); } if (region.length < 4) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, &addr, 4); isc_buffer_add(target, 4); @@ -161,7 +161,7 @@ fromtext_in_wks(ARGS_FROMTEXT) { result = mem_tobuffer(target, bm, n); cleanup: - return (result); + return result; } static isc_result_t @@ -203,7 +203,7 @@ totext_in_wks(ARGS_TOTEXT) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -222,23 +222,23 @@ fromwire_in_wks(ARGS_FROMWIRE) { isc_buffer_availableregion(target, &tr); if (sr.length < 5) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (sr.length > 8 * 1024 + 5) { - return (DNS_R_EXTRADATA); + return DNS_R_EXTRADATA; } if (sr.length > 5 && sr.base[sr.length - 1] == 0) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (tr.length < sr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, sr.base, sr.length); isc_buffer_add(target, sr.length); isc_buffer_forward(source, sr.length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -252,7 +252,7 @@ towire_in_wks(ARGS_TOWIRE) { REQUIRE(rdata->length != 0); dns_rdata_toregion(rdata, &sr); - return (mem_tobuffer(target, sr.base, sr.length)); + return mem_tobuffer(target, sr.base, sr.length); } static int @@ -269,7 +269,7 @@ compare_in_wks(ARGS_COMPARE) { dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); - return (isc_region_compare(&r1, &r2)); + return isc_region_compare(&r1, &r2); } static isc_result_t @@ -291,7 +291,7 @@ fromstruct_in_wks(ARGS_FROMSTRUCT) { a = ntohl(wks->in_addr.s_addr); RETERR(uint32_tobuffer(a, target)); RETERR(uint8_tobuffer(wks->protocol, target)); - return (mem_tobuffer(target, wks->map, wks->map_len)); + return mem_tobuffer(target, wks->map, wks->map_len); } static isc_result_t @@ -318,7 +318,7 @@ tostruct_in_wks(ARGS_TOSTRUCT) { wks->map_len = region.length; wks->map = mem_maybedup(mctx, region.base, region.length); wks->mctx = mctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -349,7 +349,7 @@ additionaldata_in_wks(ARGS_ADDLDATA) { UNUSED(add); UNUSED(arg); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -361,7 +361,7 @@ digest_in_wks(ARGS_DIGEST) { dns_rdata_toregion(rdata, &r); - return ((digest)(arg, &r)); + return (digest)(arg, &r); } static bool @@ -372,7 +372,7 @@ checkowner_in_wks(ARGS_CHECKOWNER) { UNUSED(type); UNUSED(rdclass); - return (dns_name_ishostname(name, wildcard)); + return dns_name_ishostname(name, wildcard); } static bool @@ -384,12 +384,12 @@ checknames_in_wks(ARGS_CHECKNAMES) { UNUSED(owner); UNUSED(bad); - return (true); + return true; } static int casecompare_in_wks(ARGS_COMPARE) { - return (compare_in_wks(rdata1, rdata2)); + return compare_in_wks(rdata1, rdata2); } #endif /* RDATA_IN_1_WKS_11_C */ diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c index dabc9ba95c..6320f609c7 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -108,10 +108,10 @@ dns_rdatalist_first(dns_rdataset_t *rdataset) { rdataset->rdlist.iter = ISC_LIST_HEAD(rdatalist->rdata); if (rdataset->rdlist.iter == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -120,16 +120,16 @@ dns_rdatalist_next(dns_rdataset_t *rdataset) { rdata = rdataset->rdlist.iter; if (rdata == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } rdataset->rdlist.iter = ISC_LIST_NEXT(rdata, link); if (rdataset->rdlist.iter == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -170,7 +170,7 @@ dns_rdatalist_count(dns_rdataset_t *rdataset) { count++; } - return (count); + return count; } isc_result_t @@ -195,7 +195,7 @@ dns_rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { } } if (neg == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; @@ -209,7 +209,7 @@ dns_rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { } if (negsig == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * Minimise ttl. @@ -224,7 +224,7 @@ dns_rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { rdataset->ttl = neg->ttl = negsig->ttl = ttl; rdataset->attributes |= DNS_RDATASETATTR_NOQNAME; rdataset->rdlist.noqname = name; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -257,7 +257,7 @@ dns_rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } } if (tneg == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (rdataset = ISC_LIST_HEAD(noqname->list); rdataset != NULL; @@ -270,13 +270,13 @@ dns_rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } } if (tnegsig == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_name_clone(noqname, name); dns_rdataset_clone(tneg, neg); dns_rdataset_clone(tnegsig, negsig); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -301,7 +301,7 @@ dns_rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { } } if (neg == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; @@ -315,7 +315,7 @@ dns_rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { } if (negsig == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* * Minimise ttl. @@ -330,7 +330,7 @@ dns_rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { rdataset->ttl = neg->ttl = negsig->ttl = ttl; rdataset->attributes |= DNS_RDATASETATTR_CLOSEST; rdataset->rdlist.closest = name; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -363,7 +363,7 @@ dns_rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } } if (tneg == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } for (rdataset = ISC_LIST_HEAD(closest->list); rdataset != NULL; @@ -376,13 +376,13 @@ dns_rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } } if (tnegsig == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_name_clone(closest, name); dns_rdataset_clone(tneg, neg); dns_rdataset_clone(tnegsig, negsig); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index deccd7ed9c..9a0ee35b4e 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -41,9 +41,9 @@ static const char *trustnames[] = { const char * dns_trust_totext(dns_trust_t trust) { if (trust >= sizeof(trustnames) / sizeof(*trustnames)) { - return ("bad"); + return "bad"; } - return (trustnames[trust]); + return trustnames[trust]; } void @@ -105,15 +105,15 @@ dns_rdataset_isassociated(dns_rdataset_t *rdataset) { REQUIRE(DNS_RDATASET_VALID(rdataset)); if (rdataset->methods != NULL) { - return (true); + return true; } - return (false); + return false; } static isc_result_t question_cursor(dns_rdataset_t *rdataset ISC_ATTR_UNUSED) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } static void @@ -154,7 +154,7 @@ dns_rdataset_count(dns_rdataset_t *rdataset) { REQUIRE(rdataset->methods != NULL); REQUIRE(rdataset->methods->count != NULL); - return ((rdataset->methods->count)(rdataset)); + return (rdataset->methods->count)(rdataset); } void @@ -182,7 +182,7 @@ dns_rdataset_first(dns_rdataset_t *rdataset) { REQUIRE(rdataset->methods != NULL); REQUIRE(rdataset->methods->first != NULL); - return ((rdataset->methods->first)(rdataset)); + return (rdataset->methods->first)(rdataset); } isc_result_t @@ -195,7 +195,7 @@ dns_rdataset_next(dns_rdataset_t *rdataset) { REQUIRE(rdataset->methods != NULL); REQUIRE(rdataset->methods->next != NULL); - return ((rdataset->methods->next)(rdataset)); + return (rdataset->methods->next)(rdataset); } void @@ -225,7 +225,7 @@ static int towire_compare(const void *av, const void *bv) { const struct towire_sort *a = (const struct towire_sort *)av; const struct towire_sort *b = (const struct towire_sort *)bv; - return (a->key - b->key); + return a->key - b->key; } static void @@ -283,16 +283,16 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, if ((options & DNS_RDATASETTOWIRE_OMITDNSSEC) != 0) { ncache_opts |= DNS_NCACHETOWIRE_OMITDNSSEC; } - return (dns_ncache_towire(rdataset, cctx, target, ncache_opts, - countp)); + return dns_ncache_towire(rdataset, cctx, target, ncache_opts, + countp); } else { count = dns_rdataset_count(rdataset); result = dns_rdataset_first(rdataset); if (result == ISC_R_NOMORE) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -308,7 +308,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } } - if ((shuffle || sort)) { + if (shuffle || sort) { if (count > MAX_SHUFFLE) { in = isc_mem_cget(cctx->mctx, count, sizeof(*in)); out = isc_mem_cget(cctx->mctx, count, sizeof(*out)); @@ -318,7 +318,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } } - if ((shuffle || sort)) { + if (shuffle || sort) { uint32_t seed = 0; unsigned int j = 0; @@ -472,7 +472,7 @@ cleanup: if (in != NULL && in != in_fixed) { isc_mem_cput(cctx->mctx, in, count, sizeof(*in)); } - return (result); + return result; } isc_result_t @@ -481,8 +481,8 @@ dns_rdataset_towiresorted(dns_rdataset_t *rdataset, isc_buffer_t *target, dns_rdatasetorderfunc_t order, const void *order_arg, unsigned int options, unsigned int *countp) { - return (towiresorted(rdataset, owner_name, cctx, target, order, - order_arg, false, options, countp, NULL)); + return towiresorted(rdataset, owner_name, cctx, target, order, + order_arg, false, options, countp, NULL); } isc_result_t @@ -492,16 +492,16 @@ dns_rdataset_towirepartial(dns_rdataset_t *rdataset, const void *order_arg, unsigned int options, unsigned int *countp, void **state) { REQUIRE(state == NULL); /* XXX remove when implemented */ - return (towiresorted(rdataset, owner_name, cctx, target, order, - order_arg, true, options, countp, state)); + return towiresorted(rdataset, owner_name, cctx, target, order, + order_arg, true, options, countp, state); } isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, unsigned int options, unsigned int *countp) { - return (towiresorted(rdataset, owner_name, cctx, target, NULL, NULL, - false, options, countp, NULL)); + return towiresorted(rdataset, owner_name, cctx, target, NULL, NULL, + false, options, countp, NULL); } isc_result_t @@ -521,7 +521,7 @@ dns_rdataset_additionaldata(dns_rdataset_t *rdataset, result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } do { @@ -534,10 +534,10 @@ dns_rdataset_additionaldata(dns_rdataset_t *rdataset, } while (result == ISC_R_SUCCESS); if (result != ISC_R_NOMORE) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -545,9 +545,9 @@ dns_rdataset_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); if (rdataset->methods->addnoqname == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return ((rdataset->methods->addnoqname)(rdataset, name)); + return (rdataset->methods->addnoqname)(rdataset, name); } isc_result_t @@ -558,10 +558,10 @@ dns__rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, REQUIRE(rdataset->methods != NULL); if (rdataset->methods->getnoqname == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return ((rdataset->methods->getnoqname)(rdataset, name, neg, - negsig DNS__DB_FLARG_PASS)); + return (rdataset->methods->getnoqname)(rdataset, name, neg, + negsig DNS__DB_FLARG_PASS); } isc_result_t @@ -569,9 +569,9 @@ dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); if (rdataset->methods->addclosest == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return ((rdataset->methods->addclosest)(rdataset, name)); + return (rdataset->methods->addclosest)(rdataset, name); } isc_result_t @@ -582,10 +582,10 @@ dns__rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, REQUIRE(rdataset->methods != NULL); if (rdataset->methods->getclosest == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } - return ((rdataset->methods->getclosest)(rdataset, name, neg, - negsig DNS__DB_FLARG_PASS)); + return (rdataset->methods->getclosest)(rdataset, name, neg, + negsig DNS__DB_FLARG_PASS); } void diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c index a052aca5ec..197de0ca26 100644 --- a/lib/dns/rdatasetiter.c +++ b/lib/dns/rdatasetiter.c @@ -42,7 +42,7 @@ dns__rdatasetiter_first(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_RDATASETITER_VALID(iterator)); - return (iterator->methods->first(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->first(iterator DNS__DB_FLARG_PASS); } isc_result_t @@ -53,7 +53,7 @@ dns__rdatasetiter_next(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { REQUIRE(DNS_RDATASETITER_VALID(iterator)); - return (iterator->methods->next(iterator DNS__DB_FLARG_PASS)); + return iterator->methods->next(iterator DNS__DB_FLARG_PASS); } void diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index 1c8bb816d8..3da416e2ef 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -131,7 +131,7 @@ static int compare_rdata(const void *p1, const void *p2) { const struct xrdata *x1 = p1; const struct xrdata *x2 = p2; - return (dns_rdata_compare(&x1->rdata, &x2->rdata)); + return dns_rdata_compare(&x1->rdata, &x2->rdata); } #if DNS_RDATASET_FIXED @@ -197,7 +197,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, */ if (nitems == 0) { if (rdataset->type != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } rawbuf = isc_mem_get(mctx, buflen); region->base = rawbuf; @@ -205,15 +205,15 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, rawbuf += reservelen; *rawbuf++ = 0; *rawbuf = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (maxrrperset > 0 && nitems > maxrrperset) { - return (DNS_R_TOOMANYRECORDS); + return DNS_R_TOOMANYRECORDS; } if (nitems > 0xffff) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -389,7 +389,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, free_rdatas: isc_mem_cput(mctx, x, nalloc, sizeof(struct xrdata)); - return (result); + return result; } unsigned int @@ -411,7 +411,7 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) { #endif /* if DNS_RDATASET_FIXED */ } - return ((unsigned int)(current - slab)); + return (unsigned int)(current - slab); } unsigned int @@ -435,7 +435,7 @@ dns_rdataslab_rdatasize(unsigned char *slab, unsigned int reservelen) { #endif /* if DNS_RDATASET_FIXED */ } - return (rdatalen); + return rdatalen; } unsigned int @@ -445,7 +445,7 @@ dns_rdataslab_count(unsigned char *slab, unsigned int reservelen) { unsigned char *current = slab + reservelen; uint16_t count = get_uint16(current); - return (count); + return count; } /* @@ -505,14 +505,14 @@ rdata_in_slab(unsigned char *slab, unsigned int reservelen, int n = dns_rdata_compare(&trdata, rdata); if (n == 0) { - return (true); + return true; } if (n > 0) { /* In DNSSEC order. */ break; } dns_rdata_reset(&trdata); } - return (false); + return false; } isc_result_t @@ -560,7 +560,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, INSIST(ocount > 0 && ncount > 0); if (maxrrperset > 0 && ocount + ncount > maxrrperset) { - return (DNS_R_TOOMANYRECORDS); + return DNS_R_TOOMANYRECORDS; } #if DNS_RDATASET_FIXED @@ -621,11 +621,11 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, if (((flags & DNS_RDATASLAB_EXACT) != 0) && (tcount != ncount + ocount)) { - return (DNS_R_NOTEXACT); + return DNS_R_NOTEXACT; } if (!added_something && (flags & DNS_RDATASLAB_FORCE) == 0) { - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* @@ -636,11 +636,11 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, * We have a singleton type, but there's more than one * RR in the rdataset. */ - return (DNS_R_SINGLETON); + return DNS_R_SINGLETON; } if (tcount > 0xffff) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -778,7 +778,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, *tslabp = tstart; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -860,21 +860,21 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, * check only works as rdataslabs do not contain duplicates. */ if (((flags & DNS_RDATASLAB_EXACT) != 0) && (rcount != scount)) { - return (DNS_R_NOTEXACT); + return DNS_R_NOTEXACT; } /* * Don't continue if the new rdataslab would be empty. */ if (tcount == 0) { - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } /* * If nothing is going to change, we can stop. */ if (rcount == 0) { - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* @@ -948,7 +948,7 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, *tslabp = tstart; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -965,7 +965,7 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2, count2 = get_uint16(current2); if (count1 != count2) { - return (false); + return false; } #if DNS_RDATASET_FIXED @@ -985,13 +985,13 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2, if (length1 != length2 || memcmp(current1, current2, length1) != 0) { - return (false); + return false; } current1 += length1; current2 += length1; } - return (true); + return true; } bool @@ -1010,7 +1010,7 @@ dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2, count2 = get_uint16(current2); if (count1 != count2) { - return (false); + return false; } #if DNS_RDATASET_FIXED @@ -1022,23 +1022,23 @@ dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2, rdata_from_slab(¤t1, rdclass, type, &rdata1); rdata_from_slab(¤t2, rdclass, type, &rdata2); if (dns_rdata_compare(&rdata1, &rdata2) != 0) { - return (false); + return false; } dns_rdata_reset(&rdata1); dns_rdata_reset(&rdata2); } - return (true); + return true; } dns_slabheader_t * dns_slabheader_fromrdataset(const dns_rdataset_t *rdataset) { dns_slabheader_t *header = (dns_slabheader_t *)rdataset->slab.raw; - return (header - 1); + return header - 1; } void * dns_slabheader_raw(dns_slabheader_t *header) { - return (header + 1); + return header + 1; } void @@ -1101,7 +1101,7 @@ dns_slabheader_new(dns_db_t *db, dns_dbnode_t *node) { .link = ISC_LINK_INITIALIZER, }; dns_slabheader_reset(h, db, node); - return (h); + return h; } void @@ -1185,7 +1185,7 @@ rdataset_first(dns_rdataset_t *rdataset) { if (count == 0) { rdataset->slab.iter_pos = NULL; rdataset->slab.iter_count = 0; - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if ((rdataset->attributes & DNS_RDATASETATTR_LOADORDER) == 0) { @@ -1204,7 +1204,7 @@ rdataset_first(dns_rdataset_t *rdataset) { rdataset->slab.iter_pos = raw + DNS_RDATASET_LENGTH; rdataset->slab.iter_count = count - 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1212,7 +1212,7 @@ rdataset_next(dns_rdataset_t *rdataset) { uint16_t count = rdataset->slab.iter_count; if (count == 0) { rdataset->slab.iter_pos = NULL; - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } rdataset->slab.iter_count = count - 1; @@ -1230,7 +1230,7 @@ rdataset_next(dns_rdataset_t *rdataset) { rdataset->slab.iter_pos = raw + DNS_RDATASET_ORDER + DNS_RDATASET_LENGTH; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1297,7 +1297,7 @@ rdataset_count(dns_rdataset_t *rdataset) { raw = rdataset->slab.raw; count = get_uint16(raw); - return (count); + return count; } static isc_result_t @@ -1353,7 +1353,7 @@ rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, dns_name_clone(&noqname->name, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1406,7 +1406,7 @@ rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, dns_name_clone(&closest->name, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void diff --git a/lib/dns/remote.c b/lib/dns/remote.c index 7c44904ea4..2e131062d6 100644 --- a/lib/dns/remote.c +++ b/lib/dns/remote.c @@ -28,31 +28,31 @@ isc_sockaddr_t * dns_remote_addresses(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->addresses); + return remote->addresses; } isc_sockaddr_t * dns_remote_sources(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->sources); + return remote->sources; } unsigned int dns_remote_count(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->addrcnt); + return remote->addrcnt; } dns_name_t ** dns_remote_keynames(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->keynames); + return remote->keynames; } dns_name_t ** dns_remote_tlsnames(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->tlsnames); + return remote->tlsnames; } void @@ -145,18 +145,18 @@ same_addrs(isc_sockaddr_t const *oldlist, isc_sockaddr_t const *newlist, unsigned int i; if (oldlist == NULL && newlist == NULL) { - return (true); + return true; } if (oldlist == NULL || newlist == NULL) { - return (false); + return false; } for (i = 0; i < count; i++) { if (!isc_sockaddr_equal(&oldlist[i], &newlist[i])) { - return (false); + return false; } } - return (true); + return true; } static bool @@ -165,10 +165,10 @@ same_names(dns_name_t *const *oldlist, dns_name_t *const *newlist, unsigned int i; if (oldlist == NULL && newlist == NULL) { - return (true); + return true; } if (oldlist == NULL || newlist == NULL) { - return (false); + return false; } for (i = 0; i < count; i++) { @@ -178,10 +178,10 @@ same_names(dns_name_t *const *oldlist, dns_name_t *const *newlist, if (oldlist[i] == NULL || newlist[i] == NULL || !dns_name_equal(oldlist[i], newlist[i])) { - return (false); + return false; } } - return (true); + return true; } void @@ -256,20 +256,20 @@ dns_remote_equal(dns_remote_t *a, dns_remote_t *b) { REQUIRE(DNS_REMOTE_VALID(b)); if (a->addrcnt != b->addrcnt) { - return (false); + return false; } if (!same_addrs(a->addresses, b->addresses, a->addrcnt)) { - return (false); + return false; } if (!same_names(a->keynames, b->keynames, a->addrcnt)) { - return (false); + return false; } if (!same_names(a->tlsnames, b->tlsnames, a->addrcnt)) { - return (false); + return false; } - return (true); + return true; } void @@ -291,7 +291,7 @@ dns_remote_curraddr(dns_remote_t *remote) { REQUIRE(remote->addresses != NULL); REQUIRE(remote->curraddr < remote->addrcnt); - return (remote->addresses[remote->curraddr]); + return remote->addresses[remote->curraddr]; } isc_sockaddr_t @@ -300,7 +300,7 @@ dns_remote_addr(dns_remote_t *remote, unsigned int i) { REQUIRE(remote->addresses != NULL); REQUIRE(i < remote->addrcnt); - return (remote->addresses[i]); + return remote->addresses[i]; } isc_sockaddr_t @@ -309,7 +309,7 @@ dns_remote_sourceaddr(dns_remote_t *remote) { REQUIRE(remote->sources != NULL); REQUIRE(remote->curraddr < remote->addrcnt); - return (remote->sources[remote->curraddr]); + return remote->sources[remote->curraddr]; } dns_name_t * @@ -317,13 +317,13 @@ dns_remote_keyname(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); if (remote->keynames == NULL) { - return (NULL); + return NULL; } if (remote->curraddr >= remote->addrcnt) { - return (NULL); + return NULL; } - return (remote->keynames[remote->curraddr]); + return remote->keynames[remote->curraddr]; } dns_name_t * @@ -331,13 +331,13 @@ dns_remote_tlsname(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); if (remote->tlsnames == NULL) { - return (NULL); + return NULL; } if (remote->curraddr >= remote->addrcnt) { - return (NULL); + return NULL; } - return (remote->tlsnames[remote->curraddr]); + return remote->tlsnames[remote->curraddr]; } void @@ -360,7 +360,7 @@ bool dns_remote_done(dns_remote_t *remote) { REQUIRE(DNS_REMOTE_VALID(remote)); - return (remote->curraddr >= remote->addrcnt); + return remote->curraddr >= remote->addrcnt; } void diff --git a/lib/dns/request.c b/lib/dns/request.c index f88cc4f57d..b87c52fb6a 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -165,7 +165,7 @@ dns_requestmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, req_log(ISC_LOG_DEBUG(3), "%s: %p", __func__, requestmgr); *requestmgrp = requestmgr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -307,7 +307,7 @@ new_request(isc_mem_t *mctx, isc_loop_t *loop, isc_job_cb cb, void *arg, request->timeout = udptimeout * 1000; } - return (request); + return request; } static bool @@ -320,19 +320,19 @@ isblackholed(dns_dispatchmgr_t *dispatchmgr, const isc_sockaddr_t *destaddr) { blackhole = dns_dispatchmgr_getblackhole(dispatchmgr); if (blackhole == NULL) { - return (false); + return false; } isc_netaddr_fromsockaddr(&netaddr, destaddr); result = dns_acl_match(&netaddr, NULL, blackhole, NULL, &match, NULL); if (result != ISC_R_SUCCESS || match <= 0) { - return (false); + return false; } isc_netaddr_format(&netaddr, netaddrstr, sizeof(netaddrstr)); req_log(ISC_LOG_DEBUG(10), "blackholed address %s", netaddrstr); - return (true); + return true; } static isc_result_t @@ -350,13 +350,13 @@ tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr, isc_sockaddr_format(destaddr, peer, sizeof(peer)); req_log(ISC_LOG_DEBUG(1), "attached to TCP connection to %s", peer); - return (result); + return result; } } result = dns_dispatch_createtcp(requestmgr->dispatchmgr, srcaddr, destaddr, transport, 0, dispatchp); - return (result); + return result; } static isc_result_t @@ -375,17 +375,17 @@ udp_dispatch(dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (disp == NULL) { - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; } dns_dispatch_attach(disp, dispatchp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (dns_dispatch_createudp(requestmgr->dispatchmgr, srcaddr, - dispatchp)); + return dns_dispatch_createudp(requestmgr->dispatchmgr, srcaddr, + dispatchp); } static isc_result_t @@ -400,7 +400,7 @@ get_dispatch(bool tcp, bool newtcp, dns_requestmgr_t *requestmgr, } else { result = udp_dispatch(requestmgr, srcaddr, destaddr, dispatchp); } - return (result); + return result; } isc_result_t @@ -529,7 +529,7 @@ cleanup: done: rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -559,7 +559,7 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, if (srcaddr != NULL && isc_sockaddr_pf(srcaddr) != isc_sockaddr_pf(destaddr)) { - return (ISC_R_FAMILYMISMATCH); + return ISC_R_FAMILYMISMATCH; } mctx = requestmgr->mctx; @@ -657,7 +657,7 @@ cleanup: done: rcu_read_unlock(); - return (result); + return result; } static isc_result_t @@ -736,7 +736,7 @@ req_render(dns_message_t *message, isc_buffer_t **bufferp, unsigned int options, dns_compress_invalidate(&cctx); isc_buffer_free(&buf1); *bufferp = buf2; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_message_renderreset(message); @@ -747,7 +747,7 @@ cleanup: if (buf2 != NULL) { isc_buffer_free(&buf2); } - return (result); + return result; } static void @@ -798,16 +798,16 @@ dns_request_getresponse(dns_request_t *request, dns_message_t *message, dns_message_setquerytsig(message, request->tsig); result = dns_message_settsigkey(message, request->tsigkey); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_message_parse(message, request->answer, options); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (request->tsigkey != NULL) { result = dns_tsig_verify(request->answer, message, NULL, NULL); } - return (result); + return result; } isc_buffer_t * @@ -815,7 +815,7 @@ dns_request_getanswer(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); REQUIRE(request->tid == isc_tid()); - return (request->answer); + return request->answer; } bool @@ -823,7 +823,7 @@ dns_request_usedtcp(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); REQUIRE(request->tid == isc_tid()); - return ((request->flags & DNS_REQUEST_F_TCP) != 0); + return (request->flags & DNS_REQUEST_F_TCP) != 0; } void @@ -1033,7 +1033,7 @@ dns_request_getarg(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); REQUIRE(request->tid == isc_tid()); - return (request->arg); + return request->arg; } isc_result_t @@ -1041,7 +1041,7 @@ dns_request_getresult(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); REQUIRE(request->tid == isc_tid()); - return (request->result); + return request->result; } #if DNS_REQUEST_TRACE diff --git a/lib/dns/resconf.c b/lib/dns/resconf.c index 58adf6b84a..47e8e4e663 100644 --- a/lib/dns/resconf.c +++ b/lib/dns/resconf.c @@ -144,7 +144,7 @@ eatline(FILE *fp) { ch = fgetc(fp); } - return (ch); + return ch; } /*! @@ -165,7 +165,7 @@ eatwhite(FILE *fp) { ch = eatline(fp); } - return (ch); + return ch; } /*! @@ -188,7 +188,7 @@ getword(FILE *fp, char *buffer, size_t size) { ch = eatwhite(fp); if (ch == EOF) { - return (EOF); + return EOF; } do { @@ -197,14 +197,14 @@ getword(FILE *fp, char *buffer, size_t size) { if (ch == EOF || isspace((unsigned char)ch)) { break; } else if ((size_t)(p - buffer) == size - 1) { - return (EOF); /* Not enough space. */ + return EOF; /* Not enough space. */ } *p++ = (char)ch; ch = fgetc(fp); } while (1); - return (ch); + return ch; } static isc_result_t @@ -223,7 +223,7 @@ add_server(isc_mem_t *mctx, const char *address_str, hints.ai_flags = AI_NUMERICHOST; error = getaddrinfo(address_str, "53", &hints, &res); if (error != 0) { - return (ISC_R_BADADDRESSFORM); + return ISC_R_BADADDRESSFORM; } address = isc_mem_get(mctx, sizeof(*address)); @@ -261,7 +261,7 @@ add_server(isc_mem_t *mctx, const char *address_str, cleanup: freeaddrinfo(res); - return (result); + return result; } static isc_result_t @@ -285,10 +285,10 @@ create_addr(const char *buffer, isc_netaddr_t *addr, int convert_zero) { memmove(&addr->type.in6, &v6, NS_IN6ADDRSZ); addr->zone = 0; } else { - return (ISC_R_BADADDRESSFORM); /* Unrecognised format. */ + return ISC_R_BADADDRESSFORM; /* Unrecognised format. */ } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -299,26 +299,26 @@ resconf_parsenameserver(irs_resconf_t *conf, FILE *fp) { cp = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { - return (ISC_R_UNEXPECTEDEND); /* Nothing on line. */ + return ISC_R_UNEXPECTEDEND; /* Nothing on line. */ } else if (cp == ' ' || cp == '\t') { cp = eatwhite(fp); } if (cp != EOF && cp != '\n') { - return (ISC_R_UNEXPECTEDTOKEN); /* Extra junk on line. */ + return ISC_R_UNEXPECTEDTOKEN; /* Extra junk on line. */ } if (conf->numns == RESCONFMAXNAMESERVERS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = add_server(conf->mctx, word, &conf->nameservers); if (result != ISC_R_SUCCESS) { - return (result); + return result; } conf->numns++; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -329,13 +329,13 @@ resconf_parsedomain(irs_resconf_t *conf, FILE *fp) { res = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { - return (ISC_R_UNEXPECTEDEND); /* Nothing else on line. */ + return ISC_R_UNEXPECTEDEND; /* Nothing else on line. */ } else if (res == ' ' || res == '\t') { res = eatwhite(fp); } if (res != EOF && res != '\n') { - return (ISC_R_UNEXPECTEDTOKEN); /* Extra junk on line. */ + return ISC_R_UNEXPECTEDTOKEN; /* Extra junk on line. */ } if (conf->domainname != NULL) { @@ -355,7 +355,7 @@ resconf_parsedomain(irs_resconf_t *conf, FILE *fp) { conf->domainname = isc_mem_strdup(conf->mctx, word); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -385,7 +385,7 @@ resconf_parsesearch(irs_resconf_t *conf, FILE *fp) { delim = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { - return (ISC_R_UNEXPECTEDEND); /* Nothing else on line. */ + return ISC_R_UNEXPECTEDEND; /* Nothing else on line. */ } idx = 0; @@ -407,7 +407,7 @@ resconf_parsesearch(irs_resconf_t *conf, FILE *fp) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -419,12 +419,12 @@ resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) { delim = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { - return (ISC_R_UNEXPECTEDEND); /* Empty line after keyword. */ + return ISC_R_UNEXPECTEDEND; /* Empty line after keyword. */ } while (strlen(word) > 0U) { if (conf->sortlistnxt == RESCONFMAXSORTLIST) { - return (ISC_R_QUOTA); /* Too many values. */ + return ISC_R_QUOTA; /* Too many values. */ } p = strchr(word, '/'); @@ -437,13 +437,13 @@ resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) { sizeof(conf->sortlist) / sizeof(conf->sortlist[0])); res = create_addr(word, &conf->sortlist[idx].addr, 1); if (res != ISC_R_SUCCESS) { - return (res); + return res; } if (p != NULL) { res = create_addr(p, &conf->sortlist[idx].mask, 0); if (res != ISC_R_SUCCESS) { - return (res); + return res; } } else { /* @@ -463,7 +463,7 @@ resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -473,13 +473,13 @@ resconf_optionnumber(const char *word, uint8_t *number) { n = strtol(word, &p, 10); if (*p != '\0') { /* Bad string. */ - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } if (n < 0 || n > 0xff) { /* Out of range. */ - return (ISC_R_RANGE); + return ISC_R_RANGE; } *number = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -490,7 +490,7 @@ resconf_parseoption(irs_resconf_t *conf, FILE *fp) { delim = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { - return (ISC_R_UNEXPECTEDEND); /* Empty line after keyword. */ + return ISC_R_UNEXPECTEDEND; /* Empty line after keyword. */ } while (strlen(word) > 0U) { @@ -512,7 +512,7 @@ resconf_parseoption(irs_resconf_t *conf, FILE *fp) { } cleanup: - return (result); + return result; } static isc_result_t @@ -525,7 +525,7 @@ add_search(irs_resconf_t *conf, char *domain) { ISC_LINK_INIT(entry, link); ISC_LIST_APPEND(conf->searchlist, entry, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% parses a file and fills in the data structure. */ @@ -602,7 +602,7 @@ irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp) { break; default: isc_mem_put(mctx, conf, sizeof(*conf)); - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } } @@ -646,7 +646,7 @@ error: *confp = conf; } - return (ret); + return ret; } void @@ -688,33 +688,33 @@ isc_sockaddrlist_t * irs_resconf_getnameservers(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); - return (&conf->nameservers); + return &conf->nameservers; } irs_resconf_searchlist_t * irs_resconf_getsearchlist(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); - return (&conf->searchlist); + return &conf->searchlist; } unsigned int irs_resconf_getndots(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); - return ((unsigned int)conf->ndots); + return (unsigned int)conf->ndots; } unsigned int irs_resconf_getattempts(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); - return ((unsigned int)conf->attempts); + return (unsigned int)conf->attempts; } unsigned int irs_resconf_gettimeout(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); - return ((unsigned int)conf->timeout); + return (unsigned int)conf->timeout; } diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 2189efcbba..276bbea467 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -993,7 +993,7 @@ valcreate(fetchctx_t *fctx, dns_message_t *message, dns_adbaddrinfo_t *addrinfo, fctx->validator = validator; } ISC_LIST_APPEND(fctx->validators, validator, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1416,7 +1416,7 @@ fcount_match(void *node, const void *key) { const fctxcount_t *counter = node; const dns_name_t *domain = key; - return (dns_name_equal(counter->domain, domain)); + return dns_name_equal(counter->domain, domain); } static isc_result_t @@ -1436,7 +1436,7 @@ fcount_incr(fetchctx_t *fctx, bool force) { /* Skip any counting if fetches-per-zone is disabled */ spill = atomic_load_acquire(&res->zspill); if (spill == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } hashval = dns_name_hash(fctx->domain); @@ -1494,12 +1494,12 @@ fcount_incr(fetchctx_t *fctx, bool force) { UNLOCK(&counter->lock); RWUNLOCK(&res->counters_lock, locktype); - return (result); + return result; } static bool match_ptr(void *node, const void *key) { - return (node == key); + return node == key; } static void @@ -1667,7 +1667,7 @@ fctx__done(fetchctx_t *fctx, isc_result_t result, const char *func, /* We need to do this under the lock for intra-thread synchronization */ if (fctx->state == fetchstate_done) { UNLOCK(&fctx->lock); - return (false); + return false; } fctx->state = fetchstate_done; release_fctx(fctx); @@ -1728,7 +1728,7 @@ fctx__done(fetchctx_t *fctx, isc_result_t result, const char *func, isc_timer_destroy(&fctx->timer); - return (true); + return true; } static void @@ -1802,9 +1802,9 @@ fctx_addopt(dns_message_t *message, unsigned int version, uint16_t udpsize, result = dns_message_buildopt(message, &rdataset, version, udpsize, DNS_MESSAGEEXTFLAG_DO, ednsopts, count); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (dns_message_setopt(message, rdataset)); + return dns_message_setopt(message, rdataset); } static void @@ -1929,7 +1929,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, fctx_setretryinterval(fctx, srtt); if (isc_interval_iszero(&fctx->interval)) { FCTXTRACE("fetch expired"); - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; } INSIST(ISC_LIST_EMPTY(fctx->validators)); @@ -2143,7 +2143,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, RUNTIME_CHECK(result == ISC_R_SUCCESS); } - return (result); + return result; cleanup_udpfetch: if (!RESQUERY_CANCELED(query)) { @@ -2173,7 +2173,7 @@ cleanup_query: dns_message_detach(&query->rmessage); isc_mem_put(fctx->mctx, query, sizeof(*query)); - return (result); + return result; } static bool @@ -2184,11 +2184,11 @@ bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) { sa = ISC_LIST_NEXT(sa, link)) { if (isc_sockaddr_equal(sa, address)) { - return (true); + return true; } } - return (false); + return false; } static void @@ -2218,11 +2218,11 @@ triededns(fetchctx_t *fctx, isc_sockaddr_t *address) { tried = ISC_LIST_NEXT(tried, link)) { if (isc_sockaddr_equal(&tried->addr, address)) { - return (tried); + return tried; } } - return (NULL); + return NULL; } static void @@ -2250,20 +2250,20 @@ addr2buf(void *buf, const size_t bufsize, const isc_sockaddr_t *sockaddr) { case AF_INET: INSIST(bufsize >= 4); memmove(buf, &netaddr.type.in, 4); - return (4); + return 4; case AF_INET6: INSIST(bufsize >= 16); memmove(buf, &netaddr.type.in6, 16); - return (16); + return 16; default: UNREACHABLE(); } - return (0); + return 0; } static size_t add_serveraddr(uint8_t *buf, const size_t bufsize, const resquery_t *query) { - return (addr2buf(buf, bufsize, &query->addrinfo->sockaddr)); + return addr2buf(buf, bufsize, &query->addrinfo->sockaddr); } /* @@ -2309,8 +2309,8 @@ issecuredomain(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, name = &suffix; } - return (dns_view_issecuredomain(view, name, now, checknta, ntap, - issecure)); + return dns_view_issecuredomain(view, name, now, checknta, ntap, + issecure); } static isc_result_t @@ -2345,7 +2345,7 @@ resquery_send(resquery_t *query) { if (atomic_load_acquire(&res->exiting)) { FCTXTRACE("resquery_send: resolver shutting down"); - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } dns_message_gettempname(fctx->qmessage, &qname); @@ -2747,7 +2747,7 @@ resquery_send(resquery_t *query) { transport_type, &zr, &query->start, NULL, &buffer); #endif /* HAVE_DNSTAP */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_message: dns_compress_invalidate(&cctx); @@ -2759,7 +2759,7 @@ cleanup_message: */ dns_dispatch_done(&query->dispentry); - return (result); + return result; } static void @@ -2946,11 +2946,11 @@ bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) { sa = ISC_LIST_NEXT(sa, link)) { if (isc_sockaddr_equal(sa, address)) { - return (true); + return true; } } - return (false); + return false; } static bool @@ -2961,7 +2961,7 @@ mark_bad(fetchctx_t *fctx) { #ifdef ENABLE_AFL if (dns_fuzzing_resolver) { - return (false); + return false; } #endif /* ifdef ENABLE_AFL */ @@ -3027,7 +3027,7 @@ mark_bad(fetchctx_t *fctx) { } } - return (all_bad); + return all_bad; } static void @@ -3224,11 +3224,11 @@ static bool waiting_for(dns_adbfind_t *find, dns_rdatatype_t type) { switch (type) { case dns_rdatatype_a: - return ((find->query_pending & DNS_ADBFIND_INET) != 0); + return (find->query_pending & DNS_ADBFIND_INET) != 0; case dns_rdatatype_aaaa: - return ((find->query_pending & DNS_ADBFIND_INET6) != 0); + return (find->query_pending & DNS_ADBFIND_INET6) != 0; default: - return (false); + return false; } } @@ -3403,7 +3403,7 @@ isstrictsubdomain(const dns_name_t *name1, const dns_name_t *name2) { dns_namereln_t namereln; namereln = dns_name_fullcompare(name1, name2, &order, &nlabels); - return (namereln == dns_namereln_subdomain); + return namereln == dns_namereln_subdomain; } static isc_result_t @@ -3430,7 +3430,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) { fctx->restarts++; if (fctx->restarts > 100) { FCTXTRACE("too many restarts"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } res = fctx->res; @@ -3441,7 +3441,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) { "too much NS indirection resolving '%s' " "(depth=%u, maxdepth=%u)", fctx->info, fctx->depth, res->maxdepth); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } /* @@ -3502,7 +3502,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) { result = fcount_incr(fctx, true); if (result != ISC_R_SUCCESS) { dns_forwarders_detach(&forwarders); - return (result); + return result; } } dns_forwarders_detach(&forwarders); @@ -3583,7 +3583,7 @@ normal_nses: } if ((stdoptions & DNS_ADBFIND_ADDRESSMASK) == 0) { - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } now = isc_stdtime_now(); @@ -3635,7 +3635,7 @@ normal_nses: } } if (result != ISC_R_NOMORE) { - return (result); + return result; } /* @@ -3751,7 +3751,7 @@ out: result = ISC_R_SUCCESS; } - return (result); + return result; } static void @@ -3852,7 +3852,7 @@ fctx_nextaddress(fetchctx_t *fctx) { * state. */ fctx->minimized = false; - return (addrinfo); + return addrinfo; } } @@ -3904,7 +3904,7 @@ fctx_nextaddress(fetchctx_t *fctx) { fctx->find = find; if (addrinfo != NULL) { - return (addrinfo); + return addrinfo; } /* @@ -3982,7 +3982,7 @@ fctx_nextaddress(fetchctx_t *fctx) { fctx->altfind = find; } - return (addrinfo); + return addrinfo; } static void @@ -4762,7 +4762,7 @@ fctx_create(dns_resolver_t *res, isc_loop_t *loop, const dns_name_t *name, *fctxp = fctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_qmessage: dns_message_detach(&fctx->qmessage); @@ -4781,7 +4781,7 @@ cleanup_fetch: dns_resolver_detach(&fctx->res); isc_mem_putanddetach(&fctx->mctx, fctx, sizeof(*fctx)); - return (result); + return result; } /* @@ -4797,15 +4797,15 @@ is_lame(fetchctx_t *fctx, dns_message_t *message) { message->rcode != dns_rcode_yxdomain && message->rcode != dns_rcode_nxdomain) { - return (false); + return false; } if (message->counts[DNS_SECTION_ANSWER] != 0) { - return (false); + return false; } if (message->counts[DNS_SECTION_AUTHORITY] == 0) { - return (false); + return false; } result = dns_message_firstname(message, DNS_SECTION_AUTHORITY); @@ -4826,17 +4826,17 @@ is_lame(fetchctx_t *fctx, dns_message_t *message) { if (namereln == dns_namereln_equal && (message->flags & DNS_MESSAGEFLAG_AA) != 0) { - return (false); + return false; } if (namereln == dns_namereln_subdomain) { - return (false); + return false; } - return (true); + return true; } result = dns_message_nextname(message, DNS_SECTION_AUTHORITY); } - return (false); + return false; } static void @@ -4903,19 +4903,19 @@ same_question(fetchctx_t *fctx, dns_message_t *message) { */ log_formerr(fctx, "empty question section, " "accepting it anyway as TC=1"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { log_formerr(fctx, "empty question section"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } else if (message->counts[DNS_SECTION_QUESTION] > 1) { log_formerr(fctx, "too many questions"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } result = dns_message_firstname(message, DNS_SECTION_QUESTION); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_message_currentname(message, DNS_SECTION_QUESTION, &name); @@ -4937,10 +4937,10 @@ same_question(fetchctx_t *fctx, dns_message_t *message) { dns_rdatatype_format(rdataset->type, typebuf, sizeof(typebuf)); log_formerr(fctx, "question section mismatch: got %s/%s/%s", namebuf, classbuf, typebuf); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -5055,11 +5055,11 @@ is_minimal_nsec(dns_rdataset_t *nsecset) { memcmp(nsec.typebits, minimal_typemap, nsec.len) == 0) { dns_rdataset_disassociate(&rdataset); - return (true); + return true; } } dns_rdataset_disassociate(&rdataset); - return (false); + return false; } /* @@ -5083,11 +5083,11 @@ check_soa_and_dnskey(dns_rdataset_t *nsecset) { !dns_nsec_typepresent(&rdata, dns_rdatatype_ns))) { dns_rdataset_disassociate(&rdataset); - return (false); + return false; } } dns_rdataset_disassociate(&rdataset); - return (true); + return true; } /* @@ -5110,11 +5110,11 @@ has_000_label(dns_rdataset_t *nsecset) { rdata.data[1] == 0) { dns_rdataset_disassociate(&rdataset); - return (true); + return true; } } dns_rdataset_disassociate(&rdataset); - return (false); + return false; } /* @@ -5703,7 +5703,7 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, } if (sigrdataset == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } labels = dns_name_countlabels(name); @@ -5723,10 +5723,10 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, } if (result == ISC_R_NOMORE) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } zonename = dns_fixedname_initname(&fzonename); @@ -5800,7 +5800,7 @@ findnoqname(fetchctx_t *fctx, dns_message_t *message, dns_name_t *name, *noqnamep = noqname; } } - return (result); + return result; } static isc_result_t @@ -5841,7 +5841,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, result = issecuredomain(res->view, name, fctx->type, now, checknta, NULL, &secure_domain); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -5888,7 +5888,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, */ result = dns_db_findnode(fctx->cache, name, true, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -5919,7 +5919,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, if (fail) { if (ANSWER(rdataset)) { dns_db_detachnode(fctx->cache, &node); - return (DNS_R_BADNAME); + return DNS_R_BADNAME; } continue; } @@ -6282,7 +6282,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message, dns_db_detachnode(fctx->cache, &node); } - return (result); + return result; } static isc_result_t @@ -6324,7 +6324,7 @@ cache_message(fetchctx_t *fctx, dns_message_t *message, UNLOCK(&fctx->lock); - return (result); + return result; } /* @@ -6384,7 +6384,7 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, dns_rdataset_disassociate(ardataset); } - return (result); + return result; } static isc_result_t @@ -6427,7 +6427,7 @@ ncache_message(fetchctx_t *fctx, dns_message_t *message, result = issecuredomain(res->view, name, fctx->type, now, checknta, NULL, &secure_domain); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -6462,7 +6462,7 @@ ncache_message(fetchctx_t *fctx, dns_message_t *message, DNS_SECTION_AUTHORITY); } if (result != ISC_R_NOMORE) { - return (result); + return result; } } @@ -6477,7 +6477,7 @@ ncache_message(fetchctx_t *fctx, dns_message_t *message, * continue to process the message, letting the * validation complete in its own good time. */ - return (result); + return result; } LOCK(&fctx->lock); @@ -6551,7 +6551,7 @@ unlock: dns_db_detachnode(fctx->cache, &node); } - return (result); + return result; } static void @@ -6609,7 +6609,7 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { rel = dns_name_fullcompare(name, apex, &(int){ 0 }, &(unsigned int){ 0U }); if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) { - return (true); + return true; } /* @@ -6623,7 +6623,7 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { name = &suffix; } else if (rel == dns_namereln_equal) { /* If 'name' is 'apex', no further checking is needed. */ - return (false); + return false; } /* @@ -6638,7 +6638,7 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { zname, apex, &(int){ 0 }, &(unsigned int){ 0U }); dns_zone_detach(&zone); if (reln == dns_namereln_subdomain) { - return (true); + return true; } } @@ -6656,14 +6656,14 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { bool better = !dns_name_equal(&forwarders->name, fctx->fwdname); dns_forwarders_detach(&forwarders); - return (better); + return better; } /* * If the lookup failed, the configuration must have * changed: play it safe and don't cache. */ - return (true); + return true; } else if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) { /* * If 'name' is covered by a 'forward only' clause then we @@ -6672,10 +6672,10 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { bool nocache = (forwarders->fwdpolicy == dns_fwdpolicy_only && !ISC_LIST_EMPTY(forwarders->fwdrs)); dns_forwarders_detach(&forwarders); - return (nocache); + return nocache; } - return (false); + return false; } static isc_result_t @@ -6694,7 +6694,7 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, #if CHECK_FOR_GLUE_IN_ANSWER if (section == DNS_SECTION_ANSWER && type != dns_rdatatype_a) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* if CHECK_FOR_GLUE_IN_ANSWER */ @@ -6744,14 +6744,13 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type, dns_rdataset_t *found DNS__DB_FLARG) { - return (check_section(arg, addname, type, found, - DNS_SECTION_ADDITIONAL)); + return check_section(arg, addname, type, found, DNS_SECTION_ADDITIONAL); } #ifndef CHECK_FOR_GLUE_IN_ANSWER @@ -6762,7 +6761,7 @@ check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type, static isc_result_t check_answer(void *arg, const dns_name_t *addname, dns_rdatatype_t type, dns_rdataset_t *found) { - return (check_section(arg, addname, type, found, DNS_SECTION_ANSWER)); + return check_section(arg, addname, type, found, DNS_SECTION_ANSWER); } #endif /* if CHECK_FOR_GLUE_IN_ANSWER */ @@ -6782,7 +6781,7 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, /* By default, we allow any addresses. */ if (view->denyansweracl == NULL) { - return (true); + return true; } /* @@ -6790,7 +6789,7 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, * exactly or partially, allow it. */ if (dns_nametree_covered(view->answeracl_exclude, name, NULL, 0)) { - return (true); + return true; } /* @@ -6826,11 +6825,11 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE, "answer address %s denied for %s/%s/%s", addrbuf, namebuf, typebuf, classbuf); - return (false); + return false; } } - return (true); + return true; } static bool @@ -6856,7 +6855,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, * If newqname != NULL we also need to extract the newqname. */ if (chainingp == NULL && view->denyanswernames == NULL) { - return (true); + return true; } result = dns_rdataset_first(rdataset); @@ -6872,7 +6871,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, if (dns_name_fullcompare(qname, rname, &order, &nlabels) != dns_namereln_subdomain) { - return (true); + return true; } result = dns_rdata_tostruct(&rdata, &dname, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -6884,7 +6883,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, NULL); if (result == DNS_R_NAMETOOLONG) { SET_IF_NOT_NULL(chainingp, true); - return (true); + return true; } RUNTIME_CHECK(result == ISC_R_SUCCESS); break; @@ -6895,7 +6894,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, SET_IF_NOT_NULL(chainingp, true); if (view->denyanswernames == NULL) { - return (true); + return true; } /* @@ -6903,7 +6902,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, * exactly or partially, allow it. */ if (dns_nametree_covered(view->answernames_exclude, qname, NULL, 0)) { - return (true); + return true; } /* @@ -6916,7 +6915,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, * filters can be applied; see GL #1574. */ if (!fctx->forwarding && dns_name_issubdomain(tname, fctx->domain)) { - return (true); + return true; } /* @@ -6935,10 +6934,10 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, isc_log_write(DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE, "%s target %s denied for %s/%s", typebuf, tnamebuf, qnamebuf, classbuf); - return (false); + return false; } - return (true); + return true; } static void @@ -6970,7 +6969,7 @@ validinanswer(dns_rdataset_t *rdataset, fetchctx_t *fctx) { * appear in the answer section. */ log_formerr(fctx, "NSEC3 in answer"); - return (false); + return false; } if (rdataset->type == dns_rdatatype_tkey) { /* @@ -6978,13 +6977,13 @@ validinanswer(dns_rdataset_t *rdataset, fetchctx_t *fctx) { * response to any query we can make. */ log_formerr(fctx, "TKEY in answer"); - return (false); + return false; } if (rdataset->rdclass != fctx->res->rdclass) { log_formerr(fctx, "Mismatched class in answer"); - return (false); + return false; } - return (true); + return true; } #if DNS_RESOLVER_TRACE @@ -7000,7 +6999,7 @@ fctx_hash(fetchctx_t *fctx) { isc_hash32_hash(&hash32, fctx->name->ndata, fctx->name->length, false); isc_hash32_hash(&hash32, &fctx->options, sizeof(fctx->options), true); isc_hash32_hash(&hash32, &fctx->type, sizeof(fctx->type), true); - return (isc_hash32_finalize(&hash32)); + return isc_hash32_finalize(&hash32); } static bool @@ -7008,9 +7007,8 @@ fctx_match(void *node, const void *key) { const fetchctx_t *fctx0 = node; const fetchctx_t *fctx1 = key; - return (fctx0->options == fctx1->options && - fctx0->type == fctx1->type && - dns_name_equal(fctx0->name, fctx1->name)); + return fctx0->options == fctx1->options && fctx0->type == fctx1->type && + dns_name_equal(fctx0->name, fctx1->name); } /* Must be fctx locked */ @@ -7272,7 +7270,7 @@ iscname(dns_message_t *message, dns_name_t *name) { result = dns_message_findname(message, DNS_SECTION_ANSWER, name, dns_rdatatype_cname, 0, NULL, NULL); - return (result == ISC_R_SUCCESS ? true : false); + return result == ISC_R_SUCCESS ? true : false; } static bool @@ -7297,11 +7295,11 @@ betterreferral(respctx_t *rctx) { rdataset = ISC_LIST_NEXT(rdataset, link)) { if (rdataset->type == dns_rdatatype_ns) { - return (true); + return true; } } } - return (false); + return false; } /* @@ -7857,7 +7855,7 @@ rctx_dispfail(respctx_t *rctx) { fetchctx_t *fctx = rctx->fctx; if (rctx->result == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -7894,7 +7892,7 @@ rctx_dispfail(respctx_t *rctx) { FCTXTRACE3("dispatcher failure", rctx->result); rctx_done(rctx, ISC_R_SUCCESS); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -7927,10 +7925,10 @@ rctx_timedout(respctx_t *rctx) { } rctx_done(rctx, rctx->result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -7945,7 +7943,7 @@ rctx_parse(respctx_t *rctx) { result = dns_message_parse(query->rmessage, &rctx->buffer, 0); if (result == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } FCTXTRACE3("message failed to parse", result); @@ -7961,7 +7959,7 @@ rctx_parse(respctx_t *rctx) { * check out this message further. */ rctx->truncated = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8016,7 +8014,7 @@ rctx_parse(respctx_t *rctx) { break; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -8261,7 +8259,7 @@ rctx_answer(respctx_t *rctx) { */ if ((rctx->fctx->options & DNS_FETCHOPT_NOFOLLOW) != 0) { - return (result); + return result; } result = ISC_R_SUCCESS; } else { @@ -8276,7 +8274,7 @@ rctx_answer(respctx_t *rctx) { rctx->next_server = true; FCTXTRACE3("rctx_answer lame", result); rctx_done(rctx, result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } } @@ -8286,10 +8284,10 @@ rctx_answer(respctx_t *rctx) { } FCTXTRACE3("rctx_answer failed", result); rctx_done(rctx, result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8317,26 +8315,26 @@ rctx_answer_positive(respctx_t *rctx) { if (rctx->aname != NULL && rctx->type == dns_rdatatype_any) { result = rctx_answer_any(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } } else if (rctx->aname != NULL) { result = rctx_answer_match(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } } else if (rctx->cname != NULL) { result = rctx_answer_cname(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } } else if (rctx->dname != NULL) { result = rctx_answer_dname(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } } else { log_formerr(fctx, "reply has no answer"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -8348,7 +8346,7 @@ rctx_answer_positive(respctx_t *rctx) { * Did chaining end before we got the final answer? */ if (rctx->chaining) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8358,7 +8356,7 @@ rctx_answer_positive(respctx_t *rctx) { if (rctx->query->rmessage->rcode != dns_rcode_noerror) { log_formerr(fctx, "CNAME/DNAME chain complete, but RCODE " "indicates error"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -8376,7 +8374,7 @@ rctx_answer_positive(respctx_t *rctx) { trim_ns_ttl(fctx, rctx->ns_name, rctx->ns_rdataset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8507,7 +8505,7 @@ rctx_answer_any(respctx_t *rctx) { { if (!validinanswer(rdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if ((fctx->type == dns_rdatatype_sig || @@ -8523,7 +8521,7 @@ rctx_answer_any(respctx_t *rctx) { rdataset)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if ((rdataset->type == dns_rdatatype_cname || @@ -8532,7 +8530,7 @@ rctx_answer_any(respctx_t *rctx) { rdataset, NULL)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->aname->attributes.cache = true; @@ -8545,7 +8543,7 @@ rctx_answer_any(respctx_t *rctx) { check_related, rctx); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8562,7 +8560,7 @@ rctx_answer_match(respctx_t *rctx) { if (!validinanswer(rctx->ardataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if ((rctx->ardataset->type == dns_rdatatype_a || @@ -8571,7 +8569,7 @@ rctx_answer_match(respctx_t *rctx) { rctx->ardataset)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if ((rctx->ardataset->type == dns_rdatatype_cname || rctx->ardataset->type == dns_rdatatype_dname) && @@ -8581,7 +8579,7 @@ rctx_answer_match(respctx_t *rctx) { rctx->ardataset, NULL)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->aname->attributes.cache = true; @@ -8598,7 +8596,7 @@ rctx_answer_match(respctx_t *rctx) { { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (sigrdataset->type != dns_rdatatype_rrsig || @@ -8613,7 +8611,7 @@ rctx_answer_match(respctx_t *rctx) { break; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8628,7 +8626,7 @@ rctx_answer_cname(respctx_t *rctx) { if (!validinanswer(rctx->crdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (rctx->type == dns_rdatatype_rrsig || @@ -8638,14 +8636,14 @@ rctx_answer_cname(respctx_t *rctx) { dns_rdatatype_format(rctx->type, buf, sizeof(buf)); log_formerr(fctx, "CNAME response for %s RR", buf); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (!is_answertarget_allowed(fctx, fctx->name, rctx->cname, rctx->crdataset, NULL)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->cname->attributes.cache = true; @@ -8662,7 +8660,7 @@ rctx_answer_cname(respctx_t *rctx) { { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (sigrdataset->type != dns_rdatatype_rrsig || @@ -8678,7 +8676,7 @@ rctx_answer_cname(respctx_t *rctx) { } rctx->chaining = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8692,14 +8690,14 @@ rctx_answer_dname(respctx_t *rctx) { if (!validinanswer(rctx->drdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (!is_answertarget_allowed(fctx, fctx->name, rctx->dname, rctx->drdataset, &rctx->chaining)) { rctx->result = DNS_R_SERVFAIL; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->dname->attributes.cache = true; @@ -8716,7 +8714,7 @@ rctx_answer_dname(respctx_t *rctx) { { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (sigrdataset->type != dns_rdatatype_rrsig || @@ -8731,7 +8729,7 @@ rctx_answer_dname(respctx_t *rctx) { break; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8840,7 +8838,7 @@ rctx_answer_none(respctx_t *rctx) { */ result = rctx_authority_negative(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } log_ns_ttl(fctx, "rctx_answer_none"); @@ -8869,7 +8867,7 @@ rctx_answer_none(respctx_t *rctx) { */ result = rctx_authority_dnssec(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } } @@ -8882,7 +8880,7 @@ rctx_answer_none(respctx_t *rctx) { dns_name_equal(rctx->soa_name, fctx->name) && !dns_name_equal(fctx->name, dns_rootname)) { - return (DNS_R_CHASEDSSERVERS); + return DNS_R_CHASEDSSERVERS; } /* @@ -8894,7 +8892,7 @@ rctx_answer_none(respctx_t *rctx) { */ if (rctx->found_name == NULL) { log_formerr(fctx, "invalid response"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (!dns_name_issubdomain(rctx->found_name, fctx->domain)) { char nbuf[DNS_NAME_FORMATSIZE]; @@ -8913,7 +8911,7 @@ rctx_answer_none(respctx_t *rctx) { } else { log_formerr(fctx, "invalid response"); } - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -8923,7 +8921,7 @@ rctx_answer_none(respctx_t *rctx) { rctx->ns_name != rctx->soa_name) { log_formerr(fctx, "NS/SOA mismatch"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } /* @@ -8931,7 +8929,7 @@ rctx_answer_none(respctx_t *rctx) { */ result = rctx_referral(rctx); if (result == ISC_R_COMPLETE) { - return (rctx->result); + return rctx->result; } /* @@ -8946,7 +8944,7 @@ rctx_answer_none(respctx_t *rctx) { FCTX_ATTR_SET(fctx, FCTX_ATTR_WANTNCACHE); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -8973,7 +8971,7 @@ rctx_authority_negative(respctx_t *rctx) { result = dns_message_firstname(rctx->query->rmessage, section); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } while (!finished) { @@ -8996,9 +8994,9 @@ rctx_authority_negative(respctx_t *rctx) { if (type == dns_rdatatype_rrsig) { type = rdataset->covers; } - if (((type == dns_rdatatype_ns || - type == dns_rdatatype_soa) && - !dns_name_issubdomain(fctx->name, name))) + if ((type == dns_rdatatype_ns || + type == dns_rdatatype_soa) && + !dns_name_issubdomain(fctx->name, name)) { char qbuf[DNS_NAME_FORMATSIZE]; char nbuf[DNS_NAME_FORMATSIZE]; @@ -9030,7 +9028,7 @@ rctx_authority_negative(respctx_t *rctx) { "authority " "section"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->ns_name = name; rctx->ns_rdataset = rdataset; @@ -9055,7 +9053,7 @@ rctx_authority_negative(respctx_t *rctx) { "authority " "section"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->soa_name = name; } @@ -9076,7 +9074,7 @@ rctx_authority_negative(respctx_t *rctx) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9133,7 +9131,7 @@ rctx_authority_dnssec(respctx_t *rctx) { result = dns_message_firstname(rctx->query->rmessage, DNS_SECTION_AUTHORITY); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } while (!finished) { @@ -9206,7 +9204,7 @@ rctx_authority_dnssec(respctx_t *rctx) { log_formerr(fctx, "DS with no " "referral"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (rdataset->type == dns_rdatatype_ds) { @@ -9218,7 +9216,7 @@ rctx_authority_dnssec(respctx_t *rctx) { "referral " "(NS)"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } rctx->ds_name = name; } @@ -9235,7 +9233,7 @@ rctx_authority_dnssec(respctx_t *rctx) { dns_rdatatype_ds, fctx->now, checknta, NULL, &secure_domain); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (secure_domain) { @@ -9256,7 +9254,7 @@ rctx_authority_dnssec(respctx_t *rctx) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9270,7 +9268,7 @@ rctx_referral(respctx_t *rctx) { fetchctx_t *fctx = rctx->fctx; if (rctx->negative || rctx->ns_name == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9282,7 +9280,7 @@ rctx_referral(respctx_t *rctx) { if (dns_name_equal(rctx->ns_name, fctx->domain)) { log_formerr(fctx, "non-improving referral"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -9294,7 +9292,7 @@ rctx_referral(respctx_t *rctx) { log_formerr(fctx, "referral to non-parent"); FCTXTRACE("referral to non-parent"); rctx->result = DNS_R_FORMERR; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -9358,7 +9356,7 @@ rctx_referral(respctx_t *rctx) { result = fcount_incr(fctx, true); if (result != ISC_R_SUCCESS) { rctx->result = result; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } FCTX_ATTR_SET(fctx, FCTX_ATTR_WANTCACHE); @@ -9385,7 +9383,7 @@ rctx_referral(respctx_t *rctx) { rctx->fctx->adberr = 0; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -9553,7 +9551,7 @@ rctx_next(respctx_t *rctx) { INSIST(rctx->query->dispentry != NULL); dns_message_reset(rctx->query->rmessage, DNS_MESSAGE_INTENTPARSE); result = dns_dispatch_getnext(rctx->query->dispentry); - return (result); + return result; } /* @@ -9755,7 +9753,7 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) { if (rcode == dns_rcode_noerror || rcode == dns_rcode_yxdomain || rcode == dns_rcode_nxdomain) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if ((rcode == dns_rcode_formerr) && rctx->opt == NULL && @@ -9857,7 +9855,7 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) { FCTXTRACE2("remote server broken: returned ", code); rctx_done(rctx, result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -9871,7 +9869,7 @@ rctx_lameserver(respctx_t *rctx) { resquery_t *query = rctx->query; if (ISFORWARDER(query->addrinfo) || !is_lame(fctx, query->rmessage)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } inc_stats(fctx->res, dns_resstatscounter_lame); @@ -9881,7 +9879,7 @@ rctx_lameserver(respctx_t *rctx) { FCTXTRACE("lame server"); rctx_done(rctx, result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /*** @@ -10073,7 +10071,7 @@ dns_resolver_create(dns_view_t *view, isc_loopmgr_t *loopmgr, isc_nm_t *nm, *resp = res; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -10420,7 +10418,7 @@ unlock: *fctxp = fctx; } - return (result); + return result; } isc_result_t @@ -10459,7 +10457,7 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, REQUIRE(fetchp != NULL && *fetchp == NULL); if (atomic_load_acquire(&res->exiting)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } log_fetch(name, type); @@ -10550,13 +10548,13 @@ fail: if (result != ISC_R_SUCCESS) { dns_resolver_detach(&fetch->res); isc_mem_putanddetach(&fetch->mctx, fetch, sizeof(*fetch)); - return (result); + return result; } FTRACE("created"); *fetchp = fetch; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -10677,19 +10675,19 @@ dns_resolver_logfetch(dns_fetch_t *fetch, isc_logcategory_t category, dns_dispatch_t * dns_resolver_dispatchv4(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (dns_dispatchset_get(resolver->dispatches4)); + return dns_dispatchset_get(resolver->dispatches4); } dns_dispatch_t * dns_resolver_dispatchv6(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (dns_dispatchset_get(resolver->dispatches6)); + return dns_dispatchset_get(resolver->dispatches6); } uint32_t dns_resolver_getlamettl(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->lame_ttl); + return resolver->lame_ttl; } void @@ -10750,8 +10748,8 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name, isc_result_t dns_resolver_getbadcache(dns_resolver_t *resolver, const dns_name_t *name, dns_rdatatype_t type, isc_time_t *now) { - return (dns_badcache_find(resolver->badcache, name, type, NULL, - isc_time_seconds(now))); + return dns_badcache_find(resolver->badcache, name, type, NULL, + isc_time_seconds(now)); } void @@ -10765,10 +10763,10 @@ dns_resolver_disable_algorithm(dns_resolver_t *resolver, const dns_name_t *name, REQUIRE(VALID_RESOLVER(resolver)); if (alg > 255) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } - return (dns_nametree_add(resolver->algorithms, name, alg)); + return dns_nametree_add(resolver->algorithms, name, alg); } isc_result_t @@ -10777,10 +10775,10 @@ dns_resolver_disable_ds_digest(dns_resolver_t *resolver, const dns_name_t *name, REQUIRE(VALID_RESOLVER(resolver)); if (digest_type > 255) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } - return (dns_nametree_add(resolver->digests, name, digest_type)); + return dns_nametree_add(resolver->digests, name, digest_type); } bool @@ -10789,14 +10787,14 @@ dns_resolver_algorithm_supported(dns_resolver_t *resolver, REQUIRE(VALID_RESOLVER(resolver)); if ((alg == DST_ALG_DH) || (alg == DST_ALG_INDIRECT)) { - return (false); + return false; } if (dns_nametree_covered(resolver->algorithms, name, NULL, alg)) { - return (false); + return false; } - return (dst_algorithm_supported(alg)); + return dst_algorithm_supported(alg); } bool @@ -10806,10 +10804,10 @@ dns_resolver_ds_digest_supported(dns_resolver_t *resolver, REQUIRE(VALID_RESOLVER(resolver)); if (dns_nametree_covered(resolver->digests, name, NULL, digest_type)) { - return (false); + return false; } - return (dst_ds_digest_supported(digest_type)); + return dst_ds_digest_supported(digest_type); } isc_result_t @@ -10820,14 +10818,14 @@ dns_resolver_setmustbesecure(dns_resolver_t *resolver, const dns_name_t *name, REQUIRE(VALID_RESOLVER(resolver)); result = dns_nametree_add(resolver->mustbesecure, name, value); - return (result); + return result; } bool dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name) { REQUIRE(VALID_RESOLVER(resolver)); - return (dns_nametree_covered(resolver->mustbesecure, name, NULL, 0)); + return dns_nametree_covered(resolver->mustbesecure, name, NULL, 0); } void @@ -10864,14 +10862,14 @@ uint32_t dns_resolver_getfetchesperzone(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (atomic_load_relaxed(&resolver->zspill)); + return atomic_load_relaxed(&resolver->zspill); } bool dns_resolver_getzeronosoattl(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->zero_no_soa_ttl); + return resolver->zero_no_soa_ttl; } void @@ -10885,14 +10883,14 @@ unsigned int dns_resolver_getoptions(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->options); + return resolver->options; } unsigned int dns_resolver_gettimeout(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->query_timeout); + return resolver->query_timeout; } void @@ -10937,7 +10935,7 @@ dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth) { unsigned int dns_resolver_getmaxdepth(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->maxdepth); + return resolver->maxdepth; } void @@ -10949,7 +10947,7 @@ dns_resolver_setmaxqueries(dns_resolver_t *resolver, unsigned int queries) { unsigned int dns_resolver_getmaxqueries(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); - return (resolver->maxqueries); + return resolver->maxqueries; } void @@ -10990,7 +10988,7 @@ dns_resolver_dumpquota(dns_resolver_t *res, isc_buffer_t **buf) { spill = atomic_load_acquire(&res->zspill); if (spill == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RWLOCK(&res->counters_lock, isc_rwlocktype_read); @@ -11034,7 +11032,7 @@ dns_resolver_dumpquota(dns_resolver_t *res, isc_buffer_t **buf) { cleanup: RWUNLOCK(&res->counters_lock, isc_rwlocktype_read); isc_hashmap_iter_destroy(&it); - return (result); + return result; } void @@ -11052,7 +11050,7 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) { REQUIRE(VALID_RESOLVER(resolver)); REQUIRE(which == dns_quotatype_zone || which == dns_quotatype_server); - return (resolver->quotaresp[which]); + return resolver->quotaresp[which]; } void diff --git a/lib/dns/result.c b/lib/dns/result.c index 0e695f4a95..bdf0b079a5 100644 --- a/lib/dns/result.c +++ b/lib/dns/result.c @@ -25,7 +25,7 @@ dns_result_torcode(isc_result_t result) { switch (result) { case DNS_R_NOERROR: case ISC_R_SUCCESS: - return (dns_rcode_noerror); + return dns_rcode_noerror; case DNS_R_FORMERR: case ISC_R_BADBASE64: case ISC_R_RANGE: @@ -47,40 +47,40 @@ dns_result_torcode(isc_result_t result) { case DNS_R_UNKNOWN: case DNS_R_NAMETOOLONG: case DNS_R_OPTERR: - return (dns_rcode_formerr); + return dns_rcode_formerr; case DNS_R_SERVFAIL: - return (dns_rcode_servfail); + return dns_rcode_servfail; case DNS_R_NXDOMAIN: - return (dns_rcode_nxdomain); + return dns_rcode_nxdomain; case DNS_R_NOTIMP: - return (dns_rcode_notimp); + return dns_rcode_notimp; case DNS_R_REFUSED: case DNS_R_DISALLOWED: - return (dns_rcode_refused); + return dns_rcode_refused; case DNS_R_YXDOMAIN: - return (dns_rcode_yxdomain); + return dns_rcode_yxdomain; case DNS_R_YXRRSET: - return (dns_rcode_yxrrset); + return dns_rcode_yxrrset; case DNS_R_NXRRSET: - return (dns_rcode_nxrrset); + return dns_rcode_nxrrset; case DNS_R_NOTAUTH: case DNS_R_TSIGVERIFYFAILURE: case DNS_R_CLOCKSKEW: - return (dns_rcode_notauth); + return dns_rcode_notauth; case DNS_R_NOTZONE: - return (dns_rcode_notzone); + return dns_rcode_notzone; case DNS_R_RCODE11: case DNS_R_RCODE12: case DNS_R_RCODE13: case DNS_R_RCODE14: case DNS_R_RCODE15: - return (result - DNS_R_NOERROR); + return result - DNS_R_NOERROR; case DNS_R_BADVERS: - return (dns_rcode_badvers); + return dns_rcode_badvers; case DNS_R_BADCOOKIE: - return (dns_rcode_badcookie); + return dns_rcode_badcookie; default: - return (dns_rcode_servfail); + return dns_rcode_servfail; } } @@ -88,32 +88,32 @@ isc_result_t dns_result_fromrcode(dns_rcode_t rcode) { switch (rcode) { case dns_rcode_noerror: - return (DNS_R_NOERROR); + return DNS_R_NOERROR; case dns_rcode_formerr: - return (DNS_R_FORMERR); + return DNS_R_FORMERR; case dns_rcode_servfail: - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; case dns_rcode_nxdomain: - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; case dns_rcode_notimp: - return (DNS_R_NOTIMP); + return DNS_R_NOTIMP; case dns_rcode_refused: - return (DNS_R_REFUSED); + return DNS_R_REFUSED; case dns_rcode_yxdomain: - return (DNS_R_YXDOMAIN); + return DNS_R_YXDOMAIN; case dns_rcode_yxrrset: - return (DNS_R_YXRRSET); + return DNS_R_YXRRSET; case dns_rcode_nxrrset: - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; case dns_rcode_notauth: - return (DNS_R_NOTAUTH); + return DNS_R_NOTAUTH; case dns_rcode_notzone: - return (DNS_R_NOTZONE); + return DNS_R_NOTZONE; case dns_rcode_badvers: - return (DNS_R_BADVERS); + return DNS_R_BADVERS; case dns_rcode_badcookie: - return (DNS_R_BADCOOKIE); + return DNS_R_BADCOOKIE; default: - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } } diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index b8fedf22bf..3e6333537f 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -107,7 +107,7 @@ in_rootns(dns_rdataset_t *rootns, dns_name_t *name) { dns_rdata_ns_t ns; if (!dns_rdataset_isassociated(rootns)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } result = dns_rdataset_first(rootns); @@ -115,10 +115,10 @@ in_rootns(dns_rdataset_t *rootns, dns_name_t *name) { dns_rdataset_current(rootns, &rdata); result = dns_rdata_tostruct(&rdata, &ns, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (dns_name_compare(name, &ns.name) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_rdataset_next(rootns); dns_rdata_reset(&rdata); @@ -126,7 +126,7 @@ in_rootns(dns_rdataset_t *rootns, dns_name_t *name) { if (result == ISC_R_NOMORE) { result = ISC_R_NOTFOUND; } - return (result); + return result; } static isc_result_t @@ -166,7 +166,7 @@ cleanup: if (dns_rdataset_isassociated(&rdataset)) { dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } static isc_result_t @@ -224,7 +224,7 @@ cleanup: if (dbiter != NULL) { dns_dbiterator_destroy(&dbiter); } - return (result); + return result; } isc_result_t @@ -284,7 +284,7 @@ dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, (filename != NULL) ? filename : ""); } *target = db; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: isc_log_write(DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_HINTS, @@ -298,7 +298,7 @@ failure: dns_db_detach(&db); } - return (result); + return result; } static void @@ -347,12 +347,12 @@ inrrset(dns_rdataset_t *rrset, dns_rdata_t *rdata) { while (result == ISC_R_SUCCESS) { dns_rdataset_current(rrset, ¤t); if (dns_rdata_compare(rdata, ¤t) == 0) { - return (true); + return true; } dns_rdata_reset(¤t); result = dns_rdataset_next(rrset); } - return (false); + return false; } static bool @@ -361,10 +361,10 @@ changing(const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now) { if (upcoming[i].time > now && upcoming[i].type == type && dns_name_equal(&upcoming[i].name, name)) { - return (true); + return true; } } - return (false); + return false; } /* diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 11c829b3e4..80ec16b14f 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -220,20 +220,20 @@ const char * dns_rpz_type2str(dns_rpz_type_t type) { switch (type) { case DNS_RPZ_TYPE_CLIENT_IP: - return ("CLIENT-IP"); + return "CLIENT-IP"; case DNS_RPZ_TYPE_QNAME: - return ("QNAME"); + return "QNAME"; case DNS_RPZ_TYPE_IP: - return ("IP"); + return "IP"; case DNS_RPZ_TYPE_NSIP: - return ("NSIP"); + return "NSIP"; case DNS_RPZ_TYPE_NSDNAME: - return ("NSDNAME"); + return "NSDNAME"; case DNS_RPZ_TYPE_BAD: break; } FATAL_ERROR("impossible rpz type %d", type); - return ("impossible"); + return "impossible"; } dns_rpz_policy_t @@ -255,14 +255,14 @@ dns_rpz_str2policy(const char *str) { unsigned int n; if (str == NULL) { - return (DNS_RPZ_POLICY_ERROR); + return DNS_RPZ_POLICY_ERROR; } for (n = 0; n < sizeof(tbl) / sizeof(tbl[0]); ++n) { if (!strcasecmp(tbl[n].str, str)) { - return (tbl[n].policy); + return tbl[n].policy; } } - return (DNS_RPZ_POLICY_ERROR); + return DNS_RPZ_POLICY_ERROR; } const char * @@ -304,7 +304,7 @@ dns_rpz_policy2str(dns_rpz_policy_t policy) { default: UNREACHABLE(); } - return (str); + return str; } uint16_t @@ -323,14 +323,14 @@ dns_rpz_str2ede(const char *str) { unsigned int n; if (str == NULL) { - return (UINT16_MAX); + return UINT16_MAX; } for (n = 0; n < sizeof(tbl) / sizeof(tbl[0]); ++n) { if (!strcasecmp(tbl[n].str, str)) { - return (tbl[n].ede); + return tbl[n].ede; } } - return (UINT16_MAX); + return UINT16_MAX; } /* @@ -366,7 +366,7 @@ zbit_to_num(dns_rpz_zbits_t zbit) { if ((zbit & 2) != 0) { ++rpz_num; } - return (rpz_num); + return rpz_num; } /* @@ -710,7 +710,7 @@ new_node(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *ip, node->ip.w[i++] = 0; } - return (node); + return node; } static void @@ -756,7 +756,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, (tgt_ip->w[3] >> 16) & 0xffU, (tgt_ip->w[3] >> 24) & 0xffU); if (len < 0 || (size_t)len >= sizeof(str)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else { int w[DNS_RPZ_CIDR_WORDS * 2]; @@ -764,7 +764,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, len = snprintf(str, sizeof(str), "%d", tgt_prefix); if (len < 0 || (size_t)len >= sizeof(str)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } for (int n = 0; n < DNS_RPZ_CIDR_WORDS; n++) { @@ -810,7 +810,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, ".%x", w[n]); } if (i < 0 || (size_t)i >= (size_t)(sizeof(str) - len)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } len += i; } @@ -819,7 +819,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, isc_buffer_init(&buffer, str, sizeof(str)); isc_buffer_add(&buffer, len); result = dns_name_fromtext(ip_name, &buffer, base_name, 0, NULL); - return (result); + return result; } /* @@ -829,26 +829,26 @@ static dns_rpz_type_t type_from_name(const dns_rpz_zones_t *rpzs, dns_rpz_zone_t *rpz, const dns_name_t *name) { if (dns_name_issubdomain(name, &rpz->ip)) { - return (DNS_RPZ_TYPE_IP); + return DNS_RPZ_TYPE_IP; } if (dns_name_issubdomain(name, &rpz->client_ip)) { - return (DNS_RPZ_TYPE_CLIENT_IP); + return DNS_RPZ_TYPE_CLIENT_IP; } if ((rpzs->p.nsip_on & DNS_RPZ_ZBIT(rpz->num)) != 0 && dns_name_issubdomain(name, &rpz->nsip)) { - return (DNS_RPZ_TYPE_NSIP); + return DNS_RPZ_TYPE_NSIP; } if ((rpzs->p.nsdname_on & DNS_RPZ_ZBIT(rpz->num)) != 0 && dns_name_issubdomain(name, &rpz->nsdname)) { - return (DNS_RPZ_TYPE_NSDNAME); + return DNS_RPZ_TYPE_NSDNAME; } - return (DNS_RPZ_TYPE_QNAME); + return DNS_RPZ_TYPE_QNAME; } /* @@ -885,7 +885,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } if (ip_labels < 2) { badname(log_level, src_name, "; too short", ""); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_name_init(&ip_name, ip_name_offsets); dns_name_getlabelsequence(src_name, 0, ip_labels, &ip_name); @@ -901,7 +901,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, if (*cp2 != '.') { badname(log_level, src_name, "; invalid leading prefix length", ""); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * Patch in trailing nul character to print just the length @@ -911,7 +911,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, if (prefix_num < 1U || prefix_num > 128U) { badname(log_level, src_name, "; invalid prefix length of ", prefix_str); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } cp = cp2 + 1; @@ -923,7 +923,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, if (prefix_num > 32U) { badname(log_level, src_name, "; invalid IPv4 prefix length of ", prefix_str); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } prefix_num += 96; *tgt_prefix = (dns_rpz_prefix_t)prefix_num; @@ -939,7 +939,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } badname(log_level, src_name, "; invalid IPv4 octet ", cp); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } tgt_ip->w[3] |= l << i; cp = cp2 + 1; @@ -972,7 +972,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } badname(log_level, src_name, "; invalid IPv6 word ", cp); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((i & 1) == 0) { tgt_ip->w[3 - i / 2] = l; @@ -986,7 +986,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } if (cp != end) { badname(log_level, src_name, "", ""); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -1001,7 +1001,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, if ((aword & ~DNS_RPZ_WORD_MASK(i)) != 0) { badname(log_level, src_name, "; too small prefix length of ", prefix_str); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } prefix -= i; prefix += DNS_RPZ_CIDR_WORD_BITS; @@ -1031,7 +1031,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1111,7 +1111,7 @@ clz(dns_rpz_cidr_word_t w) { --bit; } - return (bit); + return bit; } #endif /* ifndef HAVE_BUILTIN_CLZ */ @@ -1142,7 +1142,7 @@ diff_keys(const dns_rpz_cidr_key_t *key1, dns_rpz_prefix_t prefix1, break; } } - return (ISC_MIN(bit, maxbit)); + return ISC_MIN(bit, maxbit); } /* @@ -1161,7 +1161,7 @@ trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) { x &= (~x + 1); x = (x << 1) - 1; zbits &= x; - return (zbits); + return zbits; } /* @@ -1193,7 +1193,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, * or add the target as a child of the current parent. */ if (!create) { - return (find_result); + return find_result; } child = new_node(rpzs, tgt_ip, tgt_prefix, NULL); if (parent == NULL) { @@ -1207,7 +1207,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, child->set.nsip |= tgt_set->nsip; set_sum_pair(child); *found = child; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if ((cur->sum.client_ip & set.client_ip) == 0 && @@ -1223,7 +1223,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, * a node and mark/put this node in the correct tree. */ if (!create) { - return (find_result); + return find_result; } } @@ -1263,7 +1263,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, *found = cur; find_result = ISC_R_SUCCESS; } - return (find_result); + return find_result; } /* @@ -1272,7 +1272,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, * Add the target as the current node's parent. */ if (!create) { - return (find_result); + return find_result; } new_parent = new_node(rpzs, tgt_ip, tgt_prefix, cur); @@ -1288,7 +1288,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, new_parent->set = *tgt_set; set_sum_pair(new_parent); *found = new_parent; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (dbit == cur->prefix) { @@ -1322,7 +1322,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, * add the target as a sibling of the current node */ if (!create) { - return (find_result); + return find_result; } sibling = new_node(rpzs, tgt_ip, tgt_prefix, NULL); @@ -1341,7 +1341,7 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, sibling->set = *tgt_set; set_sum_pair(sibling); *found = sibling; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1363,7 +1363,7 @@ add_cidr(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, * Log complaints about bad owner names but let the zone load. */ if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } RWLOCK(&rpz->rpzs->search_lock, isc_rwlocktype_write); @@ -1394,7 +1394,7 @@ add_cidr(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, adj_trigger_cnt(rpz, rpz_type, &tgt_ip, tgt_prefix, true); done: RWUNLOCK(&rpz->rpzs->search_lock, isc_rwlocktype_write); - return (result); + return result; } static nmdata_t * @@ -1414,7 +1414,7 @@ new_nmdata(isc_mem_t *mctx, const dns_name_t *name, const nmdata_t *data) { __FILE__, __LINE__ + 1, name); #endif - return (newdata); + return newdata; } static isc_result_t @@ -1454,7 +1454,7 @@ done: dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(rpzs->table, &qp); - return (result); + return result; } static isc_result_t @@ -1480,14 +1480,14 @@ add_name(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, * because diff_apply() likes to add nodes before deleting. */ if (result == ISC_R_EXISTS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result == ISC_R_SUCCESS) { RWLOCK(&rpz->rpzs->search_lock, isc_rwlocktype_write); adj_trigger_cnt(rpz, rpz_type, NULL, 0, true); RWUNLOCK(&rpz->rpzs->search_lock, isc_rwlocktype_write); } - return (result); + return result; } /* @@ -1519,7 +1519,7 @@ dns_rpz_new_zones(dns_view_t *view, isc_loopmgr_t *loopmgr, isc_mem_attach(mctx, &rpzs->mctx); *rpzsp = rpzs; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1531,12 +1531,12 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) { REQUIRE(rpzp != NULL && *rpzp == NULL); if (rpzs->p.num_zones >= DNS_RPZ_MAX_ZONES) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } result = dns__rpz_shuttingdown(rpzs); if (result != ISC_R_SUCCESS) { - return (result); + return result; } rpz = isc_mem_get(rpzs->mctx, sizeof(*rpz)); @@ -1570,7 +1570,7 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) { *rpzp = rpz; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1627,7 +1627,7 @@ dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) { unlock: UNLOCK(&rpz->rpzs->maint_lock); - return (result); + return result; } void @@ -1736,7 +1736,7 @@ update_nodes(dns_rpz_zone_t *rpz, isc_ht_t *newnodes) { ISC_LOG_ERROR, "rpz: %s: failed to create DB iterator - %s", domain, isc_result_totext(result)); - return (result); + return result; } result = dns_dbiterator_first(updbit); @@ -1857,7 +1857,7 @@ update_nodes(dns_rpz_zone_t *rpz, isc_ht_t *newnodes) { cleanup: dns_dbiterator_destroy(&updbit); - return (result); + return result; } static isc_result_t @@ -1899,7 +1899,7 @@ cleanup_nodes(dns_rpz_zone_t *rpz) { isc_ht_iter_destroy(&iter); - return (result); + return result; } static isc_result_t @@ -1911,10 +1911,10 @@ dns__rpz_shuttingdown(dns_rpz_zones_t *rpzs) { UNLOCK(&rpzs->maint_lock); if (shuttingdown) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2177,7 +2177,7 @@ rpz_add(dns_rpz_zone_t *rpz, const dns_name_t *src_name) { break; } - return (result); + return result; } /* @@ -2446,11 +2446,11 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, break; } } else { - return (DNS_RPZ_INVALID_NUM); + return DNS_RPZ_INVALID_NUM; } if (zbits == 0) { - return (DNS_RPZ_INVALID_NUM); + return DNS_RPZ_INVALID_NUM; } make_addr_set(&tgt_set, zbits, rpz_type); @@ -2461,7 +2461,7 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, * There are no eligible zones for this IP address. */ RWUNLOCK(&rpzs->search_lock, isc_rwlocktype_read); - return (DNS_RPZ_INVALID_NUM); + return DNS_RPZ_INVALID_NUM; } /* @@ -2491,9 +2491,9 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, isc_log_write(DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB, DNS_RPZ_ERROR_LEVEL, "rpz ip2name() failed: %s", isc_result_totext(result)); - return (DNS_RPZ_INVALID_NUM); + return DNS_RPZ_INVALID_NUM; } - return (rpz_num); + return rpz_num; } /* @@ -2512,7 +2512,7 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, int i; if (zbits == 0) { - return (0); + return 0; } dns_qpmulti_query(rpzs->table, &qpr); @@ -2559,7 +2559,7 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, } dns_qpread_destroy(rpzs->table, &qpr); - return (zbits & found_zbits); + return zbits & found_zbits; } /* @@ -2583,7 +2583,7 @@ dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset, * CNAME . means NXDOMAIN */ if (dns_name_equal(&cname.cname, dns_rootname)) { - return (DNS_RPZ_POLICY_NXDOMAIN); + return DNS_RPZ_POLICY_NXDOMAIN; } if (dns_name_iswildcard(&cname.cname)) { @@ -2591,7 +2591,7 @@ dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset, * CNAME *. means NODATA */ if (dns_name_countlabels(&cname.cname) == 2) { - return (DNS_RPZ_POLICY_NODATA); + return DNS_RPZ_POLICY_NODATA; } /* @@ -2601,7 +2601,7 @@ dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset, * evil.com CNAME evil.com.garden.net */ if (dns_name_countlabels(&cname.cname) > 2) { - return (DNS_RPZ_POLICY_WILDCNAME); + return DNS_RPZ_POLICY_WILDCNAME; } } @@ -2609,34 +2609,34 @@ dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset, * CNAME rpz-tcp-only. means "send truncated UDP responses." */ if (dns_name_equal(&cname.cname, &rpz->tcp_only)) { - return (DNS_RPZ_POLICY_TCP_ONLY); + return DNS_RPZ_POLICY_TCP_ONLY; } /* * CNAME rpz-drop. means "do not respond." */ if (dns_name_equal(&cname.cname, &rpz->drop)) { - return (DNS_RPZ_POLICY_DROP); + return DNS_RPZ_POLICY_DROP; } /* * CNAME rpz-passthru. means "do not rewrite." */ if (dns_name_equal(&cname.cname, &rpz->passthru)) { - return (DNS_RPZ_POLICY_PASSTHRU); + return DNS_RPZ_POLICY_PASSTHRU; } /* * 128.1.0.127.rpz-ip CNAME 128.1.0.0.127. is obsolete PASSTHRU */ if (selfname != NULL && dns_name_equal(&cname.cname, selfname)) { - return (DNS_RPZ_POLICY_PASSTHRU); + return DNS_RPZ_POLICY_PASSTHRU; } /* * Any other rdata gives a response consisting of the rdata. */ - return (DNS_RPZ_POLICY_RECORD); + return DNS_RPZ_POLICY_RECORD; } static void @@ -2669,7 +2669,7 @@ static size_t qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { nmdata_t *data = pval; - return (dns_qpkey_fromname(key, &data->name)); + return dns_qpkey_fromname(key, &data->name); } static void diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c index 49bcd67ebf..b22b28e817 100644 --- a/lib/dns/rriterator.c +++ b/lib/dns/rriterator.c @@ -46,7 +46,7 @@ dns_rriterator_init(dns_rriterator_t *it, dns_db_t *db, dns_dbversion_t *ver, it->node = NULL; result = dns_db_createiterator(it->db, 0, &it->dbit); if (result != ISC_R_SUCCESS) { - return (result); + return result; } it->rdatasetit = NULL; dns_rdata_init(&it->rdata); @@ -54,7 +54,7 @@ dns_rriterator_init(dns_rriterator_t *it, dns_db_t *db, dns_dbversion_t *ver, dns_fixedname_init(&it->fixedname); INSIST(!dns_rdataset_isassociated(&it->rdataset)); it->result = ISC_R_SUCCESS; - return (it->result); + return it->result; } isc_result_t @@ -81,13 +81,13 @@ dns_rriterator_first(dns_rriterator_t *it) { it->dbit, &it->node, dns_fixedname_name(&it->fixedname)); if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } it->result = dns_db_allrdatasets(it->db, it->node, it->ver, 0, it->now, &it->rdatasetit); if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } it->result = dns_rdatasetiter_first(it->rdatasetit); @@ -105,9 +105,9 @@ dns_rriterator_first(dns_rriterator_t *it) { dns_fixedname_name(&it->fixedname)); it->rdataset.attributes |= DNS_RDATASETATTR_LOADORDER; it->result = dns_rdataset_first(&it->rdataset); - return (it->result); + return it->result; } - return (it->result); + return it->result; } isc_result_t @@ -127,40 +127,40 @@ dns_rriterator_nextrrset(dns_rriterator_t *it) { it->result = dns_dbiterator_next(it->dbit); if (it->result == ISC_R_NOMORE) { /* We are at the end of the entire database. */ - return (it->result); + return it->result; } if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } it->result = dns_dbiterator_current( it->dbit, &it->node, dns_fixedname_name(&it->fixedname)); if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } it->result = dns_db_allrdatasets(it->db, it->node, it->ver, 0, it->now, &it->rdatasetit); if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } it->result = dns_rdatasetiter_first(it->rdatasetit); } if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } dns_rdatasetiter_current(it->rdatasetit, &it->rdataset); dns_rdataset_getownercase(&it->rdataset, dns_fixedname_name(&it->fixedname)); it->rdataset.attributes |= DNS_RDATASETATTR_LOADORDER; it->result = dns_rdataset_first(&it->rdataset); - return (it->result); + return it->result; } isc_result_t dns_rriterator_next(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); if (it->result != ISC_R_SUCCESS) { - return (it->result); + return it->result; } INSIST(it->dbit != NULL); @@ -169,9 +169,9 @@ dns_rriterator_next(dns_rriterator_t *it) { it->result = dns_rdataset_next(&it->rdataset); if (it->result == ISC_R_NOMORE) { - return (dns_rriterator_nextrrset(it)); + return dns_rriterator_nextrrset(it); } - return (it->result); + return it->result; } void diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index ca70a635be..6442a3c077 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -81,7 +81,7 @@ hash_divisor(unsigned int initial) { while (*pp < result) { ++pp; } - return (*pp); + return *pp; } if ((result & 1) == 0) { @@ -109,7 +109,7 @@ hash_divisor(unsigned int initial) { divisions, tries, result, initial); } - return (result); + return result; } /* @@ -121,7 +121,7 @@ delta_rrl_time(isc_stdtime_t ts, isc_stdtime_t now) { delta = now - ts; if (delta >= 0) { - return (delta); + return delta; } /* @@ -132,17 +132,17 @@ delta_rrl_time(isc_stdtime_t ts, isc_stdtime_t now) { * the past, make existing timestamps appear to be in the past. */ if (delta < -DNS_RRL_MAX_TIME_TRAVEL) { - return (DNS_RRL_FOREVER); + return DNS_RRL_FOREVER; } - return (0); + return 0; } static int get_age(const dns_rrl_t *rrl, const dns_rrl_entry_t *e, isc_stdtime_t now) { if (!e->ts_valid) { - return (DNS_RRL_FOREVER); + return DNS_RRL_FOREVER; } - return (delta_rrl_time(e->ts + rrl->ts_bases[e->ts_gen], now)); + return delta_rrl_time(e->ts + rrl->ts_bases[e->ts_gen], now); } static void @@ -216,7 +216,7 @@ expand_entries(dns_rrl_t *rrl, int newsize) { { newsize = rrl->max_entries - rrl->num_entries; if (newsize <= 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -250,13 +250,13 @@ expand_entries(dns_rrl_t *rrl, int newsize) { rrl->num_entries += newsize; ISC_LIST_INITANDAPPEND(rrl->blocks, b, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static dns_rrl_bin_t * get_bin(dns_rrl_hash_t *hash, unsigned int hval) { INSIST(hash != NULL); - return (&hash->bins[hval % hash->length]); + return &hash->bins[hval % hash->length]; } static void @@ -328,7 +328,7 @@ expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) { } rrl->hash = hash; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -367,9 +367,9 @@ ref_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, int probes, isc_stdtime_t now) { static bool key_cmp(const dns_rrl_key_t *a, const dns_rrl_key_t *b) { if (memcmp(a, b, sizeof(dns_rrl_key_t)) == 0) { - return (true); + return true; } - return (false); + return false; } static uint32_t @@ -381,7 +381,7 @@ hash_key(const dns_rrl_key_t *key) { for (i = sizeof(key->w) / sizeof(key->w[0]) - 1; i >= 0; --i) { hval = key->w[i] + (hval << 1); } - return (hval); + return hval; } /* @@ -466,17 +466,17 @@ static dns_rrl_rate_t * get_rate(dns_rrl_t *rrl, dns_rrl_rtype_t rtype) { switch (rtype) { case DNS_RRL_RTYPE_QUERY: - return (&rrl->responses_per_second); + return &rrl->responses_per_second; case DNS_RRL_RTYPE_REFERRAL: - return (&rrl->referrals_per_second); + return &rrl->referrals_per_second; case DNS_RRL_RTYPE_NODATA: - return (&rrl->nodata_per_second); + return &rrl->nodata_per_second; case DNS_RRL_RTYPE_NXDOMAIN: - return (&rrl->nxdomains_per_second); + return &rrl->nxdomains_per_second; case DNS_RRL_RTYPE_ERROR: - return (&rrl->errors_per_second); + return &rrl->errors_per_second; case DNS_RRL_RTYPE_ALL: - return (&rrl->all_per_second); + return &rrl->all_per_second; default: UNREACHABLE(); } @@ -498,7 +498,7 @@ response_balance(dns_rrl_t *rrl, const dns_rrl_entry_t *e, int age) { if (balance > rate) { balance = rate; } - return (balance); + return balance; } /* @@ -528,7 +528,7 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, dns_zone_t *zone, while (e != NULL) { if (key_cmp(&e->key, &key)) { ref_entry(rrl, e, probes, now); - return (e); + return e; } ++probes; e = ISC_LIST_NEXT(e, hlink); @@ -546,7 +546,7 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, dns_zone_t *zone, ISC_LIST_PREPEND(*new_bin, e, hlink); e->hash_gen = rrl->hash_gen; ref_entry(rrl, e, probes, now); - return (e); + return e; } e = ISC_LIST_NEXT(e, hlink); } @@ -561,7 +561,7 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, dns_zone_t *zone, } if (!create) { - return (NULL); + return NULL; } /* @@ -605,7 +605,7 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, dns_zone_t *zone, e->key = key; e->ts_valid = false; ref_entry(rrl, e, probes, now); - return (e); + return e; } static void @@ -639,7 +639,7 @@ debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, ratep = get_rate(rrl, e->key.s.rtype); rate = ratep->r; if (rate == 0) { - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } if (scale < 1.0) { @@ -721,7 +721,7 @@ debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, if (isc_log_wouldlog(DNS_RRL_LOG_DEBUG3)) { debit_log(e, age, ""); } - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } if (e->responses < min) { @@ -755,7 +755,7 @@ debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, if (isc_log_wouldlog(DNS_RRL_LOG_DEBUG3)) { debit_log(e, age, "slip"); } - return (DNS_RRL_RESULT_SLIP); + return DNS_RRL_RESULT_SLIP; } else if ((int)e->slip_cnt >= slip) { e->slip_cnt = 0; } @@ -764,7 +764,7 @@ debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, if (isc_log_wouldlog(DNS_RRL_LOG_DEBUG3)) { debit_log(e, age, "drop"); } - return (DNS_RRL_RESULT_DROP); + return DNS_RRL_RESULT_DROP; } static dns_rrl_qname_buf_t * @@ -773,9 +773,9 @@ get_qname(dns_rrl_t *rrl, const dns_rrl_entry_t *e) { qbuf = rrl->qnames[e->log_qname]; if (qbuf == NULL || qbuf->e != e) { - return (NULL); + return NULL; } - return (qbuf); + return qbuf; } static void @@ -1046,7 +1046,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, result = dns_acl_match(&netclient, NULL, rrl->exempt, view->aclenv, &exempt_match, NULL); if (result == ISC_R_SUCCESS && exempt_match > 0) { - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } } @@ -1108,7 +1108,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, } } UNLOCK(&rrl->lock); - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } /* @@ -1136,7 +1136,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, true, log_buf, log_buf_len); if (e == NULL) { UNLOCK(&rrl->lock); - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } if (isc_log_wouldlog(DNS_RRL_LOG_DEBUG1)) { @@ -1171,7 +1171,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, log_buf_len); if (e_all == NULL) { UNLOCK(&rrl->lock); - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } rrl_all_result = debit_rrl_entry(rrl, e_all, qps, scale, client_addr, now, log_buf, @@ -1195,7 +1195,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, if (rrl_result == DNS_RRL_RESULT_OK) { UNLOCK(&rrl->lock); - return (DNS_RRL_RESULT_OK); + return DNS_RRL_RESULT_OK; } /* @@ -1249,7 +1249,7 @@ dns_rrl(dns_view_t *view, dns_zone_t *zone, const isc_sockaddr_t *client_addr, UNLOCK(&rrl->lock); } - return (rrl_result); + return rrl_result; } void @@ -1329,14 +1329,14 @@ dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries) { result = expand_entries(rrl, min_entries); if (result != ISC_R_SUCCESS) { dns_rrl_view_destroy(view); - return (result); + return result; } result = expand_rrl_hash(rrl, 0); if (result != ISC_R_SUCCESS) { dns_rrl_view_destroy(view); - return (result); + return result; } *rrlp = rrl; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 46c20a6b09..7e3d3f1930 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -236,7 +236,7 @@ sdlz_log(int level, const char *fmt, ...) { static unsigned int initial_size(const char *data) { unsigned int len = (strlen(data) / 64) + 1; - return (len * 64 + 64); + return len * 64 + 64; } /* @@ -261,10 +261,10 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { dns_sdlznode_t *sdlznode = (dns_sdlznode_t *)iterator->node; if (ISC_LIST_EMPTY(sdlznode->lists)) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } sdlziterator->current = ISC_LIST_HEAD(sdlznode->lists); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -273,9 +273,9 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator DNS__DB_FLARG) { sdlziterator->current = ISC_LIST_NEXT(sdlziterator->current, link); if (sdlziterator->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -330,7 +330,7 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) { REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->newversion == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } dns_name_format(&sdlz->common.origin, origin, sizeof(origin)); @@ -342,11 +342,11 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) { sdlz_log(ISC_LOG_ERROR, "sdlz newversion on origin %s failed : %s", origin, isc_result_totext(result)); - return (result); + return result; } sdlz->future_version = *versionp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -408,7 +408,7 @@ createnode(dns_sdlz_db_t *sdlz, dns_sdlznode_t **nodep) { node->magic = SDLZLOOKUP_MAGIC; *nodep = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -485,12 +485,12 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, dns_name_getlabelsequence(name, 0, labels, &relname); result = dns_name_totext(&relname, DNS_NAME_OMITFINALDOT, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } else { result = dns_name_totext(name, DNS_NAME_OMITFINALDOT, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } isc_buffer_putuint8(&b, 0); @@ -499,13 +499,13 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, result = dns_name_totext(&sdlz->common.origin, DNS_NAME_OMITFINALDOT, &b2); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putuint8(&b2, 0); result = createnode(sdlz, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isorigin = dns_name_equal(name, &sdlz->common.origin); @@ -553,7 +553,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, dns_wildcardname, fname, fname, NULL); if (result != ISC_R_SUCCESS) { MAYBE_UNLOCK(sdlz->dlzimp); - return (result); + return result; } wild = fname; } @@ -563,7 +563,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, &b); if (result != ISC_R_SUCCESS) { MAYBE_UNLOCK(sdlz->dlzimp); - return (result); + return result; } isc_buffer_putuint8(&b, 0); @@ -585,7 +585,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, if (result != ISC_R_SUCCESS) { isc_refcount_decrementz(&node->references); destroynode(node); - return (result); + return result; } if (isorigin && sdlz->dlzimp->methods->authority != NULL) { @@ -597,7 +597,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) { isc_refcount_decrementz(&node->references); destroynode(node); - return (result); + return result; } } @@ -608,20 +608,20 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, } *nodep = (dns_dbnode_t *)node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t findnodeext(dns_db_t *db, const dns_name_t *name, bool create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep DNS__DB_FLARG) { - return (getnodedata(db, name, create, 0, methods, clientinfo, nodep)); + return getnodedata(db, name, create, 0, methods, clientinfo, nodep); } static isc_result_t findnode(dns_db_t *db, const dns_name_t *name, bool create, dns_dbnode_t **nodep DNS__DB_FLARG) { - return (getnodedata(db, name, create, 0, NULL, NULL, nodep)); + return getnodedata(db, name, create, 0, NULL, NULL, nodep); } static void @@ -685,20 +685,20 @@ createiterator(dns_db_t *db, unsigned int options, REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->allnodes == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if ((options & DNS_DB_NSEC3ONLY) != 0 || (options & DNS_DB_NONSEC3) != 0) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_buffer_init(&b, zonestr, sizeof(zonestr)); result = dns_name_totext(&sdlz->common.origin, DNS_NAME_OMITFINALDOT, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putuint8(&b, 0); @@ -724,7 +724,7 @@ createiterator(dns_db_t *db, unsigned int options, if (result != ISC_R_SUCCESS) { dns_dbiterator_t *iter = &sdlziter->common; dbiterator_destroy(&iter DNS__DB_FILELINE); - return (result); + return result; } if (sdlziter->origin != NULL) { @@ -734,7 +734,7 @@ createiterator(dns_db_t *db, unsigned int options, *iteratorp = (dns_dbiterator_t *)sdlziter; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -753,7 +753,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, UNUSED(sigrdataset); if (type == dns_rdatatype_sig || type == dns_rdatatype_rrsig) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } list = ISC_LIST_HEAD(sdlznode->lists); @@ -764,12 +764,12 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, list = ISC_LIST_NEXT(list, link); } if (list == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } list_tordataset(list, db, node, rdataset); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -795,7 +795,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, UNUSED(sdlz); if (!dns_name_issubdomain(name, &db->origin)) { - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; } olabels = dns_name_countlabels(&db->origin); @@ -934,7 +934,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, detachnode(db, &node DNS__DB_FLARG_PASS); } - return (result); + return result; } static isc_result_t @@ -942,8 +942,8 @@ find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset DNS__DB_FLARG) { - return (findext(db, name, version, type, options, now, nodep, foundname, - NULL, NULL, rdataset, sigrdataset DNS__DB_FLARG_PASS)); + return findext(db, name, version, type, options, now, nodep, foundname, + NULL, NULL, rdataset, sigrdataset DNS__DB_FLARG_PASS); } static isc_result_t @@ -974,7 +974,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, *iteratorp = (dns_rdatasetiter_t *)iterator; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -993,7 +993,7 @@ modrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SDLZDB(sdlz)); if (mod_function == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } sdlznode = (dns_sdlznode_t *)node; @@ -1041,7 +1041,7 @@ cleanup: dns_master_styledestroy(&style, mctx); } - return (result); + return result; } static isc_result_t @@ -1056,12 +1056,12 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->addrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = modrdataset(db, node, version, rdataset, options, sdlz->dlzimp->methods->addrdataset); - return (result); + return result; } static isc_result_t @@ -1075,12 +1075,12 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->subtractrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = modrdataset(db, node, version, rdataset, options, sdlz->dlzimp->methods->subtractrdataset); - return (result); + return result; } static isc_result_t @@ -1097,7 +1097,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->delrdataset == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } sdlznode = (dns_sdlznode_t *)node; @@ -1109,14 +1109,14 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, name, b_type, sdlz->dlzimp->driverarg, sdlz->dbdata, version); MAYBE_UNLOCK(sdlz->dlzimp); - return (result); + return result; } static bool issecure(dns_db_t *db) { UNUSED(db); - return (false); + return false; } static unsigned int @@ -1124,7 +1124,7 @@ nodecount(dns_db_t *db, dns_dbtree_t tree) { UNUSED(db); UNUSED(tree); - return (0); + return 0; } static void @@ -1144,7 +1144,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->newversion == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = getnodedata(db, &sdlz->common.origin, false, 0, NULL, NULL, @@ -1153,7 +1153,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) { sdlz_log(ISC_LOG_ERROR, "sdlz getoriginnode failed: %s", isc_result_totext(result)); } - return (result); + return result; } static dns_dbmethods_t sdlzdb_methods = { @@ -1210,9 +1210,9 @@ dbiterator_first(dns_dbiterator_t *iterator DNS__DB_FLARG) { sdlziter->current = ISC_LIST_HEAD(sdlziter->nodelist); if (sdlziter->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1222,9 +1222,9 @@ dbiterator_last(dns_dbiterator_t *iterator DNS__DB_FLARG) { sdlziter->current = ISC_LIST_TAIL(sdlziter->nodelist); if (sdlziter->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1236,11 +1236,11 @@ dbiterator_seek(dns_dbiterator_t *iterator, sdlziter->current = ISC_LIST_HEAD(sdlziter->nodelist); while (sdlziter->current != NULL) { if (dns_name_equal(sdlziter->current->name, name)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } sdlziter->current = ISC_LIST_NEXT(sdlziter->current, link); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -1249,9 +1249,9 @@ dbiterator_prev(dns_dbiterator_t *iterator DNS__DB_FLARG) { sdlziter->current = ISC_LIST_PREV(sdlziter->current, link); if (sdlziter->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1261,9 +1261,9 @@ dbiterator_next(dns_dbiterator_t *iterator DNS__DB_FLARG) { sdlziter->current = ISC_LIST_NEXT(sdlziter->current, link); if (sdlziter->current == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1276,22 +1276,22 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, nodep DNS__DB_FLARG_PASS); if (name != NULL) { dns_name_copy(sdlziter->current->name, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator) { UNUSED(iterator); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { UNUSED(iterator); dns_name_copy(dns_rootname, name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1391,7 +1391,7 @@ dns_sdlzcreateDBP(isc_mem_t *mctx, void *driverarg, void *dbdata, sdlzdb->common.impmagic = SDLZDB_MAGIC; *dbp = (dns_db_t *)sdlzdb; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1422,7 +1422,7 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, isc_buffer_init(&b, namestr, sizeof(namestr)); result = dns_name_totext(name, DNS_NAME_OMITFINALDOT, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putuint8(&b, 0); @@ -1431,7 +1431,7 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, isc_netaddr_fromsockaddr(&netaddr, clientaddr); result = isc_netaddr_totext(&netaddr, &b2); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putuint8(&b2, 0); @@ -1458,10 +1458,10 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, if (rresult != ISC_R_SUCCESS) { result = rresult; } - return (result); + return result; } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static isc_result_t @@ -1498,7 +1498,7 @@ dns_sdlzcreate(isc_mem_t *mctx, const char *dlzname, unsigned int argc, sdlz_log(ISC_LOG_ERROR, "SDLZ driver failed to load."); } - return (result); + return result; } static void @@ -1541,7 +1541,7 @@ dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx, isc_buffer_init(&b, namestr, sizeof(namestr)); result = dns_name_totext(name, DNS_NAME_OMITFINALDOT, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_buffer_putuint8(&b, 0); @@ -1563,7 +1563,7 @@ dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx, rdclass, dbp); } - return (result); + return result; } static isc_result_t @@ -1586,7 +1586,7 @@ dns_sdlzconfigure(void *driverarg, void *dbdata, dns_view_t *view, result = ISC_R_SUCCESS; } - return (result); + return result; } static bool @@ -1608,7 +1608,7 @@ dns_sdlzssumatch(const dns_name_t *signer, const dns_name_t *name, imp = (dns_sdlzimplementation_t *)driverarg; if (imp->methods->ssumatch == NULL) { - return (false); + return false; } /* @@ -1649,7 +1649,7 @@ dns_sdlzssumatch(const dns_name_t *signer, const dns_name_t *name, token_len != 0 ? token_region.base : NULL, imp->driverarg, dbdata); MAYBE_UNLOCK(imp); - return (ret); + return ret; } static dns_dlzmethods_t sdlzmethods = { dns_sdlzcreate, dns_sdlzdestroy, @@ -1685,7 +1685,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, r.length = strlen(type); result = dns_rdatatype_fromtext(&typeval, (void *)&r); if (result != ISC_R_SUCCESS) { - return (result); + return result; } rdatalist = ISC_LIST_HEAD(lookup->lists); @@ -1766,7 +1766,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, isc_lex_destroy(&lex); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (rdatabuf != NULL) { @@ -1777,7 +1777,7 @@ failure: } isc_mem_put(mctx, rdata, sizeof(dns_rdata_t)); - return (result); + return result; } isc_result_t @@ -1804,7 +1804,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, result = dns_name_fromtext(newname, &b, origin, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (allnodes->common.relative_names) { @@ -1818,7 +1818,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, sdlznode = NULL; result = createnode(sdlz, &sdlznode); if (result != ISC_R_SUCCESS) { - return (result); + return result; } sdlznode->name = isc_mem_get(mctx, sizeof(dns_name_t)); dns_name_init(sdlznode->name, NULL); @@ -1830,7 +1830,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, allnodes->origin = sdlznode; } } - return (dns_sdlz_putrr(sdlznode, type, ttl, data)); + return dns_sdlz_putrr(sdlznode, type, ttl, data); } isc_result_t @@ -1846,9 +1846,9 @@ dns_sdlz_putsoa(dns_sdlzlookup_t *lookup, const char *mname, const char *rname, serial, SDLZ_DEFAULT_REFRESH, SDLZ_DEFAULT_RETRY, SDLZ_DEFAULT_EXPIRE, SDLZ_DEFAULT_MINIMUM); if (n >= (int)sizeof(str) || n < 0) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } - return (dns_sdlz_putrr(lookup, "SOA", SDLZ_DEFAULT_TTL, str)); + return dns_sdlz_putrr(lookup, "SOA", SDLZ_DEFAULT_TTL, str); } isc_result_t @@ -1912,7 +1912,7 @@ dns_sdlzregister(const char *drivername, const dns_sdlzmethods_t *methods, *sdlzimp = imp; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_mutex: /* destroy the driver lock, we don't need it anymore */ @@ -1923,7 +1923,7 @@ cleanup_mutex: * remove it from the memory context. */ isc_mem_putanddetach(&imp->mctx, imp, sizeof(*imp)); - return (result); + return result; } void @@ -1962,5 +1962,5 @@ dns_sdlz_setdb(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, result = dns_sdlzcreateDBP(dlzdatabase->mctx, dlzdatabase->implementation->driverarg, dlzdatabase->dbdata, name, rdclass, dbp); - return (result); + return result; } diff --git a/lib/dns/skr.c b/lib/dns/skr.c index 6ba7b9a88b..e2dada1f79 100644 --- a/lib/dns/skr.c +++ b/lib/dns/skr.c @@ -74,10 +74,10 @@ parse_rr(isc_lex_t *lex, isc_mem_t *mctx, char *owner, dns_name_t *origin, isc_buffer_add(&b, strlen(owner)); ret = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL); if (ret != ISC_R_SUCCESS) { - return (ret); + return ret; } if (dns_name_compare(dname, origin) != 0) { - return (DNS_R_BADOWNERNAME); + return DNS_R_BADOWNERNAME; } isc_buffer_clear(&b); @@ -129,7 +129,7 @@ parse_rr(isc_lex_t *lex, isc_mem_t *mctx, char *owner, dns_name_t *origin, buf, &callbacks); cleanup: isc_lex_setcomments(lex, 0); - return (ret); + return ret; } static void @@ -178,7 +178,7 @@ dns_skrbundle_getsig(dns_skrbundle_t *bundle, dst_key_t *key, result = dns_rdata_tostruct(&tuple->rdata, &rrsig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -189,13 +189,13 @@ dns_skrbundle_getsig(dns_skrbundle_t *bundle, dst_key_t *key, rrsig.keyid == dst_key_id(key)) { dns_rdata_clone(&tuple->rdata, sigrdata); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } tuple = ISC_LIST_NEXT(tuple, link); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } void @@ -264,7 +264,7 @@ dns_skr_read(isc_mem_t *mctx, const char *filename, dns_name_t *origin, ISC_LOG_ERROR, "unable to open ksr file %s: %s", filename, isc_result_totext(result)); isc_lex_destroy(&lex); - return (result); + return result; } for (result = isc_lex_gettoken(lex, opt, &token); @@ -388,7 +388,7 @@ failure: /* Clean up */ isc_lex_destroy(&lex); - return (result); + return result; } dns_skrbundle_t * @@ -402,16 +402,16 @@ dns_skr_lookup(dns_skr_t *skr, isc_stdtime_t time, uint32_t sigval) { if (next == NULL) { isc_stdtime_t expired = b->inception + sigval; if (b->inception <= time && time < expired) { - return (b); + return b; } - return (NULL); + return NULL; } if (b->inception <= time && time < next->inception) { - return (b); + return b; } } - return (NULL); + return NULL; } void diff --git a/lib/dns/soa.c b/lib/dns/soa.c index ca5ca8858c..8325d08ddd 100644 --- a/lib/dns/soa.c +++ b/lib/dns/soa.c @@ -25,8 +25,8 @@ static uint32_t decode_uint32(unsigned char *p) { - return (((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) + - ((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0)); + return ((uint32_t)p[0] << 24) + ((uint32_t)p[1] << 16) + + ((uint32_t)p[2] << 8) + ((uint32_t)p[3] << 0); } static void @@ -52,7 +52,7 @@ soa_get(dns_rdata_t *rdata, int offset) { */ INSIST(rdata->length >= 20); INSIST(offset >= 0 && offset <= 16); - return (decode_uint32(rdata->data + rdata->length - 20 + offset)); + return decode_uint32(rdata->data + rdata->length - 20 + offset); } isc_result_t @@ -82,29 +82,29 @@ dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, dns_name_init(&soa.contact, NULL); dns_name_clone(contact, &soa.contact); - return (dns_rdata_fromstruct(rdata, rdclass, dns_rdatatype_soa, &soa, - &rdatabuf)); + return dns_rdata_fromstruct(rdata, rdclass, dns_rdatatype_soa, &soa, + &rdatabuf); } uint32_t dns_soa_getserial(dns_rdata_t *rdata) { - return (soa_get(rdata, 0)); + return soa_get(rdata, 0); } uint32_t dns_soa_getrefresh(dns_rdata_t *rdata) { - return (soa_get(rdata, 4)); + return soa_get(rdata, 4); } uint32_t dns_soa_getretry(dns_rdata_t *rdata) { - return (soa_get(rdata, 8)); + return soa_get(rdata, 8); } uint32_t dns_soa_getexpire(dns_rdata_t *rdata) { - return (soa_get(rdata, 12)); + return soa_get(rdata, 12); } uint32_t dns_soa_getminimum(dns_rdata_t *rdata) { - return (soa_get(rdata, 16)); + return soa_get(rdata, 16); } static void diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 18782209d2..3005ad0937 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -137,45 +137,45 @@ static const char * mtypetostring(dns_ssumatchtype_t matchtype) { switch (matchtype) { case dns_ssumatchtype_name: - return ("name"); + return "name"; case dns_ssumatchtype_wildcard: - return ("wildcard"); + return "wildcard"; case dns_ssumatchtype_self: - return ("self"); + return "self"; case dns_ssumatchtype_selfsub: - return ("selfsub"); + return "selfsub"; case dns_ssumatchtype_selfwild: - return ("selfwild"); + return "selfwild"; case dns_ssumatchtype_selfms: - return ("ms-self"); + return "ms-self"; case dns_ssumatchtype_selfsubms: - return ("ms-selfsub"); + return "ms-selfsub"; case dns_ssumatchtype_selfkrb5: - return ("krb5-self"); + return "krb5-self"; case dns_ssumatchtype_selfsubkrb5: - return ("krb5-selfsub"); + return "krb5-selfsub"; case dns_ssumatchtype_subdomainms: - return ("ms-subdomain"); + return "ms-subdomain"; case dns_ssumatchtype_subdomainselfmsrhs: - return ("ms-subdomain-self-rhs"); + return "ms-subdomain-self-rhs"; case dns_ssumatchtype_subdomainkrb5: - return ("krb5-subdomain"); + return "krb5-subdomain"; case dns_ssumatchtype_subdomainselfkrb5rhs: - return ("krb5-subdomain-self-rhs"); + return "krb5-subdomain-self-rhs"; case dns_ssumatchtype_tcpself: - return ("tcp-self"); + return "tcp-self"; case dns_ssumatchtype_6to4self: - return ("6to4-self"); + return "6to4-self"; case dns_ssumatchtype_subdomain: - return ("subdomain"); + return "subdomain"; case dns_ssumatchtype_external: - return ("external"); + return "external"; case dns_ssumatchtype_local: - return ("local"); + return "local"; case dns_ssumatchtype_dlz: - return ("dlz"); + return "dlz"; } - return ("UnknownMatchType"); + return "UnknownMatchType"; } void @@ -229,8 +229,8 @@ dns_ssutable_addrule(dns_ssutable_t *table, bool grant, static bool isusertype(dns_rdatatype_t type) { - return (type != dns_rdatatype_ns && type != dns_rdatatype_soa && - type != dns_rdatatype_rrsig); + return type != dns_rdatatype_ns && type != dns_rdatatype_soa && + type != dns_rdatatype_rrsig; } static void @@ -372,7 +372,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, } if (signer == NULL && addr == NULL) { - return (false); + return false; } for (rule = ISC_LIST_HEAD(table->rules); rule != NULL; @@ -976,7 +976,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, rule->debug != NULL ? rule->debug : "not available"); } - return (rule->grant); + return rule->grant; } if (logit) { isc_log_write(DNS_LOGCATEGORY_UPDATE_POLICY, DNS_LOGMODULE_SSU, @@ -984,31 +984,31 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, "update-policy: no match found"); } - return (false); + return false; } bool dns_ssurule_isgrant(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); - return (rule->grant); + return rule->grant; } dns_name_t * dns_ssurule_identity(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); - return (rule->identity); + return rule->identity; } unsigned int dns_ssurule_matchtype(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); - return (rule->matchtype); + return rule->matchtype; } dns_name_t * dns_ssurule_name(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); - return (rule->name); + return rule->name; } unsigned int @@ -1016,7 +1016,7 @@ dns_ssurule_types(const dns_ssurule_t *rule, dns_ssuruletype_t **types) { REQUIRE(VALID_SSURULE(rule)); REQUIRE(types != NULL && *types != NULL); *types = rule->types; - return (rule->ntypes); + return rule->ntypes; } unsigned int @@ -1031,10 +1031,10 @@ dns_ssurule_max(const dns_ssurule_t *rule, dns_rdatatype_t type) { max = rule->types[i].max; } if (rule->types[i].type == type) { - return (rule->types[i].max); + return rule->types[i].max; } } - return (max); + return max; } isc_result_t @@ -1042,7 +1042,7 @@ dns_ssutable_firstrule(const dns_ssutable_t *table, dns_ssurule_t **rule) { REQUIRE(VALID_SSUTABLE(table)); REQUIRE(rule != NULL && *rule == NULL); *rule = ISC_LIST_HEAD(table->rules); - return (*rule != NULL ? ISC_R_SUCCESS : ISC_R_NOMORE); + return *rule != NULL ? ISC_R_SUCCESS : ISC_R_NOMORE; } isc_result_t @@ -1050,7 +1050,7 @@ dns_ssutable_nextrule(dns_ssurule_t *rule, dns_ssurule_t **nextrule) { REQUIRE(VALID_SSURULE(rule)); REQUIRE(nextrule != NULL && *nextrule == NULL); *nextrule = ISC_LIST_NEXT(rule, link); - return (*nextrule != NULL ? ISC_R_SUCCESS : ISC_R_NOMORE); + return *nextrule != NULL ? ISC_R_SUCCESS : ISC_R_NOMORE; } /* @@ -1124,7 +1124,7 @@ dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype) { } else if (strcasecmp(str, "external") == 0) { *mtype = dns_ssumatchtype_external; } else { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c index 9a4a9e980a..ec68e809a4 100644 --- a/lib/dns/ssu_external.c +++ b/lib/dns/ssu_external.c @@ -65,7 +65,7 @@ ux_socket_connect(const char *path) { "ssu_external: socket path '%s' " "longer than system maximum %zu", path, sizeof(addr.sun_path)); - return (-1); + return -1; } memset(&addr, 0, sizeof(addr)); @@ -78,7 +78,7 @@ ux_socket_connect(const char *path) { strerror_r(errno, strbuf, sizeof(strbuf)); ssu_e_log(3, "ssu_external: unable to create socket - %s", strbuf); - return (-1); + return -1; } if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) { @@ -89,9 +89,9 @@ ux_socket_connect(const char *path) { "socket '%s' - %s", path, strbuf); close(fd); - return (-1); + return -1; } - return (fd); + return fd; } /* Change this version if you update the format of the request */ @@ -136,13 +136,13 @@ dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, if (strncmp(b_identity, "local:", 6) != 0) { ssu_e_log(3, "ssu_external: invalid socket path '%s'", b_identity); - return (false); + return false; } sock_path = &b_identity[6]; fd = ux_socket_connect(sock_path); if (fd == -1) { - return (false); + return false; } if (key != NULL) { @@ -220,7 +220,7 @@ dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, ssu_e_log(3, "ssu_external: unable to send request - %s", strbuf); close(fd); - return (false); + return false; } /* Receive the reply */ @@ -231,7 +231,7 @@ dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, ssu_e_log(3, "ssu_external: unable to receive reply - %s", strbuf); close(fd); - return (false); + return false; } close(fd); @@ -241,14 +241,14 @@ dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, if (reply == 0) { ssu_e_log(3, "ssu_external: denied external auth for '%s'", b_name); - return (false); + return false; } else if (reply == 1) { ssu_e_log(3, "ssu_external: allowed external auth for '%s'", b_name); - return (true); + return true; } ssu_e_log(3, "ssu_external: invalid reply 0x%08x", reply); - return (false); + return false; } diff --git a/lib/dns/stats.c b/lib/dns/stats.c index 26829a5906..06a301966b 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -248,9 +248,9 @@ dns_generalstats_increment(dns_stats_t *stats, isc_statscounter_t counter) { static isc_statscounter_t rdatatype2counter(dns_rdatatype_t type) { if (type > (dns_rdatatype_t)RDTYPECOUNTER_MAXTYPE) { - return (0); + return 0; } - return ((isc_statscounter_t)type); + return (isc_statscounter_t)type; } void diff --git a/lib/dns/time.c b/lib/dns/time.c index dcec7c7964..ae23ce0a99 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -48,7 +48,7 @@ dns_time64_totext(int64_t t, isc_buffer_t *target) { tm.tm_year = 70; while (t < 0) { if (tm.tm_year == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } tm.tm_year--; secs = year_secs(tm.tm_year + 1900); @@ -58,7 +58,7 @@ dns_time64_totext(int64_t t, isc_buffer_t *target) { t -= secs; tm.tm_year++; if (tm.tm_year + 1900 > 9999) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } tm.tm_mon = 0; @@ -91,12 +91,12 @@ dns_time64_totext(int64_t t, isc_buffer_t *target) { l = strlen(buf); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, buf, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } int64_t @@ -119,12 +119,12 @@ dns_time64_from32(uint32_t value) { t = start - (now - value); } - return (t); + return t; } isc_result_t dns_time32_totext(uint32_t value, isc_buffer_t *target) { - return (dns_time64_totext(dns_time64_from32(value), target)); + return dns_time64_totext(dns_time64_from32(value), target); } isc_result_t @@ -141,7 +141,7 @@ dns_time64_fromtext(const char *source, int64_t *target) { } while (0) if (strlen(source) != 14U) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* * Confirm the source only consists digits. sscanf() allows some @@ -149,13 +149,13 @@ dns_time64_fromtext(const char *source, int64_t *target) { */ for (i = 0; i < 14; i++) { if (!isdigit((unsigned char)source[i])) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } if (sscanf(source, "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second) != 6) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } RANGE(0, 9999, year); @@ -198,7 +198,7 @@ dns_time64_fromtext(const char *source, int64_t *target) { } *target = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -207,9 +207,9 @@ dns_time32_fromtext(const char *source, uint32_t *target) { isc_result_t result; result = dns_time64_fromtext(source, &value64); if (result != ISC_R_SUCCESS) { - return (result); + return result; } *target = (uint32_t)value64; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 2f7a0192a8..f2cb3989a7 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -87,7 +87,7 @@ dns_tkeyctx_create(isc_mem_t *mctx, dns_tkeyctx_t **tctxp) { isc_mem_attach(mctx, &tctx->mctx); *tctxp = tctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -194,13 +194,13 @@ process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin, if (tctx->gsscred == NULL && tctx->gssapi_keytab == NULL) { tkey_log("process_gsstkey(): no tkey-gssapi-credential " "or tkey-gssapi-keytab configured"); - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } if (!dns_name_equal(&tkeyin->algorithm, DNS_TSIG_GSSAPI_NAME)) { tkeyout->error = dns_tsigerror_badalg; tkey_log("process_gsstkey(): dns_tsigerror_badalg"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -225,7 +225,7 @@ process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin, } tkeyout->error = dns_tsigerror_badkey; tkey_log("process_gsstkey(): dns_tsigerror_badkey"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != DNS_R_CONTINUE && result != ISC_R_SUCCESS) { goto failure; @@ -295,7 +295,7 @@ process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin, dns_tsigkey_detach(&tsigkey); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (tsigkey != NULL) { @@ -309,7 +309,7 @@ failure: } tkey_log("process_gsstkey(): %s", isc_result_totext(result)); - return (result); + return result; } static isc_result_t @@ -323,7 +323,7 @@ process_deletetkey(dns_name_t *signer, dns_name_t *name, result = dns_tsigkey_find(&tsigkey, name, &tkeyin->algorithm, ring); if (result != ISC_R_SUCCESS) { tkeyout->error = dns_tsigerror_badname; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -333,7 +333,7 @@ process_deletetkey(dns_name_t *signer, dns_name_t *name, identity = dns_tsigkey_identity(tsigkey); if (identity == NULL || !dns_name_equal(identity, signer)) { dns_tsigkey_detach(&tsigkey); - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } /* @@ -346,7 +346,7 @@ process_deletetkey(dns_name_t *signer, dns_name_t *name, /* Release the reference */ dns_tsigkey_detach(&tsigkey); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -374,7 +374,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, */ result = dns_message_firstname(msg, DNS_SECTION_QUESTION); if (result != ISC_R_SUCCESS) { - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } dns_message_currentname(msg, DNS_SECTION_QUESTION, &qname); @@ -514,11 +514,11 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, ISC_LIST_UNLINK(namelist, name, link); dns_message_addname(msg, name, DNS_SECTION_ANSWER); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: free_namelist(msg, &namelist); - return (result); + return result; } static isc_result_t @@ -543,7 +543,7 @@ buildquery(dns_message_t *msg, const dns_name_t *name, dns_rdata_tkey_t *tkey) { if (result != ISC_R_SUCCESS) { dns_message_puttemprdata(msg, &rdata); isc_buffer_free(&dynbuf); - return (result); + return result; } dns_message_takebuffer(msg, &dynbuf); @@ -571,7 +571,7 @@ buildquery(dns_message_t *msg, const dns_name_t *name, dns_rdata_tkey_t *tkey) { dns_message_addname(msg, qname, DNS_SECTION_QUESTION); dns_message_addname(msg, aname, DNS_SECTION_ADDITIONAL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -595,7 +595,7 @@ dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, result = dst_gssapi_initctx(gname, NULL, &token, context, mctx, err_message); if (result != DNS_R_CONTINUE && result != ISC_R_SUCCESS) { - return (result); + return result; } tkey = (dns_rdata_tkey_t){ @@ -611,7 +611,7 @@ dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, }; dns_name_clone(DNS_TSIG_GSSAPI_NAME, &tkey.algorithm); - return (buildquery(msg, name, &tkey)); + return buildquery(msg, name, &tkey); } static isc_result_t @@ -635,14 +635,14 @@ find_tkey(dns_message_t *msg, dns_name_t **name, dns_rdata_t *rdata, dns_rdataset_current(tkeyset, rdata); *name = cur; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_message_nextname(msg, section); } if (result == ISC_R_NOMORE) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } - return (result); + return result; } isc_result_t @@ -665,7 +665,7 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, REQUIRE(outkey == NULL || *outkey == NULL); if (rmsg->rcode != dns_rcode_noerror) { - return (dns_result_fromrcode(rmsg->rcode)); + return dns_result_fromrcode(rmsg->rcode); } RETERR(find_tkey(rmsg, &tkeyname, &rtkeyrdata, DNS_SECTION_ANSWER)); @@ -690,7 +690,7 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, result = dst_gssapi_initctx(server, &intoken, &outtoken, context, ring->mctx, err_message); if (result != DNS_R_CONTINUE && result != ISC_R_SUCCESS) { - return (result); + return result; } if (result == DNS_R_CONTINUE) { @@ -710,7 +710,7 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, dns_message_reset(qmsg, DNS_MESSAGE_INTENTRENDER); RETERR(buildquery(qmsg, tkeyname, &tkey)); - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } RETERR(dst_key_fromgssapi(dns_rootname, *context, rmsg->mctx, &dstkey, @@ -732,7 +732,7 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, } dst_key_free(&dstkey); - return (result); + return result; failure: if (tsigkey != NULL) { @@ -741,5 +741,5 @@ failure: if (dstkey != NULL) { dst_key_free(&dstkey); } - return (result); + return result; } diff --git a/lib/dns/transport.c b/lib/dns/transport.c index b647d1b76c..558473890a 100644 --- a/lib/dns/transport.c +++ b/lib/dns/transport.c @@ -72,7 +72,7 @@ static bool transport_match(void *node, const void *key) { dns_transport_t *transport = node; - return (dns_name_equal(transport->name, key)); + return dns_name_equal(transport->name, key); } static isc_result_t @@ -91,56 +91,56 @@ list_add(dns_transport_list_t *list, const dns_name_t *name, transport, NULL); RWUNLOCK(&list->lock, isc_rwlocktype_write); - return (result); + return result; } dns_transport_type_t dns_transport_get_type(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->type); + return transport->type; } char * dns_transport_get_certfile(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.certfile); + return transport->tls.certfile; } char * dns_transport_get_keyfile(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.keyfile); + return transport->tls.keyfile; } char * dns_transport_get_cafile(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.cafile); + return transport->tls.cafile; } char * dns_transport_get_remote_hostname(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.remote_hostname); + return transport->tls.remote_hostname; } char * dns_transport_get_endpoint(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->doh.endpoint); + return transport->doh.endpoint; } dns_http_mode_t dns_transport_get_mode(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->doh.mode); + return transport->doh.mode; } dns_transport_t * @@ -155,7 +155,7 @@ dns_transport_new(const dns_name_t *name, dns_transport_type_t type, list_add(list, name, type, transport); - return (transport); + return transport; } void @@ -259,7 +259,7 @@ uint32_t dns_transport_get_tls_versions(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.protocol_versions); + return transport->tls.protocol_versions; } void @@ -298,7 +298,7 @@ char * dns_transport_get_ciphers(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.ciphers); + return transport->tls.ciphers; } void @@ -322,14 +322,14 @@ char * dns_transport_get_cipher_suites(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.cipher_suites); + return transport->tls.cipher_suites; } char * dns_transport_get_tlsname(const dns_transport_t *transport) { REQUIRE(VALID_TRANSPORT(transport)); - return (transport->tls.tlsname); + return transport->tls.tlsname; } void @@ -348,17 +348,17 @@ dns_transport_get_prefer_server_ciphers(const dns_transport_t *transport, REQUIRE(VALID_TRANSPORT(transport)); REQUIRE(preferp != NULL); if (transport->tls.prefer_server_ciphers == ter_none) { - return (false); + return false; } else if (transport->tls.prefer_server_ciphers == ter_true) { *preferp = true; - return (true); + return true; } else if (transport->tls.prefer_server_ciphers == ter_false) { *preferp = false; - return (true); + return true; } UNREACHABLE(); - return (false); + return false; } void @@ -377,7 +377,7 @@ dns_transport_get_always_verify_remote(dns_transport_t *transport) { REQUIRE(transport->type == DNS_TRANSPORT_TLS || transport->type == DNS_TRANSPORT_HTTP); - return (transport->tls.always_verify_remote); + return transport->tls.always_verify_remote; } isc_result_t @@ -595,7 +595,7 @@ dns_transport_get_tlsctx(dns_transport_t *transport, const isc_sockaddr_t *peer, *pctx = found; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (tlsctx != NULL) { @@ -613,7 +613,7 @@ failure: isc_tls_cert_store_free(&store); } - return (result); + return result; } static void @@ -695,7 +695,7 @@ dns_transport_find(const dns_transport_type_t type, const dns_name_t *name, } RWUNLOCK(&list->lock, isc_rwlocktype_read); - return (transport); + return transport; } dns_transport_list_t * @@ -715,7 +715,7 @@ dns_transport_list_new(isc_mem_t *mctx) { isc_hashmap_create(list->mctx, 10, &list->transports[type]); } - return (list); + return list; } void @@ -777,13 +777,13 @@ const char * dns_transport_totext(dns_transport_type_t type) { switch (type) { case DNS_TRANSPORT_UDP: - return ("udp"); + return "udp"; case DNS_TRANSPORT_TCP: - return ("tcp"); + return "tcp"; case DNS_TRANSPORT_TLS: - return ("tls"); + return "tls"; case DNS_TRANSPORT_HTTP: - return ("https"); + return "https"; default: UNREACHABLE(); } diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index d4a4837bc7..6564e580d3 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -112,9 +112,9 @@ tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) bool dns__tsig_algvalid(unsigned int alg) { - return (alg == DST_ALG_HMACMD5 || alg == DST_ALG_HMACSHA1 || - alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || - alg == DST_ALG_HMACSHA384 || alg == DST_ALG_HMACSHA512); + return alg == DST_ALG_HMACMD5 || alg == DST_ALG_HMACSHA1 || + alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || + alg == DST_ALG_HMACSHA384 || alg == DST_ALG_HMACSHA512; } static void @@ -156,12 +156,12 @@ static bool tkey_match(void *node, const void *key) { dns_tsigkey_t *tkey = node; - return (dns_name_equal(tkey->name, key)); + return dns_name_equal(tkey->name, key); } static bool match_ptr(void *node, const void *key) { - return (node == key); + return node == key; } static void @@ -207,21 +207,21 @@ static const dns_name_t * namefromalg(dst_algorithm_t alg) { switch (alg) { case DST_ALG_HMACMD5: - return (dns_tsig_hmacmd5_name); + return dns_tsig_hmacmd5_name; case DST_ALG_HMACSHA1: - return (dns_tsig_hmacsha1_name); + return dns_tsig_hmacsha1_name; case DST_ALG_HMACSHA224: - return (dns_tsig_hmacsha224_name); + return dns_tsig_hmacsha224_name; case DST_ALG_HMACSHA256: - return (dns_tsig_hmacsha256_name); + return dns_tsig_hmacsha256_name; case DST_ALG_HMACSHA384: - return (dns_tsig_hmacsha384_name); + return dns_tsig_hmacsha384_name; case DST_ALG_HMACSHA512: - return (dns_tsig_hmacsha512_name); + return dns_tsig_hmacsha512_name; case DST_ALG_GSSAPI: - return (dns_tsig_gssapi_name); + return dns_tsig_gssapi_name; default: - return (NULL); + return NULL; } } @@ -301,12 +301,12 @@ dns_tsigkey_createfromkey(const dns_name_t *name, dst_algorithm_t algorithm, } SET_IF_NOT_NULL(keyp, tkey); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_name: isc_mem_put(mctx, tkey, sizeof(dns_tsigkey_t)); - return (result); + return result; } static void @@ -348,10 +348,10 @@ dns__tsig_algfromname(const dns_name_t *algorithm) { for (size_t i = 0; i < ARRAY_SIZE(known_algs); ++i) { const dns_name_t *name = known_algs[i].name; if (algorithm == name || dns_name_equal(algorithm, name)) { - return (known_algs[i].dstalg); + return known_algs[i].dstalg; } } - return (DST_ALG_UNKNOWN); + return DST_ALG_UNKNOWN; } static isc_result_t @@ -373,14 +373,14 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) { n = fscanf(fp, "%1023s %1023s %u %u %1023s %4095s\n", namestr, creatorstr, &inception, &expire, algorithmstr, keystr); if (n == EOF) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (n != 6) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (isc_serial_lt(expire, now)) { - return (DNS_R_EXPIRED); + return DNS_R_EXPIRED; } name = dns_fixedname_initname(&fname); @@ -388,7 +388,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) { isc_buffer_add(&b, strlen(namestr)); result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } creator = dns_fixedname_initname(&fcreator); @@ -396,7 +396,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) { isc_buffer_add(&b, strlen(creatorstr)); result = dns_name_fromtext(creator, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } algorithm = dns_fixedname_initname(&falgorithm); @@ -404,19 +404,19 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) { isc_buffer_add(&b, strlen(algorithmstr)); result = dns_name_fromtext(algorithm, &b, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dstalg = dns__tsig_algfromname(algorithm); if (dstalg == DST_ALG_UNKNOWN) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } result = dst_key_restore(name, dstalg, DNS_KEYOWNER_ENTITY, DNS_KEYPROTO_DNSSEC, dns_rdataclass_in, ring->mctx, keystr, &dstkey); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_tsigkey_createfromkey(name, dstalg, dstkey, true, true, @@ -429,7 +429,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) { if (dstkey != NULL) { dst_key_free(&dstkey); } - return (result); + return result; } static void @@ -483,7 +483,7 @@ dns_tsigkeyring_dump(dns_tsigkeyring_t *ring, FILE *fp) { isc_hashmap_iter_destroy(&it); RWUNLOCK(&ring->lock, isc_rwlocktype_read); - return (found ? ISC_R_SUCCESS : ISC_R_NOTFOUND); + return found ? ISC_R_SUCCESS : ISC_R_NOTFOUND; } const dns_name_t * @@ -491,12 +491,12 @@ dns_tsigkey_identity(const dns_tsigkey_t *tsigkey) { REQUIRE(tsigkey == NULL || VALID_TSIGKEY(tsigkey)); if (tsigkey == NULL) { - return (NULL); + return NULL; } if (tsigkey->generated) { - return (tsigkey->creator); + return tsigkey->creator; } else { - return (tsigkey->name); + return tsigkey->name; } } @@ -523,11 +523,11 @@ dns_tsigkey_create(const dns_name_t *name, dst_algorithm_t algorithm, DNS_KEYPROTO_DNSSEC, dns_rdataclass_in, &b, mctx, &dstkey); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } else if (length > 0) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } result = dns_tsigkey_createfromkey(name, algorithm, dstkey, false, @@ -535,7 +535,7 @@ dns_tsigkey_create(const dns_name_t *name, dst_algorithm_t algorithm, if (dstkey != NULL) { dst_key_free(&dstkey); } - return (result); + return result; } static void @@ -600,7 +600,7 @@ dns_tsig_sign(dns_message_t *msg) { response = is_response(msg); if (response && msg->querytsig == NULL) { if (msg->tkey != 1) { - return (DNS_R_EXPECTEDTSIG); + return DNS_R_EXPECTEDTSIG; } } @@ -648,7 +648,7 @@ dns_tsig_sign(dns_message_t *msg) { result = dst_context_create( key->key, mctx, DNS_LOGCATEGORY_DNSSEC, true, 0, &ctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -839,7 +839,7 @@ dns_tsig_sign(dns_message_t *msg) { /* Windows does not like the tsig name being compressed. */ msg->tsigname->attributes.nocompress = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_dynbuf: isc_buffer_free(&dynbuf); @@ -852,7 +852,7 @@ cleanup_context: if (ctx != NULL) { dst_context_destroy(&ctx); } - return (result); + return result; } isc_result_t @@ -889,16 +889,16 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, if (msg->tcp_continuation) { if (tsigkey == NULL || msg->querytsig == NULL) { - return (DNS_R_UNEXPECTEDTSIG); + return DNS_R_UNEXPECTEDTSIG; } - return (tsig_verify_tcp(source, msg)); + return tsig_verify_tcp(source, msg); } /* * There should be a TSIG record... */ if (msg->tsig == NULL) { - return (DNS_R_EXPECTEDTSIG); + return DNS_R_EXPECTEDTSIG; } /* @@ -906,7 +906,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, * shouldn't be one on the response. */ if (response && (tsigkey == NULL || msg->querytsig == NULL)) { - return (DNS_R_UNEXPECTEDTSIG); + return DNS_R_UNEXPECTEDTSIG; } mctx = msg->mctx; @@ -919,23 +919,23 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, keyname = msg->tsigname; result = dns_rdataset_first(msg->tsig); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(msg->tsig, &rdata); result = dns_rdata_tostruct(&rdata, &tsig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_reset(&rdata); if (response) { result = dns_rdataset_first(msg->querytsig); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(msg->querytsig, &rdata); result = dns_rdata_tostruct(&rdata, &querytsig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -949,7 +949,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, msg->tsigstatus = dns_tsigerror_badkey; tsig_log(msg->tsigkey, 2, "key name and algorithm do not match"); - return (DNS_R_TSIGVERIFYFAILURE); + return DNS_R_TSIGVERIFYFAILURE; } /* @@ -980,10 +980,10 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, keyname, dns__tsig_algfromname(&tsig.algorithm), NULL, 0, mctx, &msg->tsigkey); if (result != ISC_R_SUCCESS) { - return (result); + return result; } tsig_log(msg->tsigkey, 2, "unknown key"); - return (DNS_R_TSIGVERIFYFAILURE); + return DNS_R_TSIGVERIFYFAILURE; } msg->tsigkey = tsigkey; } @@ -996,19 +996,19 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, alg = dst_key_alg(key); result = dst_key_sigsize(key, &siglen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (dns__tsig_algvalid(alg)) { if (tsig.siglen > siglen) { tsig_log(msg->tsigkey, 2, "signature length too big"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } if (tsig.siglen > 0 && (tsig.siglen < 10 || tsig.siglen < ((siglen + 1) / 2))) { tsig_log(msg->tsigkey, 2, "signature length below minimum"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } } @@ -1021,7 +1021,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, result = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC, false, 0, &ctx); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (response) { @@ -1145,7 +1145,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, tsig.error != dns_tsigerror_badkey)) { tsig_log(msg->tsigkey, 2, "signature was empty"); - return (DNS_R_TSIGVERIFYFAILURE); + return DNS_R_TSIGVERIFYFAILURE; } /* @@ -1209,7 +1209,7 @@ cleanup_context: dst_context_destroy(&ctx); } - return (result); + return result; } static isc_result_t @@ -1241,7 +1241,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { msg->tsigstatus = dns_tsigerror_badsig; if (!is_response(msg)) { - return (DNS_R_EXPECTEDRESPONSE); + return DNS_R_EXPECTEDRESPONSE; } mctx = msg->mctx; @@ -1254,12 +1254,12 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { */ result = dns_rdataset_first(msg->querytsig); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(msg->querytsig, &rdata); result = dns_rdata_tostruct(&rdata, &querytsig, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_reset(&rdata); @@ -1530,7 +1530,7 @@ cleanup_context: cleanup_querystruct: dns_rdata_freestruct(&querytsig); - return (result); + return result; } isc_result_t @@ -1551,11 +1551,11 @@ again: name, (void **)&key); if (result == ISC_R_NOTFOUND) { RWUNLOCK(&ring->lock, locktype); - return (result); + return result; } if (algorithm != NULL && !dns_name_equal(key->algorithm, algorithm)) { RWUNLOCK(&ring->lock, locktype); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (key->inception != key->expire && isc_serial_lt(key->expire, now)) { /* @@ -1570,13 +1570,13 @@ again: rm_lru(key); rm_hashmap(key); RWUNLOCK(&ring->lock, locktype); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_tsigkey_ref(key); RWUNLOCK(&ring->lock, locktype); adjust_lru(key); *tsigkey = key; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1635,7 +1635,7 @@ dns_tsigkeyring_add(dns_tsigkeyring_t *ring, dns_tsigkey_t *tkey) { } RWUNLOCK(&ring->lock, isc_rwlocktype_write); - return (result); + return result; } void diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index b8060d89f8..e36adef6e4 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -60,12 +60,12 @@ ttlfmt(unsigned int t, const char *s, bool verbose, bool space, INSIST(len + 1 <= sizeof(tmp)); isc_buffer_availableregion(target, ®ion); if (len > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, tmp, len); isc_buffer_add(target, len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -124,12 +124,12 @@ dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) { region.base[region.length - 1] = isc_ascii_toupper(region.base[region.length - 1]); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_counter_fromtext(isc_textregion_t *source, uint32_t *ttl) { - return (bind_ttl(source, ttl)); + return bind_ttl(source, ttl); } isc_result_t @@ -140,7 +140,7 @@ dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl) { if (result != ISC_R_SUCCESS && result != ISC_R_RANGE) { result = DNS_R_BADTTL; } - return (result); + return result; } static isc_result_t @@ -156,7 +156,7 @@ bind_ttl(isc_textregion_t *source, uint32_t *ttl) { * No legal counter / ttl is longer that 63 characters. */ if (source->length > sizeof(buf) - 1) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } /* Copy source->length bytes and NUL terminate. */ snprintf(buf, sizeof(buf), "%.*s", (int)source->length, source->base); @@ -173,7 +173,7 @@ bind_ttl(isc_textregion_t *source, uint32_t *ttl) { INSIST(np - nbuf <= (int)sizeof(nbuf)); result = isc_parse_uint32(&n, nbuf, 10); if (result != ISC_R_SUCCESS) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } switch (*s) { case 'w': @@ -204,19 +204,19 @@ bind_ttl(isc_textregion_t *source, uint32_t *ttl) { case '\0': /* Plain number? */ if (tmp != 0ULL) { - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } tmp = n; break; default: - return (DNS_R_SYNTAX); + return DNS_R_SYNTAX; } } while (*s != '\0'); if (tmp > 0xffffffffULL) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *ttl = (uint32_t)(tmp & 0xffffffffUL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/dns/update.c b/lib/dns/update.c index 485cbbcc1e..e38d0aec46 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -246,7 +246,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, ISC_LIST_UNLINK(temp_diff.tuples, *tuple, link); if (result != ISC_R_SUCCESS) { dns_difftuple_free(tuple); - return (result); + return result; } /* @@ -257,7 +257,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, /* * Do not clear temp_diff. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -266,7 +266,7 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); - return (do_one_tuple(&tuple, db, ver, diff)); + return do_one_tuple(&tuple, db, ver, diff); } /**************************************************************************/ @@ -325,13 +325,13 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { rr.ttl = rdataset->ttl; result = (*ctx->rr_action)(ctx->rr_action_data, &rr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (result != ISC_R_NOMORE) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -351,10 +351,10 @@ foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, node = NULL; result = dns_db_findnode(db, name, false, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } iter = NULL; @@ -388,7 +388,7 @@ cleanup_iterator: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /*% @@ -405,7 +405,7 @@ foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, foreach_node_rr_ctx_t ctx; ctx.rr_action = rr_action; ctx.rr_action_data = rr_action_data; - return (foreach_rrset(db, ver, name, foreach_node_rr_action, &ctx)); + return foreach_rrset(db, ver, name, foreach_node_rr_action, &ctx); } /*% @@ -426,8 +426,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdataset_t rdataset; if (type == dns_rdatatype_any) { - return (foreach_node_rr(db, ver, name, rr_action, - rr_action_data)); + return foreach_node_rr(db, ver, name, rr_action, + rr_action_data); } node = NULL; @@ -439,10 +439,10 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, result = dns_db_findnode(db, name, false, &node); } if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -477,7 +477,7 @@ cleanup_rdataset: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /**************************************************************************/ @@ -499,7 +499,7 @@ static isc_result_t rrset_exists_action(void *data, rr_t *rr) { UNUSED(data); UNUSED(rr); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /*% @@ -571,7 +571,7 @@ rrset_visible(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, *visible = false; /* silence false compiler warning */ break; } - return (result); + return result; } /*% @@ -582,7 +582,7 @@ static isc_result_t name_exists_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); UNUSED(rrset); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /*% @@ -621,14 +621,14 @@ temp_order(const void *av, const void *bv) { int r; r = dns_name_compare(&a->name, &b->name); if (r != 0) { - return (r); + return r; } r = (b->rdata.type - a->rdata.type); if (r != 0) { - return (r); + return r; } r = dns_rdata_casecompare(&a->rdata, &b->rdata); - return (r); + return r; } /**************************************************************************/ @@ -660,7 +660,7 @@ static bool true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); UNUSED(db_rr); - return (true); + return true; } /*% @@ -669,7 +669,7 @@ true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { static bool rrsig_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); - return ((db_rr->type == dns_rdatatype_rrsig) ? true : false); + return (db_rr->type == dns_rdatatype_rrsig) ? true : false; } /*% @@ -683,9 +683,9 @@ delete_if_action(void *data, rr_t *rr) { result = update_one_rr(ctx->db, ctx->ver, ctx->diff, DNS_DIFFOP_DEL, ctx->name, rr->ttl, &rr->rdata); - return (result); + return result; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -707,8 +707,7 @@ delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, ctx.diff = diff; ctx.name = name; ctx.update_rr = update_rr; - return (foreach_rr(db, ver, name, type, covers, delete_if_action, - &ctx)); + return foreach_rr(db, ver, name, type, covers, delete_if_action, &ctx); } /**************************************************************************/ @@ -760,7 +759,7 @@ failure: if (dbit != NULL) { dns_dbiterator_destroy(&dbit); } - return (result); + return result; } /*% @@ -775,9 +774,9 @@ is_non_nsec_action(void *data, dns_rdataset_t *rrset) { (rrset->covers == dns_rdatatype_nsec || rrset->covers == dns_rdatatype_nsec3)))) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -805,7 +804,7 @@ name_order(const void *av, const void *bv) { dns_difftuple_t const *const *bp = bv; dns_difftuple_t const *a = *ap; dns_difftuple_t const *b = *bp; - return (dns_name_compare(&a->name, &b->name)); + return dns_name_compare(&a->name, &b->name); } static isc_result_t @@ -828,7 +827,7 @@ uniqify_name_list(dns_diff_t *list) { p = ISC_LIST_NEXT(p, link); } failure: - return (result); + return result; } static isc_result_t @@ -845,7 +844,7 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, *flag = true; *cut = false; SET_IF_NOT_NULL(unsecure, false); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result == DNS_R_ZONECUT) { *flag = true; *cut = true; @@ -864,14 +863,14 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, *unsecure = false; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result == DNS_R_GLUE || result == DNS_R_DNAME || result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) { *flag = false; *cut = false; SET_IF_NOT_NULL(unsecure, false); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { /* * Silence compiler. @@ -879,7 +878,7 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, *flag = false; *cut = false; SET_IF_NOT_NULL(unsecure, false); - return (result); + return result; } } @@ -965,7 +964,7 @@ failure: dns_dbiterator_destroy(&dbit); } - return (result); + return result; } /*% @@ -1016,7 +1015,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /*% @@ -1038,7 +1037,7 @@ add_placeholder_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, &tuple); CHECK(do_one_tuple(&tuple, db, ver, diff)); failure: - return (result); + return result; } static isc_result_t @@ -1067,7 +1066,7 @@ find_zone_keys(dns_zone_t *zone, isc_mem_t *mctx, unsigned int maxkeys, if (result != ISC_R_SUCCESS) { *nkeys = 0; - return (result); + return result; } /* Add new 'dnskeys' to 'keys' */ @@ -1092,7 +1091,7 @@ find_zone_keys(dns_zone_t *zone, isc_mem_t *mctx, unsigned int maxkeys, } *nkeys = count; - return (result); + return result; } /*% @@ -1283,7 +1282,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /* @@ -1305,7 +1304,7 @@ del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, result = dns_db_findnode(db, name, false, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { goto failure; @@ -1316,7 +1315,7 @@ del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_db_detachnode(db, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { goto failure; @@ -1368,7 +1367,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -1384,10 +1383,10 @@ add_exposed_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, node = NULL; result = dns_db_findnode(db, name, false, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } iter = NULL; @@ -1442,7 +1441,7 @@ cleanup_iterator: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /*% @@ -1460,8 +1459,8 @@ isc_result_t dns_update_signatures(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, dns_diff_t *diff, uint32_t sigvalidityinterval) { - return (dns_update_signaturesinc(log, zone, db, oldver, newver, diff, - sigvalidityinterval, NULL)); + return dns_update_signaturesinc(log, zone, db, oldver, newver, diff, + sigvalidityinterval, NULL); } struct dns_update_state { @@ -1513,7 +1512,7 @@ dns__jitter_expire(dns_zone_t *zone) { sigvalidity -= isc_random_uniform(1200); } } - return (sigvalidity); + return sigvalidity; } isc_result_t @@ -1695,7 +1694,7 @@ next_state: } } if (state != &mystate && sigs > maxsigs) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } ISC_LIST_APPENDLIST(diff->tuples, state->work.tuples, link); @@ -1887,7 +1886,7 @@ next_state: ISC_LIST_UNLINK(state->affected.tuples, t, link); ISC_LIST_APPEND(state->work.tuples, t, link); if (state != &mystate && sigs > maxsigs) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } ISC_LIST_APPENDLIST(state->affected.tuples, state->work.tuples, @@ -1966,7 +1965,7 @@ next_state: ISC_LIST_UNLINK(state->nsec_mindiff.tuples, t, link); ISC_LIST_APPEND(state->work.tuples, t, link); if (state != &mystate && sigs > maxsigs) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } ISC_LIST_APPENDLIST(state->nsec_mindiff.tuples, @@ -2096,7 +2095,7 @@ next_state: ISC_LIST_UNLINK(state->affected.tuples, t, link); ISC_LIST_APPEND(state->work.tuples, t, link); if (state != &mystate && sigs > maxsigs) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } ISC_LIST_APPENDLIST(state->affected.tuples, state->work.tuples, @@ -2140,7 +2139,7 @@ next_state: ISC_LIST_UNLINK(state->nsec_mindiff.tuples, t, link); ISC_LIST_APPEND(state->work.tuples, t, link); if (state != &mystate && sigs > maxsigs) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } ISC_LIST_APPENDLIST(state->nsec_mindiff.tuples, @@ -2188,17 +2187,17 @@ failure: isc_mem_put(diff->mctx, state, sizeof(*state)); } - return (result); + return result; } static isc_stdtime_t epoch_to_yyyymmdd(time_t when) { struct tm t, *tm = localtime_r(&when, &t); if (tm == NULL) { - return (0); + return 0; } - return (((tm->tm_year + 1900) * 10000) + ((tm->tm_mon + 1) * 100) + - tm->tm_mday); + return ((tm->tm_year + 1900) * 10000) + ((tm->tm_mon + 1) * 100) + + tm->tm_mday; } static uint32_t @@ -2207,20 +2206,20 @@ dns__update_soaserial(uint32_t serial, dns_updatemethod_t method) { switch (method) { case dns_updatemethod_none: - return (serial); + return serial; case dns_updatemethod_unixtime: now = isc_stdtime_now(); - return (now); + return now; case dns_updatemethod_date: now = isc_stdtime_now(); - return (epoch_to_yyyymmdd((time_t)now) * 100); + return epoch_to_yyyymmdd((time_t)now) * 100; case dns_updatemethod_increment: /* RFC1982 */ serial = (serial + 1) & 0xFFFFFFFF; if (serial == 0) { - return (1); + return 1; } - return (serial); + return serial; default: UNREACHABLE(); } @@ -2258,5 +2257,5 @@ dns_update_soaserial(uint32_t serial, dns_updatemethod_t method, SET_IF_NOT_NULL(used, method); - return (new_serial); + return new_serial; } diff --git a/lib/dns/validator.c b/lib/dns/validator.c index 681c1b4c45..203803346b 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -197,7 +197,7 @@ markanswer(dns_validator_t *val, const char *where, const char *mbstext) { if (val->mustbesecure && mbstext != NULL) { validator_log(val, ISC_LOG_WARNING, "must be secure failure, %s", mbstext); - return (DNS_R_MUSTBESECURE); + return DNS_R_MUSTBESECURE; } validator_log(val, ISC_LOG_DEBUG(3), "marking as answer (%s)", where); @@ -208,7 +208,7 @@ markanswer(dns_validator_t *val, const char *where, const char *mbstext) { dns_rdataset_settrust(val->sigrdataset, dns_trust_answer); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -273,7 +273,7 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset, goto trynsec3; } if (result != ISC_R_SUCCESS) { - return (false); + return false; } } @@ -287,7 +287,7 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_reset(&rdata); } dns_rdataset_disassociate(&set); - return (found); + return found; trynsec3: /* @@ -334,7 +334,7 @@ trynsec3: found = dns_nsec3_typepresent(&rdata, dns_rdatatype_ns); dns_rdataset_disassociate(&set); - return (found); + return found; } if ((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) == 0) { continue; @@ -350,12 +350,12 @@ trynsec3: memcmp(hash, nsec3.next, length) < 0))) { dns_rdataset_disassociate(&set); - return (true); + return true; } } dns_rdataset_disassociate(&set); } - return (found); + return found; } static void @@ -860,7 +860,7 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) { dns_rdatatype_format(type, typebuf, sizeof(typebuf)); validator_log(val, ISC_LOG_INFO, "bad cache hit (%s/%s)", namebuf, typebuf); - return (DNS_R_BROKENCHAIN); + return DNS_R_BROKENCHAIN; } options = DNS_DBFIND_PENDINGOK; @@ -879,12 +879,12 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) { goto notfound; } - return (result); + return result; notfound: disassociate_rdatasets(val); - return (result); + return result; } /*% @@ -911,10 +911,10 @@ check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, validator_log(val, ISC_LOG_DEBUG(3), "continuing validation would lead to " "deadlock: aborting validation"); - return (true); + return true; } } - return (false); + return false; } /*% @@ -931,7 +931,7 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, if (check_deadlock(val, name, type, NULL, NULL)) { validator_log(val, ISC_LOG_DEBUG(3), "deadlock found (create_fetch)"); - return (DNS_R_NOVALIDSIG); + return DNS_R_NOVALIDSIG; } if ((val->options & DNS_VALIDATOR_NOCDFLAG) != 0) { @@ -953,7 +953,7 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, dns_validator_detach(&val); } - return (result); + return result; } /*% @@ -974,7 +974,7 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, if (check_deadlock(val, name, type, rdataset, sig)) { validator_log(val, ISC_LOG_DEBUG(3), "deadlock found (create_validator)"); - return (DNS_R_NOVALIDSIG); + return DNS_R_NOVALIDSIG; } /* OK to clear other options, but preserve NOCDFLAG and NONTA. */ @@ -990,7 +990,7 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, dns_validator_attach(val, &val->subvalidator->parent); val->subvalidator->depth = val->depth + 1; } - return (result); + return result; } /*% @@ -1065,7 +1065,7 @@ done: result = ISC_R_NOTFOUND; } - return (result); + return result; } /*% @@ -1090,7 +1090,7 @@ seek_dnskey(dns_validator_t *val) { if (namereln != dns_namereln_subdomain && namereln != dns_namereln_equal) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } if (namereln == dns_namereln_equal) { @@ -1099,7 +1099,7 @@ seek_dnskey(dns_validator_t *val) { * (since seek_dnskey is not called from validate_dnskey). */ if (val->rdataset->type == dns_rdatatype_dnskey) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } /* @@ -1107,7 +1107,7 @@ seek_dnskey(dns_validator_t *val) { * points cannot be self-signed. */ if (dns_rdatatype_atparent(val->rdataset->type)) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } else { /* @@ -1126,7 +1126,7 @@ seek_dnskey(dns_validator_t *val) { } validator_log(val, ISC_LOG_DEBUG(3), "%s signer mismatch", type); - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } @@ -1154,9 +1154,9 @@ seek_dnskey(dns_validator_t *val) { &val->frdataset, &val->fsigrdataset, validator_callback_dnskey, "seek_dnskey"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (DNS_R_WAIT); + return DNS_R_WAIT; } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * Having a pending key with no signature means that @@ -1190,8 +1190,7 @@ seek_dnskey(dns_validator_t *val) { dns_rdataset_disassociate(&val->fsigrdataset); } - return (validate_helper_run(val, - resume_answer_with_key)); + return validate_helper_run(val, resume_answer_with_key); } break; @@ -1203,9 +1202,9 @@ seek_dnskey(dns_validator_t *val) { dns_rdatatype_dnskey, fetch_callback_dnskey, "seek_dnskey"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (DNS_R_WAIT); + return DNS_R_WAIT; case DNS_R_NCACHENXDOMAIN: case DNS_R_NCACHENXRRSET: @@ -1219,7 +1218,7 @@ seek_dnskey(dns_validator_t *val) { break; case DNS_R_BROKENCHAIN: - return (result); + return result; default: break; @@ -1234,7 +1233,7 @@ seek_dnskey(dns_validator_t *val) { dns_rdataset_disassociate(&val->fsigrdataset); } - return (result); + return result; } /* @@ -1245,18 +1244,18 @@ compute_keytag(dns_rdata_t *rdata) { isc_region_t r; dns_rdata_toregion(rdata, &r); - return (dst_region_computeid(&r)); + return dst_region_computeid(&r); } static bool over_max_validations(dns_validator_t *val) { if (val->nvalidations == NULL || (*val->nvalidations) > 0) { - return (false); + return false; } /* The attribute is set only on failure */ val->attributes |= VALATTR_MAXVALIDATIONS; - return (true); + return true; } static void @@ -1272,12 +1271,12 @@ consume_validation(dns_validator_t *val) { static bool over_max_fails(dns_validator_t *val) { if (val->nfails == NULL || (*val->nfails) > 0) { - return (false); + return false; } /* The attribute is set only on failure */ val->attributes |= VALATTR_MAXVALIDATIONFAILS; - return (true); + return true; } static void @@ -1302,7 +1301,7 @@ selfsigned_dnskey(dns_validator_t *val) { isc_mem_t *mctx = val->view->mctx; if (rdataset->type != dns_rdatatype_dnskey) { - return (DNS_R_NOKEYMATCH); + return DNS_R_NOKEYMATCH; } for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; @@ -1344,7 +1343,7 @@ selfsigned_dnskey(dns_validator_t *val) { * This will be verified later. */ if ((key.flags & DNS_KEYFLAG_REVOKE) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_dnssec_keyfromrdata(name, &keyrdata, mctx, @@ -1362,7 +1361,7 @@ selfsigned_dnskey(dns_validator_t *val) { { if (over_max_validations(val)) { dst_key_free(&dstkey); - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } result = dns_dnssec_verify( name, rdataset, dstkey, true, @@ -1389,7 +1388,7 @@ selfsigned_dnskey(dns_validator_t *val) { consume_validation(val); if (over_max_fails(val)) { dst_key_free(&dstkey); - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } consume_validation_fail(val); } @@ -1405,7 +1404,7 @@ selfsigned_dnskey(dns_validator_t *val) { } } - return (DNS_R_NOKEYMATCH); + return DNS_R_NOKEYMATCH; } /*% @@ -1428,7 +1427,7 @@ verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata, val->attributes |= VALATTR_TRIEDVERIFY; wild = dns_fixedname_initname(&fixed); if (over_max_validations(val)) { - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } again: result = dns_dnssec_verify(val->name, val->rdataset, key, ignore, @@ -1494,7 +1493,7 @@ again: } consume_validation_fail(val); } - return (result); + return result; } /*% @@ -1799,13 +1798,13 @@ validate_answer(void *arg) { static isc_result_t validate_async_run(dns_validator_t *val, isc_job_cb cb) { isc_async_run(val->loop, cb, val); - return (DNS_R_WAIT); + return DNS_R_WAIT; } static isc_result_t validate_helper_run(dns_validator_t *val, isc_job_cb cb) { isc_helper_run(val->loop, cb, val); - return (DNS_R_WAIT); + return DNS_R_WAIT; } static void @@ -1872,7 +1871,7 @@ check_signer(dns_validator_t *val, dns_rdata_t *keyrdata, uint16_t keyid, dst_key_free(&dstkey); } - return (result); + return result; } /* @@ -1914,7 +1913,7 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } else if (DNS_TRUST_PENDING(val->frdataset.trust)) { /* * There should never be an unsigned DS. @@ -1923,7 +1922,7 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) { validator_log(val, ISC_LOG_DEBUG(2), "unsigned DS record"); *resp = DNS_R_NOVALIDSIG; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } break; @@ -1937,7 +1936,7 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case DNS_R_NCACHENXDOMAIN: case DNS_R_NCACHENXRRSET: @@ -1951,17 +1950,17 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) { disassociate_rdatasets(val); validator_log(val, ISC_LOG_DEBUG(2), "no DS record"); *resp = DNS_R_NOVALIDSIG; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case DNS_R_BROKENCHAIN: *resp = result; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; default: break; } - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } static void @@ -2012,19 +2011,19 @@ validate_dnskey_dsset(dns_validator_t *val) { RUNTIME_CHECK(result == ISC_R_SUCCESS); if (ds.digest_type == DNS_DSDIGEST_SHA1 && val->digest_sha1 == false) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } if (!dns_resolver_ds_digest_supported(val->view->resolver, val->name, ds.digest_type)) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } if (!dns_resolver_algorithm_supported(val->view->resolver, val->name, ds.algorithm)) { - return (DNS_R_BADALG); + return DNS_R_BADALG; } val->supported_algorithm = true; @@ -2036,7 +2035,7 @@ validate_dnskey_dsset(dns_validator_t *val) { &keyrdata); if (result != ISC_R_SUCCESS) { validator_log(val, ISC_LOG_DEBUG(3), "no DNSKEY matching DS"); - return (DNS_R_NOKEYMATCH); + return DNS_R_NOKEYMATCH; } /* @@ -2047,10 +2046,10 @@ validate_dnskey_dsset(dns_validator_t *val) { validator_log(val, ISC_LOG_DEBUG(3), "no RRSIG matching DS key"); - return (DNS_R_NOVALIDSIG); + return DNS_R_NOVALIDSIG; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2274,7 +2273,7 @@ val_rdataset_first(dns_validator_t *val, dns_name_t **namep, if (message != NULL) { result = dns_message_firstname(message, DNS_SECTION_AUTHORITY); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_message_currentname(message, DNS_SECTION_AUTHORITY, namep); *rdatasetp = ISC_LIST_HEAD((*namep)->list); @@ -2285,7 +2284,7 @@ val_rdataset_first(dns_validator_t *val, dns_name_t **namep, dns_ncache_current(val->rdataset, *namep, *rdatasetp); } } - return (result); + return result; } static isc_result_t @@ -2319,7 +2318,7 @@ val_rdataset_next(dns_validator_t *val, dns_name_t **namep, dns_ncache_current(val->rdataset, *namep, *rdatasetp); } } - return (result); + return result; } /*% @@ -2346,7 +2345,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, if (dns_name_countlabels(wild) == 0) { validator_log(val, ISC_LOG_DEBUG(3), "in checkwildcard: no wildcard to check"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_format(wild, namebuf, sizeof(namebuf)); @@ -2393,7 +2392,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (rdataset->type == dns_rdatatype_nsec3 && @@ -2420,7 +2419,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } if (result == ISC_R_NOMORE) { @@ -2429,7 +2428,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (result); + return result; } /* @@ -2480,7 +2479,7 @@ findnsec3proofs(dns_validator_t *val) { if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (result); + return result; } } if (result != ISC_R_NOMORE) { @@ -2492,7 +2491,7 @@ findnsec3proofs(dns_validator_t *val) { if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -2563,7 +2562,7 @@ findnsec3proofs(dns_validator_t *val) { if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (result); + return result; } if (result != ISC_R_SUCCESS) { continue; @@ -2619,13 +2618,13 @@ findnsec3proofs(dns_validator_t *val) { if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (result); + return result; } } if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); } - return (result); + return result; } /* @@ -2660,11 +2659,11 @@ validate_neg_rrset(dns_validator_t *val, dns_name_t *name, result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_current(rdataset, &nsec); if (dns_nsec_typepresent(&nsec, dns_rdatatype_soa)) { - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } @@ -2673,11 +2672,11 @@ validate_neg_rrset(dns_validator_t *val, dns_name_t *name, sigrdataset, validator_callback_nsec, "validate_neg_rrset"); if (result != ISC_R_SUCCESS) { - return (result); + return result; } val->authcount++; - return (DNS_R_WAIT); + return DNS_R_WAIT; } /*% @@ -2731,14 +2730,14 @@ validate_authority(dns_validator_t *val, bool resume) { result = validate_neg_rrset(val, name, rdataset, sigrdataset); if (result != DNS_R_CONTINUE) { - return (result); + return result; } } } if (result == ISC_R_NOMORE) { result = ISC_R_SUCCESS; } - return (result); + return result; } /*% @@ -2782,13 +2781,13 @@ validate_ncache(dns_validator_t *val, bool resume) { continue; } - return (result); + return result; } if (result == ISC_R_NOMORE) { result = ISC_R_SUCCESS; } - return (result); + return result; } /*% @@ -2819,7 +2818,7 @@ validate_nx(dns_validator_t *val, bool resume) { } if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -2833,7 +2832,7 @@ validate_nx(dns_validator_t *val, bool resume) { validator_log(val, ISC_LOG_DEBUG(3), "too many iterations"); markanswer(val, "validate_nx (3)", NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -2842,7 +2841,7 @@ validate_nx(dns_validator_t *val, bool resume) { validator_log(val, ISC_LOG_DEBUG(3), "marking as secure, noqname proof found"); marksecure(val); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (FOUNDOPTOUT(val) && dns_name_countlabels( dns_fixedname_name(&val->wild)) != 0) @@ -2851,16 +2850,16 @@ validate_nx(dns_validator_t *val, bool resume) { "optout proof found"); val->optout = true; markanswer(val, "validate_nx (1)", NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if ((val->attributes & VALATTR_FOUNDUNKNOWN) != 0) { validator_log(val, ISC_LOG_DEBUG(3), "unknown NSEC3 hash algorithm found"); markanswer(val, "validate_nx (2)", NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } validator_log(val, ISC_LOG_DEBUG(3), "noqname proof not found"); - return (DNS_R_NOVALIDNSEC); + return DNS_R_NOVALIDNSEC; } if (!FOUNDNOQNAME(val) && !FOUNDNODATA(val)) { @@ -2869,7 +2868,7 @@ validate_nx(dns_validator_t *val, bool resume) { validator_log(val, ISC_LOG_DEBUG(3), "too many iterations"); markanswer(val, "validate_nx (4)", NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -2881,7 +2880,7 @@ validate_nx(dns_validator_t *val, bool resume) { { result = checkwildcard(val, dns_rdatatype_nsec, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -2899,14 +2898,14 @@ validate_nx(dns_validator_t *val, bool resume) { } else { val->secure = true; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (val->authfail != 0 && val->authcount == val->authfail) { - return (DNS_R_BROKENCHAIN); + return DNS_R_BROKENCHAIN; } - return (proveunsecure(val, false, false)); + return proveunsecure(val, false, false); } /*% @@ -2933,11 +2932,11 @@ check_ds_algs(dns_validator_t *val, dns_name_t *name, ds.algorithm)) { dns_rdata_reset(&dsrdata); - return (true); + return true; } dns_rdata_reset(&dsrdata); } - return (false); + return false; } /*% @@ -2988,7 +2987,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { *resp = markanswer(val, "proveunsecure (5)", "no supported " "algorithm/digest (DS)"); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } break; @@ -3015,7 +3014,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { *resp = DNS_R_NOVALIDSIG; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case ISC_R_NOTFOUND: /* @@ -3027,7 +3026,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case DNS_R_NXRRSET: case DNS_R_NCACHENXRRSET: @@ -3049,7 +3048,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* @@ -3066,7 +3065,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { { *resp = markanswer(val, "proveunsecure (3)", "no DS at zone cut"); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (val->frdataset.trust < dns_trust_secure) { @@ -3080,13 +3079,13 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { "can't validate existing " "negative responses (no DS)"); *resp = DNS_R_MUSTBESECURE; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (isdelegation(tname, &val->frdataset, result)) { *resp = markanswer(val, "proveunsecure (4)", "this is a delegation"); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } break; @@ -3103,7 +3102,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { * are still in a secure zone. */ *resp = DNS_R_NOVALIDNSEC; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } else if (DNS_TRUST_PENDING(val->frdataset.trust) || DNS_TRUST_ANSWER(val->frdataset.trust)) { @@ -3120,7 +3119,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } else if (val->frdataset.trust < dns_trust_secure) { /* * This shouldn't happen, since the negative @@ -3133,7 +3132,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { "negative responses " "(not a zone cut)"); *resp = DNS_R_NOVALIDSIG; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } break; @@ -3152,20 +3151,20 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) { if (result != ISC_R_SUCCESS) { *resp = result; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } break; default: *resp = result; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /* * No definite answer yet; continue walking down labels. */ - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } /*% @@ -3213,10 +3212,10 @@ proveunsecure(dns_validator_t *val, bool have_ds, bool resume) { result = dns_keytable_finddeepestmatch(val->keytable, secroot, secroot); if (result == ISC_R_NOTFOUND) { validator_log(val, ISC_LOG_DEBUG(3), "not beneath secure root"); - return (markanswer(val, "proveunsecure (1)", - "not beneath secure root")); + return markanswer(val, "proveunsecure (1)", + "not beneath secure root"); } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (!resume) { @@ -3269,13 +3268,13 @@ proveunsecure(dns_validator_t *val, bool have_ds, bool resume) { /* Couldn't complete insecurity proof. */ validator_log(val, ISC_LOG_DEBUG(3), "insecurity proof failed: %s", isc_result_totext(result)); - return (DNS_R_NOTINSECURE); + return DNS_R_NOTINSECURE; out: if (result != DNS_R_WAIT) { disassociate_rdatasets(val); } - return (result); + return result; } /*% @@ -3341,7 +3340,7 @@ validator_start(void *arg) { "got insecure response; " "parent indicates it should be secure"); } - } else if ((val->rdataset == NULL && val->sigrdataset == NULL)) { + } else if (val->rdataset == NULL && val->sigrdataset == NULL) { /* * This is a validation of a negative response. */ @@ -3357,7 +3356,7 @@ validator_start(void *arg) { } result = validate_nx(val, false); - } else if ((val->rdataset != NULL && NEGATIVE(val->rdataset))) { + } else if (val->rdataset != NULL && NEGATIVE(val->rdataset)) { /* * This is a delayed validation of a negative cache entry. */ @@ -3399,7 +3398,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, result = dns_view_getsecroots(view, &kt); if (result != ISC_R_SUCCESS) { - return (result); + return result; } val = isc_mem_get(view->mctx, sizeof(*val)); @@ -3447,7 +3446,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, *validatorp = val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/dns/view.c b/lib/dns/view.c index a7538bbdbe..3324108470 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -97,7 +97,7 @@ dns_view_create(isc_mem_t *mctx, dns_dispatchmgr_t *dispatchmgr, result = isc_file_sanitize(NULL, name, "nta", buffer, sizeof(buffer)); if (result != ISC_R_SUCCESS) { - return (result); + return result; } view = isc_mem_get(mctx, sizeof(*view)); @@ -170,7 +170,7 @@ dns_view_create(isc_mem_t *mctx, dns_dispatchmgr_t *dispatchmgr, view->magic = DNS_VIEW_MAGIC; *viewp = view; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_order: if (view->order != NULL) { @@ -203,7 +203,7 @@ cleanup_new_zone_lock: isc_mem_free(mctx, view->name); isc_mem_putanddetach(&view->mctx, view, sizeof(*view)); - return (result); + return result; } static void @@ -588,7 +588,7 @@ dns_view_createresolver(dns_view_t *view, isc_nm_t *netmgr, tlsctx_cache, dispatchv4, dispatchv6, &view->resolver); if (result != ISC_R_SUCCESS) { - return (result); + return result; } isc_mem_create(&mctx); @@ -603,7 +603,7 @@ dns_view_createresolver(dns_view_t *view, isc_nm_t *netmgr, goto cleanup_adb; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_adb: dns_adb_shutdown(view->adb); @@ -612,7 +612,7 @@ cleanup_adb: dns_resolver_shutdown(view->resolver); dns_resolver_detach(&view->resolver); - return (result); + return result; } void @@ -637,7 +637,7 @@ bool dns_view_iscacheshared(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); - return (view->cacheshared); + return view->cacheshared; } void @@ -753,7 +753,7 @@ dns_view_addzone(dns_view_t *view, dns_zone_t *zone) { } rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -772,7 +772,7 @@ dns_view_delzone(dns_view_t *view, dns_zone_t *zone) { } rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -792,7 +792,7 @@ dns_view_findzone(dns_view_t *view, const dns_name_t *name, } rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -1013,7 +1013,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } isc_result_t @@ -1059,7 +1059,7 @@ dns_view_simplefind(dns_view_t *view, const dns_name_t *name, result = ISC_R_NOTFOUND; } - return (result); + return result; } isc_result_t @@ -1268,7 +1268,7 @@ cleanup: dns_zone_detach(&zone); } - return (result); + return result; } isc_result_t @@ -1286,12 +1286,12 @@ dns_viewlist_find(dns_viewlist_t *list, const char *name, } } if (view == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_view_attach(view, viewp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1325,17 +1325,17 @@ dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, if (zone2 != NULL) { dns_zone_detach(&zone1); dns_zone_detach(&zone2); - return (ISC_R_MULTIPLE); + return ISC_R_MULTIPLE; } } if (zone1 != NULL) { dns_zone_attach(zone1, zonep); dns_zone_detach(&zone1); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -1353,7 +1353,7 @@ dns_view_load(dns_view_t *view, bool stop, bool newonly) { result = ISC_R_SUCCESS; } rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -1372,7 +1372,7 @@ dns_view_asyncload(dns_view_t *view, bool newonly, dns_zt_callback_t *callback, result = ISC_R_SUCCESS; } rcu_read_unlock(); - return (result); + return result; } isc_result_t @@ -1386,7 +1386,7 @@ dns_view_gettsig(dns_view_t *view, const dns_name_t *keyname, result = dns_tsigkey_find(keyp, keyname, NULL, view->dynamickeys); } - return (result); + return result; } isc_result_t @@ -1398,11 +1398,11 @@ dns_view_gettransport(dns_view_t *view, const dns_transport_type_t type, dns_transport_t *transport = dns_transport_find(type, name, view->transports); if (transport == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *transportp = transport; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1414,16 +1414,16 @@ dns_view_getpeertsig(dns_view_t *view, const isc_netaddr_t *peeraddr, result = dns_peerlist_peerbyaddr(view->peers, peeraddr, &peer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_peer_getkey(peer, &keyname); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_view_gettsig(view, keyname, keyp); - return ((result == ISC_R_NOTFOUND) ? ISC_R_FAILURE : result); + return (result == ISC_R_NOTFOUND) ? ISC_R_FAILURE : result; } isc_result_t @@ -1431,8 +1431,8 @@ dns_view_checksig(dns_view_t *view, isc_buffer_t *source, dns_message_t *msg) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(source != NULL); - return (dns_tsig_verify(source, msg, view->statickeys, - view->dynamickeys)); + return dns_tsig_verify(source, msg, view->statickeys, + view->dynamickeys); } isc_result_t @@ -1443,12 +1443,12 @@ dns_view_flushcache(dns_view_t *view, bool fixuponly) { REQUIRE(DNS_VIEW_VALID(view)); if (view->cachedb == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (!fixuponly) { result = dns_cache_flush(view->cache); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } dns_db_detach(&view->cachedb); @@ -1467,12 +1467,12 @@ dns_view_flushcache(dns_view_t *view, bool fixuponly) { } rcu_read_unlock(); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t dns_view_flushname(dns_view_t *view, const dns_name_t *name) { - return (dns_view_flushnode(view, name, false)); + return dns_view_flushnode(view, name, false); } isc_result_t @@ -1514,7 +1514,7 @@ dns_view_flushnode(dns_view_t *view, const dns_name_t *name, bool tree) { result = dns_cache_flushnode(view->cache, name, tree); } - return (result); + return result; } isc_result_t @@ -1533,7 +1533,7 @@ dns_view_freezezones(dns_view_t *view, bool value) { } rcu_read_unlock(); - return (result); + return result; } void @@ -1550,10 +1550,10 @@ dns_view_getntatable(dns_view_t *view, dns_ntatable_t **ntp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ntp != NULL && *ntp == NULL); if (view->ntatable_priv == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_ntatable_attach(view->ntatable_priv, ntp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1570,10 +1570,10 @@ dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ktp != NULL && *ktp == NULL); if (view->secroots_priv == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_keytable_attach(view->secroots_priv, ktp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -1582,10 +1582,10 @@ dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, const dns_name_t *name, REQUIRE(DNS_VIEW_VALID(view)); if (view->ntatable_priv == NULL) { - return (false); + return false; } - return (dns_ntatable_covered(view->ntatable_priv, now, name, anchor)); + return dns_ntatable_covered(view->ntatable_priv, now, name, anchor); } isc_result_t @@ -1600,7 +1600,7 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, REQUIRE(DNS_VIEW_VALID(view)); if (view->secroots_priv == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } anchor = dns_fixedname_initname(&fn); @@ -1608,7 +1608,7 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, result = dns_keytable_issecuredomain(view->secroots_priv, name, anchor, &secure); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (ntap != NULL) { @@ -1624,7 +1624,7 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, } *secure_domain = secure; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1680,7 +1680,7 @@ dns_view_istrusted(dns_view_t *view, const dns_name_t *keyname, result = dns_view_getsecroots(view, &sr); if (result != ISC_R_SUCCESS) { - return (false); + return false; } dns_rdataset_init(&dsset); @@ -1744,7 +1744,7 @@ finish: dns_keynode_detach(&knode); } dns_keytable_detach(&sr); - return (answer); + return answer; } /* @@ -1772,9 +1772,9 @@ nz_legacy(const char *directory, const char *viewname, const char *suffix, result = isc_file_sanitize(directory, viewname, suffix, buffer, buflen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } else if (directory == NULL || isc_file_exists(buffer)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { /* Save buffer */ strlcpy(newbuf, buffer, sizeof(newbuf)); @@ -1785,7 +1785,7 @@ nz_legacy(const char *directory, const char *viewname, const char *suffix, */ result = isc_file_sanitize(NULL, viewname, suffix, buffer, buflen); if (result != ISC_R_SUCCESS || isc_file_exists(buffer)) { - return (result); + return result; } /* @@ -1793,7 +1793,7 @@ nz_legacy(const char *directory, const char *viewname, const char *suffix, * so use the path in 'directory'. */ strlcpy(buffer, newbuf, buflen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1836,7 +1836,7 @@ dns_view_setnewzones(dns_view_t *view, bool allow, void *cfgctx, } if (!allow) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } CHECK(nz_legacy(view->new_zone_dir, view->name, "nzf", buffer, @@ -1905,7 +1905,7 @@ cleanup: view->cfg_destroy = NULL; } - return (result); + return result; } void @@ -1928,7 +1928,7 @@ const char * dns_view_getnewzonedir(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); - return (view->new_zone_dir); + return view->new_zone_dir; } isc_result_t @@ -2011,16 +2011,16 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, if (best != NULL) { dns_db_attach(best, dbp); dns_db_detach(&best); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } uint32_t dns_view_getfailttl(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); - return (view->fail_ttl); + return view->fail_ttl; } void @@ -2039,7 +2039,7 @@ dns_view_saventa(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); if (view->nta_lifetime == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Open NTA save file for overwrite. */ @@ -2077,7 +2077,7 @@ cleanup: (void)isc_file_remove(view->nta_file); } - return (result); + return result; } #define TSTR(t) ((t).value.as_textregion.base) @@ -2094,7 +2094,7 @@ dns_view_loadnta(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); if (view->nta_lifetime == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_lex_create(view->mctx, 1025, &lex); @@ -2186,7 +2186,7 @@ cleanup: isc_lex_destroy(&lex); } - return (result); + return result; } void @@ -2269,7 +2269,7 @@ dns_view_staleanswerenabled(dns_view_t *view) { if (dns_db_getservestalettl(view->cachedb, &stale_ttl) != ISC_R_SUCCESS) { - return (false); + return false; } if (stale_ttl > 0) { if (view->staleanswersok == dns_stale_answer_yes) { @@ -2279,7 +2279,7 @@ dns_view_staleanswerenabled(dns_view_t *view) { } } - return (result); + return result; } void @@ -2329,7 +2329,7 @@ dns_view_getresolver(dns_view_t *view, dns_resolver_t **resolverp) { result = ISC_R_SHUTTINGDOWN; } UNLOCK(&view->lock); - return (result); + return result; } void @@ -2359,7 +2359,7 @@ dns_view_setudpsize(dns_view_t *view, uint16_t udpsize) { uint16_t dns_view_getudpsize(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); - return (view->udpsize); + return view->udpsize; } dns_dispatchmgr_t * @@ -2373,7 +2373,7 @@ dns_view_getdispatchmgr(dns_view_t *view) { } rcu_read_unlock(); - return (dispatchmgr); + return dispatchmgr; } isc_result_t @@ -2412,7 +2412,7 @@ dns_view_addtrustedkey(dns_view_t *view, dns_rdatatype_t rdtype, NULL, NULL)); cleanup: - return (result); + return result; } isc_result_t @@ -2431,7 +2431,7 @@ dns_view_apply(dns_view_t *view, bool stop, isc_result_t *sub, result = ISC_R_SHUTTINGDOWN; } rcu_read_unlock(); - return (result); + return result; } void diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 4be8dc0f44..824157fd54 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -297,7 +297,7 @@ axfr_init(dns_xfrin_t *xfr) { CHECK(dns_db_beginload(xfr->db, &xfr->axfr)); result = ISC_R_SUCCESS; failure: - return (result); + return result; } static isc_result_t @@ -308,7 +308,7 @@ axfr_putdata(dns_xfrin_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_difftuple_t *tuple = NULL; if (rdata->rdclass != xfr->rdclass) { - return (DNS_R_BADCLASS); + return DNS_R_BADCLASS; } CHECK(dns_zone_checknames(xfr->zone, name, rdata)); @@ -316,7 +316,7 @@ axfr_putdata(dns_xfrin_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_diff_append(&xfr->diff, &tuple); result = ISC_R_SUCCESS; failure: - return (result); + return result; } /* @@ -407,7 +407,7 @@ axfr_finalize(dns_xfrin_t *xfr) { result = dns_zone_replacedb(xfr->zone, xfr->db, true); LIBDNS_XFRIN_AXFR_FINALIZE_END(xfr, xfr->info, result); - return (result); + return result; } /**************************************************************************/ @@ -428,7 +428,7 @@ ixfr_init(dns_xfrin_t *xfr) { if (xfr->reqtype != dns_rdatatype_ixfr) { xfrin_log(xfr, ISC_LOG_NOTICE, "got incremental response to AXFR request"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } atomic_store(&xfr->is_ixfr, true); @@ -442,7 +442,7 @@ ixfr_init(dns_xfrin_t *xfr) { result = ISC_R_SUCCESS; failure: - return (result); + return result; } static isc_result_t @@ -452,7 +452,7 @@ ixfr_putdata(dns_xfrin_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_difftuple_t *tuple = NULL; if (rdata->rdclass != xfr->rdclass) { - return (DNS_R_BADCLASS); + return DNS_R_BADCLASS; } if (op == DNS_DIFFOP_ADD) { @@ -464,7 +464,7 @@ ixfr_putdata(dns_xfrin_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, xfr->ixfr.diffs++; failure: - return (result); + return result; } static isc_result_t @@ -475,7 +475,7 @@ ixfr_begin_transaction(dns_xfrin_t *xfr) { CHECK(dns_journal_begin_transaction(xfr->ixfr.journal)); } failure: - return (result); + return result; } static isc_result_t @@ -488,7 +488,7 @@ ixfr_end_transaction(dns_xfrin_t *xfr) { CHECK(dns_journal_commit(xfr->ixfr.journal)); } failure: - return (result); + return result; } static isc_result_t @@ -512,12 +512,12 @@ ixfr_apply_one(dns_xfrin_t *xfr, ixfr_apply_data_t *data) { result = ixfr_end_transaction(xfr); - return (result); + return result; failure: /* We need to end the transaction, but keep the previous error */ (void)ixfr_end_transaction(xfr); - return (result); + return result; } static void @@ -637,7 +637,7 @@ ixfr_commit(dns_xfrin_t *xfr) { } failure: - return (result); + return result; } /**************************************************************************/ @@ -862,7 +862,7 @@ redo: } result = ISC_R_SUCCESS; failure: - return (result); + return result; } void @@ -918,7 +918,7 @@ dns_xfrin_start(dns_xfrin_t *xfr, dns_xfrindone_t done) { xfrin_fail(xfr, result, "zone transfer start failed"); } - return (result); + return result; } static void @@ -939,7 +939,7 @@ isc_time_t dns_xfrin_getstarttime(dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); - return (atomic_load_relaxed(&xfr->start)); + return atomic_load_relaxed(&xfr->start); } void @@ -991,7 +991,7 @@ uint32_t dns_xfrin_getendserial(dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); - return (atomic_load_relaxed(&xfr->end_serial)); + return atomic_load_relaxed(&xfr->end_serial); } void @@ -1009,14 +1009,14 @@ const isc_sockaddr_t * dns_xfrin_getsourceaddr(const dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); - return (&xfr->sourceaddr); + return &xfr->sourceaddr; } const isc_sockaddr_t * dns_xfrin_getprimaryaddr(const dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); - return (&xfr->primaryaddr); + return &xfr->primaryaddr; } dns_transport_type_t @@ -1024,17 +1024,17 @@ dns_xfrin_gettransporttype(const dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); if (xfr->transport != NULL) { - return (dns_transport_get_type(xfr->transport)); + return dns_transport_get_type(xfr->transport); } - return (DNS_TRANSPORT_TCP); + return DNS_TRANSPORT_TCP; } dns_transport_type_t dns_xfrin_getsoatransporttype(dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); - return (atomic_load_relaxed(&xfr->soa_transport_type)); + return atomic_load_relaxed(&xfr->soa_transport_type); } const dns_name_t * @@ -1042,10 +1042,10 @@ dns_xfrin_gettsigkeyname(const dns_xfrin_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); if (xfr->tsigkey == NULL || xfr->tsigkey->key == NULL) { - return (NULL); + return NULL; } - return (dst_key_name(xfr->tsigkey->key)); + return dst_key_name(xfr->tsigkey->key); } static void @@ -1293,13 +1293,13 @@ xfrin_start(dns_xfrin_t *xfr) { */ CHECK(dns_dispatch_connect(xfr->dispentry)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: xfrin_cancelio(xfr); dns_xfrin_detach(&xfr); - return (result); + return result; } /* XXX the resolver could use this, too */ @@ -1319,7 +1319,7 @@ render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf) { result = ISC_R_SUCCESS; failure: dns_compress_invalidate(&cctx); - return (result); + return result; } /* @@ -1446,11 +1446,11 @@ static const char * request_type(dns_xfrin_t *xfr) { switch (xfr->reqtype) { case dns_rdatatype_soa: - return ("SOA"); + return "SOA"; case dns_rdatatype_axfr: - return ("AXFR"); + return "AXFR"; case dns_rdatatype_ixfr: - return ("IXFR"); + return "IXFR"; default: ISC_UNREACHABLE(); } @@ -1482,10 +1482,10 @@ add_opt(dns_message_t *message, uint16_t udpsize, bool reqnsid, result = dns_message_buildopt(message, &rdataset, 0, udpsize, 0, ednsopts, count); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (dns_message_setopt(message, rdataset)); + return dns_message_setopt(message, rdataset); } /* @@ -1603,7 +1603,7 @@ failure: dns_db_closeversion(xfr->db, &ver, false); } - return (result); + return result; } static void diff --git a/lib/dns/zone.c b/lib/dns/zone.c index e8a57f7f41..7ef570c3d1 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -1387,9 +1387,9 @@ static bool inline_secure(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->raw != NULL) { - return (true); + return true; } - return (false); + return false; } /* @@ -1400,9 +1400,9 @@ static bool inline_raw(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->secure != NULL) { - return (true); + return true; } - return (false); + return false; } /* @@ -1446,7 +1446,7 @@ dns_rdataclass_t dns_zone_getclass(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->rdclass); + return zone->rdclass; } void @@ -1490,7 +1490,7 @@ dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp) { ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read); UNLOCK_ZONE(zone); - return (result); + return result; } /* @@ -1566,7 +1566,7 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) { } UNLOCK_ZONE(zone); *argv = mem; - return (result); + return result; } void @@ -1645,7 +1645,7 @@ dns_view_t * dns_zone_getview(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->view); + return zone->view; } void @@ -1712,7 +1712,7 @@ dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) { result = dns_zone_setorigin(zone->raw, origin); } UNLOCK_ZONE(zone); - return (result); + return result; } static isc_result_t @@ -1730,7 +1730,7 @@ dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) { } *field = copy; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1752,14 +1752,14 @@ dns_zone_setfile(dns_zone_t *zone, const char *file, dns_masterformat_t format, } UNLOCK_ZONE(zone); - return (result); + return result; } const char * dns_zone_getfile(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->masterfile); + return zone->masterfile; } isc_result_t @@ -1780,14 +1780,14 @@ dns_zone_setstream(dns_zone_t *zone, const FILE *stream, result = default_journal(zone); UNLOCK_ZONE(zone); - return (result); + return result; } dns_ttl_t dns_zone_getmaxttl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->maxttl); + return zone->maxttl; } void @@ -1827,7 +1827,7 @@ default_journal(dns_zone_t *zone) { if (journal != NULL) { isc_mem_free(zone->mctx, journal); } - return (result); + return result; } isc_result_t @@ -1840,14 +1840,14 @@ dns_zone_setjournal(dns_zone_t *zone, const char *myjournal) { result = dns_zone_setstring(zone, &zone->journal, myjournal); UNLOCK_ZONE(zone); - return (result); + return result; } char * dns_zone_getjournal(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->journal); + return zone->journal; } /* @@ -1869,12 +1869,12 @@ dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) { (zone->type == dns_zone_redirect && dns_remote_addresses(&zone->primaries) != NULL)) { - return (true); + return true; } /* Inline zones are always dynamic. */ if (zone->type == dns_zone_primary && zone->raw != NULL) { - return (true); + return true; } /* If !ignore_freeze, we need check whether updates are disabled. */ @@ -1883,10 +1883,10 @@ dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) { ((zone->ssutable != NULL) || (zone->update_acl != NULL && !dns_acl_isnone(zone->update_acl)))) { - return (true); + return true; } - return (false); + return false; } /* @@ -1909,12 +1909,12 @@ dns_zone_rpz_enable(dns_zone_t *zone, dns_rpz_zones_t *rpzs, rpzs->defined |= DNS_RPZ_ZBIT(rpz_num); UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_rpz_num_t dns_zone_get_rpz_num(dns_zone_t *zone) { - return (zone->rpz_num); + return zone->rpz_num; } /* @@ -2007,7 +2007,7 @@ bool dns_zone_catz_is_enabled(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->catzs != NULL); + return zone->catzs != NULL; } /* @@ -2033,7 +2033,7 @@ dns_zone_get_parentcatz(dns_zone_t *zone) { parentcatz = zone->parentcatz; UNLOCK_ZONE(zone); - return (parentcatz); + return parentcatz; } static bool @@ -2048,7 +2048,7 @@ zone_touched(dns_zone_t *zone) { if (result != ISC_R_SUCCESS || isc_time_compare(&modtime, &zone->loadtime) > 0) { - return (true); + return true; } for (include = ISC_LIST_HEAD(zone->includes); include != NULL; @@ -2058,11 +2058,11 @@ zone_touched(dns_zone_t *zone) { if (result != ISC_R_SUCCESS || isc_time_compare(&modtime, &include->filetime) > 0) { - return (true); + return true; } } - return (false); + return false; } /* @@ -2114,7 +2114,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) { if (!locked) { UNLOCK_ZONE(zone); } - return (result); + return result; } LOCK_ZONE(zone->raw); } @@ -2361,12 +2361,12 @@ cleanup: if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } isc_result_t dns_zone_load(dns_zone_t *zone, bool newonly) { - return (zone_load(zone, newonly ? DNS_ZONELOADFLAG_NOSTAT : 0, false)); + return zone_load(zone, newonly ? DNS_ZONELOADFLAG_NOSTAT : 0, false); } static void @@ -2401,14 +2401,14 @@ dns_zone_asyncload(dns_zone_t *zone, bool newonly, dns_zt_callback_t *done, REQUIRE(DNS_ZONE_VALID(zone)); if (zone->zmgr == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* If we already have a load pending, stop now */ LOCK_ZONE(zone); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING)) { UNLOCK_ZONE(zone); - return (ISC_R_ALREADYRUNNING); + return ISC_R_ALREADYRUNNING; } asl = isc_mem_get(zone->mctx, sizeof(*asl)); @@ -2423,14 +2423,14 @@ dns_zone_asyncload(dns_zone_t *zone, bool newonly, dns_zt_callback_t *done, isc_async_run(zone->loop, zone_asyncload, asl); UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool dns__zone_loadpending(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING)); + return DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING); } isc_result_t @@ -2469,7 +2469,7 @@ dns_zone_loadandthaw(dns_zone_t *zone) { /* Error, remain in disabled state. */ break; } - return (result); + return result; } static unsigned int @@ -2514,7 +2514,7 @@ get_primary_options(dns_zone_t *zone) { options |= DNS_MASTER_CHECKSVCB; } - return (options); + return options; } static void @@ -2640,7 +2640,7 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) { goto cleanup; } - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } else if (zone->stream != NULL) { FILE *stream = UNCONST(zone->stream); result = dns_master_loadstream( @@ -2670,7 +2670,7 @@ cleanup: zone_idetach(&load->zone); isc_mem_put(zone->mctx, load, sizeof(*load)); - return (result); + return result; } static bool @@ -2688,7 +2688,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, * "." means the services does not exist. */ if (dns_name_equal(name, dns_rootname)) { - return (true); + return true; } /* @@ -2696,9 +2696,9 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, */ if (!dns_name_issubdomain(name, &zone->origin)) { if (zone->checkmx != NULL) { - return ((zone->checkmx)(zone, name, owner)); + return (zone->checkmx)(zone, name, owner); } - return (true); + return true; } if (zone->type == dns_zone_primary) { @@ -2712,14 +2712,14 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, result = dns_db_find(db, name, NULL, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } if (result == DNS_R_NXRRSET) { result = dns_db_find(db, name, NULL, dns_rdatatype_aaaa, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } } @@ -2734,7 +2734,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, dns_zone_log(zone, level, "%s/MX '%s' has no address records (A or AAAA)", ownerbuf, namebuf); - return ((level == ISC_LOG_WARNING) ? true : false); + return (level == ISC_LOG_WARNING) ? true : false; } if (result == DNS_R_CNAME) { @@ -2748,7 +2748,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, "%s/MX '%s' is a CNAME (illegal)", ownerbuf, namebuf); } - return ((level == ISC_LOG_WARNING) ? true : false); + return (level == ISC_LOG_WARNING) ? true : false; } if (result == DNS_R_DNAME) { @@ -2764,14 +2764,14 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, " '%s' (illegal)", ownerbuf, namebuf, altbuf); } - return ((level == ISC_LOG_WARNING) ? true : false); + return (level == ISC_LOG_WARNING) ? true : false; } if (zone->checkmx != NULL && result == DNS_R_DELEGATION) { - return ((zone->checkmx)(zone, name, owner)); + return (zone->checkmx)(zone, name, owner); } - return (true); + return true; } static bool @@ -2789,7 +2789,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, * "." means the services does not exist. */ if (dns_name_equal(name, dns_rootname)) { - return (true); + return true; } /* @@ -2797,9 +2797,9 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, */ if (!dns_name_issubdomain(name, &zone->origin)) { if (zone->checksrv != NULL) { - return ((zone->checksrv)(zone, name, owner)); + return (zone->checksrv)(zone, name, owner); } - return (true); + return true; } if (zone->type == dns_zone_primary) { @@ -2813,14 +2813,14 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, result = dns_db_find(db, name, NULL, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } if (result == DNS_R_NXRRSET) { result = dns_db_find(db, name, NULL, dns_rdatatype_aaaa, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } } @@ -2833,7 +2833,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, "%s/SRV '%s' has no address records (A or AAAA)", ownerbuf, namebuf); /* XXX950 make fatal for 9.5.0. */ - return (true); + return true; } if (result == DNS_R_CNAME) { @@ -2847,7 +2847,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, "%s/SRV '%s' is a CNAME (illegal)", ownerbuf, namebuf); } - return ((level == ISC_LOG_WARNING) ? true : false); + return (level == ISC_LOG_WARNING) ? true : false; } if (result == DNS_R_DNAME) { @@ -2863,14 +2863,14 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, "DNAME '%s' (illegal)", ownerbuf, namebuf, altbuf); } - return ((level == ISC_LOG_WARNING) ? true : false); + return (level == ISC_LOG_WARNING) ? true : false; } if (zone->checksrv != NULL && result == DNS_R_DELEGATION) { - return ((zone->checksrv)(zone, name, owner)); + return (zone->checksrv)(zone, name, owner); } - return (true); + return true; } static bool @@ -2892,9 +2892,9 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, */ if (!dns_name_issubdomain(name, &zone->origin)) { if (zone->checkns != NULL) { - return ((zone->checkns)(zone, name, owner, NULL, NULL)); + return (zone->checkns)(zone, name, owner, NULL, NULL); } - return (true); + return true; } if (zone->type == dns_zone_primary) { @@ -2928,7 +2928,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, } if (result == ISC_R_SUCCESS) { dns_rdataset_disassociate(&a); - return (true); + return true; } else if (result == DNS_R_DELEGATION) { dns_rdataset_disassociate(&a); } @@ -2944,7 +2944,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, dns_rdataset_disassociate(&a); } dns_rdataset_disassociate(&aaaa); - return (true); + return true; } if (tresult == DNS_R_DELEGATION || tresult == DNS_R_DNAME) { dns_rdataset_disassociate(&aaaa); @@ -2963,7 +2963,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (dns_rdataset_isassociated(&aaaa)) { dns_rdataset_disassociate(&aaaa); } - return (answer); + return answer; } } @@ -3021,7 +3021,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (dns_rdataset_isassociated(&aaaa)) { dns_rdataset_disassociate(&aaaa); } - return (answer); + return answer; } static bool @@ -3084,7 +3084,7 @@ zone_rrset_check_dup(dns_zone_t *zone, dns_name_t *owner, break; } } - return (answer); + return answer; } static bool @@ -3103,7 +3103,7 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) { result = dns_db_createiterator(db, 0, &dbiterator); if (result != ISC_R_SUCCESS) { - return (true); + return true; } for (result = dns_dbiterator_first(dbiterator); result == ISC_R_SUCCESS; @@ -3138,7 +3138,7 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) { } dns_dbiterator_destroy(&dbiterator); - return (ok); + return ok; } static bool @@ -3162,14 +3162,14 @@ isspf(const dns_rdata_t *rdata) { } if (i < 6U) { - return (false); + return false; } buf[i] = 0; if (strncmp(buf, "v=spf1", 6) == 0 && (buf[6] == 0 || buf[6] == ' ')) { - return (true); + return true; } - return (false); + return false; } static bool @@ -3197,7 +3197,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) { result = dns_db_createiterator(db, 0, &dbiterator); if (result != ISC_R_SUCCESS) { - return (true); + return true; } result = dns_dbiterator_first(dbiterator); @@ -3376,7 +3376,7 @@ cleanup: } dns_dbiterator_destroy(&dbiterator); - return (ok); + return ok; } /* @@ -3711,7 +3711,7 @@ cleanup: if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } /* @@ -3887,7 +3887,7 @@ check_nsec3param(dns_zone_t *zone, dns_db_t *db) { dns_zone_log(zone, ISC_LOG_ERROR, "nsec3param lookup failure: %s", isc_result_totext(result)); - return (result); + return result; } dns_db_currentversion(db, &version); @@ -3976,7 +3976,7 @@ cleanup: } dns_db_closeversion(db, &version, false); dns_db_detachnode(db, &node); - return (result); + return result; } /* @@ -4048,7 +4048,7 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, * If the keynode has no trust anchor set, we shouldn't be here. */ if (!dns_keynode_dsset(keynode, NULL)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } memset(&kd, 0, sizeof(kd)); @@ -4066,10 +4066,10 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, /* Refresh new keys from the zone apex as soon as possible. */ set_refreshkeytimer(zone, &kd, now, true); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: - return (result); + return result; } /* @@ -4089,13 +4089,13 @@ delete_keydata(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, uresult = update_one_rr(db, ver, diff, DNS_DIFFOP_DEL, name, 0, &rdata); if (uresult != ISC_R_SUCCESS) { - return (uresult); + return uresult; } } if (result == ISC_R_NOMORE) { result = ISC_R_SUCCESS; } - return (result); + return result; } /* @@ -4120,7 +4120,7 @@ compute_tag(dns_name_t *name, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx, dst_key_free(&dstkey); } - return (result); + return result; } /* @@ -4285,7 +4285,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, ISC_LIST_UNLINK(temp_diff.tuples, *tuple, link); if (result != ISC_R_SUCCESS) { dns_difftuple_free(tuple); - return (result); + return result; } /* @@ -4296,7 +4296,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, /* * Do not clear temp_diff. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4306,7 +4306,7 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_difftuple_t *tuple = NULL; dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); - return (do_one_tuple(&tuple, db, ver, diff)); + return do_one_tuple(&tuple, db, ver, diff); } static isc_result_t @@ -4344,7 +4344,7 @@ failure: if (deltuple != NULL) { dns_difftuple_free(&deltuple); } - return (result); + return result; } /* @@ -4367,7 +4367,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, uint32_t *sourceserial, dns_zone_log(zone, ISC_LOG_ERROR, "%s:dns_journal_open -> %s", caller, isc_result_totext(result)); - return (result); + return result; } if (sourceserial != NULL) { @@ -4383,7 +4383,7 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, uint32_t *sourceserial, dns_journal_destroy(&journal); } - return (result); + return result; } /* @@ -4429,7 +4429,7 @@ failure: INSIST(ver == NULL); - return (result); + return result; } struct addifmissing_arg { @@ -4645,7 +4645,7 @@ failure: INSIST(ver == NULL); - return (result); + return result; } isc_result_t @@ -4654,7 +4654,7 @@ dns_zone_synckeyzone(dns_zone_t *zone) { dns_db_t *db = NULL; if (zone->type != dns_zone_key) { - return (DNS_R_BADZONE); + return DNS_R_BADZONE; } CHECK(dns_zone_getdb(zone, &db)); @@ -4667,7 +4667,7 @@ failure: if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } static void @@ -4714,7 +4714,7 @@ zone_unchanged(dns_db_t *db1, dns_db_t *db2, isc_mem_t *mctx) { answer = true; } dns_diff_clear(&diff); - return (answer); + return answer; } static void @@ -4744,7 +4744,7 @@ check_reportchannel(dns_zone_t *zone, dns_db_t *db) { * If this zone isn't logging reports, it's fine. */ if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_LOGREPORTS)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -4765,7 +4765,7 @@ check_reportchannel(dns_zone_t *zone, dns_db_t *db) { } failure: - return (result); + return result; } /* @@ -5379,7 +5379,7 @@ done: zone_debuglog(zone, __func__, 99, "done"); - return (result); + return result; } static bool @@ -5393,9 +5393,9 @@ exit_check(dns_zone_t *zone) { * DNS_ZONEFLG_SHUTDOWN can only be set if references == 0. */ INSIST(isc_refcount_current(&zone->references) == 0); - return (true); + return true; } - return (false); + return false; } static bool @@ -5409,7 +5409,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, int level; if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOCHECKNS)) { - return (true); + return true; } if (zone->type == dns_zone_primary) { @@ -5423,14 +5423,14 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, result = dns_db_find(db, name, version, dns_rdatatype_a, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } if (result == DNS_R_NXRRSET) { result = dns_db_find(db, name, version, dns_rdatatype_aaaa, 0, 0, NULL, foundname, NULL, NULL); if (result == ISC_R_SUCCESS) { - return (true); + return true; } } @@ -5444,7 +5444,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, "records (A or AAAA)", namebuf); } - return (false); + return false; } if (result == DNS_R_CNAME) { @@ -5455,7 +5455,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, "(illegal)", namebuf); } - return (false); + return false; } if (result == DNS_R_DNAME) { @@ -5467,10 +5467,10 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, "'%s' (illegal)", namebuf, altbuf); } - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -5527,7 +5527,7 @@ success: invalidate_rdataset: dns_rdataset_invalidate(&rdataset); - return (result); + return result; } #define SET_SOA_VALUES(soattl_v, serial_v, refresh_v, retry_v, expire_v, \ @@ -5597,7 +5597,7 @@ invalidate_rdataset: dns_rdataset_invalidate(&rdataset); - return (result); + return result; } /* @@ -5654,7 +5654,7 @@ zone_get_from_db(dns_zone_t *zone, dns_db_t *db, unsigned int *nscount, closeversion: dns_db_closeversion(db, &version, false); - return (answer); + return answer; } static void @@ -5749,14 +5749,14 @@ isc_mem_t * dns_zone_getmctx(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->mctx); + return zone->mctx; } dns_zonemgr_t * dns_zone_getmgr(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->zmgr); + return zone->zmgr; } void @@ -5801,7 +5801,7 @@ dns_zone_getkasp(dns_zone_t *zone) { } UNLOCK_ZONE(zone); - return (kasp); + return kasp; } static void @@ -5833,7 +5833,7 @@ dns_zone_getskrbundle(dns_zone_t *zone) { } UNLOCK_ZONE(zone); - return (bundle); + return bundle; } void @@ -5851,7 +5851,7 @@ dns_zoneopt_t dns_zone_getoptions(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (atomic_load_relaxed(&zone->options)); + return atomic_load_relaxed(&zone->options); } void @@ -5869,7 +5869,7 @@ unsigned int dns_zone_getkeyopts(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (atomic_load_relaxed(&zone->keyopts)); + return atomic_load_relaxed(&zone->keyopts); } isc_result_t @@ -5880,13 +5880,13 @@ dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) { zone->xfrsource4 = *xfrsource; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getxfrsource4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->xfrsource4); + return &zone->xfrsource4; } isc_result_t @@ -5897,13 +5897,13 @@ dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) { zone->xfrsource6 = *xfrsource; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getxfrsource6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->xfrsource6); + return &zone->xfrsource6; } isc_result_t @@ -5914,13 +5914,13 @@ dns_zone_setparentalsrc4(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc) { zone->parentalsrc4 = *parentalsrc; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getparentalsrc4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->parentalsrc4); + return &zone->parentalsrc4; } isc_result_t @@ -5931,13 +5931,13 @@ dns_zone_setparentalsrc6(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc) { zone->parentalsrc6 = *parentalsrc; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getparentalsrc6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->parentalsrc6); + return &zone->parentalsrc6; } isc_result_t @@ -5948,13 +5948,13 @@ dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) { zone->notifysrc4 = *notifysrc; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getnotifysrc4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->notifysrc4); + return &zone->notifysrc4; } isc_result_t @@ -5965,13 +5965,13 @@ dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) { zone->notifysrc6 = *notifysrc; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_sockaddr_t * dns_zone_getnotifysrc6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->notifysrc6); + return &zone->notifysrc6; } void @@ -6018,10 +6018,10 @@ static bool has_pf(isc_sockaddr_t *addresses, size_t count, int pf) { for (size_t i = 0; i < count; i++) { if (isc_sockaddr_pf(&addresses[i]) == pf) { - return (true); + return true; } } - return (false); + return false; } static void @@ -6152,7 +6152,7 @@ dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) { } ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read); - return (result); + return result; } void @@ -6171,13 +6171,13 @@ was_dumping(dns_zone_t *zone) { REQUIRE(LOCKED_ZONE(zone)); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { - return (true); + return true; } DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DUMPING); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDDUMP); isc_time_settoepoch(&zone->dumptime); - return (false); + return false; } static isc_result_t @@ -6217,7 +6217,7 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx, } *key = foundkey; - return (result); + return result; } #define is_zone_key(key) \ @@ -6378,7 +6378,7 @@ failure: } } *nkeys = count; - return (result); + return result; } /*% @@ -6417,7 +6417,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /*% @@ -6500,7 +6500,7 @@ failure: ISC_LIST_UNLINK(dnskeys, key, link); dns_dnsseckey_destroy(dns_zone_getmctx(zone), &key); } - return (result); + return result; } static isc_result_t @@ -6509,18 +6509,18 @@ offline(dns_db_t *db, dns_dbversion_t *ver, dns__zonediff_t *zonediff, isc_result_t result; if ((rdata->flags & DNS_RDATA_OFFLINE) != 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = update_one_rr(db, ver, zonediff->diff, DNS_DIFFOP_DELRESIGN, name, ttl, rdata); if (result != ISC_R_SUCCESS) { - return (result); + return result; } rdata->flags |= DNS_RDATA_OFFLINE; result = update_one_rr(db, ver, zonediff->diff, DNS_DIFFOP_ADDRESIGN, name, ttl, rdata); zonediff->offline = true; - return (result); + return result; } static void @@ -6607,14 +6607,14 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, } if (have_pksk && have_pzsk) { - return (true); + return true; } /* * Deleting the SOA RRSIG is always okay. */ if (rrsig_ptr->covered == dns_rdatatype_soa) { - return (true); + return true; } /* @@ -6624,9 +6624,9 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, */ if (have_pksk || have_pzsk) { if (kasp && have_pzsk) { - return (true); + return true; } - return (!kasp); + return !kasp; } /* @@ -6637,14 +6637,14 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, if ((rrsig_ptr->algorithm == dst_key_alg(keys[i])) && (rrsig_ptr->keyid == dst_key_id(keys[i]))) { - return (false); + return false; } } /* * But if the key is gone, then go ahead. */ - return (true); + return true; } /* @@ -6677,7 +6677,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, result = dns_db_findnode(db, name, false, &node); } if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { goto failure; @@ -6688,7 +6688,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, if (result == ISC_R_NOTFOUND) { INSIST(!dns_rdataset_isassociated(&rdataset)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { INSIST(!dns_rdataset_isassociated(&rdataset)); @@ -6848,7 +6848,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -6881,7 +6881,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, result = dns_db_findnode(db, name, false, &node); } if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { goto failure; @@ -6891,7 +6891,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, dns_db_detachnode(db, &node); if (result == ISC_R_NOTFOUND) { INSIST(!dns_rdataset_isassociated(&rdataset)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { INSIST(!dns_rdataset_isassociated(&rdataset)); @@ -7055,7 +7055,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static void @@ -7359,7 +7359,7 @@ failure: if (dbit != NULL) { dns_dbiterator_destroy(&dbit); } - return (result); + return result; } static bool @@ -7378,7 +7378,7 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, type, 0, &rdataset, NULL); if (result != ISC_R_SUCCESS) { INSIST(!dns_rdataset_isassociated(&rdataset)); - return (false); + return false; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; result = dns_rdataset_next(&rdataset)) @@ -7390,7 +7390,7 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, rrsig.keyid == dst_key_id(key)) { dns_rdataset_disassociate(&rdataset); - return (true); + return true; } if (rrsig.algorithm == dst_key_alg(key)) { count++; @@ -7429,11 +7429,11 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, } dns_rdataset_disassociate(&rdataset); - return (approved); + return approved; } dns_rdataset_disassociate(&rdataset); - return (false); + return false; } static isc_result_t @@ -7452,7 +7452,7 @@ add_nsec(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, CHECK(update_one_rr(db, version, diff, DNS_DIFFOP_ADD, name, ttl, &rdata)); failure: - return (result); + return result; } static isc_result_t @@ -7470,7 +7470,7 @@ check_if_bottom_of_zone(dns_db_t *db, dns_dbnode_t *node, if (result == ISC_R_NOTFOUND) { result = ISC_R_SUCCESS; } - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -7502,7 +7502,7 @@ check_if_bottom_of_zone(dns_db_t *db, dns_dbnode_t *node, failure: dns_rdatasetiter_destroy(&iterator); - return (result); + return result; } static isc_result_t @@ -7531,7 +7531,7 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, if (result == ISC_R_NOTFOUND) { result = ISC_R_SUCCESS; } - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -7676,7 +7676,7 @@ failure: if (iterator != NULL) { dns_rdatasetiter_destroy(&iterator); } - return (result); + return result; } /* @@ -7713,7 +7713,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -7823,7 +7823,7 @@ failure: if (node != NULL) { dns_db_detachnode(signing->db, &node); } - return (result); + return result; } /* @@ -8041,7 +8041,7 @@ failure: if (dns_rdataset_isassociated(&rdataset)) { dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } static isc_result_t @@ -8055,10 +8055,10 @@ delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, result = dns_db_findrdataset(db, node, ver, dns_rdatatype_nsec, 0, 0, &rdataset, NULL); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; result = dns_rdataset_next(&rdataset)) @@ -8074,7 +8074,7 @@ delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, } failure: dns_rdataset_disassociate(&rdataset); - return (result); + return result; } static isc_result_t @@ -8089,10 +8089,10 @@ deletematchingnsec3(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, result = dns_db_findrdataset(db, node, ver, dns_rdatatype_nsec3, 0, 0, &rdataset, NULL); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; @@ -8117,7 +8117,7 @@ deletematchingnsec3(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, } failure: dns_rdataset_disassociate(&rdataset); - return (result); + return result; } static isc_result_t @@ -8141,11 +8141,11 @@ need_nsec_chain(dns_db_t *db, dns_dbversion_t *ver, if (result == ISC_R_SUCCESS) { dns_rdataset_disassociate(&rdataset); dns_db_detachnode(db, &node); - return (result); + return result; } if (result != ISC_R_NOTFOUND) { dns_db_detachnode(db, &node); - return (result); + return result; } result = dns_db_findrdataset(db, node, ver, dns_rdatatype_nsec3param, 0, @@ -8153,11 +8153,11 @@ need_nsec_chain(dns_db_t *db, dns_dbversion_t *ver, if (result == ISC_R_NOTFOUND) { *answer = true; dns_db_detachnode(db, &node); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { dns_db_detachnode(db, &node); - return (result); + return result; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; @@ -8197,7 +8197,7 @@ failure: dns_rdataset_disassociate(&rdataset); } dns_db_detachnode(db, &node); - return (result); + return result; } /*% @@ -8213,11 +8213,11 @@ find_next_matching_tuple(dns_difftuple_t *cur) { if (cur->rdata.type == next->rdata.type && dns_name_equal(&cur->name, &next->name)) { - return (next); + return next; } } - return (NULL); + return NULL; } /*% @@ -8264,7 +8264,7 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, dns_zone_log(zone, ISC_LOG_ERROR, "dns__zone_updatesigs:del_sigs -> %s", isc_result_totext(result)); - return (result); + return result; } result = add_sigs(db, version, &tuple->name, zone, tuple->rdata.type, zonediff->diff, zone_keys, @@ -8273,7 +8273,7 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, dns_zone_log(zone, ISC_LOG_ERROR, "dns__zone_updatesigs:add_sigs -> %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -8285,7 +8285,7 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, */ move_matching_tuples(tuple, diff, zonediff->diff); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9181,7 +9181,7 @@ del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, if (result == ISC_R_NOTFOUND) { result = ISC_R_SUCCESS; } - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -9259,7 +9259,7 @@ failure: dns_rdataset_disassociate(&rdataset); } dns_rdatasetiter_destroy(&iterator); - return (result); + return result; } /* @@ -9355,10 +9355,10 @@ dns_zone_check_dnskey_nsec3(dns_zone_t *zone, dns_db_t *db, goto failure; } - return (true); + return true; failure: - return (false); + return false; } /* @@ -9948,7 +9948,7 @@ normalize_key(dns_rdata_t *rr, dns_rdata_t *target, unsigned char *data, case dns_rdatatype_keydata: result = dns_rdata_tostruct(rr, &keydata, NULL); if (result == ISC_R_UNEXPECTEDEND) { - return (result); + return result; } RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_keydata_todnskey(&keydata, &dnskey, NULL); @@ -9958,7 +9958,7 @@ normalize_key(dns_rdata_t *rr, dns_rdata_t *target, unsigned char *data, default: UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9984,7 +9984,7 @@ matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) { result = normalize_key(rr, &rdata1, data1, sizeof(data1)); if (result != ISC_R_SUCCESS) { - return (false); + return false; } for (result = dns_rdataset_first(rdset); result == ISC_R_SUCCESS; @@ -9997,11 +9997,11 @@ matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) { continue; } if (dns_rdata_compare(&rdata1, &rdata2) == 0) { - return (true); + return true; } } - return (false); + return false; } /* @@ -10027,12 +10027,12 @@ refresh_time(dns_keyfetch_t *kfetch, bool retry) { if (dns_rdataset_isassociated(&kfetch->dnskeysigset)) { rdset = &kfetch->dnskeysigset; } else { - return (now + dns_zone_mkey_hour); + return now + dns_zone_mkey_hour; } result = dns_rdataset_first(rdset); if (result != ISC_R_SUCCESS) { - return (now + dns_zone_mkey_hour); + return now + dns_zone_mkey_hour; } dns_rdataset_current(rdset, &sigrr); @@ -10075,7 +10075,7 @@ refresh_time(dns_keyfetch_t *kfetch, bool retry) { } } - return (now + t); + return now + t; } /* @@ -10130,7 +10130,7 @@ minimal_update(dns_keyfetch_t *kfetch, dns_dbversion_t *ver, dns_diff_t *diff) { } result = ISC_R_SUCCESS; failure: - return (result); + return result; } /* @@ -10163,7 +10163,7 @@ revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) { &dnskey, &keyb); result = dns_dnssec_keyfromrdata(keyname, &rr, mctx, &dstkey); if (result != ISC_R_SUCCESS) { - return (false); + return false; } /* See if that key generated any of the signatures */ @@ -10198,7 +10198,7 @@ revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) { } dst_key_free(&dstkey); - return (answer); + return answer; } /* @@ -11550,19 +11550,19 @@ zone_journal_rollforward(dns_zone_t *zone, dns_db_t *db, bool *needdump, if (result == ISC_R_NOTFOUND) { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_DEBUG(3), "no journal file, but that's OK "); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "journal open failed: %s", isc_result_totext(result)); - return (result); + return result; } if (dns_journal_empty(journal)) { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_DEBUG(1), "journal empty"); dns_journal_destroy(&journal); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_journal_rollforward(journal, db, options); @@ -11588,20 +11588,20 @@ zone_journal_rollforward(dns_zone_t *zone, dns_db_t *db, bool *needdump, } dns_journal_destroy(&journal); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case ISC_R_NOTFOUND: case ISC_R_RANGE: dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "journal rollforward failed: journal out of sync " "with zone"); dns_journal_destroy(&journal); - return (result); + return result; default: dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "journal rollforward failed: %s", isc_result_totext(result)); dns_journal_destroy(&journal); - return (result); + return result; } } @@ -11680,7 +11680,7 @@ dns_zone_flush(dns_zone_t *zone) { if (!dumping) { result = zone_dump(zone, true); } - return (result); + return result; } isc_result_t @@ -11696,7 +11696,7 @@ dns_zone_dump(dns_zone_t *zone) { if (!dumping) { result = zone_dump(zone, false); } - return (result); + return result; } static void @@ -11989,7 +11989,7 @@ fail: * Asyncronous write is in progress. Zone flags will get * updated on completion. Cleanup is complete. We are done. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } again = false; @@ -12016,7 +12016,7 @@ fail: goto redo; } - return (result); + return result; } static isc_result_t @@ -12035,7 +12035,7 @@ dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, } ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read); if (db == NULL) { - return (DNS_R_NOTLOADED); + return DNS_R_NOTLOADED; } dns_db_currentversion(db, &version); @@ -12052,14 +12052,14 @@ dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, &rawdata, fd); dns_db_closeversion(db, &version, false); dns_db_detach(&db); - return (result); + return result; } isc_result_t dns_zone_dumptostream(dns_zone_t *zone, FILE *fd, dns_masterformat_t format, const dns_master_style_t *style, const uint32_t rawversion) { - return (dumptostream(zone, fd, style, format, rawversion)); + return dumptostream(zone, fd, style, format, rawversion); } void @@ -12198,7 +12198,7 @@ uint32_t dns_zone_getmaxrecords(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->maxrecords); + return zone->maxrecords; } void @@ -12253,7 +12253,7 @@ notify_isqueued(dns_zone_t *zone, unsigned int flags, dns_name_t *name, goto requeue; } } - return (false); + return false; requeue: /* @@ -12268,7 +12268,7 @@ requeue: result = isc_ratelimiter_dequeue(zmgr->startupnotifyrl, ¬ify->rlevent); if (result != ISC_R_SUCCESS) { - return (true); + return true; } notify->flags &= ~DNS_NOTIFY_STARTUP; @@ -12276,11 +12276,11 @@ requeue: notify->zone->zmgr->notifyrl, notify->zone->loop, notify_send_toaddr, notify, ¬ify->rlevent); if (result != ISC_R_SUCCESS) { - return (false); + return false; } } - return (true); + return true; } static bool @@ -12293,7 +12293,7 @@ notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) { isc_result_t result; if (zone->view == NULL || zone->isself == NULL) { - return (false); + return false; } switch (isc_sockaddr_pf(dst)) { @@ -12306,7 +12306,7 @@ notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) { isc_sockaddr_any6(&any); break; default: - return (false); + return false; } /* @@ -12320,14 +12320,14 @@ notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) { isc_netaddr_fromsockaddr(&dstaddr, dst); result = dns_view_getpeertsig(zone->view, &dstaddr, &key); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { - return (false); + return false; } isself = (zone->isself)(zone->view, key, &src, dst, zone->rdclass, zone->isselfarg); if (key != NULL) { dns_tsigkey_detach(&key); } - return (isself); + return isself; } static void @@ -12391,7 +12391,7 @@ notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) { ISC_LINK_INIT(notify, link); notify->magic = NOTIFY_MAGIC; *notifyp = notify; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -12473,11 +12473,11 @@ destroy: static isc_result_t notify_send_queue(dns_notify_t *notify, bool startup) { - return (isc_ratelimiter_enqueue( + return isc_ratelimiter_enqueue( startup ? notify->zone->zmgr->startupnotifyrl : notify->zone->zmgr->notifyrl, notify->zone->loop, notify_send_toaddr, notify, - ¬ify->rlevent)); + ¬ify->rlevent); } static void @@ -13056,10 +13056,10 @@ add_opt(dns_message_t *message, uint16_t udpsize, bool reqnsid, result = dns_message_buildopt(message, &rdataset, 0, udpsize, 0, ednsopts, count); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (dns_message_setopt(message, rdataset)); + return dns_message_setopt(message, rdataset); } /* @@ -13375,7 +13375,7 @@ stub_request_nameserver_address(struct stub_cb_args *args, bool ipv4, dns_message_detach(&message); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; fail: dns_name_free(&sgr->name, zone->mctx); @@ -13385,7 +13385,7 @@ fail: dns_message_detach(&message); } - return (result); + return result; } static isc_result_t @@ -13535,7 +13535,7 @@ done: dns_name_free(ns_name, cb_args->stub->mctx); isc_mem_put(cb_args->stub->mctx, ns_name, sizeof(*ns_name)); } - return (result); + return result; } static void @@ -15324,7 +15324,7 @@ soa_cleanup: done: *messagep = message; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -15375,7 +15375,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, if (inline_secure(zone)) { result = dns_zone_notifyreceive(zone->raw, from, to, msg); UNLOCK_ZONE(zone); - return (result); + return result; } /* * We only handle NOTIFY (SOA) at the present. @@ -15397,11 +15397,11 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, "NOTIFY with no question " "section from: %s", fromtext); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_NOTICE, "NOTIFY zone does not match"); - return (DNS_R_NOTIMP); + return DNS_R_NOTIMP; } /* @@ -15409,7 +15409,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, */ if (zone->type == dns_zone_primary) { UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_netaddr_fromsockaddr(&netaddr, from); @@ -15449,7 +15449,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO, "refused notify from non-primary: %s", fromtext); inc_stats(zone, dns_zonestatscounter_notifyrej); - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } /* @@ -15490,7 +15490,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, "zone is up to date", fromtext); UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } @@ -15519,7 +15519,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, "refresh check queued", fromtext); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (have_serial) { dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO, @@ -15535,7 +15535,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, dns_zonemgr_unreachabledel(zone->zmgr, from, to); } dns_zone_refresh(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -15614,42 +15614,42 @@ dns_acl_t * dns_zone_getnotifyacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->notify_acl); + return zone->notify_acl; } dns_acl_t * dns_zone_getqueryacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->query_acl); + return zone->query_acl; } dns_acl_t * dns_zone_getqueryonacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->queryon_acl); + return zone->queryon_acl; } dns_acl_t * dns_zone_getupdateacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->update_acl); + return zone->update_acl; } dns_acl_t * dns_zone_getforwardacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->forward_acl); + return zone->forward_acl; } dns_acl_t * dns_zone_getxfracl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->xfr_acl); + return zone->xfr_acl; } void @@ -15721,7 +15721,7 @@ dns_zone_clearxfracl(dns_zone_t *zone) { bool dns_zone_getupdatedisabled(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->update_disabled); + return zone->update_disabled; } void @@ -15733,7 +15733,7 @@ dns_zone_setupdatedisabled(dns_zone_t *zone, bool state) { bool dns_zone_getzeronosoattl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->zero_no_soa_ttl); + return zone->zero_no_soa_ttl; } void @@ -15753,7 +15753,7 @@ dns_severity_t dns_zone_getchecknames(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->check_names); + return zone->check_names; } void @@ -15767,7 +15767,7 @@ int32_t dns_zone_getjournalsize(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->journalsize); + return zone->journalsize; } static void @@ -16012,7 +16012,7 @@ message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) { result = dns_message_nextname(msg, section); } - return (count); + return count; } void @@ -16026,7 +16026,7 @@ uint32_t dns_zone_getmaxxfrin(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->maxxfrin); + return zone->maxxfrin; } void @@ -16039,39 +16039,39 @@ uint32_t dns_zone_getmaxxfrout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->maxxfrout); + return zone->maxxfrout; } dns_zonetype_t dns_zone_gettype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->type); + return zone->type; } const char * dns_zonetype_name(dns_zonetype_t type) { switch (type) { case dns_zone_none: - return ("none"); + return "none"; case dns_zone_primary: - return ("primary"); + return "primary"; case dns_zone_secondary: - return ("secondary"); + return "secondary"; case dns_zone_mirror: - return ("mirror"); + return "mirror"; case dns_zone_stub: - return ("stub"); + return "stub"; case dns_zone_staticstub: - return ("static-stub"); + return "static-stub"; case dns_zone_key: - return ("key"); + return "key"; case dns_zone_dlz: - return ("dlz"); + return "dlz"; case dns_zone_redirect: - return ("redirect"); + return "redirect"; default: - return ("unknown"); + return "unknown"; } } @@ -16080,16 +16080,16 @@ dns_zone_getredirecttype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(zone->type == dns_zone_redirect); - return (dns_remote_addresses(&zone->primaries) == NULL - ? dns_zone_primary - : dns_zone_secondary); + return dns_remote_addresses(&zone->primaries) == NULL + ? dns_zone_primary + : dns_zone_secondary; } dns_name_t * dns_zone_getorigin(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (&zone->origin); + return &zone->origin; } void @@ -16106,7 +16106,7 @@ uint32_t dns_zone_getidlein(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->idlein); + return zone->idlein; } void @@ -16120,7 +16120,7 @@ uint32_t dns_zone_getidleout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->idleout); + return zone->idleout; } static void @@ -16211,7 +16211,7 @@ dnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, isc_mem_t *mctx, dns_zone_log(zone, ISC_LOG_ERROR, "dns_dnssec_keyfromrdata() failed: %s", isc_result_totext(result)); - return (result); + return result; } for (dns_dnsseckey_t *k = ISC_LIST_HEAD(*keylist); k != NULL; @@ -16224,7 +16224,7 @@ dnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, isc_mem_t *mctx, } dst_key_free(&dstkey); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -16238,7 +16238,7 @@ cdnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_zone_log(zone, ISC_LOG_ERROR, "dns_rdata_tostruct(cdnskey) failed: %s", isc_result_totext(result)); - return (result); + return result; } for (dns_dnsseckey_t *k = ISC_LIST_HEAD(*keylist); k != NULL; @@ -16253,7 +16253,7 @@ cdnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_zone_log(zone, ISC_LOG_ERROR, "dns_dnssec_make_dnskey() failed: %s", isc_result_totext(result)); - return (result); + return result; } cdnskeyrdata.type = dns_rdatatype_cdnskey; @@ -16263,7 +16263,7 @@ cdnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -16277,7 +16277,7 @@ cds_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_dnsseckeylist_t *keylist, dns_zone_log(zone, ISC_LOG_ERROR, "dns_rdata_tostruct(cds) failed: %s", isc_result_totext(result)); - return (result); + return result; } for (dns_dnsseckey_t *k = ISC_LIST_HEAD(*keylist); k != NULL; @@ -16299,7 +16299,7 @@ cds_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_dnsseckeylist_t *keylist, dns_zone_log(zone, ISC_LOG_ERROR, "dns_dnssec_make_dnskey() failed: %s", isc_result_totext(result)); - return (result); + return result; } result = dns_ds_buildrdata(dns_zone_getorigin(zone), &dnskey, cds.digest_type, cdsbuf, &cdsrdata); @@ -16310,7 +16310,7 @@ cds_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_dnsseckeylist_t *keylist, cds.key_tag, cds.algorithm, cds.digest_type, isc_result_totext(result)); - return (result); + return result; } cdsrdata.type = dns_rdatatype_cds; @@ -16320,7 +16320,7 @@ cds_inuse(dns_zone_t *zone, dns_rdata_t *rdata, dns_dnsseckeylist_t *keylist, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -16353,12 +16353,12 @@ dns_zone_dnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, bool *inuse) { &keylist); dns_zone_unlock_keyfiles(zone); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result != ISC_R_SUCCESS) { dns_zone_log(zone, ISC_LOG_ERROR, "dns_dnssec_findmatchingkeys() failed: %s", isc_result_totext(result)); - return (result); + return result; } switch (rdata->type) { @@ -16381,7 +16381,7 @@ dns_zone_dnskey_inuse(dns_zone_t *zone, dns_rdata_t *rdata, bool *inuse) { ISC_LIST_UNLINK(keylist, key, link); dns_dnsseckey_destroy(mctx, &key); } - return (result); + return result; } static isc_result_t @@ -16396,7 +16396,7 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, REQUIRE(soatuplep != NULL); if (start == end) { - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } CHECK(dns_journal_iter_init(journal, start, end, NULL)); @@ -16432,7 +16432,7 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, dns_zone_log(raw, ISC_LOG_ERROR, "corrupt journal file: '%s'\n", raw->journal); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (zone->privatetype != 0 && rdata->type == zone->privatetype) @@ -16474,7 +16474,7 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, } failure: - return (result); + return result; } /* @@ -16573,7 +16573,7 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, REQUIRE(soatuple != NULL && *soatuple == NULL); if (!seczone->sourceserialset) { - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } dns_db_attach(raw->db, &rawdb); @@ -16583,7 +16583,7 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, dns_db_detach(&rawdb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -16745,7 +16745,7 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, ISC_LIST_APPENDLIST(diff->tuples, cdsadd, link); if (ISC_LIST_EMPTY(diff->tuples)) { - return (DNS_R_UNCHANGED); + return DNS_R_UNCHANGED; } /* @@ -16762,7 +16762,7 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, *soatuple = newtuple; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -17025,7 +17025,7 @@ zone_send_secureserial(dns_zone_t *zone, uint32_t serial) { isc_async_run(zone->secure->loop, receive_secure_serial, rss); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_SENDSECURE); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -17046,8 +17046,8 @@ checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, RUNTIME_CHECK(result == ISC_R_SUCCESS); if (isc_serial_gt(soa.serial, oldserial)) { - return (dns_db_addrdataset(db, node, version, 0, rdataset, 0, - NULL)); + return dns_db_addrdataset(db, node, version, 0, rdataset, 0, + NULL); } /* * Always bump the serial. @@ -17077,8 +17077,7 @@ checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_getownercase(rdataset, name); dns_rdataset_setownercase(&temprdataset, name); - return (dns_db_addrdataset(db, node, version, 0, &temprdataset, 0, - NULL)); + return dns_db_addrdataset(db, node, version, 0, &temprdataset, 0, NULL); } /* @@ -17239,7 +17238,7 @@ failure: if (dns_rdataset_isassociated(&prdataset)) { dns_rdataset_disassociate(&prdataset); } - return (result); + return result; } /* @@ -17281,7 +17280,7 @@ restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, } dns_diff_clear(&diff); - return (result); + return result; } static isc_result_t @@ -17296,7 +17295,7 @@ copy_non_dnssec_records(dns_db_t *db, dns_dbversion_t *version, dns_db_t *rawdb, result = dns_dbiterator_current(dbiterator, &rawnode, name); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_dbiterator_pause(dbiterator); @@ -17357,7 +17356,7 @@ cleanup: if (node) { dns_db_detachnode(db, &node); } - return (result); + return result; } static void @@ -17507,7 +17506,7 @@ zone_send_securedb(dns_zone_t *zone, dns_db_t *db) { isc_async_run(zone->secure->loop, receive_secure_db, rss); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_SENDSECURE); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -17536,7 +17535,7 @@ again: UNLOCK_ZONE(secure); } UNLOCK_ZONE(zone); - return (result); + return result; } static isc_result_t @@ -17568,18 +17567,18 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) { result = DNS_R_BADZONE; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } } else { dns_zone_log(zone, ISC_LOG_ERROR, "retrieving SOA and NS records failed: %s", isc_result_totext(result)); - return (result); + return result; } result = check_nsec3param(zone, db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ver = NULL; @@ -17718,11 +17717,11 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) { dns_db_setmaxrrperset(zone->db, zone->maxrrperset); dns_db_setmaxtypepername(zone->db, zone->maxtypepername); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED | DNS_ZONEFLG_NEEDNOTIFY); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; fail: dns_db_closeversion(db, &ver, false); - return (result); + return result; } /* The caller must hold the dblock as a writer. */ @@ -18180,7 +18179,7 @@ uint32_t dns_zone_getsigvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->sigvalidityinterval); + return zone->sigvalidityinterval; } void @@ -18194,7 +18193,7 @@ uint32_t dns_zone_getkeyvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->keyvalidityinterval); + return zone->keyvalidityinterval; } void @@ -18217,7 +18216,7 @@ uint32_t dns_zone_getsigresigninginterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->sigresigninginterval); + return zone->sigresigninginterval; } isc_sockaddr_t @@ -18231,7 +18230,7 @@ dns_zone_getsourceaddr(dns_zone_t *zone) { sourceaddr = zone->sourceaddr; UNLOCK_ZONE(zone); - return (sourceaddr); + return sourceaddr; } isc_sockaddr_t @@ -18245,7 +18244,7 @@ dns_zone_getprimaryaddr(dns_zone_t *zone) { curraddr = dns_remote_curraddr(&zone->primaries); UNLOCK_ZONE(zone); - return (curraddr); + return curraddr; } isc_time_t @@ -18258,7 +18257,7 @@ dns_zone_getxfrintime(dns_zone_t *zone) { xfrintime = zone->xfrintime; UNLOCK_ZONE(zone); - return (xfrintime); + return xfrintime; } static void @@ -18326,7 +18325,7 @@ get_request_transport_type(dns_zone_t *zone) { } } - return (transport_type); + return transport_type; } dns_transport_type_t @@ -18339,7 +18338,7 @@ dns_zone_getrequesttransporttype(dns_zone_t *zone) { transport_type = get_request_transport_type(zone); UNLOCK_ZONE(zone); - return (transport_type); + return transport_type; } /* @@ -18599,13 +18598,13 @@ sendtoprimary(dns_forward_t *forward) { if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) { UNLOCK_ZONE(zone); - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } next: if (forward->which >= dns_remote_count(&forward->zone->primaries)) { UNLOCK_ZONE(zone); - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } forward->addr = dns_remote_addr(&zone->primaries, forward->which); @@ -18687,7 +18686,7 @@ unlock: isc_result_totext(result)); } - return (result); + return result; } static void @@ -18857,7 +18856,7 @@ cleanup: if (result != ISC_R_SUCCESS) { forward_destroy(forward); } - return (result); + return result; } isc_result_t @@ -18867,9 +18866,9 @@ dns_zone_next(dns_zone_t *zone, dns_zone_t **next) { *next = ISC_LIST_NEXT(zone, link); if (*next == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -18880,9 +18879,9 @@ dns_zone_first(dns_zonemgr_t *zmgr, dns_zone_t **first) { *first = ISC_LIST_HEAD(zmgr->zones); if (*first == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -18926,7 +18925,7 @@ static bool kfio_match(void *node, const void *key) { const dns_keyfileio_t *kfio = node; - return (dns_name_equal(kfio->name, key)); + return dns_name_equal(kfio->name, key); } static void @@ -18975,7 +18974,7 @@ zonemgr_keymgmt_add(dns_zonemgr_t *zmgr, dns_zone_t *zone, static bool match_ptr(void *node, const void *key) { - return (node == key); + return node == key; } static void @@ -19085,21 +19084,21 @@ dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) { REQUIRE(zonep != NULL && *zonep == NULL); if (zmgr->mctxpool == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } tid = isc_random_uniform(zmgr->workers); mctx = zmgr->mctxpool[tid]; if (mctx == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_zone_create(&zone, mctx, tid); *zonep = zone; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -19125,7 +19124,7 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) { UNLOCK_ZONE(zone); RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -19210,7 +19209,7 @@ dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) { RWLOCK(&zmgr->rwlock, isc_rwlocktype_write); zmgr_resume_xfrs(zmgr, true); RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -19279,7 +19278,7 @@ uint32_t dns_zonemgr_gettransfersin(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); - return (zmgr->transfersin); + return zmgr->transfersin; } void @@ -19293,7 +19292,7 @@ uint32_t dns_zonemgr_gettransfersperns(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); - return (zmgr->transfersperns); + return zmgr->transfersperns; } /* @@ -19418,11 +19417,11 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) { /* Enforce quota. */ if (nxfrsin >= maxtransfersin) { - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } if (nxfrsperns >= maxtransfersperns) { - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } gotquota: @@ -19440,7 +19439,7 @@ gotquota: "Transfer started."); UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -19539,21 +19538,21 @@ unsigned int dns_zonemgr_getnotifyrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); - return (zmgr->notifyrate); + return zmgr->notifyrate; } unsigned int dns_zonemgr_getstartupnotifyrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); - return (zmgr->startupnotifyrate); + return zmgr->startupnotifyrate; } unsigned int dns_zonemgr_getserialqueryrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); - return (zmgr->serialqueryrate); + return zmgr->serialqueryrate; } bool @@ -19578,7 +19577,7 @@ dns_zonemgr_unreachable(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, } } RWUNLOCK(&zmgr->urlock, isc_rwlocktype_read); - return (i < UNREACH_CACHE_SIZE && count > 1U); + return i < UNREACH_CACHE_SIZE && count > 1U; } void @@ -19704,7 +19703,7 @@ bool dns_zone_isforced(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)); + return DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER); } isc_result_t @@ -19714,7 +19713,7 @@ dns_zone_setstatistics(dns_zone_t *zone, bool on) { */ UNUSED(zone); UNUSED(on); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } uint64_t * @@ -19723,7 +19722,7 @@ dns_zone_getstatscounters(dns_zone_t *zone) { * This function is obsoleted. */ UNUSED(zone); - return (NULL); + return NULL; } void @@ -19782,7 +19781,7 @@ dns_stats_t * dns_zone_getdnssecsignstats(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->dnssecsignstats); + return zone->dnssecsignstats; } isc_stats_t * @@ -19796,9 +19795,9 @@ dns_zone_getrequeststats(dns_zone_t *zone) { * installed, but it shouldn't matter much in practice. */ if (zone->requeststats_on) { - return (zone->requeststats); + return zone->requeststats; } else { - return (NULL); + return NULL; } } @@ -19809,9 +19808,9 @@ dns_zone_getrequeststats(dns_zone_t *zone) { dns_stats_t * dns_zone_getrcvquerystats(dns_zone_t *zone) { if (zone->requeststats_on) { - return (zone->rcvquerystats); + return zone->rcvquerystats; } else { - return (NULL); + return NULL; } } @@ -19825,14 +19824,14 @@ dns_zone_setkeydirectory(dns_zone_t *zone, const char *directory) { result = dns_zone_setstring(zone, &zone->keydirectory, directory); UNLOCK_ZONE(zone); - return (result); + return result; } const char * dns_zone_getkeydirectory(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->keydirectory); + return zone->keydirectory; } void @@ -19858,7 +19857,7 @@ dns_zone_getkeystores(dns_zone_t *zone) { } UNLOCK_ZONE(zone); - return (ks); + return ks; } unsigned int @@ -19932,7 +19931,7 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, dns_zonestate_t state) { RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_read); - return (count); + return count; } isc_result_t @@ -19943,7 +19942,7 @@ dns_zone_getxfr(dns_zone_t *zone, dns_xfrin_t **xfrp, bool *is_firstrefresh, REQUIRE(xfrp != NULL && *xfrp == NULL); if (zone->zmgr == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* Reset. */ @@ -19995,7 +19994,7 @@ dns_zone_getxfr(dns_zone_t *zone, dns_xfrin_t **xfrp, bool *is_firstrefresh, UNLOCK_ZONE(zone); RWUNLOCK(&zone->zmgr->rwlock, isc_rwlocktype_read); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -20040,7 +20039,7 @@ dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKNAMES) && rdata->type != dns_rdatatype_nsec3) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKNAMESFAIL) || @@ -20057,7 +20056,7 @@ dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, dns_zone_log(zone, level, "%s/%s: %s", namebuf, typebuf, isc_result_totext(DNS_R_BADOWNERNAME)); if (fail) { - return (DNS_R_BADOWNERNAME); + return DNS_R_BADOWNERNAME; } } @@ -20070,11 +20069,11 @@ dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, dns_zone_log(zone, level, "%s/%s: %s: %s ", namebuf, typebuf, namebuf2, isc_result_totext(DNS_R_BADNAME)); if (fail) { - return (DNS_R_BADNAME); + return DNS_R_BADNAME; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -20118,7 +20117,7 @@ uint32_t dns_zone_getnotifydelay(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->notifydelay); + return zone->notifydelay; } isc_result_t @@ -20134,7 +20133,7 @@ dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, result = zone_signwithkey(zone, algorithm, keyid, deleteit); UNLOCK_ZONE(zone); - return (result); + return result; } /* @@ -20159,7 +20158,7 @@ dns_zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) { result = zone_addnsec3chain(zone, nsec3param); UNLOCK_ZONE(zone); - return (result); + return result; } void @@ -20191,7 +20190,7 @@ dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures) { uint32_t dns_zone_getsignatures(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->signatures); + return zone->signatures; } void @@ -20203,7 +20202,7 @@ dns_zone_setprivatetype(dns_zone_t *zone, dns_rdatatype_t type) { dns_rdatatype_t dns_zone_getprivatetype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->privatetype); + return zone->privatetype; } static isc_result_t @@ -20285,7 +20284,7 @@ cleanup: if (db != NULL) { dns_db_detach(&db); } - return (result); + return result; } /* Called once; *timep should be set to the current time. */ @@ -20308,10 +20307,10 @@ next_keyevent(dst_key_t *key, isc_stdtime_t *timep) { if (then != 0) { *timep = then; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -20356,7 +20355,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /* @@ -20504,7 +20503,7 @@ failure: INSIST(ISC_LIST_EMPTY(add)); INSIST(ISC_LIST_EMPTY(del)); INSIST(ISC_LIST_EMPTY(tuples)); - return (result); + return result; } /* @@ -20538,7 +20537,7 @@ tickle_apex_rrset(dns_rdatatype_t rrtype, dns_zone_t *zone, dns_db_t *db, dnssec_log(zone, ISC_LOG_ERROR, "sign_apex:del_sigs -> %s", isc_result_totext(result)); - return (result); + return result; } result = add_sigs(db, ver, &zone->origin, zone, rrtype, zonediff->diff, keys, nkeys, zone->mctx, now, @@ -20547,11 +20546,11 @@ tickle_apex_rrset(dns_rdatatype_t rrtype, dns_zone_t *zone, dns_db_t *db, dnssec_log(zone, ISC_LOG_ERROR, "sign_apex:add_sigs -> %s", isc_result_totext(result)); - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -20568,7 +20567,7 @@ sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dnssec_log(zone, ISC_LOG_ERROR, "sign_apex:dns_zone_findkeys -> %s", isc_result_totext(result)); - return (result); + return result; } inception = now - 3600; /* Allow for clock skew. */ @@ -20620,7 +20619,7 @@ failure: for (i = 0; i < nkeys; i++) { dst_key_free(&zone_keys[i]); } - return (result); + return result; } static isc_result_t @@ -20648,7 +20647,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } /* @@ -20663,7 +20662,7 @@ signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) { REQUIRE(rdataset == NULL || rdataset->type == dns_rdatatype_rrsig); if (rdataset == NULL || !dns_rdataset_isassociated(rdataset)) { - return (false); + return false; } for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; @@ -20674,11 +20673,11 @@ signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) { RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_rdata_reset(&rdata); if (rrsig.algorithm == alg) { - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -20698,7 +20697,7 @@ add_chains(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, CHECK(updatesecure(db, ver, origin, zone_nsecttl(zone), true, diff)); failure: - return (result); + return result; } static void @@ -20764,14 +20763,14 @@ make_dnskey(dst_key_t *key, unsigned char *buf, int bufsize, isc_buffer_init(&b, buf, bufsize); result = dst_key_todns(key, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdata_reset(target); isc_buffer_usedregion(&b, &r); dns_rdata_fromregion(target, dst_key_class(key), dns_rdatatype_dnskey, &r); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -20793,7 +20792,7 @@ do_checkds(dns_zone_t *zone, dst_key_t *key, isc_stdtime_t now, default: dns_zone_log(zone, ISC_LOG_WARNING, "checkds: option is disabled"); - return (false); + return false; } if (dspublish) { @@ -20806,7 +20805,7 @@ do_checkds(dns_zone_t *zone, dst_key_t *key, isc_stdtime_t now, count, dst_key_id(key)); if (count != num) { - return (false); + return false; } } else { (void)dst_key_getnum(key, DST_NUM_DSDELCOUNT, &count); @@ -20818,7 +20817,7 @@ do_checkds(dns_zone_t *zone, dst_key_t *key, isc_stdtime_t now, count, dst_key_id(key)); if (count != num) { - return (false); + return false; } } @@ -20837,10 +20836,10 @@ do_checkds(dns_zone_t *zone, dst_key_t *key, isc_stdtime_t now, dns_zone_log(zone, ISC_LOG_WARNING, "checkds: checkds for key %u failed: %s", dst_key_id(key), isc_result_totext(result)); - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -20858,7 +20857,7 @@ validate_ds(dns_zone_t *zone, dns_message_t *message) { /* Validate DS RRset. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -21110,15 +21109,15 @@ checkds_isqueued(dns_zone_t *zone, dns_name_t *name, isc_sockaddr_t *addr, continue; } if (name != NULL && dns_name_equal(name, &checkds->ns)) { - return (true); + return true; } if (addr != NULL && isc_sockaddr_equal(addr, &checkds->dst) && checkds->key == key && checkds->transport == transport) { - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -21138,7 +21137,7 @@ checkds_create(isc_mem_t *mctx, unsigned int flags, dns_checkds_t **checkdsp) { ISC_LINK_INIT(checkds, link); checkds->magic = CHECKDS_MAGIC; *checkdsp = checkds; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -21978,7 +21977,7 @@ update_ttl(dns_rdataset_t *rdataset, dns_name_t *name, dns_ttl_t ttl, dns_diff_appendminimal(diff, &tuple); } if (result != ISC_R_NOMORE) { - return (result); + return result; } /* @@ -21996,9 +21995,9 @@ update_ttl(dns_rdataset_t *rdataset, dns_name_t *name, dns_ttl_t ttl, dns_diff_appendminimal(diff, &tuple); } if (result != ISC_R_NOMORE) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -22034,12 +22033,12 @@ zone_verifykeys(dns_zone_t *zone, dns_dnsseckeylist_t *newkeys) { dnssec_log(zone, ISC_LOG_DEBUG(1), "verifykeys: key %s - not available", keystr); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } /* All good. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -22941,11 +22940,11 @@ dns_zone_nscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = zone_count_ns_rr(zone, db, node, version, NULL, errors, false); dns_db_detachnode(db, &node); - return (result); + return result; } isc_result_t @@ -22963,7 +22962,7 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) { result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&cds); @@ -23153,7 +23152,7 @@ failure: dns_rdataset_disassociate(&cdnskey); } dns_db_detachnode(db, &node); - return (result); + return result; } void @@ -23168,7 +23167,7 @@ dns_zone_setautomatic(dns_zone_t *zone, bool automatic) { bool dns_zone_getautomatic(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->automatic); + return zone->automatic; } void @@ -23183,7 +23182,7 @@ dns_zone_setadded(dns_zone_t *zone, bool added) { bool dns_zone_getadded(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->added); + return zone->added; } isc_result_t @@ -23219,14 +23218,14 @@ again: UNLOCK_ZONE(secure); } UNLOCK_ZONE(zone); - return (result); + return result; } isc_result_t dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); if (interval == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* Maximum value: 24 hours (3600 minutes) */ if (interval > (24 * 60)) { @@ -23234,7 +23233,7 @@ dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) { } /* Multiply by 60 for seconds */ zone->refreshkeyinterval = interval * 60; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -23246,7 +23245,7 @@ dns_zone_setrequestixfr(dns_zone_t *zone, bool flag) { bool dns_zone_getrequestixfr(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->requestixfr); + return zone->requestixfr; } void @@ -23258,7 +23257,7 @@ dns_zone_setrequestixfrmaxdiffs(dns_zone_t *zone, uint32_t maxdiffs) { bool dns_zone_getrequestixfrmaxdiffs(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->requestixfr_maxdiffs); + return zone->requestixfr_maxdiffs; } void @@ -23270,7 +23269,7 @@ dns_zone_setixfrratio(dns_zone_t *zone, uint32_t ratio) { uint32_t dns_zone_getixfrratio(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->ixfr_ratio); + return zone->ixfr_ratio; } void @@ -23282,7 +23281,7 @@ dns_zone_setrequestexpire(dns_zone_t *zone, bool flag) { bool dns_zone_getrequestexpire(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->requestexpire); + return zone->requestexpire; } void @@ -23294,7 +23293,7 @@ dns_zone_setserialupdatemethod(dns_zone_t *zone, dns_updatemethod_t method) { dns_updatemethod_t dns_zone_getserialupdatemethod(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->updatemethod); + return zone->updatemethod; } /* @@ -23340,7 +23339,7 @@ dns_zone_link(dns_zone_t *zone, dns_zone_t *raw) { UNLOCK_ZONE(raw); UNLOCK_ZONE(zone); RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -23363,7 +23362,7 @@ dns_zone_israw(dns_zone_t *zone) { LOCK(&zone->lock); israw = zone->secure != NULL; UNLOCK(&zone->lock); - return (israw); + return israw; } bool @@ -23373,7 +23372,7 @@ dns_zone_issecure(dns_zone_t *zone) { LOCK(&zone->lock); issecure = zone->raw != NULL; UNLOCK(&zone->lock); - return (issecure); + return issecure; } struct keydone { @@ -23577,7 +23576,7 @@ failure: isc_mem_put(zone->mctx, kd, sizeof(*kd)); } UNLOCK_ZONE(zone); - return (result); + return result; } /* @@ -24043,7 +24042,7 @@ failure: dns_db_detach(&db); } - return (result); + return result; } /* @@ -24100,7 +24099,7 @@ dns_zone_setnsec3param(dns_zone_t *zone, uint8_t hash, uint8_t flags, saltbuf, resalt); if (result == ISC_R_SUCCESS) { UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* * Schedule lookup if lookup above failed (may happen if @@ -24183,7 +24182,7 @@ dns_zone_setnsec3param(dns_zone_t *zone, uint8_t hash, uint8_t flags, failure: UNLOCK_ZONE(zone); - return (result); + return result; } isc_result_t @@ -24194,7 +24193,7 @@ dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime) { LOCK_ZONE(zone); *loadtime = zone->loadtime; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -24205,7 +24204,7 @@ dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime) { LOCK_ZONE(zone); *expiretime = zone->expiretime; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -24216,7 +24215,7 @@ dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime) { LOCK_ZONE(zone); *refreshtime = zone->refreshtime; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -24227,7 +24226,7 @@ dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime) { LOCK_ZONE(zone); *refreshkeytime = zone->refreshkeytime; UNLOCK_ZONE(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } unsigned int @@ -24256,7 +24255,7 @@ dns_zone_getincludes(dns_zone_t *zone, char ***includesp) { done: UNLOCK_ZONE(zone); - return (n); + return n; } void @@ -24270,7 +24269,7 @@ dns_zonestat_level_t dns_zone_getstatlevel(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->statlevel); + return zone->statlevel; } static void @@ -24407,21 +24406,21 @@ dns_zone_setserial(dns_zone_t *zone, uint32_t serial) { failure: UNLOCK_ZONE(zone); - return (result); + return result; } isc_stats_t * dns_zone_getgluecachestats(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (zone->gluecachestats); + return zone->gluecachestats; } bool dns_zone_isloaded(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)); + return DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED); } isc_result_t @@ -24437,7 +24436,7 @@ dns_zone_verifydb(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver) { ENTER; if (dns_zone_gettype(zone) != dns_zone_mirror) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (ver == NULL) { @@ -24472,14 +24471,14 @@ done: result = DNS_R_VERIFYFAILURE; } - return (result); + return result; } static dns_ttl_t zone_nsecttl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); - return (ISC_MIN(zone->minimum, zone->soattl)); + return ISC_MIN(zone->minimum, zone->soattl); } void @@ -24514,17 +24513,17 @@ zmgr_tlsctx_attach(dns_zonemgr_t *zmgr, isc_tlsctx_cache_t **ptlsctx_cache) { isc_mem_t * dns_zone_getmem(dns_zone_t *zone) { - return (zone->mctx); + return zone->mctx; } unsigned int dns_zone_gettid(dns_zone_t *zone) { - return (zone->tid); + return zone->tid; } isc_loop_t * dns_zone_getloop(dns_zone_t *zone) { - return (zone->loop); + return zone->loop; } isc_result_t @@ -24540,7 +24539,7 @@ dns_zone_makedb(dns_zone_t *zone, dns_db_t **dbp) { : dns_dbtype_zone, zone->rdclass, zone->db_argc - 1, zone->db_argv + 1, &db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } switch (zone->type) { @@ -24553,7 +24552,7 @@ dns_zone_makedb(dns_zone_t *zone, dns_db_t **dbp) { } if (result != ISC_R_SUCCESS) { dns_db_detach(&db); - return (result); + return result; } break; default: @@ -24566,7 +24565,7 @@ dns_zone_makedb(dns_zone_t *zone, dns_db_t **dbp) { *dbp = db; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -24589,7 +24588,7 @@ dns_zone_import_skr(dns_zone_t *zone, const char *file) { failure: dns_skr_detach(&skr); - return (result); + return result; } isc_result_t @@ -24605,7 +24604,7 @@ dns_zone_getrad(dns_zone_t *zone, dns_name_t *name) { result = ISC_R_SUCCESS; } UNLOCK_ZONE(zone); - return (result); + return result; } void diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c index f86c2ca9f2..310bf889bf 100644 --- a/lib/dns/zonekey.c +++ b/lib/dns/zonekey.c @@ -35,7 +35,7 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata) { result = dns_rdata_tostruct(keyrdata, &key, NULL); if (result != ISC_R_SUCCESS) { - return (false); + return false; } if ((key.flags & DNS_KEYTYPE_NOAUTH) != 0) { @@ -50,5 +50,5 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata) { iszonekey = false; } - return (iszonekey); + return iszonekey; } diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c index b52f651d8b..100778a508 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -101,7 +101,7 @@ struct nsec3_chain_fixed { */ static size_t chain_length(struct nsec3_chain_fixed *chain) { - return (chain->salt_length + 2 * chain->next_length); + return chain->salt_length + 2 * chain->next_length; } /*% @@ -132,7 +132,7 @@ is_delegation(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, isc_result_t result; if (dns_name_equal(name, vctx->origin)) { - return (false); + return false; } dns_rdataset_init(&nsset); @@ -145,7 +145,7 @@ is_delegation(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, dns_rdataset_disassociate(&nsset); } - return ((result == ISC_R_SUCCESS)); + return result == ISC_R_SUCCESS; } /*% @@ -165,7 +165,7 @@ has_dname(const vctx_t *vctx, dns_dbnode_t *node) { dns_rdataset_disassociate(&dnameset); } - return ((result == ISC_R_SUCCESS)); + return result == ISC_R_SUCCESS; } static bool @@ -187,10 +187,10 @@ goodsig(const vctx_t *vctx, dns_rdata_t *sigrdata, const dns_name_t *name, result = dns_dnssec_verify(name, rdataset, dstkeys[key], false, 0, vctx->mctx, sigrdata, NULL); if (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD) { - return (true); + return true; } } - return (false); + return false; } static bool @@ -204,9 +204,9 @@ nsec_bitmap_equal(dns_rdata_nsec_t *nsec, dns_rdata_t *rdata) { if (nsec->len != tmpnsec.len || memcmp(nsec->typebits, tmpnsec.typebits, nsec->len) != 0) { - return (false); + return false; } - return (true); + return true; } static isc_result_t @@ -293,7 +293,7 @@ done: dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } static isc_result_t @@ -310,7 +310,7 @@ check_no_rrsig(const vctx_t *vctx, const dns_rdataset_t *rdataset, if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_db_allrdatasets(): %s", isc_result_totext(result)); - return (result); + return result; } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; result = dns_rdatasetiter_next(rdsiter)) @@ -336,7 +336,7 @@ check_no_rrsig(const vctx_t *vctx, const dns_rdataset_t *rdataset, } dns_rdatasetiter_destroy(&rdsiter); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -346,52 +346,52 @@ chain_compare(void *arg1, void *arg2) { * Do each element in turn to get a stable sort. */ if (e1->hash < e2->hash) { - return (true); + return true; } if (e1->hash > e2->hash) { - return (false); + return false; } if (e1->iterations < e2->iterations) { - return (true); + return true; } if (e1->iterations > e2->iterations) { - return (false); + return false; } if (e1->salt_length < e2->salt_length) { - return (true); + return true; } if (e1->salt_length > e2->salt_length) { - return (false); + return false; } if (e1->next_length < e2->next_length) { - return (true); + return true; } if (e1->next_length > e2->next_length) { - return (false); + return false; } if (memcmp(e1 + 1, e2 + 1, chain_length(e1)) < 0) { - return (true); + return true; } - return (false); + return false; } static bool chain_equal(const struct nsec3_chain_fixed *e1, const struct nsec3_chain_fixed *e2, size_t data_length) { if (e1->hash != e2->hash) { - return (false); + return false; } if (e1->iterations != e2->iterations) { - return (false); + return false; } if (e1->salt_length != e2->salt_length) { - return (false); + return false; } if (e1->next_length != e2->next_length) { - return (false); + return false; } - return (memcmp(e1 + 1, e2 + 1, data_length) == 0); + return memcmp(e1 + 1, e2 + 1, data_length) == 0; } static void @@ -446,11 +446,11 @@ find_nsec3_match(const dns_rdata_nsec3param_t *nsec3param, memcmp(nsec3_match->salt, nsec3param->salt, nsec3param->salt_length) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (result); + return result; } static isc_result_t @@ -471,7 +471,7 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, zoneverify_log_error(vctx, "Missing NSEC3 record for %s", namebuf); *vresult = result; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -485,7 +485,7 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, "mismatch", namebuf); *vresult = ISC_R_FAILURE; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -516,16 +516,16 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, "same parameter set for %s", namebuf); *vresult = DNS_R_DUPLICATE; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } if (result != ISC_R_NOMORE) { - return (result); + return result; } *vresult = ISC_R_SUCCESS; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -547,10 +547,10 @@ innsec3params(const dns_rdata_nsec3_t *nsec3, dns_rdataset_t *nsec3paramset) { memcmp(nsec3param.salt, nsec3->salt, nsec3->salt_length) == 0) { - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -565,7 +565,7 @@ record_found(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (nsec3paramset == NULL || !dns_rdataset_isassociated(nsec3paramset)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_rdataset_init(&rdataset); @@ -573,7 +573,7 @@ record_found(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, dns_rdatatype_nsec3, 0, 0, &rdataset, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_getlabel(name, 0, &hashlabel); @@ -613,7 +613,7 @@ record_found(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, cleanup: dns_rdataset_disassociate(&rdataset); - return (result); + return result; } static isc_result_t @@ -637,7 +637,7 @@ isoptout(const vctx_t *vctx, const dns_rdata_nsec3param_t *nsec3param, if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_nsec3_hashname(): %s", isc_result_totext(result)); - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -675,7 +675,7 @@ done: dns_db_detachnode(vctx->db, &node); } - return (result); + return result; } static isc_result_t @@ -699,23 +699,23 @@ verifynsec3(const vctx_t *vctx, const dns_name_t *name, RUNTIME_CHECK(result == ISC_R_SUCCESS); if (nsec3param.flags != 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (!dns_nsec3_supportedhash(nsec3param.hash)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (nsec3param.iterations > DNS_NSEC3_MAXITERATIONS) { result = DNS_R_NSEC3ITERRANGE; zoneverify_log_error(vctx, "verifynsec3: %s", isc_result_totext(result)); - return (result); + return result; } result = isoptout(vctx, &nsec3param, &optout); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_fixedname_init(&fixed); @@ -725,7 +725,7 @@ verifynsec3(const vctx_t *vctx, const dns_name_t *name, if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_nsec3_hashname(): %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -773,7 +773,7 @@ done: dns_db_detachnode(vctx->db, &node); } - return (result); + return result; } static isc_result_t @@ -792,7 +792,7 @@ verifynsec3s(const vctx_t *vctx, const dns_name_t *name, result = verifynsec3(vctx, name, &rdata, delegation, empty, types, maxtype, vresult); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (*vresult != ISC_R_SUCCESS) { break; @@ -801,7 +801,7 @@ verifynsec3s(const vctx_t *vctx, const dns_name_t *name, if (result == ISC_R_NOMORE) { result = ISC_R_SUCCESS; } - return (result); + return result; } static isc_result_t @@ -820,7 +820,7 @@ verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_db_allrdatasets(): %s", isc_result_totext(result)); - return (result); + return result; } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; result = dns_rdatasetiter_next(rdsiter)) @@ -904,7 +904,7 @@ done: } dns_rdatasetiter_destroy(&rdsiter); - return (result); + return result; } static isc_result_t @@ -924,7 +924,7 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_db_allrdatasets(): %s", isc_result_totext(result)); - return (result); + return result; } result = dns_rdatasetiter_first(rdsiter); @@ -947,7 +947,7 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (result != ISC_R_SUCCESS) { dns_rdataset_disassociate(&rdataset); dns_rdatasetiter_destroy(&rdsiter); - return (result); + return result; } dns_nsec_setbit(types, rdataset.type, 1); if (rdataset.type > maxtype) { @@ -964,7 +964,7 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (result != ISC_R_SUCCESS) { dns_rdataset_disassociate(&rdataset); dns_rdatasetiter_destroy(&rdsiter); - return (result); + return result; } } else { dns_nsec_setbit(types, rdataset.type, 1); @@ -979,11 +979,11 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (result != ISC_R_NOMORE) { zoneverify_log_error(vctx, "rdataset iteration failed: %s", isc_result_totext(result)); - return (result); + return result; } if (vresult == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } *vresult = ISC_R_SUCCESS; @@ -991,7 +991,7 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (nsecset != NULL && dns_rdataset_isassociated(nsecset)) { result = verifynsec(vctx, name, node, nextname, &tvresult); if (result != ISC_R_SUCCESS) { - return (result); + return result; } *vresult = tvresult; } @@ -1000,14 +1000,14 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, result = verifynsec3s(vctx, name, nsec3paramset, delegation, false, types, maxtype, &tvresult); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (*vresult == ISC_R_SUCCESS) { *vresult = tvresult; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1019,12 +1019,12 @@ is_empty(const vctx_t *vctx, dns_dbnode_t *node) { if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_db_allrdatasets(): %s", isc_result_totext(result)); - return (result); + return result; } result = dns_rdatasetiter_first(rdsiter); dns_rdatasetiter_destroy(&rdsiter); - return (result); + return result; } static isc_result_t @@ -1048,7 +1048,7 @@ check_no_nsec(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node) { dns_rdataset_disassociate(&rdataset); } - return (nsec_exists ? ISC_R_FAILURE : ISC_R_SUCCESS); + return nsec_exists ? ISC_R_FAILURE : ISC_R_SUCCESS; } static void @@ -1080,7 +1080,7 @@ _checknext(const vctx_t *vctx, const struct nsec3_chain_fixed *first, d2 += e->salt_length; if (memcmp(d1, d2, first->next_length) == 0) { - return (true); + return true; } sr.base = UNCONST(d1 - first->next_length); @@ -1104,7 +1104,7 @@ _checknext(const vctx_t *vctx, const struct nsec3_chain_fixed *first, zoneverify_log_error(vctx, "Found: %.*s", (int)isc_buffer_usedlength(&b), buf); - return (false); + return false; } static bool @@ -1117,7 +1117,7 @@ checknext(isc_mem_t *mctx, const vctx_t *vctx, free_element(mctx, prev); } - return (result); + return result; } static bool @@ -1129,7 +1129,7 @@ checklast(isc_mem_t *mctx, const vctx_t *vctx, struct nsec3_chain_fixed *first, } free_element(mctx, first); - return (result); + return result; } static isc_result_t @@ -1225,7 +1225,7 @@ verify_nsec3_chains(const vctx_t *vctx, isc_mem_t *mctx) { } } while (f != NULL); - return (result); + return result; } static isc_result_t @@ -1242,7 +1242,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, reln = dns_name_fullcompare(prevname, name, &order, &labels); if (order >= 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } nlabels = dns_name_countlabels(name); @@ -1261,7 +1261,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, vctx, &suffix, nsec3paramset, isdelegation, true, NULL, 0, &tvresult); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (*vresult == ISC_R_SUCCESS) { *vresult = tvresult; @@ -1270,7 +1270,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1346,7 +1346,7 @@ check_apex_rrsets(vctx_t *vctx) { zoneverify_log_error(vctx, "failed to find the zone's origin: %s", isc_result_totext(result)); - return (result); + return result; } result = dns_db_findrdataset(vctx->db, node, vctx->ver, @@ -1427,7 +1427,7 @@ check_apex_rrsets(vctx_t *vctx) { done: dns_db_detachnode(vctx->db, &node); - return (result); + return result; } /*% @@ -1604,7 +1604,7 @@ check_dnskey(vctx_t *vctx) { zoneverify_log_error( vctx, "dns_rdata_totext: %s", isc_result_totext(result)); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } zoneverify_log_error( vctx, @@ -1613,7 +1613,7 @@ check_dnskey(vctx_t *vctx) { namebuf, (int)isc_buffer_usedlength(&buf), buffer); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((dnskey.flags & DNS_KEYFLAG_KSK) != 0 && vctx->revoked_ksk[dnskey.algorithm] != @@ -1633,7 +1633,7 @@ check_dnskey(vctx_t *vctx) { dns_rdata_reset(&rdata); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1868,7 +1868,7 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) { if (result != ISC_R_SUCCESS) { zoneverify_log_error(vctx, "dns_db_createiterator(): %s", isc_result_totext(result)); - return (result); + return result; } for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; @@ -1907,7 +1907,7 @@ done: dns_dbiterator_destroy(&dbiter); } - return (result); + return result; } static isc_result_t @@ -1932,7 +1932,7 @@ check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) { report("."); } - return (first ? ISC_R_SUCCESS : ISC_R_FAILURE); + return first ? ISC_R_SUCCESS : ISC_R_FAILURE; } static void @@ -2034,5 +2034,5 @@ dns_zoneverify_dnssec(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, done: vctx_destroy(&vctx); - return (result); + return result; } diff --git a/lib/dns/zt.c b/lib/dns/zt.c index b8001f68ee..b4e75c1843 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -77,7 +77,7 @@ ztqpmakekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, uint32_t ival ISC_ATTR_UNUSED) { dns_zone_t *zone = pval; dns_name_t *name = dns_zone_getorigin(zone); - return (dns_qpkey_fromname(key, name)); + return dns_qpkey_fromname(key, name); } static void @@ -145,7 +145,7 @@ dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone) { dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(zt->multi, &qp); - return (result); + return result; } isc_result_t @@ -160,7 +160,7 @@ dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone) { dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(zt->multi, &qp); - return (result); + return result; } isc_result_t @@ -227,7 +227,7 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, dns_ztfind_t options, } } - return (result); + return result; } void @@ -243,7 +243,7 @@ dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) { static isc_result_t flush(dns_zone_t *zone, void *uap) { UNUSED(uap); - return (dns_zone_flush(zone)); + return dns_zone_flush(zone); } static void @@ -289,13 +289,13 @@ load(dns_zone_t *zone, void *uap) { { result = ISC_R_SUCCESS; } - return (result); + return result; } isc_result_t dns_zt_load(dns_zt_t *zt, bool stop, bool newonly) { REQUIRE(VALID_ZT(zt)); - return (dns_zt_apply(zt, stop, NULL, load, newonly ? &newonly : NULL)); + return dns_zt_apply(zt, stop, NULL, load, newonly ? &newonly : NULL); } static void @@ -326,7 +326,7 @@ loaded_one(void *uap) { zt_destroy(zt); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -355,7 +355,7 @@ asyncload(dns_zone_t *zone, void *uap) { isc_refcount_decrement1(&zt->references); isc_refcount_decrement1(&zt->loads_pending); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -392,7 +392,7 @@ dns_zt_asyncload(dns_zt_t *zt, bool newonly, dns_zt_callback_t *loaddone, loaded_all(params); } - return (result); + return result; } static isc_result_t @@ -416,19 +416,19 @@ freezezones(dns_zone_t *zone, void *uap) { if (raw != NULL) { dns_zone_detach(&raw); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (dns_zone_gettype(zone) != dns_zone_primary) { if (raw != NULL) { dns_zone_detach(&raw); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (!dns_zone_isdynamic(zone, true)) { if (raw != NULL) { dns_zone_detach(&raw); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } frozen = dns_zone_getupdatedisabled(zone); @@ -473,7 +473,7 @@ freezezones(dns_zone_t *zone, void *uap) { if (raw != NULL) { dns_zone_detach(&raw); } - return (result); + return result; } isc_result_t @@ -487,7 +487,7 @@ dns_zt_freezezones(dns_zt_t *zt, dns_view_t *view, bool freeze) { if (tresult == ISC_R_NOTFOUND) { tresult = ISC_R_SUCCESS; } - return ((result == ISC_R_SUCCESS) ? tresult : result); + return (result == ISC_R_SUCCESS) ? tresult : result; } typedef void @@ -497,7 +497,7 @@ static isc_result_t setview(dns_zone_t *zone, void *arg) { setview_cb *cb = arg; cb(zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -538,5 +538,5 @@ dns_zt_apply(dns_zt_t *zt, bool stop, isc_result_t *sub, SET_IF_NOT_NULL(sub, tresult); - return (result); + return result; } diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index 3dfccdcb07..8a69e1c730 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -85,7 +85,7 @@ isc_assertion_typetotext(isc_assertiontype_t type) { default: result = "UNKNOWN"; } - return (result); + return result; } /* diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index aace374f6c..9b32d9ad11 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -34,7 +34,7 @@ isc_backtrace(void **addrs, int maxaddrs) { * See notes in backtrace.h. */ if (addrs == NULL || maxaddrs <= 0) { - return (-1); + return -1; } /* @@ -43,17 +43,17 @@ isc_backtrace(void **addrs, int maxaddrs) { */ n = backtrace(addrs, maxaddrs); if (n < 2) { - return (-1); + return -1; } n--; memmove(addrs, &addrs[1], sizeof(addrs[0]) * n); - return (n); + return n; } char ** isc_backtrace_symbols(void *const *buffer, int size) { - return (backtrace_symbols(buffer, size)); + return backtrace_symbols(buffer, size); } void @@ -88,7 +88,7 @@ isc_backtrace(void **addrs, int maxaddrs) { UNUSED(addrs); UNUSED(maxaddrs); - return (-1); + return -1; } char ** @@ -96,7 +96,7 @@ isc_backtrace_symbols(void *const *buffer, int size) { UNUSED(buffer); UNUSED(size); - return (NULL); + return NULL; } void diff --git a/lib/isc/base32.c b/lib/isc/base32.c index ce6db733e4..74e74839f2 100644 --- a/lib/isc/base32.c +++ b/lib/isc/base32.c @@ -110,28 +110,28 @@ base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, if (source->length > 0) { isc_region_consume(source, source->length); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t isc_base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_buffer_t *target) { - return (base32_totext(source, wordlength, wordbreak, target, base32, - '=')); + return base32_totext(source, wordlength, wordbreak, target, base32, + '='); } isc_result_t isc_base32hex_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_buffer_t *target) { - return (base32_totext(source, wordlength, wordbreak, target, base32hex, - '=')); + return base32_totext(source, wordlength, wordbreak, target, base32hex, + '='); } isc_result_t isc_base32hexnp_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_buffer_t *target) { - return (base32_totext(source, wordlength, wordbreak, target, base32hex, - 0)); + return base32_totext(source, wordlength, wordbreak, target, base32hex, + 0); } /*% @@ -155,10 +155,10 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) { unsigned int last; if (ctx->seen_end) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } if ((s = strchr(ctx->base, c)) == NULL) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } last = (unsigned int)(s - ctx->base); @@ -173,14 +173,14 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) { * Check that padding is contiguous. */ if (last != 32 && ctx->seen_32 != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } /* * If padding is not permitted flag padding as a error. */ if (last == 32 && !ctx->pad) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } /* @@ -192,32 +192,32 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) { switch (ctx->digits) { case 0: case 1: - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; case 2: if ((ctx->val[1] & 0x03) != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } ctx->seen_32 = 1; break; case 3: - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; case 4: if ((ctx->val[3] & 0x0f) != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } ctx->seen_32 = 2; break; case 5: if ((ctx->val[4] & 0x01) != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } ctx->seen_32 = 3; break; case 6: - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; case 7: if ((ctx->val[6] & 0x07) != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } ctx->seen_32 = 4; break; @@ -247,20 +247,20 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) { RETERR(mem_tobuffer(ctx->target, buf, n)); if (ctx->length >= 0) { if (n > ctx->length) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } else { ctx->length -= n; } } ctx->digits = 0; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t base32_decode_finish(base32_decode_ctx_t *ctx) { if (ctx->length > 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } /* * Add missing padding if required. @@ -272,9 +272,9 @@ base32_decode_finish(base32_decode_ctx_t *ctx) { } while (ctx->digits != 0); } if (ctx->digits != 0) { - return (ISC_R_BADBASE32); + return ISC_R_BADBASE32; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -315,24 +315,24 @@ base32_tobuffer(isc_lex_t *lexer, const char base[], bool pad, } RETERR(base32_decode_finish(&ctx)); if (length == -2 && before == after) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t isc_base32_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { - return (base32_tobuffer(lexer, base32, true, target, length)); + return base32_tobuffer(lexer, base32, true, target, length); } isc_result_t isc_base32hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { - return (base32_tobuffer(lexer, base32hex, true, target, length)); + return base32_tobuffer(lexer, base32hex, true, target, length); } isc_result_t isc_base32hexnp_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { - return (base32_tobuffer(lexer, base32hex, false, target, length)); + return base32_tobuffer(lexer, base32hex, false, target, length); } static isc_result_t @@ -353,22 +353,22 @@ base32_decodestring(const char *cstr, const char base[], bool pad, RETERR(base32_decode_char(&ctx, c)); } RETERR(base32_decode_finish(&ctx)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t isc_base32_decodestring(const char *cstr, isc_buffer_t *target) { - return (base32_decodestring(cstr, base32, true, target)); + return base32_decodestring(cstr, base32, true, target); } isc_result_t isc_base32hex_decodestring(const char *cstr, isc_buffer_t *target) { - return (base32_decodestring(cstr, base32hex, true, target)); + return base32_decodestring(cstr, base32hex, true, target); } isc_result_t isc_base32hexnp_decodestring(const char *cstr, isc_buffer_t *target) { - return (base32_decodestring(cstr, base32hex, false, target)); + return base32_decodestring(cstr, base32hex, false, target); } static isc_result_t @@ -384,22 +384,22 @@ base32_decoderegion(isc_region_t *source, const char base[], bool pad, isc_region_consume(source, 1); } RETERR(base32_decode_finish(&ctx)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t isc_base32_decoderegion(isc_region_t *source, isc_buffer_t *target) { - return (base32_decoderegion(source, base32, true, target)); + return base32_decoderegion(source, base32, true, target); } isc_result_t isc_base32hex_decoderegion(isc_region_t *source, isc_buffer_t *target) { - return (base32_decoderegion(source, base32hex, true, target)); + return base32_decoderegion(source, base32hex, true, target); } isc_result_t isc_base32hexnp_decoderegion(isc_region_t *source, isc_buffer_t *target) { - return (base32_decoderegion(source, base32hex, false, target)); + return base32_decoderegion(source, base32hex, false, target); } static isc_result_t @@ -411,12 +411,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -425,9 +425,9 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_buffer_availableregion(target, &tr); if (length > tr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, base, length); isc_buffer_add(target, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/base64.c b/lib/isc/base64.c index 958ef4ff28..a51aa0d163 100644 --- a/lib/isc/base64.c +++ b/lib/isc/base64.c @@ -86,7 +86,7 @@ isc_base64_totext(isc_region_t *source, int wordlength, const char *wordbreak, RETERR(str_totext(buf, target)); isc_region_consume(source, 1); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -113,33 +113,33 @@ base64_decode_char(base64_decode_ctx_t *ctx, int c) { const char *s; if (ctx->seen_end) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } if ((s = strchr(base64, c)) == NULL) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } ctx->val[ctx->digits++] = (int)(s - base64); if (ctx->digits == 4) { int n; unsigned char buf[3]; if (ctx->val[0] == 64 || ctx->val[1] == 64) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } if (ctx->val[2] == 64 && ctx->val[3] != 64) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } /* * Check that bits that should be zero are. */ if (ctx->val[2] == 64 && (ctx->val[1] & 0xf) != 0) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } /* * We don't need to test for ctx->val[2] != 64 as * the bottom two bits of 64 are zero. */ if (ctx->val[3] == 64 && (ctx->val[2] & 0x3) != 0) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } n = (ctx->val[2] == 64) ? 1 : (ctx->val[3] == 64) ? 2 : 3; if (n != 3) { @@ -157,25 +157,25 @@ base64_decode_char(base64_decode_ctx_t *ctx, int c) { RETERR(mem_tobuffer(ctx->target, buf, n)); if (ctx->length >= 0) { if (n > ctx->length) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } else { ctx->length -= n; } } ctx->digits = 0; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t base64_decode_finish(base64_decode_ctx_t *ctx) { if (ctx->length > 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (ctx->digits != 0) { - return (ISC_R_BADBASE64); + return ISC_R_BADBASE64; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -215,9 +215,9 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { } RETERR(base64_decode_finish(&ctx)); if (length == -2 && before == after) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -236,7 +236,7 @@ isc_base64_decodestring(const char *cstr, isc_buffer_t *target) { RETERR(base64_decode_char(&ctx, c)); } RETERR(base64_decode_finish(&ctx)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -248,12 +248,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -262,9 +262,9 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_buffer_availableregion(target, &tr); if (length > tr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, base, length); isc_buffer_add(target, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c index c6e3568939..491830e976 100644 --- a/lib/isc/commandline.c +++ b/lib/isc/commandline.c @@ -106,7 +106,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { * Index out of range or points to non-option. */ place = ENDOPT; - return (-1); + return -1; } if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { @@ -116,7 +116,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { */ isc_commandline_index++; place = ENDOPT; - return (-1); + return -1; } } @@ -139,7 +139,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { isc_commandline_option); } - return (BADOPT); + return BADOPT; } if (*++option != ':') { @@ -179,7 +179,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { * when ':' starts options string, per historical spec. */ if (*options == ':') { - return (BADARG); + return BADARG; } if (isc_commandline_errprint) { @@ -190,7 +190,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { isc_commandline_option); } - return (BADOPT); + return BADOPT; } place = ENDOPT; @@ -201,7 +201,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { isc_commandline_index++; } - return (isc_commandline_option); + return isc_commandline_option; } isc_result_t @@ -255,10 +255,10 @@ restart: result = isc_commandline_strtoargv(mctx, p, argcp, argvp, n + 1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } (*argvp)[n] = s; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/condition.c b/lib/isc/condition.c index baf2808a6b..722a599491 100644 --- a/lib/isc/condition.c +++ b/lib/isc/condition.c @@ -41,7 +41,7 @@ isc__condition_waituntil(pthread_cond_t *c, pthread_mutex_t *m, isc_time_t *t) { if (result == ISC_R_RANGE) { ts.tv_sec = INT_MAX; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } /*! @@ -53,13 +53,13 @@ isc__condition_waituntil(pthread_cond_t *c, pthread_mutex_t *m, isc_time_t *t) { do { presult = pthread_cond_timedwait(c, m, &ts); if (presult == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (presult == ETIMEDOUT) { - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; } } while (presult == EINTR); UNEXPECTED_SYSERROR(presult, "pthread_cond_timedwait()"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } diff --git a/lib/isc/counter.c b/lib/isc/counter.c index 0c0ccd665b..452ca10663 100644 --- a/lib/isc/counter.c +++ b/lib/isc/counter.c @@ -51,7 +51,7 @@ isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) { counter->magic = COUNTER_MAGIC; *counterp = counter; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -60,17 +60,17 @@ isc_counter_increment(isc_counter_t *counter) { uint32_t limit = atomic_load_acquire(&counter->limit); if (limit != 0 && used >= limit) { - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } unsigned int isc_counter_used(isc_counter_t *counter) { REQUIRE(VALID_COUNTER(counter)); - return (atomic_load_acquire(&counter->used)); + return atomic_load_acquire(&counter->used); } void diff --git a/lib/isc/crypto.c b/lib/isc/crypto.c index fd38109a9b..7dc870bdd6 100644 --- a/lib/isc/crypto.c +++ b/lib/isc/crypto.c @@ -79,14 +79,14 @@ const EVP_MD *isc__crypto_sha512 = NULL; static void * isc__crypto_malloc_ex(size_t size, const char *file, int line) { - return (isc__mem_allocate(isc__crypto_mctx, size, 0, file, - (unsigned int)line)); + return isc__mem_allocate(isc__crypto_mctx, size, 0, file, + (unsigned int)line); } static void * isc__crypto_realloc_ex(void *ptr, size_t size, const char *file, int line) { - return (isc__mem_reallocate(isc__crypto_mctx, ptr, size, 0, file, - (unsigned int)line)); + return isc__mem_reallocate(isc__crypto_mctx, ptr, size, 0, file, + (unsigned int)line); } static void @@ -106,14 +106,14 @@ static void * isc__crypto_malloc_ex(size_t size, const char *file, int line) { UNUSED(file); UNUSED(line); - return (isc_mem_allocate(isc__crypto_mctx, size)); + return isc_mem_allocate(isc__crypto_mctx, size); } static void * isc__crypto_realloc_ex(void *ptr, size_t size, const char *file, int line) { UNUSED(file); UNUSED(line); - return (isc_mem_reallocate(isc__crypto_mctx, ptr, size)); + return isc_mem_reallocate(isc__crypto_mctx, ptr, size); } static void diff --git a/lib/isc/dir.c b/lib/isc/dir.c index 7c3ea98837..79a7739a3b 100644 --- a/lib/isc/dir.c +++ b/lib/isc/dir.c @@ -60,7 +60,7 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) { */ if (strlen(dirname) + 3 > sizeof(dir->dirname)) { /* XXXDCL ? */ - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strlcpy(dir->dirname, dirname, sizeof(dir->dirname)); @@ -80,10 +80,10 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) { dir->handle = opendir(dirname); if (dir->handle == NULL) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } - return (result); + return result; } /*! @@ -105,14 +105,14 @@ isc_dir_read(isc_dir_t *dir) { entry = readdir(dir->handle); if (entry == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* * Make sure that the space for the name is long enough. */ if (sizeof(dir->entry.name) <= strlen(entry->d_name)) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } strlcpy(dir->entry.name, entry->d_name, sizeof(dir->entry.name)); @@ -122,7 +122,7 @@ isc_dir_read(isc_dir_t *dir) { */ dir->entry.length = strlen(entry->d_name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*! @@ -145,7 +145,7 @@ isc_dir_reset(isc_dir_t *dir) { rewinddir(dir->handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -157,10 +157,10 @@ isc_dir_chdir(const char *dirname) { REQUIRE(dirname != NULL); if (chdir(dirname) < 0) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -184,11 +184,11 @@ isc_dir_chroot(const char *dirname) { } if (chroot(dirname) < 0 || chdir("/") < 0) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else /* ifdef HAVE_CHROOT */ - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif /* ifdef HAVE_CHROOT */ } diff --git a/lib/isc/errno.c b/lib/isc/errno.c index 5875f3b66e..c675ff7b0c 100644 --- a/lib/isc/errno.c +++ b/lib/isc/errno.c @@ -20,5 +20,5 @@ isc_result_t isc_errno_toresult(int err) { - return (isc___errno2result(err, false, 0, 0)); + return isc___errno2result(err, false, 0, 0); } diff --git a/lib/isc/errno2result.c b/lib/isc/errno2result.c index 1ef0c884d5..acb555e170 100644 --- a/lib/isc/errno2result.c +++ b/lib/isc/errno2result.c @@ -38,33 +38,33 @@ isc___errno2result(int posixerrno, bool dolog, const char *file, case EINVAL: /* XXX sometimes this is not for files */ case ENAMETOOLONG: case EBADF: - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; case EISDIR: - return (ISC_R_NOTFILE); + return ISC_R_NOTFILE; case ENOENT: - return (ISC_R_FILENOTFOUND); + return ISC_R_FILENOTFOUND; case EACCES: case EPERM: case EROFS: - return (ISC_R_NOPERM); + return ISC_R_NOPERM; case EEXIST: - return (ISC_R_FILEEXISTS); + return ISC_R_FILEEXISTS; case EIO: - return (ISC_R_IOERROR); + return ISC_R_IOERROR; case ENOMEM: - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; case ENFILE: case EMFILE: - return (ISC_R_TOOMANYOPENFILES); + return ISC_R_TOOMANYOPENFILES; #ifdef EDQUOT case EDQUOT: - return (ISC_R_DISCQUOTA); + return ISC_R_DISCQUOTA; #endif /* ifdef EDQUOT */ case ENOSPC: - return (ISC_R_DISCFULL); + return ISC_R_DISCFULL; #ifdef EOVERFLOW case EOVERFLOW: - return (ISC_R_RANGE); + return ISC_R_RANGE; #endif /* ifdef EOVERFLOW */ case EPIPE: #ifdef ECONNRESET @@ -73,47 +73,47 @@ isc___errno2result(int posixerrno, bool dolog, const char *file, #ifdef ECONNABORTED case ECONNABORTED: #endif /* ifdef ECONNABORTED */ - return (ISC_R_CONNECTIONRESET); + return ISC_R_CONNECTIONRESET; #ifdef ENOTCONN case ENOTCONN: - return (ISC_R_NOTCONNECTED); + return ISC_R_NOTCONNECTED; #endif /* ifdef ENOTCONN */ #ifdef ETIMEDOUT case ETIMEDOUT: - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; #endif /* ifdef ETIMEDOUT */ #ifdef ENOBUFS case ENOBUFS: - return (ISC_R_NORESOURCES); + return ISC_R_NORESOURCES; #endif /* ifdef ENOBUFS */ #ifdef EAFNOSUPPORT case EAFNOSUPPORT: - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; #endif /* ifdef EAFNOSUPPORT */ #ifdef ENETDOWN case ENETDOWN: - return (ISC_R_NETDOWN); + return ISC_R_NETDOWN; #endif /* ifdef ENETDOWN */ #ifdef EHOSTDOWN case EHOSTDOWN: - return (ISC_R_HOSTDOWN); + return ISC_R_HOSTDOWN; #endif /* ifdef EHOSTDOWN */ #ifdef ENETUNREACH case ENETUNREACH: - return (ISC_R_NETUNREACH); + return ISC_R_NETUNREACH; #endif /* ifdef ENETUNREACH */ #ifdef EHOSTUNREACH case EHOSTUNREACH: - return (ISC_R_HOSTUNREACH); + return ISC_R_HOSTUNREACH; #endif /* ifdef EHOSTUNREACH */ #ifdef EADDRINUSE case EADDRINUSE: - return (ISC_R_ADDRINUSE); + return ISC_R_ADDRINUSE; #endif /* ifdef EADDRINUSE */ case EADDRNOTAVAIL: - return (ISC_R_ADDRNOTAVAIL); + return ISC_R_ADDRNOTAVAIL; case ECONNREFUSED: - return (ISC_R_CONNREFUSED); + return ISC_R_CONNREFUSED; default: if (dolog) { strerror_r(posixerrno, strbuf, sizeof(strbuf)); @@ -128,6 +128,6 @@ isc___errno2result(int posixerrno, bool dolog, const char *file, * might have something more descriptive than "unexpected * error" to log with. */ - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } diff --git a/lib/isc/file.c b/lib/isc/file.c index 439e882aad..59b1b46431 100644 --- a/lib/isc/file.c +++ b/lib/isc/file.c @@ -88,7 +88,7 @@ file_stats(const char *file, struct stat *stats) { result = isc__errno2result(errno); } - return (result); + return result; } static isc_result_t @@ -101,7 +101,7 @@ fd_stats(int fd, struct stat *stats) { result = isc__errno2result(errno); } - return (result); + return result; } isc_result_t @@ -117,7 +117,7 @@ isc_file_getsizefd(int fd, off_t *size) { *size = stats.st_size; } - return (result); + return result; } isc_result_t @@ -132,7 +132,7 @@ isc_file_mode(const char *file, mode_t *modep) { *modep = (stats.st_mode & 07777); } - return (result); + return result; } isc_result_t @@ -153,7 +153,7 @@ isc_file_getmodtime(const char *file, isc_time_t *modtime) { #endif /* if defined(HAVE_STAT_NSEC) */ } - return (result); + return result; } isc_result_t @@ -170,7 +170,7 @@ isc_file_getsize(const char *file, off_t *size) { *size = stats.st_size; } - return (result); + return result; } isc_result_t @@ -197,7 +197,7 @@ isc_file_settime(const char *file, isc_time_t *when) { if ((times[0].tv_sec & (1ULL << (sizeof(times[0].tv_sec) * CHAR_BIT - 1))) != 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* @@ -208,10 +208,10 @@ isc_file_settime(const char *file, isc_time_t *when) { (int32_t)(isc_time_nanoseconds(when) / 1000); if (utimes(file, times) < 0) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #undef TEMPLATE @@ -219,7 +219,7 @@ isc_file_settime(const char *file, isc_time_t *when) { isc_result_t isc_file_mktemplate(const char *path, char *buf, size_t buflen) { - return (isc_file_template(path, TEMPLATE, buf, buflen)); + return isc_file_template(path, TEMPLATE, buf, buflen); } isc_result_t @@ -244,7 +244,7 @@ isc_file_template(const char *path, const char *templet, char *buf, if (s != NULL) { size_t prefixlen = s - path + 1; if ((prefixlen + strlen(templet) + 1) > buflen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* Copy 'prefixlen' bytes and NUL terminate. */ @@ -252,13 +252,13 @@ isc_file_template(const char *path, const char *templet, char *buf, strlcat(buf, templet, buflen); } else { if ((strlen(templet) + 1) > buflen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strlcpy(buf, templet, buflen); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static const char alphnum[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuv" @@ -277,7 +277,7 @@ isc_file_renameunique(const char *file, char *templet) { cp++; } if (cp == templet) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } x = cp--; @@ -287,12 +287,12 @@ isc_file_renameunique(const char *file, char *templet) { } while (link(file, templet) == -1) { if (errno != EEXIST) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } for (cp = x;;) { const char *t; if (*cp == '\0') { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } t = strchr(alphnum, *cp); if (t == NULL || *++t == '\0') { @@ -305,22 +305,22 @@ isc_file_renameunique(const char *file, char *templet) { } if (unlink(file) < 0) { if (errno != ENOENT) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t isc_file_openunique(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; - return (isc_file_openuniquemode(templet, mode, fp)); + return isc_file_openuniquemode(templet, mode, fp); } isc_result_t isc_file_openuniqueprivate(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR; - return (isc_file_openuniquemode(templet, mode, fp)); + return isc_file_openuniquemode(templet, mode, fp); } isc_result_t @@ -339,7 +339,7 @@ isc_file_openuniquemode(char *templet, int mode, FILE **fp) { cp++; } if (cp == templet) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } x = cp--; @@ -350,12 +350,12 @@ isc_file_openuniquemode(char *templet, int mode, FILE **fp) { while ((fd = open(templet, O_RDWR | O_CREAT | O_EXCL, mode)) == -1) { if (errno != EEXIST) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } for (cp = x;;) { char *t; if (*cp == '\0') { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } t = strchr(alphnum, *cp); if (t == NULL || *++t == '\0') { @@ -379,7 +379,7 @@ isc_file_openuniquemode(char *templet, int mode, FILE **fp) { *fp = f; } - return (result); + return result; } isc_result_t @@ -390,9 +390,9 @@ isc_file_remove(const char *filename) { r = unlink(filename); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -405,9 +405,9 @@ isc_file_rename(const char *oldname, const char *newname) { r = rename(oldname, newname); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -417,7 +417,7 @@ isc_file_exists(const char *pathname) { REQUIRE(pathname != NULL); - return (file_stats(pathname, &stats) == ISC_R_SUCCESS); + return file_stats(pathname, &stats) == ISC_R_SUCCESS; } isc_result_t @@ -429,14 +429,14 @@ isc_file_isplainfile(const char *filename) { memset(&filestat, 0, sizeof(struct stat)); if ((stat(filename, &filestat)) == -1) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } if (!S_ISREG(filestat.st_mode)) { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -448,14 +448,14 @@ isc_file_isplainfilefd(int fd) { memset(&filestat, 0, sizeof(struct stat)); if ((fstat(fd, &filestat)) == -1) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } if (!S_ISREG(filestat.st_mode)) { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -468,38 +468,38 @@ isc_file_isdirectory(const char *filename) { memset(&filestat, 0, sizeof(struct stat)); if ((stat(filename, &filestat)) == -1) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } if (!S_ISDIR(filestat.st_mode)) { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool isc_file_isabsolute(const char *filename) { REQUIRE(filename != NULL); - return (filename[0] == '/'); + return filename[0] == '/'; } bool isc_file_iscurrentdir(const char *filename) { REQUIRE(filename != NULL); - return (filename[0] == '.' && filename[1] == '\0'); + return filename[0] == '.' && filename[1] == '\0'; } bool isc_file_ischdiridempotent(const char *filename) { REQUIRE(filename != NULL); if (isc_file_isabsolute(filename)) { - return (true); + return true; } if (isc_file_iscurrentdir(filename)) { - return (true); + return true; } - return (false); + return false; } const char * @@ -510,10 +510,10 @@ isc_file_basename(const char *filename) { s = strrchr(filename, '/'); if (s == NULL) { - return (filename); + return filename; } - return (s + 1); + return s + 1; } isc_result_t @@ -528,11 +528,11 @@ isc_file_progname(const char *filename, char *buf, size_t buflen) { len = strlen(base) + 1; if (len > buflen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(buf, base, len); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -565,7 +565,7 @@ dir_current(char *dirname, size_t length) { } } - return (result); + return result; } isc_result_t @@ -573,13 +573,13 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { isc_result_t result; result = dir_current(path, pathlen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (strlen(path) + strlen(filename) + 1 > pathlen) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } strlcat(path, filename, pathlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -589,7 +589,7 @@ isc_file_truncate(const char *filename, off_t size) { if (truncate(filename, size) < 0) { result = isc__errno2result(errno); } - return (result); + return result; } isc_result_t @@ -606,29 +606,29 @@ isc_file_safecreate(const char *filename, FILE **fp) { result = file_stats(filename, &sb); if (result == ISC_R_SUCCESS) { if ((sb.st_mode & S_IFREG) == 0) { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } flags = O_WRONLY | O_TRUNC; } else if (result == ISC_R_FILENOTFOUND) { flags = O_WRONLY | O_CREAT | O_EXCL; } else { - return (result); + return result; } fd = open(filename, flags, S_IRUSR | S_IWUSR); if (fd == -1) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } f = fdopen(fd, "w"); if (f == NULL) { result = isc__errno2result(errno); close(fd); - return (result); + return result; } *fp = f; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -638,7 +638,7 @@ isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, const char *file, *slash; if (path == NULL) { - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } slash = strrchr(path, '/'); @@ -656,18 +656,18 @@ isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, } if (dir == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (*file == '\0') { isc_mem_free(mctx, dir); - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; } *dirname = dir; *bname = file; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #define DISALLOW "\\/ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -681,10 +681,10 @@ digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, size_t left = hashlen - i * 2; ret = snprintf(hash + i * 2, left, "%02x", digest[i]); if (ret < 0 || (size_t)ret >= left) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -718,19 +718,19 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, } if (l > length || l > (unsigned int)PATH_MAX) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* Check whether the full-length SHA256 hash filename exists */ err = isc_md(ISC_MD_SHA256, (const unsigned char *)base, strlen(base), digest, &digestlen); if (err != ISC_R_SUCCESS) { - return (err); + return err; } err = digest2hex(digest, digestlen, hash, sizeof(hash)); if (err != ISC_R_SUCCESS) { - return (err); + return err; } snprintf(buf, sizeof(buf), "%s%s%s%s%s", dir != NULL ? dir : "", @@ -738,7 +738,7 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, ext != NULL ? ext : ""); if (isc_file_exists(buf)) { strlcpy(path, buf, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Check for a truncated SHA256 hash filename */ @@ -748,7 +748,7 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, ext != NULL ? ext : ""); if (isc_file_exists(buf)) { strlcpy(path, buf, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -758,17 +758,17 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, */ if (strpbrk(base, DISALLOW) != NULL) { strlcpy(path, buf, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } snprintf(buf, sizeof(buf), "%s%s%s%s%s", dir != NULL ? dir : "", dir != NULL ? "/" : "", base, ext != NULL ? "." : "", ext != NULL ? ext : ""); strlcpy(path, buf, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool isc_file_isdirwritable(const char *path) { - return (access(path, W_OK | X_OK) == 0); + return access(path, W_OK | X_OK) == 0; } diff --git a/lib/isc/fips.c b/lib/isc/fips.c index e97c6b0020..43454516bb 100644 --- a/lib/isc/fips.c +++ b/lib/isc/fips.c @@ -20,36 +20,36 @@ #include bool isc_fips_mode(void) { - return (EVP_default_properties_is_fips_enabled(NULL) != 0); + return EVP_default_properties_is_fips_enabled(NULL) != 0; } isc_result_t isc_fips_set_mode(int mode) { - return (EVP_default_properties_enable_fips(NULL, mode) != 0 - ? ISC_R_SUCCESS - : ISC_R_FAILURE); + return EVP_default_properties_enable_fips(NULL, mode) != 0 + ? ISC_R_SUCCESS + : ISC_R_FAILURE; } #elif defined(HAVE_FIPS_MODE) #include bool isc_fips_mode(void) { - return (FIPS_mode() != 0); + return FIPS_mode() != 0; } isc_result_t isc_fips_set_mode(int mode) { - return (FIPS_mode_set(mode) != 0 ? ISC_R_SUCCESS : ISC_R_FAILURE); + return FIPS_mode_set(mode) != 0 ? ISC_R_SUCCESS : ISC_R_FAILURE; } #else bool isc_fips_mode(void) { - return (false); + return false; } isc_result_t isc_fips_set_mode(int mode) { UNUSED(mode); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } #endif diff --git a/lib/isc/getaddresses.c b/lib/isc/getaddresses.c index bed59b483a..e77ef7a085 100644 --- a/lib/isc/getaddresses.c +++ b/lib/isc/getaddresses.c @@ -62,7 +62,7 @@ isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, isc_sockaddr_v6fromin(&addrs[0], &in4, port); } *addrcount = 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (strlen(hostname) <= 127U) { char tmpbuf[128], *d; uint32_t zone = 0; @@ -77,7 +77,7 @@ isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, isc_netaddr_t na; if (!have_ipv6) { - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; } if (d != NULL) { @@ -87,7 +87,7 @@ isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, &in6, &zone); if (iresult != ISC_R_SUCCESS) { - return (iresult); + return iresult; } } @@ -97,7 +97,7 @@ isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, &addrs[0], (const isc_netaddr_t *)&na, port); *addrcount = 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } memset(&hints, 0, sizeof(hints)); @@ -123,7 +123,7 @@ again: #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME) case EAI_NODATA: #endif /* if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME) */ - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; #ifdef AI_ADDRCONFIG case EAI_BADFLAGS: if ((hints.ai_flags & AI_ADDRCONFIG) != 0) { @@ -133,7 +133,7 @@ again: #endif /* ifdef AI_ADDRCONFIG */ FALLTHROUGH; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } for (tmpai = ai, i = 0; tmpai != NULL && i < addrsize; tmpai = tmpai->ai_next) @@ -156,8 +156,8 @@ again: freeaddrinfo(ai); *addrcount = i; if (*addrcount == 0) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } diff --git a/lib/isc/hash.c b/lib/isc/hash.c index 2783a37e41..387e2373cd 100644 --- a/lib/isc/hash.c +++ b/lib/isc/hash.c @@ -44,7 +44,7 @@ isc__hash_initialize(void) { const void * isc_hash_get_initializer(void) { - return (isc_hash_key); + return isc_hash_key; } void @@ -73,7 +73,7 @@ isc_hash32_finalize(isc_hash32_t *restrict state) { isc_halfsiphash24_finalize(state, (uint8_t *)&hval); - return (hval); + return hval; } void @@ -95,5 +95,5 @@ isc_hash64_finalize(isc_hash64_t *restrict state) { isc_siphash24_finalize(state, (uint8_t *)&hval); - return (hval); + return hval; } diff --git a/lib/isc/hashmap.c b/lib/isc/hashmap.c index b97fb26e6e..d8c2bd58ae 100644 --- a/lib/isc/hashmap.c +++ b/lib/isc/hashmap.c @@ -117,18 +117,18 @@ under_threshold(isc_hashmap_t *hashmap); static uint8_t hashmap_nexttable(uint8_t idx) { - return ((idx == 0) ? 1 : 0); + return (idx == 0) ? 1 : 0; } static bool rehashing_in_progress(const isc_hashmap_t *hashmap) { - return (hashmap->tables[hashmap_nexttable(hashmap->hindex)].table != - NULL); + return hashmap->tables[hashmap_nexttable(hashmap->hindex)].table != + NULL; } static bool try_nexttable(const isc_hashmap_t *hashmap, uint8_t idx) { - return (idx == hashmap->hindex && rehashing_in_progress(hashmap)); + return idx == hashmap->hindex && rehashing_in_progress(hashmap); } static void @@ -276,7 +276,7 @@ nexttable: if (match(node->value, key)) { *pslp = psl; *idxp = idx; - return (node); + return node; } } @@ -287,7 +287,7 @@ nexttable: goto nexttable; } - return (NULL); + return NULL; } isc_result_t @@ -300,12 +300,12 @@ isc_hashmap_find(const isc_hashmap_t *hashmap, const uint32_t hashval, hashmap_node_t *node = hashmap_find(hashmap, hashval, match, key, &(uint32_t){ 0 }, &idx); if (node == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } INSIST(node->key != NULL); SET_IF_NOT_NULL(valuep, node->value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static bool @@ -343,7 +343,7 @@ hashmap_delete_node(isc_hashmap_t *hashmap, hashmap_node_t *entry, } *entry = (hashmap_node_t){ 0 }; - return (last); + return last; } static void @@ -399,7 +399,7 @@ grow_bits(isc_hashmap_t *hashmap) { newbits = HASHMAP_MAX_BITS; } - return (newbits); + return newbits; } static uint32_t @@ -410,7 +410,7 @@ shrink_bits(isc_hashmap_t *hashmap) { newbits = HASHMAP_MIN_BITS; } - return (newbits); + return newbits; } static void @@ -476,27 +476,27 @@ isc_hashmap_delete(isc_hashmap_t *hashmap, const uint32_t hashval, result = ISC_R_SUCCESS; } - return (result); + return result; } static bool over_threshold(isc_hashmap_t *hashmap) { uint32_t bits = hashmap->tables[hashmap->hindex].hashbits; if (bits == HASHMAP_MAX_BITS) { - return (false); + return false; } size_t threshold = APPROX_90_PERCENT(HASHSIZE(bits)); - return (hashmap->count > threshold); + return hashmap->count > threshold; } static bool under_threshold(isc_hashmap_t *hashmap) { uint32_t bits = hashmap->tables[hashmap->hindex].hashbits; if (bits == HASHMAP_MIN_BITS) { - return (false); + return false; } size_t threshold = APPROX_20_PERCENT(HASHSIZE(bits)); - return (hashmap->count < threshold); + return hashmap->count < threshold; } static isc_result_t @@ -530,7 +530,7 @@ hashmap_add(isc_hashmap_t *hashmap, const uint32_t hashval, if (current->hashval == hashval) { if (match != NULL && match(current->value, key)) { SET_IF_NOT_NULL(foundp, current->value); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } @@ -560,7 +560,7 @@ hashmap_add(isc_hashmap_t *hashmap, const uint32_t hashval, /* We found an empty place, store entry into current node */ *current = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -587,12 +587,12 @@ isc_hashmap_add(isc_hashmap_t *hashmap, const uint32_t hashval, if (found != NULL) { INSIST(found->key != NULL); SET_IF_NOT_NULL(foundp, found->value); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } - return (hashmap_add(hashmap, hashval, match, key, value, foundp, - hashmap->hindex)); + return hashmap_add(hashmap, hashval, match, key, value, foundp, + hashmap->hindex); } void @@ -641,17 +641,17 @@ isc__hashmap_iter_next(isc_hashmap_iter_t *iter) { if (iter->i < iter->size) { iter->cur = &hashmap->tables[iter->hindex].table[iter->i]; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (try_nexttable(hashmap, iter->hindex)) { iter->hindex = hashmap_nexttable(iter->hindex); iter->i = hashmap->hiter; iter->size = hashmap->tables[iter->hindex].size; - return (isc__hashmap_iter_next(iter)); + return isc__hashmap_iter_next(iter); } - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } isc_result_t @@ -662,7 +662,7 @@ isc_hashmap_iter_first(isc_hashmap_iter_t *iter) { iter->i = 0; iter->size = iter->hashmap->tables[iter->hashmap->hindex].size; - return (isc__hashmap_iter_next(iter)); + return isc__hashmap_iter_next(iter); } isc_result_t @@ -672,7 +672,7 @@ isc_hashmap_iter_next(isc_hashmap_iter_t *iter) { iter->i++; - return (isc__hashmap_iter_next(iter)); + return isc__hashmap_iter_next(iter); } isc_result_t @@ -694,7 +694,7 @@ isc_hashmap_iter_delcurrent_next(isc_hashmap_iter_t *iter) { iter->size--; } - return (isc__hashmap_iter_next(iter)); + return isc__hashmap_iter_next(iter); } void @@ -719,5 +719,5 @@ unsigned int isc_hashmap_count(isc_hashmap_t *hashmap) { REQUIRE(ISC_HASHMAP_VALID(hashmap)); - return (hashmap->count); + return hashmap->count; } diff --git a/lib/isc/heap.c b/lib/isc/heap.c index 2ac7c8e7f2..02d6a210e0 100644 --- a/lib/isc/heap.c +++ b/lib/isc/heap.c @@ -260,9 +260,9 @@ isc_heap_element(isc_heap_t *heap, unsigned int idx) { heap_check(heap); if (idx <= heap->last) { - return (heap->array[idx]); + return heap->array[idx]; } - return (NULL); + return NULL; } void diff --git a/lib/isc/hex.c b/lib/isc/hex.c index a2aa07c466..abb38cb590 100644 --- a/lib/isc/hex.c +++ b/lib/isc/hex.c @@ -80,7 +80,7 @@ isc_hex_totext(isc_region_t *source, int wordlength, const char *wordbreak, RETERR(str_totext(wordbreak, target)); } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -106,7 +106,7 @@ hex_decode_char(hex_decode_ctx_t *ctx, int c) { hexval = isc_hex_char(c); if (hexval == 0) { - return (ISC_R_BADHEX); + return ISC_R_BADHEX; } ctx->val[ctx->digits++] = c - hexval; if (ctx->digits == 2) { @@ -116,25 +116,25 @@ hex_decode_char(hex_decode_ctx_t *ctx, int c) { RETERR(mem_tobuffer(ctx->target, &num, 1)); if (ctx->length >= 0) { if (ctx->length == 0) { - return (ISC_R_BADHEX); + return ISC_R_BADHEX; } else { ctx->length -= 1; } } ctx->digits = 0; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t hex_decode_finish(hex_decode_ctx_t *ctx) { if (ctx->length > 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (ctx->digits != 0) { - return (ISC_R_BADHEX); + return ISC_R_BADHEX; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -174,9 +174,9 @@ isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { } RETERR(hex_decode_finish(&ctx)); if (length == -2 && before == after) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -195,7 +195,7 @@ isc_hex_decodestring(const char *cstr, isc_buffer_t *target) { RETERR(hex_decode_char(&ctx, c)); } RETERR(hex_decode_finish(&ctx)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -207,12 +207,12 @@ str_totext(const char *source, isc_buffer_t *target) { l = strlen(source); if (l > region.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(region.base, source, l); isc_buffer_add(target, l); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -221,9 +221,9 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_buffer_availableregion(target, &tr); if (length > tr.length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } memmove(tr.base, base, length); isc_buffer_add(target, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/histo.c b/lib/isc/histo.c index 7aac5c36ca..4fa9d83396 100644 --- a/lib/isc/histo.c +++ b/lib/isc/histo.c @@ -117,7 +117,7 @@ isc_histo_destroy(isc_histo_t **hgp) { uint isc_histo_sigbits(isc_histo_t *hg) { REQUIRE(HISTO_VALID(hg)); - return (hg->sigbits); + return hg->sigbits; } /* @@ -128,14 +128,14 @@ uint isc_histo_bits_to_digits(uint bits) { REQUIRE(bits >= ISC_HISTO_MINBITS); REQUIRE(bits <= ISC_HISTO_MAXBITS); - return (floor(1.0 - (1.0 - bits) * LN_2 / LN_10)); + return floor(1.0 - (1.0 - bits) * LN_2 / LN_10); } uint isc_histo_digits_to_bits(uint digits) { REQUIRE(digits >= ISC_HISTO_MINDIGITS); REQUIRE(digits <= ISC_HISTO_MAXDIGITS); - return (ceil(1.0 - (1.0 - digits) * LN_10 / LN_2)); + return ceil(1.0 - (1.0 - digits) * LN_10 / LN_2); } /**********************************************************************/ @@ -186,7 +186,7 @@ value_to_key(const isc_histo_t *hg, uint64_t value) { /* mantissa has leading bit set except for denormals */ uint mantissa = value >> exponent; /* leading bit of mantissa adds one to exponent */ - return ((exponent << hg->sigbits) + mantissa); + return (exponent << hg->sigbits) + mantissa; } /* @@ -215,12 +215,12 @@ key_to_minval(const isc_histo_t *hg, uint key) { uint chunksize = CHUNKSIZE(hg); uint exponent = (key / chunksize) - 1; uint64_t mantissa = (key % chunksize) + chunksize; - return (key < chunksize ? key : mantissa << exponent); + return key < chunksize ? key : mantissa << exponent; } static inline uint64_t key_to_maxval(const isc_histo_t *hg, uint key) { - return (key_to_minval(hg, key + 1) - 1); + return key_to_minval(hg, key + 1) - 1; } /**********************************************************************/ @@ -236,18 +236,18 @@ key_to_new_bucket(isc_histo_t *hg, uint key) { sizeof(hg_bucket_t)); hg_chunk_t *cpp = &hg->chunk[chunk]; if (atomic_compare_exchange_strong_acq_rel(cpp, &old_cp, new_cp)) { - return (&new_cp[bucket]); + return &new_cp[bucket]; } else { /* lost the race, so use the winner's chunk */ isc_mem_cput(hg->mctx, new_cp, CHUNKSIZE(hg), sizeof(hg_bucket_t)); - return (&old_cp[bucket]); + return &old_cp[bucket]; } } static hg_bucket_t * get_chunk(const isc_histo_t *hg, uint chunk) { - return (atomic_load_acquire(&hg->chunk[chunk])); + return atomic_load_acquire(&hg->chunk[chunk]); } static inline hg_bucket_t * @@ -257,17 +257,17 @@ key_to_bucket(const isc_histo_t *hg, uint key) { uint chunk = key / chunksize; uint bucket = key % chunksize; hg_bucket_t *cp = get_chunk(hg, chunk); - return (cp == NULL ? NULL : &cp[bucket]); + return cp == NULL ? NULL : &cp[bucket]; } static inline uint64_t bucket_count(const hg_bucket_t *bp) { - return (bp == NULL ? 0 : atomic_load_relaxed(bp)); + return bp == NULL ? 0 : atomic_load_relaxed(bp); } static inline uint64_t get_key_count(const isc_histo_t *hg, uint key) { - return (bucket_count(key_to_bucket(hg, key))); + return bucket_count(key_to_bucket(hg, key)); } static inline void @@ -320,9 +320,9 @@ isc_histo_get(const isc_histo_t *hg, uint key, uint64_t *minp, uint64_t *maxp, SET_IF_NOT_NULL(minp, key_to_minval(hg, key)); SET_IF_NOT_NULL(maxp, key_to_maxval(hg, key)); SET_IF_NOT_NULL(countp, get_key_count(hg, key)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } @@ -473,7 +473,7 @@ lerp(uint64_t min, uint64_t max, uint64_t lo, uint64_t in, uint64_t hi) { double inpart = (double)(in - lo); double outrange = (double)(max - min); double outpart = round(outrange * inpart / inrange); - return (min + ISC_MIN((uint64_t)outpart, max - min)); + return min + ISC_MIN((uint64_t)outpart, max - min); } /* @@ -481,7 +481,7 @@ lerp(uint64_t min, uint64_t max, uint64_t lo, uint64_t in, uint64_t hi) { */ static inline bool inside(uint64_t lo, uint64_t in, uint64_t hi) { - return (lo < hi && lo <= in && in <= hi); + return lo < hi && lo <= in && in <= hi; } isc_result_t @@ -559,13 +559,13 @@ isc_histo_quantiles(const isc_histo_t *hg, uint size, const double *fraction, key_to_maxval(hg, key), bucket_lo, rank[i], bucket_hi); if (++i == size) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } } - return (ISC_R_UNSET); + return ISC_R_UNSET; } /**********************************************************************/ diff --git a/lib/isc/hmac.c b/lib/isc/hmac.c index 4bce2c80f3..46582ea9ec 100644 --- a/lib/isc/hmac.c +++ b/lib/isc/hmac.c @@ -29,7 +29,7 @@ isc_hmac_t * isc_hmac_new(void) { EVP_MD_CTX *hmac_st = EVP_MD_CTX_new(); RUNTIME_CHECK(hmac_st != NULL); - return ((isc_hmac_t *)hmac_st); + return (isc_hmac_t *)hmac_st; } void @@ -51,24 +51,24 @@ isc_hmac_init(isc_hmac_t *hmac_st, const void *key, const size_t keylen, REQUIRE(keylen <= INT_MAX); if (md_type == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, key, keylen); if (pkey == NULL) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } if (EVP_DigestSignInit(hmac_st, NULL, md_type, NULL, pkey) != 1) { EVP_PKEY_free(pkey); ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } EVP_PKEY_free(pkey); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -77,10 +77,10 @@ isc_hmac_reset(isc_hmac_t *hmac_st) { if (EVP_MD_CTX_reset(hmac_st) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -89,15 +89,15 @@ isc_hmac_update(isc_hmac_t *hmac_st, const unsigned char *buf, REQUIRE(hmac_st != NULL); if (buf == NULL || len == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (EVP_DigestSignUpdate(hmac_st, buf, len) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -111,33 +111,33 @@ isc_hmac_final(isc_hmac_t *hmac_st, unsigned char *digest, if (EVP_DigestSignFinal(hmac_st, digest, &len) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } *digestlen = (unsigned int)len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } const isc_md_type_t * isc_hmac_get_md_type(isc_hmac_t *hmac_st) { REQUIRE(hmac_st != NULL); - return (EVP_MD_CTX_get0_md(hmac_st)); + return EVP_MD_CTX_get0_md(hmac_st); } size_t isc_hmac_get_size(isc_hmac_t *hmac_st) { REQUIRE(hmac_st != NULL); - return ((size_t)EVP_MD_CTX_size(hmac_st)); + return (size_t)EVP_MD_CTX_size(hmac_st); } int isc_hmac_get_block_size(isc_hmac_t *hmac_st) { REQUIRE(hmac_st != NULL); - return (EVP_MD_CTX_block_size(hmac_st)); + return EVP_MD_CTX_block_size(hmac_st); } isc_result_t @@ -164,5 +164,5 @@ isc_hmac(const isc_md_type_t *type, const void *key, const size_t keylen, end: isc_hmac_free(hmac_st); - return (res); + return res; } diff --git a/lib/isc/ht.c b/lib/isc/ht.c index dd49b007da..f18978cdac 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -97,27 +97,27 @@ isc__ht_iter_next(isc_ht_iter_t *it); static bool isc__ht_node_match(isc_ht_node_t *node, const uint32_t hashval, const uint8_t *key, uint32_t keysize, bool case_sensitive) { - return (node->hashval == hashval && node->keysize == keysize && - (case_sensitive - ? (memcmp(node->key, key, keysize) == 0) - : (isc_ascii_lowerequal(node->key, key, keysize)))); + return node->hashval == hashval && node->keysize == keysize && + (case_sensitive + ? (memcmp(node->key, key, keysize) == 0) + : (isc_ascii_lowerequal(node->key, key, keysize))); } static uint32_t hash_32(uint32_t val, unsigned int bits) { REQUIRE(bits <= HT_MAX_BITS); /* High bits are more random. */ - return (val * GOLDEN_RATIO_32 >> (32 - bits)); + return val * GOLDEN_RATIO_32 >> (32 - bits); } static bool rehashing_in_progress(const isc_ht_t *ht) { - return (ht->table[HT_NEXTTABLE(ht->hindex)] != NULL); + return ht->table[HT_NEXTTABLE(ht->hindex)] != NULL; } static bool hashtable_is_overcommited(isc_ht_t *ht) { - return (ht->count >= (ht->size[ht->hindex] * HT_OVERCOMMIT)); + return ht->count >= (ht->size[ht->hindex] * HT_OVERCOMMIT); } static uint32_t @@ -128,7 +128,7 @@ rehash_bits(isc_ht_t *ht, size_t newcount) { newbits += 1; } - return (newbits); + return newbits; } /* @@ -321,12 +321,12 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize, hashval = isc_hash32(key, keysize, ht->case_sensitive); if (isc__ht_find(ht, key, keysize, hashval, ht->hindex) != NULL) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } isc__ht_add(ht, key, keysize, hashval, ht->hindex, value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_ht_node_t * @@ -344,7 +344,7 @@ nexttable: if (isc__ht_node_match(node, hashval, key, keysize, ht->case_sensitive)) { - return (node); + return node; } } if (TRY_NEXTTABLE(findex, ht)) { @@ -355,7 +355,7 @@ nexttable: goto nexttable; } - return (NULL); + return NULL; } isc_result_t @@ -372,11 +372,11 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key, node = isc__ht_find(ht, key, keysize, hashval, ht->hindex); if (node == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } SET_IF_NOT_NULL(valuep, node->value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -402,11 +402,11 @@ isc__ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize, STRUCT_FLEX_SIZE(node, key, node->keysize)); ht->count--; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -436,7 +436,7 @@ nexttable: goto nexttable; } - return (result); + return result; } void @@ -479,7 +479,7 @@ isc_ht_iter_first(isc_ht_iter_t *it) { it->hindex = ht->hindex; it->i = 0; - return (isc__ht_iter_next(it)); + return isc__ht_iter_next(it); } static isc_result_t @@ -495,16 +495,16 @@ isc__ht_iter_next(isc_ht_iter_t *it) { if (it->i < ht->size[it->hindex]) { it->cur = ht->table[it->hindex][it->i]; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (TRY_NEXTTABLE(it->hindex, ht)) { it->hindex = HT_NEXTTABLE(it->hindex); it->i = 0; - return (isc__ht_iter_next(it)); + return isc__ht_iter_next(it); } - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } isc_result_t @@ -515,12 +515,12 @@ isc_ht_iter_next(isc_ht_iter_t *it) { it->cur = it->cur->next; if (it->cur != NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } it->i++; - return (isc__ht_iter_next(it)); + return isc__ht_iter_next(it); } isc_result_t @@ -544,7 +544,7 @@ isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) { dindex); INSIST(dresult == ISC_R_SUCCESS); - return (result); + return result; } void @@ -571,5 +571,5 @@ size_t isc_ht_count(const isc_ht_t *ht) { REQUIRE(ISC_HT_VALID(ht)); - return (ht->count); + return ht->count; } diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index fc54e109b7..2d67ecc28d 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -258,7 +258,7 @@ isc_httpdmgr_create(isc_nm_t *nm, isc_mem_t *mctx, isc_sockaddr_t *addr, httpdmgr->magic = HTTPDMGR_MAGIC; *httpdmgrp = httpdmgr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: httpdmgr->magic = 0; @@ -268,7 +268,7 @@ cleanup: isc_mutex_destroy(&httpdmgr->lock); isc_mem_put(mctx, httpdmgr, sizeof(isc_httpdmgr_t)); - return (result); + return result; } static void @@ -316,9 +316,9 @@ static bool name_match(const struct phr_header *header, const char *match) { size_t match_len = strlen(match); if (match_len != header->name_len) { - return (false); + return false; } - return (strncasecmp(header->name, match, match_len) == 0); + return strncasecmp(header->name, match, match_len) == 0; } static bool @@ -327,7 +327,7 @@ value_match(const struct phr_header *header, const char *match) { size_t limit; if (match_len > header->value_len) { - return (false); + return false; } limit = header->value_len - match_len + 1; @@ -351,7 +351,7 @@ value_match(const struct phr_header *header, const char *match) { if (i == header->value_len || header->value[i] == ',' || header->value[i] == ';') { - return (true); + return true; } } @@ -359,7 +359,7 @@ value_match(const struct phr_header *header, const char *match) { i++; } } - return (false); + return false; } static isc_result_t @@ -382,16 +382,16 @@ process_request(isc_httpd_t *httpd, size_t last_len) { if (pret == -1) { /* Parse Error */ - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } else if (pret == -2) { /* Need more data */ - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } INSIST(pret > 0); if (pret > HTTP_MAX_REQUEST_LEN) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } httpd->consume = pret; @@ -405,7 +405,7 @@ process_request(isc_httpd_t *httpd, size_t last_len) { } else if (strncmp(method, "POST ", method_len) == 0) { httpd->method = METHOD_POST; } else { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* @@ -413,7 +413,7 @@ process_request(isc_httpd_t *httpd, size_t last_len) { */ result = isc_url_parse(path, path_len, 0, &httpd->up); if (result != ISC_R_SUCCESS) { - return (result); + return result; } httpd->path = path; @@ -439,15 +439,15 @@ process_request(isc_httpd_t *httpd, size_t last_len) { /* ensure we consumed all digits */ if ((header->value + header->value_len) != endptr) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } /* ensure there was no minus sign */ if (val < 0) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } /* ensure it did not overflow */ if (errno != 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } content_len = val; } else if (name_match(header, "Connection")) { @@ -482,17 +482,17 @@ process_request(isc_httpd_t *httpd, size_t last_len) { * For a GET the length must be zero. */ if (httpd->method == METHOD_GET && content_len != 0) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (content_len >= HTTP_MAX_REQUEST_LEN) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } size_t consume = httpd->consume + content_len; if (consume > httpd->recvlen) { /* The request data isn't complete yet. */ - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* Consume the request's data, which we do not use. */ @@ -512,11 +512,11 @@ process_request(isc_httpd_t *httpd, size_t last_len) { break; case 1: if (!host_header) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } break; default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -527,7 +527,7 @@ process_request(isc_httpd_t *httpd, size_t last_len) { * to the buffer. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -606,7 +606,7 @@ isc__httpd_sendreq_new(isc_httpd_t *httpd) { isc_httpd_attach(httpd, &req->httpd); - return (req); + return req; } static void @@ -641,24 +641,24 @@ httpd_newconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { REQUIRE(VALID_HTTPDMGR(httpdmgr)); if ((httpdmgr->flags & ISC_HTTPDMGR_SHUTTINGDOWN) != 0) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } else if (result == ISC_R_CANCELED) { isc_httpdmgr_shutdown(&httpdmgr); - return (result); + return result; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } peeraddr = isc_nmhandle_peeraddr(handle); if (httpdmgr->client_ok != NULL && !(httpdmgr->client_ok)(&peeraddr, httpdmgr->cb_arg)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } new_httpd(httpdmgr, handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -679,7 +679,7 @@ render_404(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, void *arg, *freecb = NULL; *freecb_args = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -700,7 +700,7 @@ render_500(const isc_httpd_t *httpd, const isc_httpdurl_t *urlinfo, void *arg, *freecb = NULL; *freecb_args = NULL; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #ifdef HAVE_ZLIB @@ -728,7 +728,7 @@ httpd_compress(isc_httpd_sendreq_t *req) { */ inputlen = isc_buffer_usedlength(&req->bodybuffer); if (inputlen == 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_buffer_allocate(req->mctx, &req->compbuffer, inputlen); @@ -749,10 +749,10 @@ httpd_compress(isc_httpd_sendreq_t *req) { deflateEnd(&zstr); if (ret == Z_STREAM_END) { isc_buffer_add(req->compbuffer, zstr.total_out); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { isc_buffer_free(&req->compbuffer); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } #endif /* ifdef HAVE_ZLIB */ @@ -1075,7 +1075,7 @@ isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic, if (url == NULL) { httpdmgr->render_404 = func; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } item = isc_mem_get(httpdmgr->mctx, sizeof(isc_httpdurl_t)); @@ -1093,7 +1093,7 @@ isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic, ISC_LIST_APPEND(httpdmgr->urls, item, link); UNLOCK(&httpdmgr->lock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1107,15 +1107,15 @@ isc_httpd_setfinishhook(void (*fn)(void)) { bool isc_httpdurl_isstatic(const isc_httpdurl_t *url) { - return (url->isstatic); + return url->isstatic; } const isc_time_t * isc_httpdurl_loadtime(const isc_httpdurl_t *url) { - return (&url->loadtime); + return &url->loadtime; } const isc_time_t * isc_httpd_if_modified_since(const isc_httpd_t *httpd) { - return ((const isc_time_t *)&httpd->if_modified_since); + return (const isc_time_t *)&httpd->if_modified_since; } diff --git a/lib/isc/include/isc/ascii.h b/lib/isc/include/isc/ascii.h index 7ba411c4a0..384c3a190d 100644 --- a/lib/isc/include/isc/ascii.h +++ b/lib/isc/include/isc/ascii.h @@ -37,7 +37,7 @@ extern const uint8_t isc__ascii_toupper[256]; */ static inline uint8_t isc__ascii_tolower1(uint8_t c) { - return (c + ('a' - 'A') * ('A' <= c && c <= 'Z')); + return c + ('a' - 'A') * ('A' <= c && c <= 'Z'); } /* @@ -100,7 +100,7 @@ isc_ascii_tolower8(uint64_t octets) { * Move the is_upper flag bits to bit 0x20 (which is 'a' - 'A') * and use them to adjust each byte as required */ - return (octets | (is_upper >> 2)); + return octets | (is_upper >> 2); } /* @@ -114,7 +114,7 @@ isc_ascii_tolower4(uint32_t octets) { uint32_t is_gt_Z = heptets + (0x7F - 'Z') * all_bytes; uint32_t is_ge_A = heptets + (0x80 - 'A') * all_bytes; uint32_t is_upper = (is_ge_A ^ is_gt_Z) & is_ascii; - return (octets | (is_upper >> 2)); + return octets | (is_upper >> 2); } /* @@ -124,7 +124,7 @@ static inline uint64_t isc__ascii_load8(const uint8_t *ptr) { uint64_t bytes = 0; memmove(&bytes, ptr, sizeof(bytes)); - return (bytes); + return bytes; } /* @@ -137,7 +137,7 @@ isc_ascii_lowerequal(const uint8_t *a, const uint8_t *b, unsigned int len) { a8 = isc_ascii_tolower8(isc__ascii_load8(a)); b8 = isc_ascii_tolower8(isc__ascii_load8(b)); if (a8 != b8) { - return (false); + return false; } len -= 8; a += 8; @@ -145,10 +145,10 @@ isc_ascii_lowerequal(const uint8_t *a, const uint8_t *b, unsigned int len) { } while (len-- > 0) { if (isc_ascii_tolower(*a++) != isc_ascii_tolower(*b++)) { - return (false); + return false; } } - return (true); + return true; } /* @@ -179,10 +179,10 @@ isc_ascii_lowercmp(const uint8_t *a, const uint8_t *b, unsigned int len) { } ret: if (a8 < b8) { - return (-1); + return -1; } if (a8 > b8) { - return (+1); + return +1; } - return (0); + return 0; } diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index 9c4a27d1d3..6d62415461 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -845,7 +845,7 @@ isc_buffer_peekuint8(const isc_buffer_t *restrict b, uint8_t *valp) { uint8_t *cp = isc_buffer_current(b); SET_IF_NOT_NULL(valp, (uint8_t)(cp[0])); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline uint8_t @@ -854,7 +854,7 @@ isc_buffer_getuint8(isc_buffer_t *restrict b) { isc_result_t result = isc_buffer_peekuint8(b, &val); ENSURE(result == ISC_R_SUCCESS); b->current += sizeof(val); - return (val); + return val; } #define ISC_BUFFER_PUT_RESERVE(b, v, s) \ @@ -885,7 +885,7 @@ isc_buffer_peekuint16(const isc_buffer_t *restrict b, uint16_t *valp) { uint8_t *cp = isc_buffer_current(b); SET_IF_NOT_NULL(valp, ISC_U8TO16_BE(cp)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline uint16_t @@ -894,7 +894,7 @@ isc_buffer_getuint16(isc_buffer_t *restrict b) { isc_result_t result = isc_buffer_peekuint16(b, &val); ENSURE(result == ISC_R_SUCCESS); b->current += sizeof(val); - return (val); + return val; } static inline void @@ -913,7 +913,7 @@ isc_buffer_peekuint32(const isc_buffer_t *restrict b, uint32_t *valp) { uint8_t *cp = isc_buffer_current(b); SET_IF_NOT_NULL(valp, ISC_U8TO32_BE(cp)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } uint32_t @@ -922,7 +922,7 @@ isc_buffer_getuint32(isc_buffer_t *restrict b) { isc_result_t result = isc_buffer_peekuint32(b, &val); ENSURE(result == ISC_R_SUCCESS); b->current += sizeof(val); - return (val); + return val; } static inline void @@ -942,7 +942,7 @@ isc_buffer_peekuint48(const isc_buffer_t *restrict b, uint64_t *valp) { uint8_t *cp = isc_buffer_current(b); SET_IF_NOT_NULL(valp, ISC_U8TO48_BE(cp)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline uint64_t @@ -951,7 +951,7 @@ isc_buffer_getuint48(isc_buffer_t *restrict b) { isc_result_t result = isc_buffer_peekuint48(b, &val); ENSURE(result == ISC_R_SUCCESS); b->current += 6; /* 48-bits */ - return (val); + return val; } static inline void @@ -1118,11 +1118,11 @@ isc_buffer_reserve(isc_buffer_t *restrict dbuf, const unsigned int size) { len = dbuf->length; if ((len - dbuf->used) >= size) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (dbuf->mctx == NULL) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* Round to nearest buffer size increment */ @@ -1135,7 +1135,7 @@ isc_buffer_reserve(isc_buffer_t *restrict dbuf, const unsigned int size) { } if ((len - dbuf->used) < size) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } if (!dbuf->dynamic) { @@ -1151,7 +1151,7 @@ isc_buffer_reserve(isc_buffer_t *restrict dbuf, const unsigned int size) { } dbuf->length = (unsigned int)len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline void @@ -1188,7 +1188,7 @@ isc_buffer_dup(isc_mem_t *mctx, isc_buffer_t **restrict dstp, result = isc_buffer_copyregion(dst, ®ion); RUNTIME_CHECK(result == ISC_R_SUCCESS); /* NOSPACE is impossible */ *dstp = dst; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline isc_result_t @@ -1202,12 +1202,12 @@ isc_buffer_copyregion(isc_buffer_t *restrict b, if (b->mctx) { result = isc_buffer_reserve(b, r->length); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (r->length > isc_buffer_availablelength(b)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } if (r->length > 0U) { @@ -1215,7 +1215,7 @@ isc_buffer_copyregion(isc_buffer_t *restrict b, b->used += r->length; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline isc_result_t @@ -1231,18 +1231,18 @@ isc_buffer_printf(isc_buffer_t *restrict b, const char *restrict format, ...) { va_end(ap); if (n < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (b->mctx) { result = isc_buffer_reserve(b, n + 1); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (isc_buffer_availablelength(b) < (unsigned int)n + 1) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } va_start(ap, format); @@ -1250,12 +1250,12 @@ isc_buffer_printf(isc_buffer_t *restrict b, const char *restrict format, ...) { va_end(ap); if (n < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } b->used += n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/dnsstream.h b/lib/isc/include/isc/dnsstream.h index 472cf22dd3..09ab258208 100644 --- a/lib/isc/include/isc/dnsstream.h +++ b/lib/isc/include/isc/dnsstream.h @@ -268,7 +268,7 @@ isc_dnsstream_assembler_new(isc_mem_t *memctx, isc_dnsstream_assembler_cb_t cb, newasm = isc_mem_get(memctx, sizeof(*newasm)); isc_dnsstream_assembler_init(newasm, memctx, cb, cbarg); - return (newasm); + return newasm; } static inline void @@ -306,7 +306,7 @@ isc__dnsstream_assembler_callcb(isc_dnsstream_assembler_t *restrict dnsasm, ret = dnsasm->onmsg_cb(dnsasm, result, region, dnsasm->cbarg, userarg); dnsasm->calling_cb = false; - return (ret); + return ret; } static inline bool @@ -361,7 +361,7 @@ isc__dnsstream_assembler_handle_message( userarg); } - return (cont); + return cont; } static inline void @@ -420,7 +420,7 @@ isc__dnsstream_assembler_incoming_direct_non_empty( size_t remaining_no_len; if (isc_buffer_peekuint16(dnsasm->current, &dnslen) != ISC_R_SUCCESS) { - return (false); + return false; } remaining = isc_buffer_remaininglength(dnsasm->current); @@ -431,7 +431,7 @@ isc__dnsstream_assembler_incoming_direct_non_empty( * previous iteration we stopped prematurely intentionally. */ if (remaining_no_len >= dnslen) { - return (false); + return false; } /* @@ -457,7 +457,7 @@ isc__dnsstream_assembler_incoming_direct_non_empty( INSIST(isc_buffer_remaininglength(dnsasm->current) == 0); if (unprocessed_size == 0) { - return (true); + return true; } if (cont) { @@ -478,10 +478,10 @@ isc__dnsstream_assembler_incoming_direct_non_empty( unprocessed_size); } - return (true); + return true; } - return (false); + return false; } static inline void @@ -565,7 +565,7 @@ isc_dnsstream_assembler_result( const isc_dnsstream_assembler_t *restrict dnsasm) { REQUIRE(dnsasm != NULL); - return (dnsasm->result); + return dnsasm->result; } static inline size_t @@ -573,7 +573,7 @@ isc_dnsstream_assembler_remaininglength( const isc_dnsstream_assembler_t *restrict dnsasm) { REQUIRE(dnsasm != NULL); - return (isc_buffer_remaininglength(dnsasm->current)); + return isc_buffer_remaininglength(dnsasm->current); } static inline void diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h index 231ecfb321..bee5a8332d 100644 --- a/lib/isc/include/isc/hash.h +++ b/lib/isc/include/isc/hash.h @@ -56,7 +56,7 @@ isc_hash32(const void *data, const size_t length, const bool case_sensitive) { isc_hash32_t state; isc_hash32_init(&state); isc_hash32_hash(&state, data, length, case_sensitive); - return (isc_hash32_finalize(&state)); + return isc_hash32_finalize(&state); } void @@ -71,7 +71,7 @@ isc_hash64(const void *data, const size_t length, const bool case_sensitive) { isc_hash64_t state; isc_hash64_init(&state); isc_hash64_hash(&state, data, length, case_sensitive); - return (isc_hash64_finalize(&state)); + return isc_hash64_finalize(&state); } /*!< * \brief Calculate a hash over data. @@ -116,7 +116,7 @@ static inline uint32_t isc_hash_bits32(uint32_t val, unsigned int bits) { ISC_REQUIRE(bits <= ISC_HASH_MAX_BITS); /* High bits are more random. */ - return (val * ISC_HASH_GOLDENRATIO_32 >> (32 - bits)); + return val * ISC_HASH_GOLDENRATIO_32 >> (32 - bits); } ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/loop.h b/lib/isc/include/isc/loop.h index f02c0925d6..fe3545115a 100644 --- a/lib/isc/include/isc/loop.h +++ b/lib/isc/include/isc/loop.h @@ -35,7 +35,7 @@ extern thread_local isc_loop_t *isc__loop_local; static inline isc_loop_t * isc_loop(void) { - return (isc__loop_local); + return isc__loop_local; } void isc_loopmgr_create(isc_mem_t *mctx, uint32_t nloops, isc_loopmgr_t **loopmgrp); diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h index 743d3c626d..d34f551262 100644 --- a/lib/isc/include/isc/queue.h +++ b/lib/isc/include/isc/queue.h @@ -44,12 +44,12 @@ isc_queue_destroy(isc_queue_t *queue) { static inline bool isc_queue_empty(isc_queue_t *queue) { - return (cds_wfcq_empty(&(queue)->head, &(queue)->tail)); + return cds_wfcq_empty(&(queue)->head, &(queue)->tail); } static inline bool isc_queue_enqueue(isc_queue_t *queue, isc_queue_node_t *node) { - return (cds_wfcq_enqueue(&(queue)->head, &(queue)->tail, node)); + return cds_wfcq_enqueue(&(queue)->head, &(queue)->tail, node); } #define isc_queue_enqueue_entry(queue, entry, member) \ @@ -57,7 +57,7 @@ isc_queue_enqueue(isc_queue_t *queue, isc_queue_node_t *node) { static inline isc_queue_node_t * isc_queue_dequeue(isc_queue_t *queue) { - return (__cds_wfcq_dequeue_nonblocking(&(queue)->head, &(queue)->tail)); + return __cds_wfcq_dequeue_nonblocking(&(queue)->head, &(queue)->tail); } #define isc_queue_entry(ptr, type, member) \ @@ -73,7 +73,7 @@ isc_queue_splice(isc_queue_t *dest, isc_queue_t *src) { INSIST(ret != CDS_WFCQ_RET_WOULDBLOCK && ret != CDS_WFCQ_RET_DEST_NON_EMPTY); - return (ret != CDS_WFCQ_RET_SRC_EMPTY); + return ret != CDS_WFCQ_RET_SRC_EMPTY; } #define isc_queue_first_entry(queue, type, member) \ diff --git a/lib/isc/include/isc/tid.h b/lib/isc/include/isc/tid.h index e630c4f24f..8100237031 100644 --- a/lib/isc/include/isc/tid.h +++ b/lib/isc/include/isc/tid.h @@ -32,7 +32,7 @@ extern thread_local uint32_t isc__tid_local; static inline uint32_t isc_tid(void) { - return (isc__tid_local); + return isc__tid_local; } /*%< * Returns the thread ID of the currently-running loop. diff --git a/lib/isc/interfaceiter.c b/lib/isc/interfaceiter.c index fdd50c65d6..cd03dbf91c 100644 --- a/lib/isc/interfaceiter.c +++ b/lib/isc/interfaceiter.c @@ -183,14 +183,14 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) { iter->magic = IFITER_MAGIC; *iterp = iter; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: if (iter->ifaddrs != NULL) { /* just in case */ freeifaddrs(iter->ifaddrs); } isc_mem_put(mctx, iter, sizeof(*iter)); - return (result); + return result; } /* @@ -214,12 +214,12 @@ internal_current(isc_interfaceiter_t *iter) { INSIST(ifa->ifa_name != NULL); if (ifa->ifa_addr == NULL) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } family = ifa->ifa_addr->sa_family; if (family != AF_INET && family != AF_INET6) { - return (ISC_R_IGNORE); + return ISC_R_IGNORE; } memset(&iter->current, 0, sizeof(iter->current)); @@ -262,7 +262,7 @@ internal_current(isc_interfaceiter_t *iter) { ifa->ifa_name); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -278,10 +278,10 @@ internal_next(isc_interfaceiter_t *iter) { iter->pos = iter->pos->ifa_next; } if (iter->pos == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -305,7 +305,7 @@ isc_result_t isc_interfaceiter_current(isc_interfaceiter_t *iter, isc_interface_t *ifdata) { REQUIRE(iter->result == ISC_R_SUCCESS); memmove(ifdata, &iter->current, sizeof(*ifdata)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -326,7 +326,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter) { } } iter->result = result; - return (result); + return result; } isc_result_t @@ -347,7 +347,7 @@ isc_interfaceiter_next(isc_interfaceiter_t *iter) { } } iter->result = result; - return (result); + return result; } void diff --git a/lib/isc/iterated_hash.c b/lib/isc/iterated_hash.c index dabdb0fa1c..dfffe3b129 100644 --- a/lib/isc/iterated_hash.c +++ b/lib/isc/iterated_hash.c @@ -39,7 +39,7 @@ isc_iterated_hash(unsigned char *out, const unsigned int hashalg, SHA_CTX ctx; if (hashalg != 1) { - return (0); + return 0; } buf = in; @@ -48,29 +48,29 @@ isc_iterated_hash(unsigned char *out, const unsigned int hashalg, do { if (SHA1_Init(&ctx) != 1) { ERR_clear_error(); - return (0); + return 0; } if (SHA1_Update(&ctx, buf, len) != 1) { ERR_clear_error(); - return (0); + return 0; } if (SHA1_Update(&ctx, salt, saltlength) != 1) { ERR_clear_error(); - return (0); + return 0; } if (SHA1_Final(out, &ctx) != 1) { ERR_clear_error(); - return (0); + return 0; } buf = out; len = SHA_DIGEST_LENGTH; } while (n++ < iterations); - return (SHA_DIGEST_LENGTH); + return SHA_DIGEST_LENGTH; } void @@ -106,7 +106,7 @@ isc_iterated_hash(unsigned char *out, const unsigned int hashalg, const unsigned char *buf; if (hashalg != 1) { - return (0); + return 0; } buf = in; @@ -132,11 +132,11 @@ isc_iterated_hash(unsigned char *out, const unsigned int hashalg, len = outlength; } while (n++ < iterations); - return (outlength); + return outlength; fail: ERR_clear_error(); - return (0); + return 0; } void diff --git a/lib/isc/jemalloc_shim.h b/lib/isc/jemalloc_shim.h index 619d510432..1f6ef0fc44 100644 --- a/lib/isc/jemalloc_shim.h +++ b/lib/isc/jemalloc_shim.h @@ -48,7 +48,7 @@ mallocx(size_t size, int flags) { memset(ptr, 0, size); } - return (ptr); + return ptr; } static inline void @@ -62,7 +62,7 @@ static inline size_t sallocx(void *ptr, int flags ISC_ATTR_UNUSED) { size_info *si = &(((size_info *)ptr)[-1]); - return (si[0].size); + return si[0].size; } static inline void * @@ -78,7 +78,7 @@ rallocx(void *ptr, size_t size, int flags) { si->size = size; ptr = &si[1]; - return (ptr); + return ptr; } #endif /* !defined(HAVE_JEMALLOC) */ diff --git a/lib/isc/lex.c b/lib/isc/lex.c index 3232b8c152..aa3beaa976 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -78,7 +78,7 @@ grow_data(isc_lex_t *lex, size_t *remainingp, char **currp, char **prevp) { lex->data = tmp; *remainingp += lex->max_token; lex->max_token *= 2; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -142,7 +142,7 @@ isc_lex_getcomments(isc_lex_t *lex) { REQUIRE(VALID_LEX(lex)); - return (lex->comments); + return lex->comments; } void @@ -199,7 +199,7 @@ new_source(isc_lex_t *lex, bool is_file, bool need_close, void *input, source->line = 1; ISC_LIST_INITANDPREPEND(lex->sources, source, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -215,14 +215,14 @@ isc_lex_openfile(isc_lex_t *lex, const char *filename) { result = isc_stdio_open(filename, "r", &stream); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = new_source(lex, true, true, stream, filename); if (result != ISC_R_SUCCESS) { (void)fclose(stream); } - return (result); + return result; } isc_result_t @@ -237,7 +237,7 @@ isc_lex_openstream(isc_lex_t *lex, FILE *stream) { snprintf(name, sizeof(name), "stream-%p", stream); - return (new_source(lex, true, false, stream, name)); + return new_source(lex, true, false, stream, name); } isc_result_t @@ -252,7 +252,7 @@ isc_lex_openbuffer(isc_lex_t *lex, isc_buffer_t *buffer) { snprintf(name, sizeof(name), "buffer-%p", buffer); - return (new_source(lex, false, false, buffer, name)); + return new_source(lex, false, false, buffer, name); } isc_result_t @@ -267,7 +267,7 @@ isc_lex_close(isc_lex_t *lex) { source = HEAD(lex->sources); if (source == NULL) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } ISC_LIST_UNLINK(lex->sources, source, link); @@ -281,7 +281,7 @@ isc_lex_close(isc_lex_t *lex) { isc_buffer_free(&source->pushback); isc_mem_put(lex->mctx, source, sizeof(*source)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } typedef enum { @@ -333,7 +333,7 @@ pushandgrow(isc_lex_t *lex, inputsource *source, int c) { source->pushback = tbuf; } isc_buffer_putuint8(source->pushback, (uint8_t)c); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -364,13 +364,13 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { if (source == NULL) { if ((options & ISC_LEXOPT_NOMORE) != 0) { tokenp->type = isc_tokentype_nomore; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (source->result != ISC_R_SUCCESS) { - return (source->result); + return source->result; } lex->saved_paren_count = lex->paren_count; @@ -382,18 +382,18 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { lex->paren_count != 0) { lex->paren_count = 0; - return (ISC_R_UNBALANCED); + return ISC_R_UNBALANCED; } if ((options & ISC_LEXOPT_BTEXT) != 0 && lex->brace_count != 0) { lex->brace_count = 0; - return (ISC_R_UNBALANCED); + return ISC_R_UNBALANCED; } if ((options & ISC_LEXOPT_EOF) != 0) { tokenp->type = isc_tokentype_eof; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (ISC_R_EOF); + return ISC_R_EOF; } isc_buffer_compact(source->pushback); @@ -925,7 +925,7 @@ done: funlockfile(source->input); } #endif /* ifdef HAVE_FLOCKFILE */ - return (result); + return result; } isc_result_t @@ -950,37 +950,37 @@ isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token, isc_lex_ungettoken(lex, token); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (eol && ((token->type == isc_tokentype_eol) || (token->type == isc_tokentype_eof))) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (token->type == isc_tokentype_string && (expect == isc_tokentype_qstring || expect == isc_tokentype_qvpair)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (token->type == isc_tokentype_vpair && expect == isc_tokentype_qvpair) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (token->type != expect) { isc_lex_ungettoken(lex, token); if (token->type == isc_tokentype_eol || token->type == isc_tokentype_eof) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (expect == isc_tokentype_number) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -995,24 +995,24 @@ isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) { isc_lex_ungettoken(lex, token); } if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (eol && ((token->type == isc_tokentype_eol) || (token->type == isc_tokentype_eof))) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (token->type != isc_tokentype_number) { isc_lex_ungettoken(lex, token); if (token->type == isc_tokentype_eol || token->type == isc_tokentype_eof) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -1065,10 +1065,10 @@ isc_lex_getsourcename(isc_lex_t *lex) { source = HEAD(lex->sources); if (source == NULL) { - return (NULL); + return NULL; } - return (source->name); + return source->name; } unsigned long @@ -1079,10 +1079,10 @@ isc_lex_getsourceline(isc_lex_t *lex) { source = HEAD(lex->sources); if (source == NULL) { - return (0); + return 0; } - return (source->line); + return source->line; } isc_result_t @@ -1094,12 +1094,12 @@ isc_lex_setsourcename(isc_lex_t *lex, const char *name) { source = HEAD(lex->sources); if (source == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } newname = isc_mem_strdup(lex->mctx, name); isc_mem_free(lex->mctx, source->name); source->name = newname; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1110,11 +1110,11 @@ isc_lex_setsourceline(isc_lex_t *lex, unsigned long line) { source = HEAD(lex->sources); if (source == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } source->line = line; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -1126,8 +1126,8 @@ isc_lex_isfile(isc_lex_t *lex) { source = HEAD(lex->sources); if (source == NULL) { - return (false); + return false; } - return (source->is_file); + return source->is_file; } diff --git a/lib/isc/log.c b/lib/isc/log.c index 04be355ae2..b3b437dbcd 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -369,7 +369,7 @@ isc_logconfig_t * isc_logconfig_get(void) { REQUIRE(VALID_CONTEXT(isc__lctx)); - return (rcu_dereference(isc__lctx->logconfig)); + return rcu_dereference(isc__lctx->logconfig); } void @@ -463,11 +463,11 @@ isc_log_categorybyname(const char *name) { category++) { if (strcmp(categories_description[category], name) == 0) { - return (category); + return category; } } - return (ISC_LOGCATEGORY_INVALID); + return ISC_LOGCATEGORY_INVALID; } void @@ -570,7 +570,7 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name, } if (channel == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (category != ISC_LOGCATEGORY_DEFAULT) { @@ -596,7 +596,7 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name, } rcu_read_unlock(); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -670,7 +670,7 @@ unsigned int isc_log_getdebuglevel(void) { REQUIRE(VALID_CONTEXT(isc__lctx)); - return (atomic_load_acquire(&isc__lctx->debug_level)); + return atomic_load_acquire(&isc__lctx->debug_level); } void @@ -694,7 +694,7 @@ char * isc_log_gettag(isc_logconfig_t *lcfg) { REQUIRE(VALID_CONFIG(lcfg)); - return (lcfg->tag); + return lcfg->tag; } /* XXXDCL NT -- This interface will assuredly be changing. */ @@ -791,7 +791,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) { result = ISC_R_NOSPACE; syslog(LOG_ERR, "unable to remove log files: %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -813,7 +813,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) { * Return if the directory open failed. */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } while (isc_dir_read(&dir) == ISC_R_SUCCESS) { @@ -855,7 +855,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) { isc_dir_close(&dir); *greatestp = greatest; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -881,7 +881,7 @@ last_to_keep(int64_t versions, isc_dir_t *dirp, const char *bname, int64_t version = 0; if (versions <= 0) { - return (INT64_MAX); + return INT64_MAX; } if (versions > ISC_LOG_MAX_VERSIONS) { @@ -914,7 +914,7 @@ last_to_keep(int64_t versions, isc_dir_t *dirp, const char *bname, /* * to_keep[versions - 1] is the last one we want to keep */ - return (to_keep[versions - 1]); + return to_keep[versions - 1]; } static isc_result_t @@ -938,7 +938,7 @@ remove_old_tsversions(isc_logfile_t *file, int versions) { result = ISC_R_NOSPACE; syslog(LOG_ERR, "unable to remove log files: %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -960,7 +960,7 @@ remove_old_tsversions(isc_logfile_t *file, int versions) { * Return if the directory open failed. */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } last = last_to_keep(versions, &dir, bname, bnamelen); @@ -1000,7 +1000,7 @@ remove_old_tsversions(isc_logfile_t *file, int versions) { } } isc_dir_close(&dir); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1036,7 +1036,7 @@ roll_increment(isc_logfile_t *file) { */ result = greatest_version(file, file->versions, &greatest); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -1083,7 +1083,7 @@ roll_increment(isc_logfile_t *file) { path, path, isc_result_totext(result)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1123,7 +1123,7 @@ roll_timestamp(isc_logfile_t *file) { path, path, isc_result_totext(result)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1138,23 +1138,23 @@ isc_logfile_roll(isc_logfile_t *file) { * files is desired. */ if (file->versions == ISC_LOG_ROLLNEVER) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (file->versions == 0) { result = isc_file_remove(file->name); if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) { syslog(LOG_ERR, "unable to remove log file '%s': %s", file->name, isc_result_totext(result)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } switch (file->suffix) { case isc_log_rollsuffix_increment: - return (roll_increment(file)); + return roll_increment(file); case isc_log_rollsuffix_timestamp: - return (roll_timestamp(file)); + return roll_timestamp(file); default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -1200,7 +1200,7 @@ isc_log_open(isc_logchannel_t *channel) { */ if (result == ISC_R_SUCCESS && roll) { if (FILE_VERSIONS(channel) == ISC_LOG_ROLLNEVER) { - return (ISC_R_MAXSIZE); + return ISC_R_MAXSIZE; } result = isc_logfile_roll(&channel->destination.file); if (result != ISC_R_SUCCESS) { @@ -1212,13 +1212,13 @@ isc_log_open(isc_logchannel_t *channel) { isc_result_totext(result)); channel->flags |= ISC_LOG_OPENERR; } - return (result); + return result; } } result = isc_stdio_open(path, "a", &FILE_STREAM(channel)); - return (result); + return result; } ISC_NO_SANITIZE_THREAD bool @@ -1234,24 +1234,24 @@ isc_log_wouldlog(int level) { * entered to see if the message should really be output. */ if (isc__lctx == NULL) { - return (false); + return false; } if (forcelog) { - return (true); + return true; } int highest_level = atomic_load_acquire(&isc__lctx->highest_level); if (level <= highest_level) { - return (true); + return true; } if (atomic_load_acquire(&isc__lctx->dynamic)) { int debug_level = atomic_load_acquire(&isc__lctx->debug_level); if (level <= debug_level) { - return (true); + return true; } } - return (false); + return false; } static void diff --git a/lib/isc/loop.c b/lib/isc/loop.c index fb18356973..44a6239de1 100644 --- a/lib/isc/loop.c +++ b/lib/isc/loop.c @@ -290,7 +290,7 @@ helper_thread(void *arg) { isc_barrier_wait(&helper->loopmgr->stopping); - return (NULL); + return NULL; } static void * @@ -338,7 +338,7 @@ loop_thread(void *arg) { isc_barrier_wait(&loopmgr->stopping); - return (NULL); + return NULL; } /** @@ -438,7 +438,7 @@ isc_loop_setup(isc_loop_t *loop, isc_job_cb cb, void *cbarg) { cds_wfcq_enqueue(&loop->setup_jobs.head, &loop->setup_jobs.tail, &job->wfcq_node); - return (job); + return job; } isc_job_t * @@ -459,7 +459,7 @@ isc_loop_teardown(isc_loop_t *loop, isc_job_cb cb, void *cbarg) { cds_wfcq_enqueue(&loop->teardown_jobs.head, &loop->teardown_jobs.tail, &job->wfcq_node); - return (job); + return job; } void @@ -625,21 +625,21 @@ uint32_t isc_loopmgr_nloops(isc_loopmgr_t *loopmgr) { REQUIRE(VALID_LOOPMGR(loopmgr)); - return (loopmgr->nloops); + return loopmgr->nloops; } isc_mem_t * isc_loop_getmctx(isc_loop_t *loop) { REQUIRE(VALID_LOOP(loop)); - return (loop->mctx); + return loop->mctx; } isc_loop_t * isc_loop_main(isc_loopmgr_t *loopmgr) { REQUIRE(VALID_LOOPMGR(loopmgr)); - return (DEFAULT_LOOP(loopmgr)); + return DEFAULT_LOOP(loopmgr); } isc_loop_t * @@ -647,7 +647,7 @@ isc_loop_get(isc_loopmgr_t *loopmgr, uint32_t tid) { REQUIRE(VALID_LOOPMGR(loopmgr)); REQUIRE(tid < loopmgr->nloops); - return (LOOP(loopmgr, tid)); + return LOOP(loopmgr, tid); } void @@ -670,7 +670,7 @@ isc_loopmgr_t * isc_loop_getloopmgr(isc_loop_t *loop) { REQUIRE(VALID_LOOP(loop)); - return (loop->loopmgr); + return loop->loopmgr; } isc_time_t @@ -683,7 +683,7 @@ isc_loop_now(isc_loop_t *loop) { .nanoseconds = (msec % MS_PER_SEC) * NS_PER_MS, }; - return (t); + return t; } bool @@ -691,5 +691,5 @@ isc_loop_shuttingdown(isc_loop_t *loop) { REQUIRE(VALID_LOOP(loop)); REQUIRE(loop->tid == isc_tid()); - return (loop->shuttingdown); + return loop->shuttingdown; } diff --git a/lib/isc/md.c b/lib/isc/md.c index a0f8e58cf2..8f461d60ca 100644 --- a/lib/isc/md.c +++ b/lib/isc/md.c @@ -26,7 +26,7 @@ isc_md_t * isc_md_new(void) { isc_md_t *md = EVP_MD_CTX_new(); RUNTIME_CHECK(md != NULL); - return (md); + return md; } void @@ -43,15 +43,15 @@ isc_md_init(isc_md_t *md, const isc_md_type_t *md_type) { REQUIRE(md != NULL); if (md_type == NULL) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } if (EVP_DigestInit_ex(md, md_type, NULL) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -60,10 +60,10 @@ isc_md_reset(isc_md_t *md) { if (EVP_MD_CTX_reset(md) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -71,15 +71,15 @@ isc_md_update(isc_md_t *md, const unsigned char *buf, const size_t len) { REQUIRE(md != NULL); if (buf == NULL || len == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (EVP_DigestUpdate(md, buf, len) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -89,31 +89,31 @@ isc_md_final(isc_md_t *md, unsigned char *digest, unsigned int *digestlen) { if (EVP_DigestFinal_ex(md, digest, digestlen) != 1) { ERR_clear_error(); - return (ISC_R_CRYPTOFAILURE); + return ISC_R_CRYPTOFAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } const isc_md_type_t * isc_md_get_md_type(isc_md_t *md) { REQUIRE(md != NULL); - return (EVP_MD_CTX_get0_md(md)); + return EVP_MD_CTX_get0_md(md); } size_t isc_md_get_size(isc_md_t *md) { REQUIRE(md != NULL); - return (EVP_MD_CTX_size(md)); + return EVP_MD_CTX_size(md); } size_t isc_md_get_block_size(isc_md_t *md) { REQUIRE(md != NULL); - return (EVP_MD_CTX_block_size(md)); + return EVP_MD_CTX_block_size(md); } size_t @@ -122,10 +122,10 @@ isc_md_type_get_size(const isc_md_type_t *md_type) { "Change ISC_MAX_MD_SIZE to be greater than or equal to " "EVP_MAX_MD_SIZE"); if (md_type != NULL) { - return ((size_t)EVP_MD_size(md_type)); + return (size_t)EVP_MD_size(md_type); } - return (ISC_MAX_MD_SIZE); + return ISC_MAX_MD_SIZE; } size_t @@ -134,10 +134,10 @@ isc_md_type_get_block_size(const isc_md_type_t *md_type) { "Change ISC_MAX_MD_SIZE to be greater than or equal to " "EVP_MAX_MD_SIZE"); if (md_type != NULL) { - return ((size_t)EVP_MD_block_size(md_type)); + return (size_t)EVP_MD_block_size(md_type); } - return (ISC_MAX_MD_SIZE); + return ISC_MAX_MD_SIZE; } isc_result_t @@ -165,5 +165,5 @@ isc_md(const isc_md_type_t *md_type, const unsigned char *buf, const size_t len, end: isc_md_free(md); - return (res); + return res; } diff --git a/lib/isc/mem.c b/lib/isc/mem.c index a56cb9eb97..8a23b0f46a 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -309,7 +309,7 @@ mem_get(isc_mem_t *ctx, size_t size, int flags) { memset(ret, 0xbe, size); /* Mnemonic for "beef". */ } - return (ret); + return ret; } /*! @@ -347,7 +347,7 @@ mem_realloc(isc_mem_t *ctx, void *old_ptr, size_t old_size, size_t new_size, } } - return (new_ptr); + return new_ptr; } /*! @@ -382,15 +382,15 @@ mem_jemalloc_arena_create(unsigned int *pnew_arenano) { res = mallctl("arenas.create", &arenano, &len, NULL, 0); if (res != 0) { - return (false); + return false; } *pnew_arenano = arenano; - return (true); + return true; #else *pnew_arenano = ISC_MEM_ILLEGAL_ARENA; - return (true); + return true; #endif /* JEMALLOC_API_SUPPORTED */ } @@ -403,13 +403,13 @@ mem_jemalloc_arena_destroy(unsigned int arenano) { (void)snprintf(buf, sizeof(buf), "arena.%u.destroy", arenano); res = mallctl(buf, NULL, NULL, NULL, 0); if (res != 0) { - return (false); + return false; } - return (true); + return true; #else UNUSED(arenano); - return (true); + return true; #endif /* JEMALLOC_API_SUPPORTED */ } @@ -656,7 +656,7 @@ isc__mem_get(isc_mem_t *ctx, size_t size, int flags FLARG) { mem_getstats(ctx, size); ADD_TRACE(ctx, ptr, size, file, line); - return (ptr); + return ptr; } void @@ -762,7 +762,7 @@ isc__mem_allocate(isc_mem_t *ctx, size_t size, int flags FLARG) { mem_getstats(ctx, size); ADD_TRACE(ctx, ptr, size, file, line); - return (ptr); + return ptr; } void * @@ -791,7 +791,7 @@ isc__mem_reget(isc_mem_t *ctx, void *old_ptr, size_t old_size, size_t new_size, */ } - return (new_ptr); + return new_ptr; } void * @@ -826,7 +826,7 @@ isc__mem_reallocate(isc_mem_t *ctx, void *old_ptr, size_t new_size, */ } - return (new_ptr); + return new_ptr; } void @@ -862,7 +862,7 @@ isc__mem_strdup(isc_mem_t *mctx, const char *s FLARG) { strlcpy(ns, s, len); - return (ns); + return ns; } char * @@ -883,7 +883,7 @@ isc__mem_strndup(isc_mem_t *mctx, const char *s, size_t size FLARG) { strlcpy(ns, s, len); - return (ns); + return ns; } void @@ -901,7 +901,7 @@ size_t isc_mem_inuse(isc_mem_t *ctx) { REQUIRE(VALID_CONTEXT(ctx)); - return (atomic_load_relaxed(&ctx->inuse)); + return atomic_load_relaxed(&ctx->inuse); } void @@ -930,12 +930,12 @@ isc_mem_isovermem(isc_mem_t *ctx) { /* We are not overmem, check whether we should be? */ size_t hiwater = atomic_load_relaxed(&ctx->hi_water); if (hiwater == 0) { - return (false); + return false; } size_t inuse = atomic_load_relaxed(&ctx->inuse); if (inuse <= hiwater) { - return (false); + return false; } if ((isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0) { @@ -945,17 +945,17 @@ isc_mem_isovermem(isc_mem_t *ctx) { } atomic_store_relaxed(&ctx->is_overmem, true); - return (true); + return true; } else { /* We are overmem, check whether we should not be? */ size_t lowater = atomic_load_relaxed(&ctx->lo_water); if (lowater == 0) { - return (false); + return false; } size_t inuse = atomic_load_relaxed(&ctx->inuse); if (inuse >= lowater) { - return (true); + return true; } if ((isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0) { @@ -964,7 +964,7 @@ isc_mem_isovermem(isc_mem_t *ctx) { inuse, lowater); } atomic_store_relaxed(&ctx->is_overmem, false); - return (false); + return false; } } @@ -982,10 +982,10 @@ isc_mem_getname(isc_mem_t *ctx) { REQUIRE(VALID_CONTEXT(ctx)); if (ctx->name[0] == 0) { - return (""); + return ""; } - return (ctx->name); + return ctx->name; } /* @@ -1138,7 +1138,7 @@ isc__mempool_get(isc_mempool_t *restrict mpctx FLARG) { ADD_TRACE(mpctx->mctx, item, mpctx->size, file, line); - return (item); + return item; } /* coverity[+free : arg-1] */ @@ -1195,21 +1195,21 @@ unsigned int isc_mempool_getfreemax(isc_mempool_t *restrict mpctx) { REQUIRE(VALID_MEMPOOL(mpctx)); - return (mpctx->freemax); + return mpctx->freemax; } unsigned int isc_mempool_getfreecount(isc_mempool_t *restrict mpctx) { REQUIRE(VALID_MEMPOOL(mpctx)); - return (mpctx->freecount); + return mpctx->freecount; } unsigned int isc_mempool_getallocated(isc_mempool_t *restrict mpctx) { REQUIRE(VALID_MEMPOOL(mpctx)); - return (mpctx->allocated); + return mpctx->allocated; } void @@ -1225,7 +1225,7 @@ unsigned int isc_mempool_getfillcount(isc_mempool_t *restrict mpctx) { REQUIRE(VALID_MEMPOOL(mpctx)); - return (mpctx->fillcount); + return mpctx->fillcount; } /* @@ -1277,7 +1277,7 @@ isc__mem_checkdestroyed(void) { unsigned int isc_mem_references(isc_mem_t *ctx) { - return (isc_refcount_current(&ctx->references)); + return isc_refcount_current(&ctx->references); } #ifdef HAVE_LIBXML2 @@ -1345,7 +1345,7 @@ xml_renderctx(isc_mem_t *ctx, size_t *inuse, xmlTextWriterPtr writer) { error: MCTXUNLOCK(ctx); - return (xmlrc); + return xmlrc; } int @@ -1385,7 +1385,7 @@ isc_mem_renderxml(void *writer0) { TRY0(xmlTextWriterEndElement(writer)); /* summary */ error: - return (xmlrc); + return xmlrc; } #endif /* HAVE_LIBXML2 */ @@ -1445,7 +1445,7 @@ json_renderctx(isc_mem_t *ctx, size_t *inuse, json_object *array) { MCTXUNLOCK(ctx); json_object_array_add(array, ctxobj); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1480,13 +1480,13 @@ isc_mem_renderjson(void *memobj0) { json_object_object_add(memobj, "Malloced", obj); json_object_object_add(memobj, "contexts", ctxarray); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; error: if (ctxarray != NULL) { json_object_put(ctxarray); } - return (result); + return result; } #endif /* HAVE_JSON_C */ @@ -1535,7 +1535,7 @@ jemalloc_set_ssize_value(const char *valname, ssize_t newval) { int ret; ret = mallctl(valname, NULL, NULL, &newval, sizeof(newval)); - return (ret == 0); + return ret == 0; } #endif /* JEMALLOC_API_SUPPORTED */ @@ -1548,7 +1548,7 @@ mem_set_arena_ssize_value(isc_mem_t *mctx, const char *arena_valname, char buf[256] = { 0 }; if (mctx->jemalloc_arena == ISC_MEM_ILLEGAL_ARENA) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } (void)snprintf(buf, sizeof(buf), "arena.%u.%s", mctx->jemalloc_arena, @@ -1557,25 +1557,25 @@ mem_set_arena_ssize_value(isc_mem_t *mctx, const char *arena_valname, ret = jemalloc_set_ssize_value(buf, newval); if (!ret) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else UNUSED(arena_valname); UNUSED(newval); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif } isc_result_t isc_mem_arena_set_muzzy_decay_ms(isc_mem_t *mctx, const ssize_t decay_ms) { - return (mem_set_arena_ssize_value(mctx, "muzzy_decay_ms", decay_ms)); + return mem_set_arena_ssize_value(mctx, "muzzy_decay_ms", decay_ms); } isc_result_t isc_mem_arena_set_dirty_decay_ms(isc_mem_t *mctx, const ssize_t decay_ms) { - return (mem_set_arena_ssize_value(mctx, "dirty_decay_ms", decay_ms)); + return mem_set_arena_ssize_value(mctx, "dirty_decay_ms", decay_ms); } void diff --git a/lib/isc/meminfo.c b/lib/isc/meminfo.c index 5480a74b11..ae926eb41b 100644 --- a/lib/isc/meminfo.c +++ b/lib/isc/meminfo.c @@ -22,8 +22,8 @@ isc_meminfo_totalphys(void) { #if UV_VERSION_HEX >= UV_VERSION(1, 29, 0) uint64_t cmem = uv_get_constrained_memory(); if (cmem > 0 && cmem < tmem) { - return (cmem); + return cmem; } #endif /* UV_VERSION_HEX >= UV_VERSION(1, 29, 0) */ - return (tmem); + return tmem; } diff --git a/lib/isc/net.c b/lib/isc/net.c index 6133664bf1..adae0fef83 100644 --- a/lib/isc/net.c +++ b/lib/isc/net.c @@ -129,10 +129,10 @@ try_proto(int domain) { #ifdef EINVAL case EINVAL: #endif /* ifdef EINVAL */ - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; default: UNEXPECTED_SYSERROR(errno, "socket()"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -174,7 +174,7 @@ try_proto(int domain) { (void)close(s); - return (result); + return result; } static void @@ -191,13 +191,13 @@ initialize(void) { isc_result_t isc_net_probeipv4(void) { initialize(); - return (ipv4_result); + return ipv4_result; } isc_result_t isc_net_probeipv6(void) { initialize(); - return (ipv6_result); + return ipv6_result; } static void @@ -308,7 +308,7 @@ initialize_ipv6pktinfo(void) { isc_result_t isc_net_probe_ipv6only(void) { initialize_ipv6only(); - return (ipv6only_result); + return ipv6only_result; } isc_result_t @@ -325,7 +325,7 @@ isc_net_probe_ipv6pktinfo(void) { #ifdef __notyet__ initialize_ipv6pktinfo(); #endif /* ifdef __notyet__ */ - return (ipv6pktinfo_result); + return ipv6pktinfo_result; } #if defined(USE_SYSCTL_PORTRANGE) @@ -346,21 +346,21 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) { portlen = sizeof(port_low); if (sysctlbyname(sysctlname_lowport, &port_low, &portlen, NULL, 0) < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } portlen = sizeof(port_high); if (sysctlbyname(sysctlname_hiport, &port_high, &portlen, NULL, 0) < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((port_low & ~0xffff) != 0 || (port_high & ~0xffff) != 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *low = (in_port_t)port_low; *high = (in_port_t)port_high; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else /* !HAVE_SYSCTLBYNAME */ static isc_result_t @@ -385,22 +385,22 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) { portlen = sizeof(port_low); if (sysctl(mib_lo, miblen, &port_low, &portlen, NULL, 0) < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } portlen = sizeof(port_high); if (sysctl(mib_hi, miblen, &port_high, &portlen, NULL, 0) < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if ((port_low & ~0xffff) != 0 || (port_high & ~0xffff) != 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *low = (in_port_t)port_low; *high = (in_port_t)port_high; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* HAVE_SYSCTLBYNAME */ #endif /* USE_SYSCTL_PORTRANGE */ @@ -445,7 +445,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) { *high = ISC_NET_PORTRANGEHIGH; } - return (ISC_R_SUCCESS); /* we currently never fail in this function */ + return ISC_R_SUCCESS; /* we currently never fail in this function */ } void diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index 2c7894f8c7..317f271ffe 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -29,17 +29,17 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) { REQUIRE(a != NULL && b != NULL); if (a->family != b->family) { - return (false); + return false; } if (a->zone != b->zone) { - return (false); + return false; } switch (a->family) { case AF_INET: if (a->type.in.s_addr != b->type.in.s_addr) { - return (false); + return false; } break; case AF_INET6: @@ -47,13 +47,13 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) { 0 || a->zone != b->zone) { - return (false); + return false; } break; default: - return (false); + return false; } - return (true); + return true; } bool @@ -67,11 +67,11 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, REQUIRE(a != NULL && b != NULL); if (a->family != b->family) { - return (false); + return false; } if (a->zone != b->zone && b->zone != 0) { - return (false); + return false; } switch (a->family) { @@ -86,7 +86,7 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, ipabytes = 16; break; default: - return (false); + return false; } /* @@ -101,7 +101,7 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, if (nbytes > 0) { if (memcmp(pa, pb, nbytes) != 0) { - return (false); + return false; } } if (nbits > 0) { @@ -112,10 +112,10 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, byteb = pb[nbytes]; mask = (0xFF << (8 - nbits)) & 0xFF; if ((bytea & mask) != (byteb & mask)) { - return (false); + return false; } } - return (true); + return true; } isc_result_t @@ -137,11 +137,11 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { type = &netaddr->type.in6; break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } r = inet_ntop(netaddr->family, type, abuf, sizeof(abuf)); if (r == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } alen = strlen(abuf); @@ -151,19 +151,19 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { if (netaddr->family == AF_INET6 && netaddr->zone != 0) { zlen = snprintf(zbuf, sizeof(zbuf), "%%%u", netaddr->zone); if (zlen < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } INSIST((unsigned int)zlen < sizeof(zbuf)); } if (alen + zlen > isc_buffer_availablelength(target)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(target, (unsigned char *)abuf, alen); isc_buffer_putmem(target, (unsigned char *)zbuf, (unsigned int)zlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -207,34 +207,34 @@ isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen) { p = (const unsigned char *)&na->type.in; ipbytes = 4; if (prefixlen > 32) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } break; case AF_INET6: p = (const unsigned char *)&na->type.in6; ipbytes = 16; if (prefixlen > 128) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } nbytes = prefixlen / 8; nbits = prefixlen % 8; if (nbits != 0) { INSIST(nbytes < ipbytes); if ((p[nbytes] & (0xff >> nbits)) != 0U) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } nbytes++; } if (nbytes < ipbytes && memcmp(p + nbytes, zeros, ipbytes - nbytes) != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -252,7 +252,7 @@ isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) { ipbytes = 16; break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } for (i = 0; i < ipbytes; i++) { if (p[i] != 0xFF) { @@ -267,17 +267,17 @@ isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) { nbits++; } if ((c & 0xFF) != 0) { - return (ISC_R_MASKNONCONTIG); + return ISC_R_MASKNONCONTIG; } i++; } for (; i < ipbytes; i++) { if (p[i] != 0) { - return (ISC_R_MASKNONCONTIG); + return ISC_R_MASKNONCONTIG; } } *lenp = nbytes * 8 + nbits; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -304,7 +304,7 @@ isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone) { uint32_t isc_netaddr_getzone(const isc_netaddr_t *netaddr) { - return (netaddr->zone); + return netaddr->zone; } void @@ -349,11 +349,11 @@ bool isc_netaddr_ismulticast(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (ISC_IPADDR_ISMULTICAST(na->type.in.s_addr)); + return ISC_IPADDR_ISMULTICAST(na->type.in.s_addr); case AF_INET6: - return (IN6_IS_ADDR_MULTICAST(&na->type.in6)); + return IN6_IS_ADDR_MULTICAST(&na->type.in6); default: - return (false); /* XXXMLG ? */ + return false; /* XXXMLG ? */ } } @@ -361,9 +361,9 @@ bool isc_netaddr_isexperimental(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (ISC_IPADDR_ISEXPERIMENTAL(na->type.in.s_addr)); + return ISC_IPADDR_ISEXPERIMENTAL(na->type.in.s_addr); default: - return (false); /* XXXMLG ? */ + return false; /* XXXMLG ? */ } } @@ -371,11 +371,11 @@ bool isc_netaddr_islinklocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (false); + return false; case AF_INET6: - return (IN6_IS_ADDR_LINKLOCAL(&na->type.in6)); + return IN6_IS_ADDR_LINKLOCAL(&na->type.in6); default: - return (false); + return false; } } @@ -383,11 +383,11 @@ bool isc_netaddr_issitelocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (false); + return false; case AF_INET6: - return (IN6_IS_ADDR_SITELOCAL(&na->type.in6)); + return IN6_IS_ADDR_SITELOCAL(&na->type.in6); default: - return (false); + return false; } } @@ -398,11 +398,11 @@ bool isc_netaddr_isnetzero(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (ISC_IPADDR_ISNETZERO(na->type.in.s_addr)); + return ISC_IPADDR_ISNETZERO(na->type.in.s_addr); case AF_INET6: - return (false); + return false; default: - return (false); + return false; } } @@ -424,11 +424,10 @@ bool isc_netaddr_isloopback(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: - return (((ntohl(na->type.in.s_addr) & 0xff000000U) == - 0x7f000000U)); + return (ntohl(na->type.in.s_addr) & 0xff000000U) == 0x7f000000U; case AF_INET6: - return (IN6_IS_ADDR_LOOPBACK(&na->type.in6)); + return IN6_IS_ADDR_LOOPBACK(&na->type.in6); default: - return (false); + return false; } } diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c index 8927bf31a1..9d153a0f2e 100644 --- a/lib/isc/netmgr/http.c +++ b/lib/isc/netmgr/http.c @@ -247,22 +247,22 @@ http_initsocket(isc_nmsocket_t *sock); static bool http_session_active(isc_nm_http_session_t *session) { REQUIRE(VALID_HTTP2_SESSION(session)); - return (!session->closed && !session->closing); + return !session->closed && !session->closing; } static void * http_malloc(size_t sz, isc_mem_t *mctx) { - return (isc_mem_allocate(mctx, sz)); + return isc_mem_allocate(mctx, sz); } static void * http_calloc(size_t n, size_t sz, isc_mem_t *mctx) { - return (isc_mem_callocate(mctx, n, sz)); + return isc_mem_callocate(mctx, n, sz); } static void * http_realloc(void *p, size_t newsz, isc_mem_t *mctx) { - return (isc_mem_reallocate(mctx, p, newsz)); + return isc_mem_reallocate(mctx, p, newsz); } static void @@ -354,7 +354,7 @@ isc_nmhandle_t * isc__nm_httpsession_handle(isc_nm_http_session_t *session) { REQUIRE(VALID_HTTP2_SESSION(session)); - return (session->handle); + return session->handle; } static http_cstream_t * @@ -363,7 +363,7 @@ find_http_cstream(int32_t stream_id, isc_nm_http_session_t *session) { REQUIRE(VALID_HTTP2_SESSION(session)); if (ISC_LIST_EMPTY(session->cstreams)) { - return (NULL); + return NULL; } for (cstream = ISC_LIST_HEAD(session->cstreams); cstream != NULL; @@ -380,7 +380,7 @@ find_http_cstream(int32_t stream_id, isc_nm_http_session_t *session) { ISC_LIST_PREPEND(session->cstreams, cstream, link); } - return (cstream); + return cstream; } static isc_result_t @@ -405,7 +405,7 @@ new_http_cstream(isc_nmsocket_t *sock, http_cstream_t **streamp) { if (result != ISC_R_SUCCESS) { isc_mem_free(mctx, stream->uri); isc_mem_put(mctx, stream, sizeof(http_cstream_t)); - return (result); + return result; } isc__nmsocket_attach(sock, &stream->httpsock); @@ -456,7 +456,7 @@ new_http_cstream(isc_nmsocket_t *sock, http_cstream_t **streamp) { ISC_LIST_PREPEND(sock->h2->session->cstreams, stream, link); *streamp = stream; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -546,13 +546,13 @@ on_client_data_chunk_recv_callback(int32_t stream_id, const uint8_t *data, { isc_buffer_putmem(cstream->rbuf, data, len); } else { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } } else { - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } - return (0); + return 0; } static int @@ -579,15 +579,15 @@ on_server_data_chunk_recv_callback(int32_t stream_id, const uint8_t *data, break; } - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } h2 = ISC_LIST_NEXT(h2, link); } if (h2 == NULL) { - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } - return (0); + return 0; } static int @@ -608,7 +608,7 @@ on_data_chunk_recv_callback(nghttp2_session *ngsession, uint8_t flags, session); } - return (rv); + return rv; } static void @@ -642,17 +642,17 @@ on_client_stream_close_callback(int32_t stream_id, rv = nghttp2_session_terminate_session( session->ngsession, NGHTTP2_NO_ERROR); if (rv != 0) { - return (rv); + return rv; } /* Mark the session as closing one to finish it on a * subsequent call to http_do_bio() */ session->closing = true; } } else { - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } - return (0); + return 0; } static int @@ -681,7 +681,7 @@ on_server_stream_close_callback(int32_t stream_id, */ isc__nmsocket_prep_destroy(sock); isc__nmsocket_detach(&sock); - return (rv); + return rv; } static int @@ -701,7 +701,7 @@ on_stream_close_callback(nghttp2_session *ngsession, int32_t stream_id, rv = on_server_stream_close_callback(stream_id, session); } - return (rv); + return rv; } static bool @@ -714,10 +714,10 @@ client_handle_status_header(http_cstream_t *cstream, const uint8_t *value, cstream->response_status.code = strtoul(tmp, NULL, 10); if (SUCCESSFUL_HTTP_STATUS(cstream->response_status.code)) { - return (true); + return true; } - return (false); + return false; } static bool @@ -733,10 +733,10 @@ client_handle_content_length_header(http_cstream_t *cstream, if (cstream->response_status.content_length == 0 || cstream->response_status.content_length > MAX_DNS_MESSAGE_SIZE) { - return (false); + return false; } - return (true); + return true; } static bool @@ -749,10 +749,10 @@ client_handle_content_type_header(http_cstream_t *cstream, const uint8_t *value, if (strncasecmp((const char *)value, type_dns_message, len) == 0) { cstream->response_status.content_type_valid = true; - return (true); + return true; } - return (false); + return false; } static int @@ -781,7 +781,7 @@ client_on_header_callback(nghttp2_session *ngsession, * - we closed the session prematurely before receiving all * responses (i.e., because of a belated or partial response). */ - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } INSIST(!ISC_LIST_EMPTY(session->cstreams)); @@ -806,10 +806,10 @@ client_on_header_callback(nghttp2_session *ngsession, } if (!header_ok) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } - return (0); + return 0; } static void @@ -852,10 +852,10 @@ send_client_connection_header(isc_nm_http_session_t *session) { rv = nghttp2_submit_settings(session->ngsession, NGHTTP2_FLAG_NONE, iv, sizeof(iv) / sizeof(iv[0])); if (rv != 0) { - return (false); + return false; } - return (true); + return true; } #define MAKE_NV(NAME, VALUE, VALUELEN) \ @@ -882,7 +882,7 @@ client_read_callback(nghttp2_session *ngsession, int32_t stream_id, cstream = find_http_cstream(stream_id, session); if (!cstream || cstream->stream_id != stream_id) { /* We haven't found the stream, so we are not reading */ - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } if (cstream->post) { @@ -902,13 +902,13 @@ client_read_callback(nghttp2_session *ngsession, int32_t stream_id, *data_flags |= NGHTTP2_DATA_FLAG_EOF; } - return (len); + return len; } else { *data_flags |= NGHTTP2_DATA_FLAG_EOF; - return (0); + return 0; } - return (0); + return 0; } /* @@ -967,12 +967,12 @@ client_submit_request(isc_nm_http_session_t *session, http_cstream_t *stream) { sizeof(hdrs) / sizeof(hdrs[0]), &dp, stream); } if (stream_id < 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } stream->stream_id = stream_id; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1098,7 +1098,7 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle, (!nghttp2_session_want_write(session->ngsession) && session->pending_write_data == NULL)) { - return (false); + return false; } /* @@ -1242,11 +1242,11 @@ http_send_outgoing(isc_nm_http_session_t *session, isc_nmhandle_t *httphandle, session->sending++; isc_buffer_usedregion(send->pending_write_data, &send_data); isc_nm_send(transphandle, &send_data, http_writecb, send); - return (true); + return true; nothing_to_send: isc_nmhandle_detach(&transphandle); - return (false); + return false; } static void @@ -1334,12 +1334,12 @@ get_http_cstream(isc_nmsocket_t *sock, http_cstream_t **streamp) { result = new_http_cstream(sock, &cstream); if (result != ISC_R_SUCCESS) { INSIST(cstream == NULL); - return (result); + return result; } } *streamp = cstream; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1580,7 +1580,7 @@ client_send(isc_nmhandle_t *handle, const isc_region_t *region) { REQUIRE(region->length <= MAX_DNS_MESSAGE_SIZE); if (session->closed) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } INSIST(cstream != NULL); @@ -1640,7 +1640,7 @@ client_send(isc_nmhandle_t *handle, const isc_region_t *region) { } error: - return (result); + return result; } isc_result_t @@ -1662,21 +1662,21 @@ isc__nm_http_request(isc_nmhandle_t *handle, isc_region_t *region, isc__nm_http_read(handle, cb, cbarg); if (!http_session_active(handle->sock->h2->session)) { /* the callback was called by isc__nm_http_read() */ - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } result = client_send(handle, region); if (result != ISC_R_SUCCESS) { goto error; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; error: cstream = sock->h2->connect.cstream; if (cstream->read_cb != NULL) { cstream->read_cb(handle, result, NULL, cstream->read_cbarg); } - return (result); + return result; } static int @@ -1690,13 +1690,13 @@ server_on_begin_headers_callback(nghttp2_session *ngsession, if (frame->hd.type != NGHTTP2_HEADERS || frame->headers.cat != NGHTTP2_HCAT_REQUEST) { - return (0); + return 0; } else if (frame->hd.length > MAX_ALLOWED_DATA_IN_HEADERS) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } if (session->nsstreams >= session->max_concurrent_streams) { - return (NGHTTP2_ERR_CALLBACK_FAILURE); + return NGHTTP2_ERR_CALLBACK_FAILURE; } INSIST(session->handle->sock->tid == isc_tid()); @@ -1726,7 +1726,7 @@ server_on_begin_headers_callback(nghttp2_session *ngsession, nghttp2_session_set_stream_user_data(ngsession, frame->hd.stream_id, socket); - return (0); + return 0; } static isc_http_error_responses_t @@ -1750,7 +1750,7 @@ server_handle_path_header(isc_nmsocket_t *socket, const uint8_t *value, if (!isc_nm_http_path_isvalid(socket->h2->request_path)) { isc_mem_free(socket->worker->mctx, socket->h2->request_path); socket->h2->request_path = NULL; - return (ISC_HTTP_ERROR_BAD_REQUEST); + return ISC_HTTP_ERROR_BAD_REQUEST; } handler = http_endpoints_find(socket->h2->request_path, @@ -1761,7 +1761,7 @@ server_handle_path_header(isc_nmsocket_t *socket, const uint8_t *value, } else { isc_mem_free(socket->worker->mctx, socket->h2->request_path); socket->h2->request_path = NULL; - return (ISC_HTTP_ERROR_NOT_FOUND); + return ISC_HTTP_ERROR_NOT_FOUND; } if (qstr != NULL) { @@ -1784,13 +1784,13 @@ server_handle_path_header(isc_nmsocket_t *socket, const uint8_t *value, &socket->h2->query_data_len); } else { socket->h2->query_too_large = true; - return (ISC_HTTP_ERROR_PAYLOAD_TOO_LARGE); + return ISC_HTTP_ERROR_PAYLOAD_TOO_LARGE; } } else { - return (ISC_HTTP_ERROR_BAD_REQUEST); + return ISC_HTTP_ERROR_BAD_REQUEST; } } - return (ISC_HTTP_ERROR_SUCCESS); + return ISC_HTTP_ERROR_SUCCESS; } static isc_http_error_responses_t @@ -1804,9 +1804,9 @@ server_handle_method_header(isc_nmsocket_t *socket, const uint8_t *value, } else if (HEADER_MATCH(post, value, valuelen)) { socket->h2->request_type = ISC_HTTP_REQ_POST; } else { - return (ISC_HTTP_ERROR_NOT_IMPLEMENTED); + return ISC_HTTP_ERROR_NOT_IMPLEMENTED; } - return (ISC_HTTP_ERROR_SUCCESS); + return ISC_HTTP_ERROR_SUCCESS; } static isc_http_error_responses_t @@ -1820,9 +1820,9 @@ server_handle_scheme_header(isc_nmsocket_t *socket, const uint8_t *value, } else if (HEADER_MATCH(http, value, valuelen)) { socket->h2->request_scheme = ISC_HTTP_SCHEME_HTTP; } else { - return (ISC_HTTP_ERROR_BAD_REQUEST); + return ISC_HTTP_ERROR_BAD_REQUEST; } - return (ISC_HTTP_ERROR_SUCCESS); + return ISC_HTTP_ERROR_SUCCESS; } static isc_http_error_responses_t @@ -1836,11 +1836,11 @@ server_handle_content_length_header(isc_nmsocket_t *socket, valuelen > tmplen ? tmplen : valuelen); socket->h2->content_length = strtoul(tmp, NULL, 10); if (socket->h2->content_length > MAX_DNS_MESSAGE_SIZE) { - return (ISC_HTTP_ERROR_PAYLOAD_TOO_LARGE); + return ISC_HTTP_ERROR_PAYLOAD_TOO_LARGE; } else if (socket->h2->content_length == 0) { - return (ISC_HTTP_ERROR_BAD_REQUEST); + return ISC_HTTP_ERROR_BAD_REQUEST; } - return (ISC_HTTP_ERROR_SUCCESS); + return ISC_HTTP_ERROR_SUCCESS; } static isc_http_error_responses_t @@ -1854,7 +1854,7 @@ server_handle_content_type_header(isc_nmsocket_t *socket, const uint8_t *value, if (!HEADER_MATCH(type_dns_message, value, valuelen)) { resp = ISC_HTTP_ERROR_UNSUPPORTED_MEDIA_TYPE; } - return (resp); + return resp; } static isc_http_error_responses_t @@ -1888,7 +1888,7 @@ server_handle_header(isc_nmsocket_t *socket, const uint8_t *name, valuelen); } - return (code); + return code; } static int @@ -1905,7 +1905,7 @@ server_on_header_callback(nghttp2_session *session, const nghttp2_frame *frame, socket = nghttp2_session_get_stream_user_data(session, frame->hd.stream_id); if (socket == NULL) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } socket->h2->headers_data_processed += (namelen + valuelen); @@ -1923,18 +1923,18 @@ server_on_header_callback(nghttp2_session *session, const nghttp2_frame *frame, INSIST(socket != NULL); if (socket->h2->headers_data_processed > MAX_ALLOWED_DATA_IN_HEADERS) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } else if (socket->h2->content_length > MAX_ALLOWED_DATA_IN_POST) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } if (code == ISC_HTTP_ERROR_SUCCESS) { - return (0); + return 0; } else { socket->h2->headers_error_code = code; } - return (0); + return 0; } static ssize_t @@ -1965,7 +1965,7 @@ server_read_callback(nghttp2_session *ngsession, int32_t stream_id, *data_flags |= NGHTTP2_DATA_FLAG_EOF; } - return (buflen); + return buflen; } static isc_result_t @@ -1981,7 +1981,7 @@ server_send_response(nghttp2_session *ngsession, int32_t stream_id, * same HTTP/2 stream. Thus, we need to handle this case * manually. We will return failure code so that it will be * passed to the write callback. */ - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } data_prd.source.ptr = socket; @@ -1990,11 +1990,11 @@ server_send_response(nghttp2_session *ngsession, int32_t stream_id, rv = nghttp2_submit_response(ngsession, stream_id, nva, nvlen, &data_prd); if (rv != 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } socket->h2->response_submitted = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #define MAKE_ERROR_REPLY(tag, code, desc) \ @@ -2061,14 +2061,14 @@ server_send_error_response(const isc_http_error_responses_t error, { if (error_responses[i].type == error) { log_server_error_response(socket, &error_responses[i]); - return (server_send_response( + return server_send_response( ngsession, socket->h2->stream_id, - &error_responses[i].header, 1, socket)); + &error_responses[i].header, 1, socket); } } - return (server_send_error_response(ISC_HTTP_ERROR_GENERIC, ngsession, - socket)); + return server_send_error_response(ISC_HTTP_ERROR_GENERIC, ngsession, + socket); } static void @@ -2184,14 +2184,14 @@ server_on_request_recv(nghttp2_session *ngsession, isc_nmsocket_t *socket) { server_call_cb(socket, ISC_R_SUCCESS, &data); - return (0); + return 0; error: result = server_send_error_response(code, ngsession, socket); if (result != ISC_R_SUCCESS) { - return (NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } - return (0); + return 0; } static void @@ -2390,16 +2390,16 @@ server_on_frame_recv_callback(nghttp2_session *ngsession, * still alive. */ if (socket == NULL) { - return (0); + return 0; } - return (server_on_request_recv(ngsession, socket)); + return server_on_request_recv(ngsession, socket); } break; default: break; } - return (0); + return 0; } static void @@ -2444,9 +2444,9 @@ server_send_connection_header(isc_nm_http_session_t *session) { rv = nghttp2_submit_settings(session->ngsession, NGHTTP2_FLAG_NONE, iv, 1); if (rv != 0) { - return (-1); + return -1; } - return (0); + return 0; } /* @@ -2470,9 +2470,9 @@ httplisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { REQUIRE(VALID_NMSOCK(handle->sock)); if (isc__nm_closing(handle->sock->worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } REQUIRE(VALID_NMSOCK(httpserver)); @@ -2494,7 +2494,7 @@ httplisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { /* TODO H2 */ http_do_bio(session, NULL, NULL, NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -2559,14 +2559,14 @@ isc_nm_listenhttp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, if (result != ISC_R_SUCCESS) { sock->closed = true; isc__nmsocket_detach(&sock); - return (result); + return result; } sock->nchildren = sock->outer->nchildren; sock->fd = (uv_os_sock_t)-1; *sockp = sock; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_nm_http_endpoints_t * @@ -2583,7 +2583,7 @@ isc_nm_http_endpoints_new(isc_mem_t *mctx) { atomic_init(&eps->in_use, false); eps->magic = HTTP_ENDPOINTS_MAGIC; - return (eps); + return eps; } void @@ -2641,7 +2641,7 @@ http_endpoints_find(const char *request_path, REQUIRE(VALID_HTTP_ENDPOINTS(eps)); if (request_path == NULL || *request_path == '\0') { - return (NULL); + return NULL; } for (handler = ISC_LIST_HEAD(eps->handlers); handler != NULL; @@ -2654,7 +2654,7 @@ http_endpoints_find(const char *request_path, } } - return (handler); + return handler; } isc_result_t @@ -2684,7 +2684,7 @@ isc_nm_http_endpoints_add(isc_nm_http_endpoints_t *restrict eps, ISC_LIST_APPEND(eps->handlers, handler, link); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2890,10 +2890,10 @@ isc__nm_http_has_encryption(const isc_nmhandle_t *handle) { INSIST(VALID_HTTP2_SESSION(session)); if (session->handle == NULL) { - return (false); + return false; } - return (isc_nm_has_encryption(session->handle)); + return isc_nm_has_encryption(session->handle); } const char * @@ -2914,20 +2914,20 @@ isc__nm_http_verify_tls_peer_result_string(const isc_nmhandle_t *handle) { */ if (session == NULL && sock->h2->connect.tls_peer_verify_string != NULL) { - return (sock->h2->connect.tls_peer_verify_string); + return sock->h2->connect.tls_peer_verify_string; } if (session == NULL) { - return (NULL); + return NULL; } INSIST(VALID_HTTP2_SESSION(session)); if (session->handle == NULL) { - return (NULL); + return NULL; } - return (isc_nm_verify_tls_peer_result_string(session->handle)); + return isc_nm_verify_tls_peer_result_string(session->handle); } void @@ -3057,7 +3057,7 @@ http_get_listener_endpoints(isc_nmsocket_t *listener, const int tid) { eps = listener->h2->listener_endpoints[tid]; INSIST(eps != NULL); - return (eps); + return eps; } static const bool base64url_validation_table[256] = { @@ -3096,7 +3096,7 @@ isc__nm_base64url_to_base64(isc_mem_t *mem, const char *base64url, size_t i, k, len; if (mem == NULL || base64url == NULL || base64url_len == 0) { - return (NULL); + return NULL; } len = base64url_len % 4 ? base64url_len + (4 - base64url_len % 4) @@ -3116,7 +3116,7 @@ isc__nm_base64url_to_base64(isc_mem_t *mem, const char *base64url, res[i] = base64url[i]; } else { isc_mem_free(mem, res); - return (NULL); + return NULL; } break; } @@ -3136,7 +3136,7 @@ isc__nm_base64url_to_base64(isc_mem_t *mem, const char *base64url, res[len] = '\0'; - return (res); + return res; } char * @@ -3146,7 +3146,7 @@ isc__nm_base64_to_base64url(isc_mem_t *mem, const char *base64, size_t i; if (mem == NULL || base64 == NULL || base64_len == 0) { - return (NULL); + return NULL; } res = isc_mem_allocate(mem, base64_len + 1); /* '\0' */ @@ -3177,7 +3177,7 @@ isc__nm_base64_to_base64url(isc_mem_t *mem, const char *base64, res[i] = base64[i]; } else { isc_mem_free(mem, res); - return (NULL); + return NULL; } break; } @@ -3189,7 +3189,7 @@ end: res[i] = '\0'; - return (res); + return res; } static void @@ -3424,22 +3424,22 @@ isc__nm_parse_httpquery(const char *query_string, const char **start, REQUIRE(len != NULL); if (query_string == NULL || query_string[0] == '\0') { - return (false); + return false; } state = (isc_httpparser_state_t){ .str = query_string }; if (!rule_query_string(&state)) { - return (false); + return false; } if (!state.query_found) { - return (false); + return false; } *start = state.query; *len = state.query_len; - return (true); + return true; } static bool @@ -3471,23 +3471,23 @@ rule_query_string(isc_httpparser_state_t *st) { } if (!MATCH('\0')) { - return (false); + return false; } ADVANCE(); - return (true); + return true; } static bool rule_key_value_pair(isc_httpparser_state_t *st) { if (!rule_key(st)) { - return (false); + return false; } if (MATCH('=')) { ADVANCE(); } else { - return (false); + return false; } if (rule_value(st)) { @@ -3500,14 +3500,14 @@ rule_key_value_pair(isc_httpparser_state_t *st) { st->query_len = st->last_value_len; } } else { - return (false); + return false; } if (MATCH('&')) { ADVANCE(); } - return (true); + return true; } static bool @@ -3516,7 +3516,7 @@ rule_key(isc_httpparser_state_t *st) { st->last_key = GETP(); ADVANCE(); } else { - return (false); + return false; } while (MATCH('_') || MATCH_ALNUM()) { @@ -3524,14 +3524,14 @@ rule_key(isc_httpparser_state_t *st) { } st->last_key_len = GETP() - st->last_key; - return (true); + return true; } static bool rule_value(isc_httpparser_state_t *st) { const char *s = GETP(); if (!rule_value_char(st)) { - return (false); + return false; } st->last_value = s; @@ -3539,16 +3539,16 @@ rule_value(isc_httpparser_state_t *st) { /* skip */; } st->last_value_len = GETP() - st->last_value; - return (true); + return true; } static bool rule_value_char(isc_httpparser_state_t *st) { if (rule_unreserved_char(st)) { - return (true); + return true; } - return (rule_percent_charcode(st)); + return rule_percent_charcode(st); } static bool @@ -3557,9 +3557,9 @@ rule_unreserved_char(isc_httpparser_state_t *st) { MATCH('~')) { ADVANCE(); - return (true); + return true; } - return (false); + return false; } static bool @@ -3567,20 +3567,20 @@ rule_percent_charcode(isc_httpparser_state_t *st) { if (MATCH('%')) { ADVANCE(); } else { - return (false); + return false; } if (!MATCH_XDIGIT()) { - return (false); + return false; } ADVANCE(); if (!MATCH_XDIGIT()) { - return (false); + return false; } ADVANCE(); - return (true); + return true; } /* @@ -3643,7 +3643,7 @@ rule_loc_path_absolute(isc_http_location_parser_state_t *st) { if (MATCH('/')) { ADVANCE(); } else { - return (false); + return false; } (void)rule_loc_segments(st); @@ -3651,23 +3651,23 @@ rule_loc_path_absolute(isc_http_location_parser_state_t *st) { if (MATCH('\0')) { ADVANCE(); } else { - return (false); + return false; } - return (true); + return true; } static bool rule_loc_segments(isc_http_location_parser_state_t *st) { if (!rule_loc_segment_nz(st)) { - return (false); + return false; } while (rule_loc_slash_segment(st)) { /* zero or more */; } - return (true); + return true; } static bool @@ -3675,10 +3675,10 @@ rule_loc_slash_segment(isc_http_location_parser_state_t *st) { if (MATCH('/')) { ADVANCE(); } else { - return (false); + return false; } - return (rule_loc_segment(st)); + return rule_loc_segment(st); } static bool @@ -3687,36 +3687,36 @@ rule_loc_segment(isc_http_location_parser_state_t *st) { /* zero or more */; } - return (true); + return true; } static bool rule_loc_segment_nz(isc_http_location_parser_state_t *st) { if (!rule_loc_pchar(st)) { - return (false); + return false; } while (rule_loc_pchar(st)) { /* zero or more */; } - return (true); + return true; } static bool rule_loc_pchar(isc_http_location_parser_state_t *st) { if (rule_loc_unreserved(st)) { - return (true); + return true; } else if (rule_loc_pct_encoded(st)) { - return (true); + return true; } else if (rule_loc_sub_delims(st)) { - return (true); + return true; } else if (MATCH(':') || MATCH('@')) { ADVANCE(); - return (true); + return true; } - return (false); + return false; } static bool @@ -3725,29 +3725,29 @@ rule_loc_unreserved(isc_http_location_parser_state_t *st) { MATCH('_') | MATCH('~')) { ADVANCE(); - return (true); + return true; } - return (false); + return false; } static bool rule_loc_pct_encoded(isc_http_location_parser_state_t *st) { if (!MATCH('%')) { - return (false); + return false; } ADVANCE(); if (!MATCH_XDIGIT()) { - return (false); + return false; } ADVANCE(); if (!MATCH_XDIGIT()) { - return (false); + return false; } ADVANCE(); - return (true); + return true; } static bool @@ -3757,10 +3757,10 @@ rule_loc_sub_delims(isc_http_location_parser_state_t *st) { MATCH('=')) { ADVANCE(); - return (true); + return true; } - return (false); + return false; } bool @@ -3771,5 +3771,5 @@ isc_nm_http_path_isvalid(const char *path) { state.str = path; - return (rule_loc_path_absolute(&state)); + return rule_loc_path_absolute(&state); } diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index 8c55bc5fe6..70519621c7 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -363,7 +363,7 @@ bool isc_nm_getloadbalancesockets(isc_nm_t *mgr) { REQUIRE(VALID_NM(mgr)); - return (mgr->load_balance_sockets); + return mgr->load_balance_sockets; } void @@ -393,7 +393,7 @@ bool isc__nmsocket_active(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); - return (sock->active); + return sock->active; } void @@ -506,19 +506,19 @@ nmsocket_cleanup(void *arg) { static bool nmsocket_has_active_handles(isc_nmsocket_t *sock) { if (!ISC_LIST_EMPTY(sock->active_handles)) { - return (true); + return true; } if (sock->children != NULL) { for (size_t i = 0; i < sock->nchildren; i++) { isc_nmsocket_t *csock = &sock->children[i]; if (!ISC_LIST_EMPTY(csock->active_handles)) { - return (true); + return true; } } } - return (false); + return false; } static void @@ -797,7 +797,7 @@ alloc_handle(isc_nmsocket_t *sock) { }; isc_refcount_init(&handle->references, 1); - return (handle); + return handle; } static isc_nmhandle_t * @@ -811,12 +811,12 @@ dequeue_handle(isc_nmsocket_t *sock) { isc_refcount_init(&handle->references, 1); INSIST(VALID_NMHANDLE(handle)); - return (handle); + return handle; } #else INSIST(ISC_LIST_EMPTY(sock->inactive_handles)); #endif /* !__SANITIZE_ADDRESS__ && !__SANITIZE_THREAD__ */ - return (NULL); + return NULL; } isc_nmhandle_t * @@ -887,18 +887,18 @@ isc___nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t const *peer, } #endif - return (handle); + return handle; } bool isc_nmhandle_is_stream(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); - return (handle->sock->type == isc_nm_tcpsocket || - handle->sock->type == isc_nm_tlssocket || - handle->sock->type == isc_nm_httpsocket || - handle->sock->type == isc_nm_streamdnssocket || - handle->sock->type == isc_nm_proxystreamsocket); + return handle->sock->type == isc_nm_tcpsocket || + handle->sock->type == isc_nm_tlssocket || + handle->sock->type == isc_nm_httpsocket || + handle->sock->type == isc_nm_streamdnssocket || + handle->sock->type == isc_nm_proxystreamsocket; } static void @@ -994,7 +994,7 @@ void * isc_nmhandle_getdata(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); - return (handle->opaque); + return handle->opaque; } void @@ -1215,18 +1215,18 @@ isc__nmsocket_timer_running(isc_nmsocket_t *sock) { switch (sock->type) { case isc_nm_tlssocket: - return (isc__nmsocket_tls_timer_running(sock)); + return isc__nmsocket_tls_timer_running(sock); case isc_nm_streamdnssocket: - return (isc__nmsocket_streamdns_timer_running(sock)); + return isc__nmsocket_streamdns_timer_running(sock); case isc_nm_proxystreamsocket: - return (isc__nmsocket_proxystream_timer_running(sock)); + return isc__nmsocket_proxystream_timer_running(sock); case isc_nm_proxyudpsocket: - return (isc__nmsocket_proxyudp_timer_running(sock)); + return isc__nmsocket_proxyudp_timer_running(sock); default: break; } - return (uv_is_active((uv_handle_t *)&sock->read_timer)); + return uv_is_active((uv_handle_t *)&sock->read_timer); } void @@ -1311,7 +1311,7 @@ isc___nm_get_read_req(isc_nmsocket_t *sock, isc_sockaddr_t *sockaddr FLARG) { break; } - return (req); + return req; } /*%< @@ -1360,7 +1360,7 @@ isc__nm_start_reading(isc_nmsocket_t *sock) { int r; if (uv_is_active(&sock->uv_handle.handle)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } switch (sock->type) { @@ -1379,7 +1379,7 @@ isc__nm_start_reading(isc_nmsocket_t *sock) { result = isc_uverr2result(r); } - return (result); + return result; } void @@ -1406,14 +1406,14 @@ isc__nm_stop_reading(isc_nmsocket_t *sock) { bool isc__nm_closing(isc__networker_t *worker) { - return (worker->shuttingdown); + return worker->shuttingdown; } bool isc__nmsocket_closing(isc_nmsocket_t *sock) { - return (!sock->active || sock->closing || - isc__nm_closing(sock->worker) || - (sock->server != NULL && !isc__nmsocket_active(sock->server))); + return !sock->active || sock->closing || + isc__nm_closing(sock->worker) || + (sock->server != NULL && !isc__nmsocket_active(sock->server)); } void @@ -1527,21 +1527,21 @@ isc_nmhandle_timer_running(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); - return (isc__nmsocket_timer_running(handle->sock)); + return isc__nmsocket_timer_running(handle->sock); } isc_sockaddr_t isc_nmhandle_peeraddr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); - return (handle->peer); + return handle->peer; } isc_sockaddr_t isc_nmhandle_localaddr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); - return (handle->local); + return handle->local; } isc_nm_t * @@ -1549,7 +1549,7 @@ isc_nmhandle_netmgr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); - return (handle->sock->worker->netmgr); + return handle->sock->worker->netmgr; } isc__nm_uvreq_t * @@ -1572,7 +1572,7 @@ isc___nm_uvreq_get(isc_nmsocket_t *sock FLARG) { ISC_LIST_APPEND(sock->active_uvreqs, req, active_link); - return (req); + return req; } void @@ -2055,7 +2055,7 @@ isc_nm_checkaddr(const isc_sockaddr_t *addr, isc_socktype_t type) { proto = SOCK_DGRAM; break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } pf = isc_sockaddr_pf(addr); @@ -2067,17 +2067,17 @@ isc_nm_checkaddr(const isc_sockaddr_t *addr, isc_socktype_t type) { fd = socket(pf, proto, 0); if (fd < 0) { - return (isc_errno_toresult(errno)); + return isc_errno_toresult(errno); } r = bind(fd, (const struct sockaddr *)&addr->type.sa, addrlen); if (r < 0) { close(fd); - return (isc_errno_toresult(errno)); + return isc_errno_toresult(errno); } close(fd); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #if defined(TCP_CONNECTIONTIMEOUT) @@ -2180,7 +2180,7 @@ isc_nm_xfr_checkperm(isc_nmhandle_t *handle) { break; } - return (result); + return result; } bool @@ -2188,7 +2188,7 @@ isc_nm_is_http_handle(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); - return (handle->sock->type == isc_nm_httpsocket); + return handle->sock->type == isc_nm_httpsocket; } static isc_nmhandle_t * @@ -2200,24 +2200,24 @@ get_proxy_handle(isc_nmhandle_t *handle) { switch (sock->type) { case isc_nm_proxystreamsocket: case isc_nm_proxyudpsocket: - return (handle); + return handle; #ifdef HAVE_LIBNGHTTP2 case isc_nm_httpsocket: if (sock->h2 != NULL) { - return (get_proxy_handle( - isc__nm_httpsession_handle(sock->h2->session))); + return get_proxy_handle( + isc__nm_httpsession_handle(sock->h2->session)); } - return (NULL); + return NULL; #endif /* HAVE_LIBNGHTTP2 */ default: break; } if (sock->outerhandle != NULL) { - return (get_proxy_handle(sock->outerhandle)); + return get_proxy_handle(sock->outerhandle); } - return (NULL); + return NULL; } bool @@ -2225,7 +2225,7 @@ isc_nm_is_proxy_handle(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); - return (get_proxy_handle(handle) != NULL); + return get_proxy_handle(handle) != NULL; } bool @@ -2235,15 +2235,15 @@ isc_nm_is_proxy_unspec(isc_nmhandle_t *handle) { REQUIRE(VALID_NMSOCK(handle->sock)); if (handle->sock->client) { - return (false); + return false; } proxyhandle = get_proxy_handle(handle); if (proxyhandle == NULL) { - return (false); + return false; } - return (proxyhandle->proxy_is_unspec); + return proxyhandle->proxy_is_unspec; } isc_sockaddr_t @@ -2254,7 +2254,7 @@ isc_nmhandle_real_peeraddr(isc_nmhandle_t *handle) { proxyhandle = get_proxy_handle(handle); if (proxyhandle == NULL) { - return (isc_nmhandle_peeraddr(handle)); + return isc_nmhandle_peeraddr(handle); } INSIST(VALID_NMSOCK(proxyhandle->sock)); @@ -2266,7 +2266,7 @@ isc_nmhandle_real_peeraddr(isc_nmhandle_t *handle) { addr = isc_nmhandle_peeraddr(proxyhandle->proxy_udphandle); } - return (addr); + return addr; } isc_sockaddr_t @@ -2277,7 +2277,7 @@ isc_nmhandle_real_localaddr(isc_nmhandle_t *handle) { proxyhandle = get_proxy_handle(handle); if (proxyhandle == NULL) { - return (isc_nmhandle_localaddr(handle)); + return isc_nmhandle_localaddr(handle); } INSIST(VALID_NMSOCK(proxyhandle->sock)); @@ -2289,7 +2289,7 @@ isc_nmhandle_real_localaddr(isc_nmhandle_t *handle) { addr = isc_nmhandle_localaddr(proxyhandle->proxy_udphandle); } - return (addr); + return addr; } bool @@ -2301,7 +2301,7 @@ isc__nm_valid_proxy_addresses(const isc_sockaddr_t *src, isc_netaddr_t src_addr = { 0 }, dst_addr = { 0 }; if (src == NULL || dst == NULL) { - return (false); + return false; } /* @@ -2310,7 +2310,7 @@ isc__nm_valid_proxy_addresses(const isc_sockaddr_t *src, * addresses (kdig). */ if (isc_sockaddr_getport(dst) == 0) { - return (false); + return false; } /* @@ -2333,27 +2333,27 @@ isc__nm_valid_proxy_addresses(const isc_sockaddr_t *src, switch (isc_sockaddr_pf(src)) { case AF_INET: if (isc_netaddr_equal(&src_addr, &zerov4)) { - return (false); + return false; } if (isc_netaddr_equal(&dst_addr, &zerov4)) { - return (false); + return false; } break; case AF_INET6: if (isc_netaddr_equal(&src_addr, &zerov6)) { - return (false); + return false; } if (isc_netaddr_equal(&dst_addr, &zerov6)) { - return (false); + return false; } break; default: UNREACHABLE(); } - return (true); + return true; } void @@ -2394,7 +2394,7 @@ isc_nm_socket_type(const isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); - return (handle->sock->type); + return handle->sock->type; } bool @@ -2404,20 +2404,20 @@ isc_nm_has_encryption(const isc_nmhandle_t *handle) { switch (handle->sock->type) { case isc_nm_tlssocket: - return (true); + return true; #if HAVE_LIBNGHTTP2 case isc_nm_httpsocket: - return (isc__nm_http_has_encryption(handle)); + return isc__nm_http_has_encryption(handle); #endif /* HAVE_LIBNGHTTP2 */ case isc_nm_streamdnssocket: - return (isc__nm_streamdns_has_encryption(handle)); + return isc__nm_streamdns_has_encryption(handle); case isc_nm_proxystreamsocket: - return (isc__nm_proxystream_has_encryption(handle)); + return isc__nm_proxystream_has_encryption(handle); default: - return (false); + return false; }; - return (false); + return false; } const char * @@ -2430,26 +2430,25 @@ isc_nm_verify_tls_peer_result_string(const isc_nmhandle_t *handle) { sock = handle->sock; switch (sock->type) { case isc_nm_tlssocket: - return (isc__nm_tls_verify_tls_peer_result_string(handle)); + return isc__nm_tls_verify_tls_peer_result_string(handle); break; case isc_nm_proxystreamsocket: - return (isc__nm_proxystream_verify_tls_peer_result_string( - handle)); + return isc__nm_proxystream_verify_tls_peer_result_string( + handle); break; #if HAVE_LIBNGHTTP2 case isc_nm_httpsocket: - return (isc__nm_http_verify_tls_peer_result_string(handle)); + return isc__nm_http_verify_tls_peer_result_string(handle); break; #endif /* HAVE_LIBNGHTTP2 */ case isc_nm_streamdnssocket: - return (isc__nm_streamdns_verify_tls_peer_result_string( - handle)); + return isc__nm_streamdns_verify_tls_peer_result_string(handle); break; default: break; } - return (NULL); + return NULL; } typedef struct settlsctx_data { @@ -2797,13 +2796,13 @@ isc_nmhandle_set_tcp_nodelay(isc_nmhandle_t *handle, const bool value) { break; }; - return (result); + return result; } isc_sockaddr_t isc_nmsocket_getaddr(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); - return (sock->iface); + return sock->iface; } void @@ -2846,33 +2845,33 @@ static const char * nmsocket_type_totext(isc_nmsocket_type type) { switch (type) { case isc_nm_udpsocket: - return ("isc_nm_udpsocket"); + return "isc_nm_udpsocket"; case isc_nm_udplistener: - return ("isc_nm_udplistener"); + return "isc_nm_udplistener"; case isc_nm_tcpsocket: - return ("isc_nm_tcpsocket"); + return "isc_nm_tcpsocket"; case isc_nm_tcplistener: - return ("isc_nm_tcplistener"); + return "isc_nm_tcplistener"; case isc_nm_tlssocket: - return ("isc_nm_tlssocket"); + return "isc_nm_tlssocket"; case isc_nm_tlslistener: - return ("isc_nm_tlslistener"); + return "isc_nm_tlslistener"; case isc_nm_httplistener: - return ("isc_nm_httplistener"); + return "isc_nm_httplistener"; case isc_nm_httpsocket: - return ("isc_nm_httpsocket"); + return "isc_nm_httpsocket"; case isc_nm_streamdnslistener: - return ("isc_nm_streamdnslistener"); + return "isc_nm_streamdnslistener"; case isc_nm_streamdnssocket: - return ("isc_nm_streamdnssocket"); + return "isc_nm_streamdnssocket"; case isc_nm_proxystreamlistener: - return ("isc_nm_proxystreamlistener"); + return "isc_nm_proxystreamlistener"; case isc_nm_proxystreamsocket: - return ("isc_nm_proxystreamsocket"); + return "isc_nm_proxystreamsocket"; case isc_nm_proxyudplistener: - return ("isc_nm_proxyudplistener"); + return "isc_nm_proxyudplistener"; case isc_nm_proxyudpsocket: - return ("isc_nm_proxyudpsocket"); + return "isc_nm_proxyudpsocket"; default: UNREACHABLE(); } diff --git a/lib/isc/netmgr/proxystream.c b/lib/isc/netmgr/proxystream.c index c24ed26278..a55a396ddb 100644 --- a/lib/isc/netmgr/proxystream.c +++ b/lib/isc/netmgr/proxystream.c @@ -260,7 +260,7 @@ proxystream_sock_new(isc__networker_t *worker, const isc_nmsocket_type_t type, } } - return (sock); + return sock; } static isc_result_t @@ -271,7 +271,7 @@ proxystream_accept_cb(isc_nmhandle_t *handle, isc_result_t result, isc_sockaddr_t iface; if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(VALID_NMHANDLE(handle)); @@ -280,9 +280,9 @@ proxystream_accept_cb(isc_nmhandle_t *handle, isc_result_t result, INSIST(listensock->type == isc_nm_proxystreamlistener); if (isc__nm_closing(handle->sock->worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } else if (isc__nmsocket_closing(handle->sock)) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } iface = isc_nmhandle_localaddr(handle); @@ -310,7 +310,7 @@ proxystream_accept_cb(isc_nmhandle_t *handle, isc_result_t result, proxystream_read_start(nsock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -327,7 +327,7 @@ isc_nm_listenproxystream(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, REQUIRE(sockp != NULL && *sockp == NULL); if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } listener = proxystream_sock_new(worker, isc_nm_proxystreamlistener, @@ -348,7 +348,7 @@ isc_nm_listenproxystream(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, if (result != ISC_R_SUCCESS) { listener->closed = true; isc__nmsocket_detach(&listener); - return (result); + return result; } listener->active = true; @@ -357,7 +357,7 @@ isc_nm_listenproxystream(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, *sockp = listener; - return (result); + return result; } static void @@ -655,10 +655,10 @@ isc__nmsocket_proxystream_timer_running(isc_nmsocket_t *sock) { if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); REQUIRE(VALID_NMSOCK(sock->outerhandle->sock)); - return (isc__nmsocket_timer_running(sock->outerhandle->sock)); + return isc__nmsocket_timer_running(sock->outerhandle->sock); } - return (false); + return false; } void @@ -719,7 +719,7 @@ isc__nmhandle_proxystream_set_tcp_nodelay(isc_nmhandle_t *handle, result = isc_nmhandle_set_tcp_nodelay(sock->outerhandle, value); } - return (result); + return result; } static void @@ -791,9 +791,9 @@ isc__nm_proxystream_close(isc_nmsocket_t *sock) { static bool proxystream_closing(isc_nmsocket_t *sock) { - return (isc__nmsocket_closing(sock) || sock->outerhandle == NULL || - (sock->outerhandle != NULL && - isc__nmsocket_closing(sock->outerhandle->sock))); + return isc__nmsocket_closing(sock) || sock->outerhandle == NULL || + (sock->outerhandle != NULL && + isc__nmsocket_closing(sock->outerhandle->sock)); } static void @@ -996,7 +996,7 @@ proxystream_get_send_req(isc_mem_t *mctx, isc_nmsocket_t *sock, sock->proxy.nsending++; - return (send_req); + return send_req; } static void @@ -1126,10 +1126,10 @@ isc__nm_proxystream_has_encryption(const isc_nmhandle_t *handle) { sock = handle->sock; if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); - return (isc_nm_has_encryption(sock->outerhandle)); + return isc_nm_has_encryption(sock->outerhandle); } - return (false); + return false; } const char * @@ -1143,11 +1143,10 @@ isc__nm_proxystream_verify_tls_peer_result_string(const isc_nmhandle_t *handle) sock = handle->sock; if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); - return (isc_nm_verify_tls_peer_result_string( - sock->outerhandle)); + return isc_nm_verify_tls_peer_result_string(sock->outerhandle); } - return (NULL); + return NULL; } void diff --git a/lib/isc/netmgr/proxyudp.c b/lib/isc/netmgr/proxyudp.c index 49a372563d..c288d84230 100644 --- a/lib/isc/netmgr/proxyudp.c +++ b/lib/isc/netmgr/proxyudp.c @@ -77,10 +77,10 @@ proxyudp_send_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg); static bool proxyudp_closing(isc_nmsocket_t *sock) { - return (isc__nmsocket_closing(sock) || - (sock->client && sock->outerhandle == NULL) || - (sock->outerhandle != NULL && - isc__nmsocket_closing(sock->outerhandle->sock))); + return isc__nmsocket_closing(sock) || + (sock->client && sock->outerhandle == NULL) || + (sock->outerhandle != NULL && + isc__nmsocket_closing(sock->outerhandle->sock)); } static void @@ -230,7 +230,7 @@ proxyudp_sock_new(isc__networker_t *worker, const isc_nmsocket_type_t type, worker->mctx, nworkers, sizeof(isc_nmsocket_t *)); } - return (sock); + return sock; } static void @@ -329,7 +329,7 @@ isc_nm_listenproxyudp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, REQUIRE(sockp != NULL && *sockp == NULL); if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } listener = proxyudp_sock_new(worker, isc_nm_proxyudplistener, iface, @@ -371,7 +371,7 @@ isc_nm_listenproxyudp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, isc__nmsocket_detach(&listener); } - return (result); + return result; } static void @@ -634,10 +634,10 @@ isc__nmsocket_proxyudp_timer_running(isc_nmsocket_t *sock) { if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); REQUIRE(VALID_NMSOCK(sock->outerhandle->sock)); - return (isc__nmsocket_timer_running(sock->outerhandle->sock)); + return isc__nmsocket_timer_running(sock->outerhandle->sock); } - return (false); + return false; } void @@ -768,7 +768,7 @@ proxyudp_get_send_req(isc_mem_t *mctx, isc_nmsocket_t *sock, sock->proxy.nsending++; - return (send_req); + return send_req; } static void diff --git a/lib/isc/netmgr/socket.c b/lib/isc/netmgr/socket.c index 8f02dc848d..4b71e9dbfd 100644 --- a/lib/isc/netmgr/socket.c +++ b/lib/isc/netmgr/socket.c @@ -30,36 +30,36 @@ socket_freebind(uv_os_sock_t fd, sa_family_t sa_family) { #ifdef IP_FREEBIND UNUSED(sa_family); if (setsockopt_on(fd, IPPROTO_IP, IP_FREEBIND) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #elif defined(IP_BINDANY) || defined(IPV6_BINDANY) if (sa_family == AF_INET) { #if defined(IP_BINDANY) if (setsockopt_on(fd, IPPROTO_IP, IP_BINDANY) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } else if (sa_family == AF_INET6) { #if defined(IPV6_BINDANY) if (setsockopt_on(fd, IPPROTO_IPV6, IPV6_BINDANY) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #elif defined(SO_BINDANY) UNUSED(sa_family); if (setsockopt_on(fd, SOL_SOCKET, SO_BINDANY) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else UNUSED(fd); UNUSED(sa_family); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif } @@ -71,7 +71,7 @@ isc__nm_udp_freebind(uv_udp_t *handle, const struct sockaddr *addr, r = uv_fileno((const uv_handle_t *)handle, (uv_os_fd_t *)&fd); if (r < 0) { - return (r); + return r; } r = uv_udp_bind(handle, addr, flags); @@ -87,7 +87,7 @@ isc__nm_udp_freebind(uv_udp_t *handle, const struct sockaddr *addr, r = uv_udp_bind(handle, addr, flags); } - return (r); + return r; } static int @@ -99,7 +99,7 @@ tcp_bind_now(uv_tcp_t *handle, const struct sockaddr *addr, r = uv_tcp_bind(handle, addr, flags); if (r < 0) { - return (r); + return r; } /* @@ -109,10 +109,10 @@ tcp_bind_now(uv_tcp_t *handle, const struct sockaddr *addr, */ r = uv_tcp_getsockname(handle, (struct sockaddr *)&sname, &snamelen); if (r < 0) { - return (r); + return r; } - return (0); + return 0; } int @@ -123,7 +123,7 @@ isc__nm_tcp_freebind(uv_tcp_t *handle, const struct sockaddr *addr, r = uv_fileno((const uv_handle_t *)handle, (uv_os_fd_t *)&fd); if (r < 0) { - return (r); + return r; } r = tcp_bind_now(handle, addr, flags); @@ -139,18 +139,18 @@ isc__nm_tcp_freebind(uv_tcp_t *handle, const struct sockaddr *addr, r = tcp_bind_now(handle, addr, flags); } - return (r); + return r; } isc_result_t isc__nm_socket(int domain, int type, int protocol, uv_os_sock_t *sockp) { int sock = socket(domain, type, protocol); if (sock < 0) { - return (isc_errno_toresult(errno)); + return isc_errno_toresult(errno); } *sockp = (uv_os_sock_t)sock; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -174,17 +174,17 @@ isc__nm_socket_reuse(uv_os_sock_t fd, int val) { #if defined(SO_REUSEPORT) && !defined(__linux__) if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #elif defined(SO_REUSEADDR) if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else UNUSED(fd); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif } @@ -202,19 +202,19 @@ isc__nm_socket_reuse_lb(uv_os_sock_t fd) { */ #if defined(SO_REUSEPORT_LB) if (setsockopt_on(fd, SOL_SOCKET, SO_REUSEPORT_LB) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #elif defined(SO_REUSEPORT) && defined(__linux__) if (setsockopt_on(fd, SOL_SOCKET, SO_REUSEPORT) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif } @@ -226,17 +226,17 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family) { if (sa_family == AF_INET6) { #if defined(IPV6_DONTFRAG) if (setsockopt_off(fd, IPPROTO_IPV6, IPV6_DONTFRAG) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #elif defined(IPV6_MTU_DISCOVER) && defined(IP_PMTUDISC_OMIT) if (setsockopt(fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &(int){ IP_PMTUDISC_OMIT }, sizeof(int)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); @@ -244,26 +244,26 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_family_t sa_family) { } else if (sa_family == AF_INET) { #if defined(IP_DONTFRAG) if (setsockopt_off(fd, IPPROTO_IP, IP_DONTFRAG) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_OMIT) if (setsockopt(fd, IPPROTO_IP, IP_MTU_DISCOVER, &(int){ IP_PMTUDISC_OMIT }, sizeof(int)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); #endif } else { - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -274,15 +274,15 @@ isc__nm_socket_v6only(uv_os_sock_t fd, sa_family_t sa_family) { if (sa_family == AF_INET6) { #if defined(IPV6_V6ONLY) if (setsockopt_on(fd, IPPROTO_IPV6, IPV6_V6ONLY) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); #endif } - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } isc_result_t @@ -297,15 +297,15 @@ isc__nm_socket_connectiontimeout(uv_os_sock_t fd, int timeout_ms) { if (setsockopt(fd, IPPROTO_TCP, TIMEOUT_OPTNAME, &timeout, sizeof(timeout)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else UNUSED(fd); UNUSED(timeout_ms); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } @@ -321,13 +321,13 @@ isc__nm_socket_tcp_nodelay(uv_os_sock_t fd, bool value) { } if (ret == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } @@ -337,35 +337,35 @@ isc__nm_socket_tcp_maxseg(uv_os_sock_t fd, int size) { if (setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, (void *)&size, sizeof(size))) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #else UNUSED(fd); UNUSED(size); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif } isc_result_t isc__nm_socket_min_mtu(uv_os_sock_t fd, sa_family_t sa_family) { if (sa_family != AF_INET6) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #ifdef IPV6_USE_MIN_MTU if (setsockopt_on(fd, IPPROTO_IPV6, IPV6_USE_MIN_MTU) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } #elif defined(IPV6_MTU) if (setsockopt(fd, IPPROTO_IPV6, IPV6_MTU, &(int){ 1280 }, sizeof(int)) == -1) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } #else UNUSED(fd); #endif - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/netmgr/streamdns.c b/lib/isc/netmgr/streamdns.c index 35148fed6c..d2cd1325f3 100644 --- a/lib/isc/netmgr/streamdns.c +++ b/lib/isc/netmgr/streamdns.c @@ -197,7 +197,7 @@ streamdns_on_complete_dnsmessage(isc_dnsstream_assembler_t *dnsasm, sock); } - return (false); + return false; } /* @@ -220,8 +220,8 @@ streamdns_on_dnsmessage_data_cb(isc_dnsstream_assembler_t *dnsasm, * A complete DNS message has been assembled from the incoming * data. Let's process it. */ - return (streamdns_on_complete_dnsmessage(dnsasm, region, sock, - transphandle)); + return streamdns_on_complete_dnsmessage(dnsasm, region, sock, + transphandle); case ISC_R_RANGE: /* * It seems that someone attempts to send us some binary junk @@ -230,7 +230,7 @@ streamdns_on_dnsmessage_data_cb(isc_dnsstream_assembler_t *dnsasm, * We should treat it as a hard error. */ streamdns_failed_read_cb(sock, result, false); - return (false); + return false; case ISC_R_NOMORE: /* * We do not have enough data to process the next message and @@ -239,7 +239,7 @@ streamdns_on_dnsmessage_data_cb(isc_dnsstream_assembler_t *dnsasm, if (sock->recv_handle != NULL) { streamdns_readmore(sock, transphandle); } - return (false); + return false; default: UNREACHABLE(); }; @@ -281,7 +281,7 @@ streamdns_sock_new(isc__networker_t *worker, const isc_nmsocket_type_t type, sock); } - return (sock); + return sock; } static void @@ -455,14 +455,14 @@ isc__nmsocket_streamdns_timer_running(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_streamdnssocket); if (sock->outerhandle == NULL) { - return (false); + return false; } INSIST(VALID_NMHANDLE(sock->outerhandle)); transp_sock = sock->outerhandle->sock; INSIST(VALID_NMSOCK(transp_sock)); - return (isc__nmsocket_timer_running(transp_sock)); + return isc__nmsocket_timer_running(transp_sock); } void @@ -615,7 +615,7 @@ streamdns_get_send_req(isc_nmsocket_t *sock, isc_mem_t *mctx, sock->streamdns.nsending++; - return (send_req); + return send_req; } static void @@ -669,10 +669,10 @@ streamdns_writecb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { static bool streamdns_closing(isc_nmsocket_t *sock) { - return (isc__nmsocket_closing(sock) || isc__nm_closing(sock->worker) || - sock->outerhandle == NULL || - (sock->outerhandle != NULL && - isc__nmsocket_closing(sock->outerhandle->sock))); + return isc__nmsocket_closing(sock) || isc__nm_closing(sock->worker) || + sock->outerhandle == NULL || + (sock->outerhandle != NULL && + isc__nmsocket_closing(sock->outerhandle->sock)); } static void @@ -708,9 +708,9 @@ streamdns_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { REQUIRE(VALID_NMSOCK(handle->sock)); if (isc__nm_closing(handle->sock->worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } REQUIRE(VALID_NMSOCK(listensock)); @@ -759,7 +759,7 @@ streamdns_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { exit: nsock->accepting = false; - return (result); + return result; } isc_result_t @@ -778,7 +778,7 @@ isc_nm_listenstreamdns(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, worker = &mgr->workers[isc_tid()]; if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } listener = streamdns_sock_new(worker, isc_nm_streamdnslistener, iface, @@ -827,7 +827,7 @@ isc_nm_listenstreamdns(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, if (result != ISC_R_SUCCESS) { listener->closed = true; isc__nmsocket_detach(&listener); - return (result); + return result; } /* copy the actual port we're listening on into sock->iface */ @@ -843,7 +843,7 @@ isc_nm_listenstreamdns(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, *sockp = listener; - return (result); + return result; } void @@ -1119,10 +1119,10 @@ isc__nm_streamdns_has_encryption(const isc_nmhandle_t *handle) { sock = handle->sock; if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); - return (isc_nm_has_encryption(sock->outerhandle)); + return isc_nm_has_encryption(sock->outerhandle); } - return (false); + return false; } const char * @@ -1136,13 +1136,12 @@ isc__nm_streamdns_verify_tls_peer_result_string(const isc_nmhandle_t *handle) { sock = handle->sock; if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); - return (isc_nm_verify_tls_peer_result_string( - sock->outerhandle)); + return isc_nm_verify_tls_peer_result_string(sock->outerhandle); } else if (sock->streamdns.tls_verify_error != NULL) { - return (sock->streamdns.tls_verify_error); + return sock->streamdns.tls_verify_error; } - return (NULL); + return NULL; } void @@ -1173,7 +1172,7 @@ isc__nm_streamdns_xfr_checkperm(isc_nmsocket_t *sock) { } } - return (result); + return result; } void diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index 1916b79998..d22a3f5a91 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -46,10 +46,10 @@ can_log_tcp_quota(void) { isc_stdtime_t now = isc_stdtime_now(); last = atomic_exchange_relaxed(&last_tcpquota_log, now); if (now != last) { - return (true); + return true; } - return (false); + return false; } static isc_result_t @@ -105,7 +105,7 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { if (r != 0) { isc__nm_closesocket(sock->fd); isc__nm_incstats(sock, STATID_OPENFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc__nm_incstats(sock, STATID_OPEN); @@ -113,7 +113,7 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { r = uv_tcp_bind(&sock->uv_handle.tcp, &req->local.type.sa, 0); if (r != 0) { isc__nm_incstats(sock, STATID_BINDFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } } @@ -125,14 +125,14 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { &req->peer.type.sa, tcp_connect_cb); if (r != 0) { isc__nm_incstats(sock, STATID_CONNECTFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } uv_handle_set_data((uv_handle_t *)&sock->read_timer, &req->uv_req.connect); isc__nmsocket_timer_start(sock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -297,7 +297,7 @@ isc__nm_tcp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) { RUNTIME_CHECK(result == ISC_R_SUCCESS); } - return (sock); + return sock; } static void @@ -508,13 +508,13 @@ isc_nm_listentcp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, isc__nm_tcp_stoplistening(sock); isc_nmsocket_close(&sock); - return (result); + return result; } sock->active = true; *sockp = sock; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -971,7 +971,7 @@ accept_connection(isc_nmsocket_t *csock) { */ isc__nmsocket_detach(&csock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: csock->active = false; @@ -988,7 +988,7 @@ failure: isc__nmsocket_detach(&csock); - return (result); + return result; } static void @@ -1118,7 +1118,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { size_t nbufs = 1; if (isc__nmsocket_closing(sock)) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } /* Check if we are not trying to send a DNS message */ @@ -1132,12 +1132,12 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { /* Wrote everything */ isc__nm_sendcb(sock, req, ISC_R_SUCCESS, true); tcp_maybe_restart_reading(sock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (r > 0) { bufs[0].base += (size_t)r; bufs[0].len -= (size_t)r; } else if (!(r == UV_ENOSYS || r == UV_EAGAIN)) { - return (isc_uverr2result(r)); + return isc_uverr2result(r); } } else { nbufs = 2; @@ -1152,7 +1152,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { /* Wrote everything */ isc__nm_sendcb(sock, req, ISC_R_SUCCESS, true); tcp_maybe_restart_reading(sock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (r == 1) { /* Partial write of DNSMSG length */ bufs[0].base = req->tcplen + 1; @@ -1163,7 +1163,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { bufs[0].base = req->uvbuf.base + (r - 2); bufs[0].len = req->uvbuf.len - (r - 2); } else if (!(r == UV_ENOSYS || r == UV_EAGAIN)) { - return (isc_uverr2result(r)); + return isc_uverr2result(r); } } @@ -1177,7 +1177,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { r = uv_write(&req->uv_req.write, &sock->uv_handle.stream, bufs, nbufs, tcp_send_cb); if (r < 0) { - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc_nm_timer_create(req->handle, isc__nmsocket_writetimeout_cb, req, @@ -1186,7 +1186,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { isc_nm_timer_start(req->timer, sock->write_timeout); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c index acb8f71c5d..c045ebe96d 100644 --- a/lib/isc/netmgr/tlsstream.c +++ b/lib/isc/netmgr/tlsstream.c @@ -52,15 +52,15 @@ ISC_ATTR_UNUSED static const char * tls_status2str(int tls_status) { switch (tls_status) { case SSL_ERROR_NONE: - return ("SSL_ERROR_NONE"); + return "SSL_ERROR_NONE"; case SSL_ERROR_ZERO_RETURN: - return ("SSL_ERROR_ZERO_RETURN"); + return "SSL_ERROR_ZERO_RETURN"; case SSL_ERROR_WANT_WRITE: - return ("SSL_ERROR_WANT_WRITE"); + return "SSL_ERROR_WANT_WRITE"; case SSL_ERROR_WANT_READ: - return ("SSL_ERROR_WANT_READ"); + return "SSL_ERROR_WANT_READ"; case SSL_ERROR_SSL: - return ("SSL_ERROR_SSL"); + return "SSL_ERROR_SSL"; default: UNREACHABLE(); } @@ -70,13 +70,13 @@ ISC_ATTR_UNUSED static const char * state2str(int state) { switch (state) { case TLS_INIT: - return ("TLS_INIT"); + return "TLS_INIT"; case TLS_HANDSHAKE: - return ("TLS_HANDSHAKE"); + return "TLS_HANDSHAKE"; case TLS_IO: - return ("TLS_IO"); + return "TLS_IO"; case TLS_CLOSED: - return ("TLS_CLOSED"); + return "TLS_CLOSED"; default: UNREACHABLE(); } @@ -87,16 +87,16 @@ static isc_result_t tls_error_to_result(const int tls_err, const int tls_state, isc_tls_t *tls) { switch (tls_err) { case SSL_ERROR_ZERO_RETURN: - return (ISC_R_EOF); + return ISC_R_EOF; case SSL_ERROR_SSL: if (tls != NULL && tls_state < TLS_IO && SSL_get_verify_result(tls) != X509_V_OK) { - return (ISC_R_TLSBADPEERCERT); + return ISC_R_TLSBADPEERCERT; } - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -145,11 +145,11 @@ tls_try_to_enable_tcp_nodelay(isc_nmsocket_t *tlssock); */ static bool inactive(isc_nmsocket_t *sock) { - return (!isc__nmsocket_active(sock) || sock->closing || - sock->outerhandle == NULL || - !isc__nmsocket_active(sock->outerhandle->sock) || - sock->outerhandle->sock->closing || - isc__nm_closing(sock->worker)); + return !isc__nmsocket_active(sock) || sock->closing || + sock->outerhandle == NULL || + !isc__nmsocket_active(sock->outerhandle->sock) || + sock->outerhandle->sock->closing || + isc__nm_closing(sock->worker); } static void @@ -366,7 +366,7 @@ tls_send_outgoing(isc_nmsocket_t *sock, bool finish, isc_nmhandle_t *tlshandle, INSIST(VALID_NMHANDLE(tlshandle)); cb(tlshandle, result, cbarg); } - return (0); + return 0; } if (finish) { @@ -376,7 +376,7 @@ tls_send_outgoing(isc_nmsocket_t *sock, bool finish, isc_nmhandle_t *tlshandle, pending = BIO_pending(sock->tlsstream.bio_out); if (pending <= 0) { - return (pending); + return pending; } /* Try to reuse previously allocated object */ @@ -418,7 +418,7 @@ tls_send_outgoing(isc_nmsocket_t *sock, bool finish, isc_nmhandle_t *tlshandle, isc_buffer_remainingregion(&send_req->data, &used_region); isc_nm_send(sock->outerhandle, &used_region, tls_senddone, send_req); - return (pending); + return pending; } static int @@ -444,7 +444,7 @@ tls_process_outgoing(isc_nmsocket_t *sock, bool finish, pending = tls_send_outgoing(sock, finish, NULL, NULL, NULL); } - return (pending); + return pending; } static int @@ -452,7 +452,7 @@ tls_try_handshake(isc_nmsocket_t *sock, isc_result_t *presult) { REQUIRE(sock->tlsstream.state == TLS_HANDSHAKE); if (SSL_is_init_finished(sock->tlsstream.tls) == 1) { - return (0); + return 0; } int rv = SSL_do_handshake(sock->tlsstream.tls); @@ -497,7 +497,7 @@ tls_try_handshake(isc_nmsocket_t *sock, isc_result_t *presult) { } } - return (rv); + return rv; } static bool @@ -511,10 +511,10 @@ tls_try_to_close_unused_socket(isc_nmsocket_t *sock) { * close the connection. */ isc__nmsocket_prep_destroy(sock); - return (true); + return true; } - return (false); + return false; } static void @@ -847,14 +847,14 @@ initialize_tls(isc_nmsocket_t *sock, bool server) { sock->tlsstream.bio_in = BIO_new(BIO_s_mem()); if (sock->tlsstream.bio_in == NULL) { isc_tls_free(&sock->tlsstream.tls); - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } sock->tlsstream.bio_out = BIO_new(BIO_s_mem()); if (sock->tlsstream.bio_out == NULL) { BIO_free_all(sock->tlsstream.bio_in); sock->tlsstream.bio_in = NULL; isc_tls_free(&sock->tlsstream.tls); - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } if (BIO_set_mem_eof_return(sock->tlsstream.bio_in, EOF) != 1 || @@ -868,11 +868,11 @@ initialize_tls(isc_nmsocket_t *sock, bool server) { sock->tlsstream.server = server; sock->tlsstream.nsending = 0; sock->tlsstream.state = TLS_INIT; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; error: isc_tls_free(&sock->tlsstream.tls); sock->tlsstream.bio_out = sock->tlsstream.bio_in = NULL; - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } static void @@ -895,7 +895,7 @@ tlslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { /* If accept() was unsuccessful we can't do anything */ if (result != ISC_R_SUCCESS) { - return (result); + return result; } REQUIRE(VALID_NMHANDLE(handle)); @@ -904,9 +904,9 @@ tlslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { REQUIRE(tlslistensock->type == isc_nm_tlslistener); if (isc__nm_closing(handle->sock->worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } else if (isc__nmsocket_closing(handle->sock)) { - return (ISC_R_CANCELED); + return ISC_R_CANCELED; } local = isc_nmhandle_localaddr(handle); @@ -927,7 +927,7 @@ tlslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { tlssock->closed = true; isc_tlsctx_free(&tlssock->tlsstream.ctx); isc__nmsocket_detach(&tlssock); - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } tlssock->accept_cb = tlslistensock->accept_cb; @@ -952,7 +952,7 @@ tlslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { isc__nmhandle_set_manual_timer(tlssock->outerhandle, true); tls_do_bio(tlssock, NULL, NULL, false); - return (result); + return result; } isc_result_t @@ -971,7 +971,7 @@ isc_nm_listentls(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, worker = &mgr->workers[isc_tid()]; if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } if (workers == 0) { @@ -1002,7 +1002,7 @@ isc_nm_listentls(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, if (result != ISC_R_SUCCESS) { tlssock->closed = true; isc__nmsocket_detach(&tlssock); - return (result); + return result; } /* copy the actual port we're listening on into sock->iface */ @@ -1024,7 +1024,7 @@ isc_nm_listentls(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, *sockp = tlssock; } - return (result); + return result; } static void @@ -1442,10 +1442,10 @@ isc__nmsocket_tls_timer_running(isc_nmsocket_t *sock) { if (sock->outerhandle != NULL) { INSIST(VALID_NMHANDLE(sock->outerhandle)); REQUIRE(VALID_NMSOCK(sock->outerhandle->sock)); - return (isc__nmsocket_timer_running(sock->outerhandle->sock)); + return isc__nmsocket_timer_running(sock->outerhandle->sock); } - return (false); + return false; } void @@ -1482,10 +1482,10 @@ isc__nm_tls_verify_tls_peer_result_string(const isc_nmhandle_t *handle) { sock = handle->sock; if (sock->tlsstream.tls == NULL) { - return (NULL); + return NULL; } - return (isc_tls_verify_peer_result_string(sock->tlsstream.tls)); + return isc_tls_verify_peer_result_string(sock->tlsstream.tls); } static void @@ -1532,10 +1532,10 @@ tls_get_listener_tlsctx(isc_nmsocket_t *listener, const int tid) { REQUIRE(tid >= 0); if (listener->tlsstream.listener_tls_ctx == NULL) { - return (NULL); + return NULL; } - return (listener->tlsstream.listener_tls_ctx[tid]); + return listener->tlsstream.listener_tls_ctx[tid]; } void @@ -1626,5 +1626,5 @@ isc__nmhandle_tls_set_tcp_nodelay(isc_nmhandle_t *handle, const bool value) { } } - return (result); + return result; } diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index 4da1db8519..ae2fea4ae1 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -86,7 +86,7 @@ isc__nm_udp_lb_socket(isc_nm_t *mgr, sa_family_t sa_family) { RUNTIME_CHECK(result == ISC_R_SUCCESS); } - return (sock); + return sock; } /* @@ -219,7 +219,7 @@ isc_nm_listenudp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, worker = &mgr->workers[0]; if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } if (workers == 0) { @@ -275,13 +275,13 @@ isc_nm_listenudp(isc_nm_t *mgr, uint32_t workers, isc_sockaddr_t *iface, isc__nm_udp_stoplistening(sock); isc_nmsocket_close(&sock); - return (result); + return result; } sock->active = true; *sockp = sock; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #ifdef USE_ROUTE_SOCKET @@ -297,7 +297,7 @@ route_socket(uv_os_sock_t *fdp) { result = isc__nm_socket(ROUTE_SOCKET_PF, SOCK_RAW, ROUTE_SOCKET_PROTOCOL, &fd); if (result != ISC_R_SUCCESS) { - return (result); + return result; } #ifdef USE_NETLINK @@ -306,12 +306,12 @@ route_socket(uv_os_sock_t *fdp) { r = bind(fd, (struct sockaddr *)&sa, sizeof(sa)); if (r < 0) { isc__nm_closesocket(fd); - return (isc_errno_toresult(r)); + return isc_errno_toresult(r); } #endif *fdp = fd; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -334,12 +334,12 @@ route_connect_direct(isc_nmsocket_t *sock) { uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock); if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } r = uv_udp_open(&sock->uv_handle.udp, sock->fd); if (r != 0) { - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc__nm_set_network_buffers(sock->worker->netmgr, @@ -348,7 +348,7 @@ route_connect_direct(isc_nmsocket_t *sock) { sock->connecting = false; sock->connected = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* USE_ROUTE_SOCKET */ @@ -368,12 +368,12 @@ isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg) { worker = &mgr->workers[isc_tid()]; if (isc__nm_closing(worker)) { - return (ISC_R_SHUTTINGDOWN); + return ISC_R_SHUTTINGDOWN; } result = route_socket(&fd); if (result != ISC_R_SUCCESS) { - return (result); + return result; } sock = isc_mempool_get(worker->nmsocket_pool); @@ -402,13 +402,13 @@ isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg) { isc__nmsocket_detach(&sock); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else /* USE_ROUTE_SOCKET */ UNUSED(mgr); UNUSED(cb); UNUSED(cbarg); UNUSED(extrahandlesize); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif /* USE_ROUTE_SOCKET */ } @@ -506,7 +506,7 @@ isc__nm_udp_read_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf, * bigger than 'maxudp' bytes for testing purposes. */ maxudp = atomic_load_relaxed(&sock->worker->netmgr->maxudp); - if ((maxudp != 0 && (uint32_t)nrecv > maxudp)) { + if (maxudp != 0 && (uint32_t)nrecv > maxudp) { /* * We need to keep the read_cb intact in case, so the * readtimeout_cb can trigger and not crash because of @@ -648,10 +648,10 @@ can_log_udp_sends(void) { isc_stdtime_t now = isc_stdtime_now(); isc_stdtime_t last = atomic_exchange_relaxed(&last_udpsends_log, now); if (now != last) { - return (true); + return true; } - return (false); + return false; } /* @@ -768,7 +768,7 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { r = uv_udp_open(&sock->uv_handle.udp, sock->fd); if (r != 0) { isc__nm_incstats(sock, STATID_OPENFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc__nm_incstats(sock, STATID_OPEN); @@ -790,7 +790,7 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { uv_bind_flags); if (r != 0) { isc__nm_incstats(sock, STATID_BINDFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc__nm_set_network_buffers(sock->worker->netmgr, @@ -806,11 +806,11 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { } while (r == UV_EADDRINUSE && --req->connect_tries > 0); if (r != 0) { isc__nm_incstats(sock, STATID_CONNECTFAIL); - return (isc_uverr2result(r)); + return isc_uverr2result(r); } isc__nm_incstats(sock, STATID_CONNECT); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c index 69c3e9a075..40de1ece9e 100644 --- a/lib/isc/netscope.c +++ b/lib/isc/netscope.c @@ -38,7 +38,7 @@ isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) { /* at this moment, we only support AF_INET6 */ if (af != AF_INET6) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* @@ -59,18 +59,18 @@ isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) { #endif /* ifdef HAVE_IF_NAMETOINDEX */ llz = strtoull(scopename, &ep, 10); if (ep == scopename) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* check overflow */ zone = (uint32_t)(llz & 0xffffffffUL); if (zone != llz) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } #ifdef HAVE_IF_NAMETOINDEX } #endif /* ifdef HAVE_IF_NAMETOINDEX */ *zoneid = zone; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/openssl_shim.c b/lib/isc/openssl_shim.c index d19bfc0f0f..67868126a4 100644 --- a/lib/isc/openssl_shim.c +++ b/lib/isc/openssl_shim.c @@ -34,7 +34,7 @@ BIO_read_ex(BIO *b, void *data, size_t dlen, size_t *readbytes) { rv = 1; } - return (rv); + return rv; } #endif /* !HAVE_BIO_READ_EX */ @@ -47,7 +47,7 @@ BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written) { rv = 1; } - return (rv); + return rv; } #endif /* !HAVE_BIO_WRITE_EX */ @@ -67,6 +67,6 @@ unsigned long ERR_get_error_all(const char **file, int *line, const char **func, const char **data, int *flags) { SET_IF_NOT_NULL(func, &err_empty_string); - return (ERR_get_error_line_data(file, line, data, flags)); + return ERR_get_error_line_data(file, line, data, flags); } #endif /* if !HAVE_ERR_GET_ERROR_ALL */ diff --git a/lib/isc/os.c b/lib/isc/os.c index 7f0d7cced5..b50248d591 100644 --- a/lib/isc/os.c +++ b/lib/isc/os.c @@ -48,8 +48,8 @@ ncpus_initialize(void) { static int sysconf_ncpus(void) { - long ncpus = sysconf((_SC_NPROCESSORS_ONLN)); - return ((int)ncpus); + long ncpus = sysconf(_SC_NPROCESSORS_ONLN); + return (int)ncpus; } #if HAVE_SYSCTLBYNAME @@ -66,10 +66,10 @@ sysctlbyname_ncpus(void) { for (size_t i = 0; i < ARRAY_SIZE(mib); i++) { int r = sysctlbyname(mib[i], &ncpu, &len, NULL, 0); if (r != -1) { - return (ncpu); + return ncpu; } } - return (-1); + return -1; } #endif /* HAVE_SYSCTLBYNAME */ @@ -89,10 +89,10 @@ sysctl_ncpus(void) { int r = sysctl(mib[i], ARRAY_SIZE(mib[i]), &ncpu, &len, NULL, 0); if (r != -1) { - return (ncpu); + return ncpu; } } - return (-1); + return -1; } #endif /* HAVE_SYS_SYSCTL_H */ @@ -113,9 +113,9 @@ sched_affinity_ncpus(void) { cpu_set_t cpus; int r = sched_getaffinity(0, sizeof(cpus), &cpus); if (r != -1) { - return (CPU_COUNT(&cpus)); + return CPU_COUNT(&cpus); } - return (-1); + return -1; } #endif @@ -132,9 +132,9 @@ cpuset_affinity_ncpus(void) { int r = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpus), &cpus); if (r != -1) { - return (CPU_COUNT(&cpus)); + return CPU_COUNT(&cpus); } - return (-1); + return -1; } #endif @@ -178,17 +178,17 @@ umask_initialize(void) { unsigned int isc_os_ncpus(void) { - return (isc__os_ncpus); + return isc__os_ncpus; } unsigned long isc_os_cacheline(void) { - return (isc__os_cacheline); + return isc__os_cacheline; } mode_t isc_os_umask(void) { - return (isc__os_umask); + return isc__os_umask; } void diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c index da6c281d42..001fe9d416 100644 --- a/lib/isc/parseint.c +++ b/lib/isc/parseint.c @@ -28,12 +28,12 @@ isc_parse_uint32(uint32_t *uip, const char *string, int base) { uint32_t r; char *e; if (!isalnum((unsigned char)(string[0]))) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } errno = 0; n = strtoul(string, &e, base); if (*e != '\0') { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } /* * Where long is 64 bits we need to convert to 32 bits then test for @@ -42,10 +42,10 @@ isc_parse_uint32(uint32_t *uip, const char *string, int base) { */ r = (uint32_t)n; if ((n == ULONG_MAX && errno == ERANGE) || (n != (unsigned long)r)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *uip = r; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -54,13 +54,13 @@ isc_parse_uint16(uint16_t *uip, const char *string, int base) { isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (val > 0xFFFF) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *uip = (uint16_t)val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -69,11 +69,11 @@ isc_parse_uint8(uint8_t *uip, const char *string, int base) { isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (val > 0xFF) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *uip = (uint8_t)val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c index 593e09991c..df8f62d92f 100644 --- a/lib/isc/picohttpparser.c +++ b/lib/isc/picohttpparser.c @@ -138,7 +138,7 @@ findchar_fast(const char *buf, const char *buf_end, const char *ranges, (void)ranges; (void)ranges_size; #endif - return (buf); + return buf; } static const char * @@ -207,11 +207,11 @@ FOUND_CTL: ++buf; } else { *ret = -1; - return (NULL); + return NULL; } *token = token_start; - return (buf); + return buf; } static const char * @@ -234,12 +234,12 @@ is_complete(const char *buf, const char *buf_end, size_t last_len, int *ret) { ret_cnt = 0; } if (ret_cnt == 2) { - return (buf); + return buf; } } *ret = -2; - return (NULL); + return NULL; } #define PARSE_INT(valp_, mul_) \ @@ -289,14 +289,14 @@ parse_token(const char *buf, const char *buf_end, const char **token, break; } else if (!token_char_map[(unsigned char)*buf]) { *ret = -1; - return (NULL); + return NULL; } ++buf; CHECK_EOF(); } *token = buf_start; *token_len = buf - buf_start; - return (buf); + return buf; } /* returned pointer is always within [buf, buf_end), or null */ @@ -306,7 +306,7 @@ parse_http_version(const char *buf, const char *buf_end, int *minor_version, /* we want at least [HTTP/1.] to try to parse */ if (buf_end - buf < 9) { *ret = -2; - return (NULL); + return NULL; } EXPECT_CHAR_NO_CHECK('H'); EXPECT_CHAR_NO_CHECK('T'); @@ -316,7 +316,7 @@ parse_http_version(const char *buf, const char *buf_end, int *minor_version, EXPECT_CHAR_NO_CHECK('1'); EXPECT_CHAR_NO_CHECK('.'); PARSE_INT(minor_version, 1); - return (buf); + return buf; } static const char * @@ -334,7 +334,7 @@ parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, } if (*num_headers == max_headers) { *ret = -1; - return (NULL); + return NULL; } if (!(*num_headers != 0 && (*buf == ' ' || *buf == '\t'))) { /* parsing name, but do not discard SP before colon, see @@ -345,11 +345,11 @@ parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, &headers[*num_headers].name_len, ':', ret)) == NULL) { - return (NULL); + return NULL; } if (headers[*num_headers].name_len == 0) { *ret = -1; - return (NULL); + return NULL; } ++buf; for (;; ++buf) { @@ -367,7 +367,7 @@ parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, ret)) == NULL) { - return (NULL); + return NULL; } /* remove trailing SPs and HTABs */ const char *value_end = value + value_len; @@ -380,7 +380,7 @@ parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, headers[*num_headers].value = value; headers[*num_headers].value_len = value_end - value; } - return (buf); + return buf; } static const char * @@ -401,7 +401,7 @@ parse_request(const char *buf, const char *buf_end, const char **method, if ((buf = parse_token(buf, buf_end, method, method_len, ' ', ret)) == NULL) { - return (NULL); + return NULL; } do { ++buf; @@ -414,12 +414,12 @@ parse_request(const char *buf, const char *buf_end, const char **method, } while (*buf == ' '); if (*method_len == 0 || *path_len == 0) { *ret = -1; - return (NULL); + return NULL; } if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == NULL) { - return (NULL); + return NULL; } if (*buf == '\015') { ++buf; @@ -428,11 +428,11 @@ parse_request(const char *buf, const char *buf_end, const char **method, ++buf; } else { *ret = -1; - return (NULL); + return NULL; } - return (parse_headers(buf, buf_end, headers, num_headers, max_headers, - ret)); + return parse_headers(buf, buf_end, headers, num_headers, max_headers, + ret); } int @@ -454,14 +454,14 @@ phr_parse_request(const char *buf_start, size_t len, const char **method, /* if last_len != 0, check if the request is complete (a fast countermeasure againt slowloris */ if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) { - return (r); + return r; } if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, minor_version, headers, num_headers, max_headers, &r)) == NULL) { - return (r); + return r; } return (int)(buf - buf_start); @@ -476,12 +476,12 @@ parse_response(const char *buf, const char *buf_end, int *minor_version, if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == NULL) { - return (NULL); + return NULL; } /* skip space */ if (*buf != ' ') { *ret = -1; - return (NULL); + return NULL; } do { ++buf; @@ -491,13 +491,13 @@ parse_response(const char *buf, const char *buf_end, int *minor_version, * char> to try to parse */ if (buf_end - buf < 4) { *ret = -2; - return (NULL); + return NULL; } PARSE_INT_3(status); /* get message including preceding space */ if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) { - return (NULL); + return NULL; } if (*msg_len == 0) { /* ok */ @@ -513,11 +513,11 @@ parse_response(const char *buf, const char *buf_end, int *minor_version, } else { /* garbage found after status code */ *ret = -1; - return (NULL); + return NULL; } - return (parse_headers(buf, buf_end, headers, num_headers, max_headers, - ret)); + return parse_headers(buf, buf_end, headers, num_headers, max_headers, + ret); } int @@ -538,14 +538,14 @@ phr_parse_response(const char *buf_start, size_t len, int *minor_version, /* if last_len != 0, check if the response is complete (a fast countermeasure against slowloris */ if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) { - return (r); + return r; } if ((buf = parse_response(buf, buf_end, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) == NULL) { - return (r); + return r; } return (int)(buf - buf_start); @@ -563,13 +563,13 @@ phr_parse_headers(const char *buf_start, size_t len, struct phr_header *headers, /* if last_len != 0, check if the response is complete (a fast countermeasure against slowloris */ if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) { - return (r); + return r; } if ((buf = parse_headers(buf, buf_end, headers, num_headers, max_headers, &r)) == NULL) { - return (r); + return r; } return (int)(buf - buf_start); @@ -587,13 +587,13 @@ enum { static int decode_hex(int ch) { if ('0' <= ch && ch <= '9') { - return (ch - '0'); + return ch - '0'; } else if ('A' <= ch && ch <= 'F') { - return (ch - 'A' + 0xa); + return ch - 'A' + 0xa; } else if ('a' <= ch && ch <= 'f') { - return (ch - 'a' + 0xa); + return ch - 'a' + 0xa; } else { - return (-1); + return -1; } } @@ -727,12 +727,12 @@ Exit: memmove(buf + dst, buf + src, bufsz - src); } *_bufsz = dst; - return (ret); + return ret; } int phr_decode_chunked_is_in_data(struct phr_chunked_decoder *decoder) { - return (decoder->_state == CHUNKED_IN_CHUNK_DATA); + return decoder->_state == CHUNKED_IN_CHUNK_DATA; } #undef CHECK_EOF diff --git a/lib/isc/portset.c b/lib/isc/portset.c index 789195a612..f3e515eaad 100644 --- a/lib/isc/portset.c +++ b/lib/isc/portset.c @@ -36,7 +36,7 @@ struct isc_portset { static bool portset_isset(isc_portset_t *portset, in_port_t port) { - return ((portset->buf[port >> 5] & ((uint32_t)1 << (port & 31))) != 0); + return (portset->buf[port >> 5] & ((uint32_t)1 << (port & 31))) != 0; } static void @@ -65,7 +65,7 @@ isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp) { *portset = (isc_portset_t){ 0 }; *portsetp = portset; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -82,14 +82,14 @@ bool isc_portset_isset(isc_portset_t *portset, in_port_t port) { REQUIRE(portset != NULL); - return (portset_isset(portset, port)); + return portset_isset(portset, port); } unsigned int isc_portset_nports(isc_portset_t *portset) { REQUIRE(portset != NULL); - return (portset->nports); + return portset->nports; } void diff --git a/lib/isc/proxy2.c b/lib/isc/proxy2.c index 0e3b99a146..ccf386bd26 100644 --- a/lib/isc/proxy2.c +++ b/lib/isc/proxy2.c @@ -95,7 +95,7 @@ isc_proxy2_handler_new(isc_mem_t *mctx, const uint16_t max_size, newhandler = isc_mem_get(mctx, sizeof(*newhandler)); isc_proxy2_handler_init(newhandler, mctx, max_size, cb, cbarg); - return (newhandler); + return newhandler; } void @@ -140,7 +140,7 @@ proxy2_socktype_to_socktype(const isc_proxy2_socktype_t proxy_socktype) { ISC_UNREACHABLE(); }; - return (socktype); + return socktype; } static inline void @@ -197,7 +197,7 @@ isc__proxy2_handler_handle_signature(isc_proxy2_handler_t *restrict handler) { if (memcmp(ISC_PROXY2_HEADER_SIGNATURE, remaining.base, len) != 0) { isc__proxy2_handler_error(handler, ISC_R_UNEXPECTED); - return (false); + return false; } else if (len == ISC_PROXY2_HEADER_SIGNATURE_SIZE) { isc_buffer_forward(&handler->hdrbuf, ISC_PROXY2_HEADER_SIGNATURE_SIZE); @@ -207,9 +207,9 @@ isc__proxy2_handler_handle_signature(isc_proxy2_handler_t *restrict handler) { } else { INSIST(len < ISC_PROXY2_HEADER_SIGNATURE_SIZE); isc__proxy2_handler_error(handler, ISC_R_NOMORE); - return (false); + return false; } - return (true); + return true; } static inline bool @@ -239,7 +239,7 @@ isc__proxy2_handler_handle_header(isc_proxy2_handler_t *restrict handler) { if ((ver_cmd & 0xF0U) >> 4 != 2) { /* only support for version 2 is implemented */ isc__proxy2_handler_error(handler, ISC_R_NOTIMPLEMENTED); - return (false); + return false; } /* extract command */ @@ -341,14 +341,14 @@ isc__proxy2_handler_handle_header(isc_proxy2_handler_t *restrict handler) { handler->state++; - return (true); + return true; error_unexpected: isc__proxy2_handler_error(handler, ISC_R_UNEXPECTED); - return (false); + return false; error_range: isc__proxy2_handler_error(handler, ISC_R_RANGE); - return (false); + return false; } static inline isc_result_t @@ -449,13 +449,13 @@ isc__proxy2_handler_get_addresses(isc_proxy2_handler_t *restrict handler, * without a terminating '\0' byte - not a friend * knocking at the door. */ - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_forward(hdrbuf, addr_size); ret = memchr(isc_buffer_current(hdrbuf), '\0', addr_size); if (ret == NULL) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_forward(hdrbuf, addr_size); } break; @@ -463,7 +463,7 @@ isc__proxy2_handler_get_addresses(isc_proxy2_handler_t *restrict handler, UNREACHABLE(); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline void @@ -518,7 +518,7 @@ isc__proxy2_handler_handle_data(isc_proxy2_handler_t *restrict handler) { if (isc_buffer_remaininglength(&handler->hdrbuf) < handler->expect_data) { isc__proxy2_handler_error(handler, ISC_R_NOMORE); - return (false); + return false; } switch (handler->state) { @@ -531,13 +531,13 @@ isc__proxy2_handler_handle_data(isc_proxy2_handler_t *restrict handler) { * by byte, we would detect the problem when processing the * first unexpected byte. */ - return (isc__proxy2_handler_handle_signature(handler)); + return isc__proxy2_handler_handle_signature(handler); case ISC_PROXY2_STATE_WAITING_HEADER: /* * Handle the rest of the header (except signature which we * heave verified by now). */ - return (isc__proxy2_handler_handle_header(handler)); + return isc__proxy2_handler_handle_header(handler); case ISC_PROXY2_STATE_WAITING_PAYLOAD: /* * Handle the PROXYv2 header payload - addresses and TLVs. @@ -549,7 +549,7 @@ isc__proxy2_handler_handle_data(isc_proxy2_handler_t *restrict handler) { break; }; - return (false); + return false; } static inline isc_result_t @@ -560,7 +560,7 @@ isc__proxy2_handler_process_data(isc_proxy2_handler_t *restrict handler) { } } - return (handler->result); + return handler->result; } isc_result_t @@ -582,7 +582,7 @@ isc_proxy2_handler_push_data(isc_proxy2_handler_t *restrict handler, result = isc__proxy2_handler_process_data(handler); - return (result); + return result; } isc_result_t @@ -596,7 +596,7 @@ isc_proxy2_handler_push(isc_proxy2_handler_t *restrict handler, result = isc_proxy2_handler_push_data(handler, region->base, region->length); - return (result); + return result; } static inline bool @@ -604,10 +604,10 @@ proxy2_payload_is_processed(const isc_proxy2_handler_t *restrict handler) { if (handler->state < ISC_PROXY2_STATE_END || handler->result != ISC_R_SUCCESS) { - return (false); + return false; } - return (true); + return true; } size_t @@ -618,7 +618,7 @@ isc_proxy2_handler_header(const isc_proxy2_handler_t *restrict handler, (region->base == NULL && region->length == 0)); if (!proxy2_payload_is_processed(handler)) { - return (0); + return 0; } if (region != NULL) { @@ -626,7 +626,7 @@ isc_proxy2_handler_header(const isc_proxy2_handler_t *restrict handler, region->length = handler->header_size; } - return (handler->header_size); + return handler->header_size; } size_t @@ -637,12 +637,12 @@ isc_proxy2_handler_tlvs(const isc_proxy2_handler_t *restrict handler, (region->base == NULL && region->length == 0)); if (!proxy2_payload_is_processed(handler)) { - return (0); + return 0; } SET_IF_NOT_NULL(region, handler->tlv_data); - return (handler->tlv_data.length); + return handler->tlv_data.length; } size_t @@ -653,19 +653,19 @@ isc_proxy2_handler_extra(const isc_proxy2_handler_t *restrict handler, (region->base == NULL && region->length == 0)); if (!proxy2_payload_is_processed(handler)) { - return (0); + return 0; } SET_IF_NOT_NULL(region, handler->extra_data); - return (handler->extra_data.length); + return handler->extra_data.length; } isc_result_t isc_proxy2_handler_result(const isc_proxy2_handler_t *restrict handler) { REQUIRE(handler != NULL); - return (handler->result); + return handler->result; } isc_result_t @@ -681,7 +681,7 @@ isc_proxy2_handler_addresses(const isc_proxy2_handler_t *restrict handler, REQUIRE(handler != NULL); if (!proxy2_payload_is_processed(handler)) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } ret = isc_proxy2_handler_header(handler, &header_region); @@ -697,13 +697,13 @@ isc_proxy2_handler_addresses(const isc_proxy2_handler_t *restrict handler, (isc_proxy2_handler_t *)handler, &buf, psrc_addr, pdst_addr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } SET_IF_NOT_NULL(psocktype, proxy2_socktype_to_socktype(handler->proxy_socktype)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -760,7 +760,7 @@ isc_proxy2_tlv_iterate(const isc_region_t *restrict tlv_data, } } - return (result); + return result; } typedef struct proxy2_tls_cbarg { @@ -780,7 +780,7 @@ proxy2_tls_iter_cb(const isc_proxy2_tlv_type_t tlv_type, (isc_proxy2_tlv_subtype_tls_t)tlv_type, data, tls_cbarg->cbarg); - return (ret); + return ret; } isc_result_t @@ -806,7 +806,7 @@ isc_proxy2_subtlv_tls_header_data(const isc_region_t *restrict tls_tlv_data, *pclient_cert_verified == false); if (tls_tlv_data->length < ISC_PROXY2_TLS_SUBHEADER_MIN_SIZE) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } p = tls_tlv_data->base; @@ -820,7 +820,7 @@ isc_proxy2_subtlv_tls_header_data(const isc_region_t *restrict tls_tlv_data, SET_IF_NOT_NULL(pclient_flags, client_flags); SET_IF_NOT_NULL(pclient_cert_verified, client_cert_verified); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -837,14 +837,14 @@ isc_proxy2_subtlv_tls_iterate(const isc_region_t *restrict tls_tlv_data, REQUIRE(cb != NULL); if (tls_tlv_data->length < ISC_PROXY2_TLS_SUBHEADER_MIN_SIZE) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } result = isc_proxy2_subtlv_tls_header_data(tls_tlv_data, &client_flags, &client_cert_verified); if (result != ISC_R_SUCCESS) { - return (result); + return result; } p = tls_tlv_data->base; @@ -865,7 +865,7 @@ isc_proxy2_subtlv_tls_iterate(const isc_region_t *restrict tls_tlv_data, &tls_cbarg); } - return (result); + return result; } typedef struct tls_subtlv_verify_cbarg { @@ -890,7 +890,7 @@ proxy2_subtlv_verify_iter_cb(const uint8_t client, type == ISC_PROXY2_TLV_TYPE_NETNS) { arg->verif_result = ISC_R_UNEXPECTED; - return (false); + return false; } switch (tls_subtlv_type) { @@ -900,7 +900,7 @@ proxy2_subtlv_verify_iter_cb(const uint8_t client, case ISC_PROXY2_TLV_SUBTYPE_TLS_KEY_ALG: if (data->length == 0) { arg->verif_result = ISC_R_RANGE; - return (false); + return false; } arg->count[tls_subtlv_type]++; verify_count = true; @@ -911,10 +911,10 @@ proxy2_subtlv_verify_iter_cb(const uint8_t client, if (verify_count && arg->count[tls_subtlv_type] > 1) { arg->verif_result = ISC_R_UNEXPECTED; - return (false); + return false; } - return (true); + return true; } typedef struct tlv_verify_cbarg { @@ -969,17 +969,17 @@ isc_proxy2_tlv_verify_cb(const isc_proxy2_tlv_type_t tlv_type, isc_proxy2_subtlv_tls_header_data(data, &client, NULL); if (arg->verify_result != ISC_R_SUCCESS) { - return (false); + return false; } arg->verify_result = isc_proxy2_subtlv_tls_iterate( data, proxy2_subtlv_verify_iter_cb, &tls_cbarg); if (arg->verify_result != ISC_R_SUCCESS) { - return (false); + return false; } else if (tls_cbarg.verif_result != ISC_R_SUCCESS) { arg->verify_result = tls_cbarg.verif_result; - return (false); + return false; } /* @@ -1028,15 +1028,15 @@ isc_proxy2_tlv_verify_cb(const isc_proxy2_tlv_type_t tlv_type, goto error_unexpected; } - return (true); + return true; error_unexpected: arg->verify_result = ISC_R_UNEXPECTED; - return (false); + return false; error_range: arg->verify_result = ISC_R_RANGE; - return (false); + return false; } isc_result_t @@ -1047,10 +1047,10 @@ isc_proxy2_tlv_data_verify(const isc_region_t *restrict tlv_data) { result = isc_proxy2_tlv_iterate(tlv_data, isc_proxy2_tlv_verify_cb, &cbarg); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (cbarg.verify_result); + return cbarg.verify_result; } isc_result_t @@ -1067,7 +1067,7 @@ isc_proxy2_header_handle_directly(const isc_region_t *restrict header_data, result = isc__proxy2_handler_process_data(&handler); - return (result); + return result; } isc_result_t @@ -1160,12 +1160,12 @@ isc_proxy2_make_header(isc_buffer_t *restrict outbuf, (void *)&dst_addr->type.sin6.sin6_addr; break; default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } break; default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } switch (socktype) { @@ -1179,20 +1179,20 @@ isc_proxy2_make_header(isc_buffer_t *restrict outbuf, proxy_socktype = ISC_PROXY2_SOCK_DGRAM; break; default: - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (tlv_data != NULL) { if (tlv_data->length > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } total_size += tlv_data->length; } if (isc_buffer_availablelength(outbuf) < total_size) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else if (total_size > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* @@ -1238,7 +1238,7 @@ isc_proxy2_make_header(isc_buffer_t *restrict outbuf, isc_buffer_putmem(outbuf, tlv_data->base, tlv_data->length); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1256,9 +1256,9 @@ isc_proxy2_header_append(isc_buffer_t *restrict outbuf, REQUIRE(data != NULL); if (isc_buffer_availablelength(outbuf) < data->length) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else if ((data->length + header_data.length) > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } INSIST(memcmp(header_data.base, ISC_PROXY2_HEADER_SIGNATURE, @@ -1270,7 +1270,7 @@ isc_proxy2_header_append(isc_buffer_t *restrict outbuf, new_len = ntohs(new_len); /* check */ if ((data->length + new_len) > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* update */ new_len += (uint16_t)data->length; @@ -1280,7 +1280,7 @@ isc_proxy2_header_append(isc_buffer_t *restrict outbuf, isc_buffer_putmem(outbuf, data->base, data->length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static inline void @@ -1329,10 +1329,10 @@ isc_proxy2_header_append_tlv(isc_buffer_t *restrict outbuf, new_data_len = tlv_data->length + 3; if (isc_buffer_availablelength(outbuf) < (new_data_len)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else if ((isc_buffer_usedlength(outbuf) + new_data_len) > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } append_type_and_length(outbuf, (uint8_t)tlv_type, @@ -1344,7 +1344,7 @@ isc_proxy2_header_append_tlv(isc_buffer_t *restrict outbuf, RUNTIME_CHECK(result == ISC_R_SUCCESS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1361,7 +1361,7 @@ isc_proxy2_header_append_tlv_string(isc_buffer_t *restrict outbuf, result = isc_proxy2_header_append_tlv(outbuf, tlv_type, ®ion); - return (result); + return result; } isc_result_t @@ -1378,9 +1378,9 @@ isc_proxy2_make_tls_subheader(isc_buffer_t *restrict outbuf, } if (isc_buffer_availablelength(outbuf) < total_size) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else if (total_size > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } isc_buffer_putuint8(outbuf, client_flags); @@ -1393,7 +1393,7 @@ isc_proxy2_make_tls_subheader(isc_buffer_t *restrict outbuf, tls_subtlvs_data->length); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1406,11 +1406,11 @@ isc_proxy2_append_tlv(isc_buffer_t *restrict outbuf, const uint8_t type, new_data_len = (data->length + 3); if (isc_buffer_availablelength(outbuf) < new_data_len) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else if ((isc_buffer_usedlength(outbuf) + (data->length + 3)) > UINT16_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } append_type_and_length(outbuf, (uint8_t)type, ((uint16_t)data->length), @@ -1420,7 +1420,7 @@ isc_proxy2_append_tlv(isc_buffer_t *restrict outbuf, const uint8_t type, isc_buffer_putmem(outbuf, data->base, data->length); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -1436,5 +1436,5 @@ isc_proxy2_append_tlv_string(isc_buffer_t *restrict outbuf, const uint8_t type, result = isc_proxy2_append_tlv(outbuf, type, ®ion); - return (result); + return result; } diff --git a/lib/isc/quota.c b/lib/isc/quota.c index 0b1f050ce7..06ad1e4627 100644 --- a/lib/isc/quota.c +++ b/lib/isc/quota.c @@ -48,19 +48,19 @@ isc_quota_max(isc_quota_t *quota, unsigned int max) { unsigned int isc_quota_getmax(isc_quota_t *quota) { REQUIRE(VALID_QUOTA(quota)); - return (atomic_load_relaxed("a->max)); + return atomic_load_relaxed("a->max); } unsigned int isc_quota_getsoft(isc_quota_t *quota) { REQUIRE(VALID_QUOTA(quota)); - return (atomic_load_relaxed("a->soft)); + return atomic_load_relaxed("a->soft); } unsigned int isc_quota_getused(isc_quota_t *quota) { REQUIRE(VALID_QUOTA(quota)); - return (atomic_load_relaxed("a->used)); + return atomic_load_relaxed("a->used); } void @@ -108,15 +108,15 @@ isc_quota_acquire_cb(isc_quota_t *quota, isc_job_t *job, isc_job_cb cb, cds_wfcq_enqueue("a->jobs.head, "a->jobs.tail, &job->wfcq_node); } - return (ISC_R_QUOTA); + return ISC_R_QUOTA; } uint_fast32_t soft = atomic_load_relaxed("a->soft); if (soft != 0 && used >= soft) { - return (ISC_R_SOFTQUOTA); + return ISC_R_SOFTQUOTA; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isc/radix.c b/lib/isc/radix.c index f688a75255..ba3c875b71 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -50,7 +50,7 @@ _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest, REQUIRE(target != NULL); if (family != AF_INET6 && family != AF_INET && family != AF_UNSPEC) { - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } prefix = isc_mem_get(mctx, sizeof(isc_prefix_t)); @@ -71,7 +71,7 @@ _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest, isc_refcount_init(&prefix->refcount, 1); *target = prefix; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -102,20 +102,20 @@ _ref_prefix(isc_mem_t *mctx, isc_prefix_t **target, isc_prefix_t *prefix) { isc_result_t ret; ret = _new_prefix(mctx, target, prefix->family, &prefix->add, prefix->bitlen); - return (ret); + return ret; } isc_refcount_increment(&prefix->refcount); *target = prefix; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static int _comp_with_mask(void *addr, void *dest, u_int mask) { /* Mask length of zero matches everything */ if (mask == 0) { - return (1); + return 1; } if (memcmp(addr, dest, mask / 8) == 0) { @@ -125,10 +125,10 @@ _comp_with_mask(void *addr, void *dest, u_int mask) { if ((mask % 8) == 0 || (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m)) { - return (1); + return 1; } } - return (0); + return 0; } void @@ -232,7 +232,7 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, node = radix->head; if (node == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } addr = isc_prefix_touchar(prefix); @@ -278,9 +278,9 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, } if (*target == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -318,7 +318,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, if (result != ISC_R_SUCCESS) { isc_mem_put(radix->mctx, node, sizeof(isc_radix_node_t)); - return (result); + return result; } node->parent = NULL; node->l = node->r = NULL; @@ -355,7 +355,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, radix->head = node; radix->num_active_node++; *target = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } addr = isc_prefix_touchar(prefix); @@ -448,12 +448,12 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } } *target = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { result = _ref_prefix(radix->mctx, &node->prefix, prefix); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } INSIST(node->data[RADIX_V4] == NULL && @@ -482,7 +482,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } } *target = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } new_node = isc_mem_get(radix->mctx, sizeof(isc_radix_node_t)); @@ -498,7 +498,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, isc_mem_put(radix->mctx, glue, sizeof(isc_radix_node_t)); } - return (result); + return result; } new_node->parent = NULL; new_node->l = new_node->r = NULL; @@ -544,7 +544,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, node->l = new_node; } *target = new_node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (bitlen == differ_bit) { @@ -599,7 +599,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } *target = new_node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isc/random.c b/lib/isc/random.c index a9608b8696..88efd21c4e 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -66,7 +66,7 @@ static thread_local uint32_t seed[4] = { 0 }; static uint32_t rotl(const uint32_t x, int k) { - return ((x << k) | (x >> (32 - k))); + return (x << k) | (x >> (32 - k)); } static uint32_t @@ -85,7 +85,7 @@ next(void) { seed[3] = rotl(seed[3], 11); - return (result_starstar); + return result_starstar; } static void @@ -112,19 +112,19 @@ isc__random_initialize(void) { uint8_t isc_random8(void) { isc__random_initialize(); - return ((uint8_t)next()); + return (uint8_t)next(); } uint16_t isc_random16(void) { isc__random_initialize(); - return ((uint16_t)next()); + return (uint16_t)next(); } uint32_t isc_random32(void) { isc__random_initialize(); - return (next()); + return next(); } void @@ -219,5 +219,5 @@ isc_random_uniform(uint32_t limit) { /* * Return the integer part (upper 32 bits). */ - return ((uint32_t)(num >> 32)); + return (uint32_t)(num >> 32); } diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c index 9d59ffc43d..5cb83f273c 100644 --- a/lib/isc/ratelimiter.c +++ b/lib/isc/ratelimiter.c @@ -194,7 +194,7 @@ isc_ratelimiter_enqueue(isc_ratelimiter_t *restrict rl, UNREACHABLE(); } UNLOCK(&rl->lock); - return (result); + return result; } isc_result_t @@ -212,7 +212,7 @@ isc_ratelimiter_dequeue(isc_ratelimiter_t *restrict rl, isc_rlevent_t **rlep) { result = ISC_R_NOTFOUND; } UNLOCK(&rl->lock); - return (result); + return result; } static void diff --git a/lib/isc/regex.c b/lib/isc/regex.c index de99688f1c..261b299207 100644 --- a/lib/isc/regex.c +++ b/lib/isc/regex.c @@ -425,11 +425,11 @@ isc_regex_validate(const char *c) { if (!have_atom) { FAIL("no atom"); } - return (sub); + return sub; error: #if VALREGEX_REPORT_REASON fprintf(stderr, "%s\n", reason); #endif /* if VALREGEX_REPORT_REASON */ - return (-1); + return -1; } diff --git a/lib/isc/region.c b/lib/isc/region.c index 675f4ec7b2..e3b1e663e2 100644 --- a/lib/isc/region.c +++ b/lib/isc/region.c @@ -30,10 +30,10 @@ isc_region_compare(isc_region_t *r1, isc_region_t *r2) { l = (r1->length < r2->length) ? r1->length : r2->length; if ((result = memcmp(r1->base, r2->base, l)) != 0) { - return ((result < 0) ? -1 : 1); + return (result < 0) ? -1 : 1; } else { - return ((r1->length == r2->length) ? 0 - : (r1->length < r2->length) ? -1 - : 1); + return (r1->length == r2->length) ? 0 + : (r1->length < r2->length) ? -1 + : 1; } } diff --git a/lib/isc/result.c b/lib/isc/result.c index 4c34c01c0e..f54e71e8a5 100644 --- a/lib/isc/result.c +++ b/lib/isc/result.c @@ -540,10 +540,10 @@ STATIC_ASSERT((ISC_R_NRESULTS < INT32_MAX), "result.h enum too big"); const char * isc_result_totext(isc_result_t result) { - return (description[result]); + return description[result]; } const char * isc_result_toid(isc_result_t result) { - return (identifier[result]); + return identifier[result]; } diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index f2f3a49398..6c040400aa 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -94,8 +94,8 @@ read_indicator_depart(isc_rwlock_t *rwl) { static bool read_indicator_isempty(isc_rwlock_t *rwl) { - return (atomic_load_acquire(&rwl->readers_egress) == - atomic_load_acquire(&rwl->readers_ingress)); + return atomic_load_acquire(&rwl->readers_egress) == + atomic_load_acquire(&rwl->readers_ingress); } static void @@ -110,19 +110,19 @@ writers_barrier_lower(isc_rwlock_t *rwl) { static bool writers_barrier_israised(isc_rwlock_t *rwl) { - return (atomic_load_acquire(&rwl->writers_barrier) > 0); + return atomic_load_acquire(&rwl->writers_barrier) > 0; } static bool writers_lock_islocked(isc_rwlock_t *rwl) { - return (atomic_load_acquire(&rwl->writers_lock) == ISC_RWLOCK_LOCKED); + return atomic_load_acquire(&rwl->writers_lock) == ISC_RWLOCK_LOCKED; } static bool writers_lock_acquire(isc_rwlock_t *rwl) { - return (atomic_compare_exchange_weak_acq_rel( + return atomic_compare_exchange_weak_acq_rel( &rwl->writers_lock, &(bool){ ISC_RWLOCK_UNLOCKED }, - ISC_RWLOCK_LOCKED)); + ISC_RWLOCK_LOCKED); } static void @@ -174,12 +174,12 @@ isc_rwlock_tryrdlock(isc_rwlock_t *rwl) { read_indicator_depart(rwl); LIBISC_RWLOCK_TRYRDLOCK(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } /* Acquired lock in read-only mode */ LIBISC_RWLOCK_TRYRDLOCK(rwl, ISC_R_SUCCESS); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -193,13 +193,13 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { /* Write Barriers has been raised */ if (writers_barrier_israised(rwl)) { LIBISC_RWLOCK_TRYUPGRADE(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } /* Try to acquire the write-lock */ if (!writers_lock_acquire(rwl)) { LIBISC_RWLOCK_TRYUPGRADE(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } /* Unlock the read-lock */ @@ -212,10 +212,10 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { /* Unlock the write-lock */ writers_lock_release(rwl); LIBISC_RWLOCK_TRYUPGRADE(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } LIBISC_RWLOCK_TRYUPGRADE(rwl, ISC_R_SUCCESS); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -259,13 +259,13 @@ isc_rwlock_trywrlock(isc_rwlock_t *rwl) { /* Write Barriers has been raised */ if (writers_barrier_israised(rwl)) { LIBISC_RWLOCK_TRYWRLOCK(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } /* Try to acquire the write-lock */ if (!writers_lock_acquire(rwl)) { LIBISC_RWLOCK_TRYWRLOCK(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } if (!read_indicator_isempty(rwl)) { @@ -273,11 +273,11 @@ isc_rwlock_trywrlock(isc_rwlock_t *rwl) { writers_lock_release(rwl); LIBISC_RWLOCK_TRYWRLOCK(rwl, ISC_R_LOCKBUSY); - return (ISC_R_LOCKBUSY); + return ISC_R_LOCKBUSY; } LIBISC_RWLOCK_TRYWRLOCK(rwl, ISC_R_SUCCESS); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isc/safe.c b/lib/isc/safe.c index 988034dfbe..348402507f 100644 --- a/lib/isc/safe.c +++ b/lib/isc/safe.c @@ -17,7 +17,7 @@ int isc_safe_memequal(const void *s1, const void *s2, size_t len) { - return (!CRYPTO_memcmp(s1, s2, len)); + return !CRYPTO_memcmp(s1, s2, len); } void diff --git a/lib/isc/serial.c b/lib/isc/serial.c index 5ede64bdc0..5ef37b3341 100644 --- a/lib/isc/serial.c +++ b/lib/isc/serial.c @@ -24,32 +24,32 @@ isc_serial_lt(uint32_t a, uint32_t b) { * Undefined => false */ if (a == (b ^ 0x80000000U)) { - return (false); + return false; } - return (((int32_t)(a - b) < 0) ? true : false); + return ((int32_t)(a - b) < 0) ? true : false; } bool isc_serial_gt(uint32_t a, uint32_t b) { - return (((int32_t)(a - b) > 0) ? true : false); + return ((int32_t)(a - b) > 0) ? true : false; } bool isc_serial_le(uint32_t a, uint32_t b) { - return ((a == b) ? true : isc_serial_lt(a, b)); + return (a == b) ? true : isc_serial_lt(a, b); } bool isc_serial_ge(uint32_t a, uint32_t b) { - return ((a == b) ? true : isc_serial_gt(a, b)); + return (a == b) ? true : isc_serial_gt(a, b); } bool isc_serial_eq(uint32_t a, uint32_t b) { - return ((a == b) ? true : false); + return (a == b) ? true : false; } bool isc_serial_ne(uint32_t a, uint32_t b) { - return ((a != b) ? true : false); + return (a != b) ? true : false; } diff --git a/lib/isc/signal.c b/lib/isc/signal.c index 5181f15af1..78cb9773e6 100644 --- a/lib/isc/signal.c +++ b/lib/isc/signal.c @@ -43,7 +43,7 @@ isc_signal_new(isc_loopmgr_t *loopmgr, isc_signal_cb cb, void *cbarg, uv_handle_set_data((uv_handle_t *)&signal->signal, signal); - return (signal); + return signal; } static void diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c index 7faa8578ad..f09d8aacbc 100644 --- a/lib/isc/sockaddr.c +++ b/lib/isc/sockaddr.c @@ -27,16 +27,16 @@ bool isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) { - return (isc_sockaddr_compare(a, b, - ISC_SOCKADDR_CMPADDR | - ISC_SOCKADDR_CMPPORT | - ISC_SOCKADDR_CMPSCOPE)); + return isc_sockaddr_compare(a, b, + ISC_SOCKADDR_CMPADDR | + ISC_SOCKADDR_CMPPORT | + ISC_SOCKADDR_CMPSCOPE); } bool isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) { - return (isc_sockaddr_compare( - a, b, ISC_SOCKADDR_CMPADDR | ISC_SOCKADDR_CMPSCOPE)); + return isc_sockaddr_compare( + a, b, ISC_SOCKADDR_CMPADDR | ISC_SOCKADDR_CMPSCOPE); } bool @@ -45,7 +45,7 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, REQUIRE(a != NULL && b != NULL); if (a->length != b->length) { - return (false); + return false; } /* @@ -54,7 +54,7 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, */ if (a->type.sa.sa_family != b->type.sa.sa_family) { - return (false); + return false; } switch (a->type.sa.sa_family) { case AF_INET: @@ -62,12 +62,12 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr, sizeof(a->type.sin.sin_addr)) != 0) { - return (false); + return false; } if ((flags & ISC_SOCKADDR_CMPPORT) != 0 && a->type.sin.sin_port != b->type.sin.sin_port) { - return (false); + return false; } break; case AF_INET6: @@ -75,7 +75,7 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr, sizeof(a->type.sin6.sin6_addr)) != 0) { - return (false); + return false; } /* * If ISC_SOCKADDR_CMPSCOPEZERO is set then don't return @@ -87,20 +87,20 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, (a->type.sin6.sin6_scope_id != 0 && b->type.sin6.sin6_scope_id != 0))) { - return (false); + return false; } if ((flags & ISC_SOCKADDR_CMPPORT) != 0 && a->type.sin6.sin6_port != b->type.sin6.sin6_port) { - return (false); + return false; } break; default: if (memcmp(&a->type, &b->type, a->length) != 0) { - return (false); + return false; } } - return (true); + return true; } bool @@ -109,7 +109,7 @@ isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b, isc_netaddr_t na, nb; isc_netaddr_fromsockaddr(&na, a); isc_netaddr_fromsockaddr(&nb, b); - return (isc_netaddr_eqprefix(&na, &nb, prefixlen)); + return isc_netaddr_eqprefix(&na, &nb, prefixlen); } isc_result_t @@ -137,7 +137,7 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) { ntohs(sockaddr->type.sin6.sin6_port)); break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } plen = strlen(pbuf); @@ -146,11 +146,11 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); result = isc_netaddr_totext(&netaddr, target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (1 + plen + 1 > isc_buffer_availablelength(target)) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(target, (const unsigned char *)"#", 1); @@ -163,7 +163,7 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) { INSIST(avail.length >= 1); avail.base[0] = '\0'; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -236,7 +236,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) { isc_sockaddr_hash_ex(&hash, sockaddr, address_only); - return (isc_hash32_finalize(&hash)); + return isc_hash32_finalize(&hash); } void @@ -318,13 +318,13 @@ isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) { /* * Assume that PF_xxx == AF_xxx for all AF and PF. */ - return (sockaddr->type.sa.sa_family); + return sockaddr->type.sa.sa_family; #else /* if (AF_INET == PF_INET && AF_INET6 == PF_INET6) */ switch (sockaddr->type.sa.sa_family) { case AF_INET: - return (PF_INET); + return PF_INET; case AF_INET6: - return (PF_INET6); + return PF_INET6; default: FATAL_ERROR("unknown address family: %d", (int)sockaddr->type.sa.sa_family); @@ -386,7 +386,7 @@ isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) { (int)sockaddr->type.sa.sa_family); } - return (port); + return port; } bool @@ -397,9 +397,9 @@ isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) { sockaddr->type.sa.sa_family == AF_INET6) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); - return (isc_netaddr_ismulticast(&netaddr)); + return isc_netaddr_ismulticast(&netaddr); } - return (false); + return false; } bool @@ -408,9 +408,9 @@ isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) { if (sockaddr->type.sa.sa_family == AF_INET) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); - return (isc_netaddr_isexperimental(&netaddr)); + return isc_netaddr_isexperimental(&netaddr); } - return (false); + return false; } bool @@ -419,9 +419,9 @@ isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) { if (sockaddr->type.sa.sa_family == AF_INET6) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); - return (isc_netaddr_issitelocal(&netaddr)); + return isc_netaddr_issitelocal(&netaddr); } - return (false); + return false; } bool @@ -430,9 +430,9 @@ isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) { if (sockaddr->type.sa.sa_family == AF_INET6) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); - return (isc_netaddr_islinklocal(&netaddr)); + return isc_netaddr_islinklocal(&netaddr); } - return (false); + return false; } bool @@ -441,9 +441,9 @@ isc_sockaddr_isnetzero(const isc_sockaddr_t *sockaddr) { if (sockaddr->type.sa.sa_family == AF_INET) { isc_netaddr_fromsockaddr(&netaddr, sockaddr); - return (isc_netaddr_isnetzero(&netaddr)); + return isc_netaddr_isnetzero(&netaddr); } - return (false); + return false; } isc_result_t @@ -458,14 +458,14 @@ isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa) { length = sizeof(isa->type.sin6); break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } *isa = (isc_sockaddr_t){ .length = length, .link = ISC_LINK_INITIALIZER }; memmove(isa, sa, length); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } bool @@ -475,7 +475,7 @@ isc_sockaddr_disabled(const isc_sockaddr_t *sockaddr) { (sockaddr->type.sa.sa_family == AF_INET6 && isc_net_probeipv6() == ISC_R_DISABLED)) { - return (true); + return true; } - return (false); + return false; } diff --git a/lib/isc/stats.c b/lib/isc/stats.c index 2f7e8bcde1..30474b1867 100644 --- a/lib/isc/stats.c +++ b/lib/isc/stats.c @@ -75,7 +75,7 @@ int isc_stats_ncounters(isc_stats_t *stats) { REQUIRE(ISC_STATS_VALID(stats)); - return (stats->ncounters); + return stats->ncounters; } void @@ -102,7 +102,7 @@ isc_stats_increment(isc_stats_t *stats, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); - return (atomic_fetch_add_relaxed(&stats->counters[counter], 1)); + return atomic_fetch_add_relaxed(&stats->counters[counter], 1); } void @@ -162,7 +162,7 @@ isc_stats_get_counter(isc_stats_t *stats, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); - return (atomic_load_acquire(&stats->counters[counter])); + return atomic_load_acquire(&stats->counters[counter]); } void diff --git a/lib/isc/stdio.c b/lib/isc/stdio.c index 601dcc1758..37a7fb768a 100644 --- a/lib/isc/stdio.c +++ b/lib/isc/stdio.c @@ -26,10 +26,10 @@ isc_stdio_open(const char *filename, const char *mode, FILE **fp) { f = fopen(filename, mode); if (f == NULL) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } *fp = f; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -38,9 +38,9 @@ isc_stdio_close(FILE *f) { r = fclose(f); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -50,9 +50,9 @@ isc_stdio_seek(FILE *f, off_t offset, int whence) { r = fseeko(f, offset, whence); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -65,9 +65,9 @@ isc_stdio_tell(FILE *f, off_t *offsetp) { r = ftello(f); if (r >= 0) { *offsetp = r; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -86,7 +86,7 @@ isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) { } } SET_IF_NOT_NULL(nret, r); - return (result); + return result; } isc_result_t @@ -101,7 +101,7 @@ isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f, result = isc__errno2result(errno); } SET_IF_NOT_NULL(nret, r); - return (result); + return result; } isc_result_t @@ -110,9 +110,9 @@ isc_stdio_flush(FILE *f) { r = fflush(f); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } @@ -129,20 +129,20 @@ isc_stdio_sync(FILE *f) { int r; if (fstat(fileno(f), &buf) != 0) { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } /* * Only call fsync() on regular files. */ if ((buf.st_mode & S_IFMT) != S_IFREG) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } r = fsync(fileno(f)); if (r == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (isc__errno2result(errno)); + return isc__errno2result(errno); } } diff --git a/lib/isc/stdtime.c b/lib/isc/stdtime.c index 0bd4c7ad6d..69c9be25e1 100644 --- a/lib/isc/stdtime.c +++ b/lib/isc/stdtime.c @@ -43,7 +43,7 @@ isc_stdtime_now(void) { INSIST(ts.tv_sec > 0 && ts.tv_nsec >= 0 && ts.tv_nsec < (long)NS_PER_SEC); - return ((isc_stdtime_t)ts.tv_sec); + return (isc_stdtime_t)ts.tv_sec; } void @@ -55,6 +55,6 @@ isc_stdtime_tostring(isc_stdtime_t t, char *out, size_t outlen) { /* time_t and isc_stdtime_t might be different sizes */ when = t; - INSIST((ctime_r(&when, out) != NULL)); + INSIST(ctime_r(&when, out) != NULL); *(out + strlen(out) - 1) = '\0'; } diff --git a/lib/isc/string.c b/lib/isc/string.c index e6a9ad822e..9199b30c6f 100644 --- a/lib/isc/string.c +++ b/lib/isc/string.c @@ -60,7 +60,7 @@ */ int isc_string_strerror_r(int errnum, char *buf, size_t buflen) { - return (strerror_r(errnum, buf, buflen)); + return strerror_r(errnum, buf, buflen); } #if !defined(HAVE_STRLCPY) @@ -88,7 +88,7 @@ strlcpy(char *dst, const char *src, size_t size) { } } - return (s - src - 1); /* count does not include NUL */ + return s - src - 1; /* count does not include NUL */ } #endif /* !defined(HAVE_STRLCPY) */ @@ -108,7 +108,7 @@ strlcat(char *dst, const char *src, size_t size) { n = size - dlen; if (n == 0U) { - return (dlen + strlen(s)); + return dlen + strlen(s); } while (*s != '\0') { if (n != 1U) { @@ -119,7 +119,7 @@ strlcat(char *dst, const char *src, size_t size) { } *d = '\0'; - return (dlen + (s - src)); /* count does not include NUL */ + return dlen + (s - src); /* count does not include NUL */ } #endif /* !defined(HAVE_STRLCAT) */ @@ -134,15 +134,15 @@ strnstr(const char *s, const char *find, size_t slen) { do { do { if (slen-- < 1 || (sc = *s++) == '\0') { - return (NULL); + return NULL; } } while (sc != c); if (len > slen) { - return (NULL); + return NULL; } } while (strncmp(s, find, len) != 0); s--; } - return ((char *)s); + return (char *)s; } #endif diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c index d96ab3dc60..0d4da2fe19 100644 --- a/lib/isc/symtab.c +++ b/lib/isc/symtab.c @@ -76,7 +76,7 @@ isc_symtab_create(isc_mem_t *mctx, unsigned int size, *symtabp = symtab; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -127,7 +127,7 @@ hash(const char *key, bool case_sensitive) { } } - return (h); + return h; } #define FIND(s, k, t, b, e) \ @@ -158,12 +158,12 @@ isc_symtab_lookup(isc_symtab_t *symtab, const char *key, unsigned int type, FIND(symtab, key, type, bucket, elt); if (elt == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } SET_IF_NOT_NULL(value, elt->value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -219,7 +219,7 @@ isc_symtab_define(isc_symtab_t *symtab, const char *key, unsigned int type, if (exists_policy != isc_symexists_add && elt != NULL) { if (exists_policy == isc_symexists_reject) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } INSIST(exists_policy == isc_symexists_replace); UNLINK(symtab->table[bucket], elt, link); @@ -254,7 +254,7 @@ isc_symtab_define(isc_symtab_t *symtab, const char *key, unsigned int type, grow_table(symtab); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -268,7 +268,7 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) { FIND(symtab, key, type, bucket, elt); if (elt == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (symtab->undefine_action != NULL) { @@ -279,11 +279,11 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) { isc_mem_put(symtab->mctx, elt, sizeof(*elt)); symtab->count--; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } unsigned int isc_symtab_count(isc_symtab_t *symtab) { REQUIRE(VALID_SYMTAB(symtab)); - return (symtab->count); + return symtab->count; } diff --git a/lib/isc/syslog.c b/lib/isc/syslog.c index 81b99ca490..e30b593881 100644 --- a/lib/isc/syslog.c +++ b/lib/isc/syslog.c @@ -66,8 +66,8 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp) { for (i = 0; facilities[i].strval != NULL; i++) { if (strcasecmp(facilities[i].strval, str) == 0) { *facilityp = facilities[i].val; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } diff --git a/lib/isc/thread.c b/lib/isc/thread.c index 4c0245dd36..ca0c1a219a 100644 --- a/lib/isc/thread.c +++ b/lib/isc/thread.c @@ -62,7 +62,7 @@ thread_wrap(isc_threadfunc_t func, void *arg) { .func = func, .arg = arg, }; - return (wrap); + return wrap; } static void * @@ -84,7 +84,7 @@ thread_body(struct thread_wrap *wrap) { ret = func(arg); - return (ret); + return ret; } static void * @@ -103,7 +103,7 @@ thread_run(void *wrap) { rcu_unregister_thread(); - return (ret); + return ret; } void diff --git a/lib/isc/tid.c b/lib/isc/tid.c index d19a413554..6979f0cf66 100644 --- a/lib/isc/tid.c +++ b/lib/isc/tid.c @@ -53,5 +53,5 @@ isc__tid_initcount(uint32_t count) { uint32_t isc_tid_count(void) { - return (tid_count); + return tid_count; } diff --git a/lib/isc/time.c b/lib/isc/time.c index 1a4eae228d..fc47e6c48f 100644 --- a/lib/isc/time.c +++ b/lib/isc/time.c @@ -74,10 +74,10 @@ isc_time_isepoch(const isc_time_t *t) { INSIST(t->nanoseconds < NS_PER_SEC); if (t->seconds == 0 && t->nanoseconds == 0) { - return (true); + return true; } - return (false); + return false; } static isc_time_t @@ -98,17 +98,17 @@ time_now(clockid_t clock) { t.seconds = ts.tv_sec; t.nanoseconds = ts.tv_nsec; - return (t); + return t; } isc_time_t isc_time_now_hires(void) { - return (time_now(CLOCKSOURCE_HIRES)); + return time_now(CLOCKSOURCE_HIRES); } isc_time_t isc_time_now(void) { - return (time_now(CLOCKSOURCE)); + return time_now(CLOCKSOURCE); } isc_nanosecs_t @@ -117,10 +117,12 @@ isc_time_monotonic(void) { RUNTIME_CHECK(clock_gettime(CLOCK_MONOTONIC, &ts) != -1); - return (isc_nanosecs_fromtime(((isc_time_t){ + isc_time_t time = { .seconds = ts.tv_sec, .nanoseconds = ts.tv_nsec, - }))); + }; + + return isc_nanosecs_fromtime(time); } isc_result_t @@ -133,11 +135,11 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) { if (clock_gettime(CLOCKSOURCE, &ts) == -1) { UNEXPECTED_SYSERROR(errno, "clock_gettime()"); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } if (ts.tv_sec < 0 || ts.tv_nsec < 0 || ts.tv_nsec >= (long)NS_PER_SEC) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } /* @@ -149,7 +151,7 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) { if ((ts.tv_sec > INT_MAX || i->seconds > INT_MAX) && ((long long)ts.tv_sec + i->seconds > UINT_MAX)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } t->seconds = ts.tv_sec + i->seconds; @@ -159,7 +161,7 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) { t->nanoseconds -= NS_PER_SEC; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } int @@ -168,18 +170,18 @@ isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) { INSIST(t1->nanoseconds < NS_PER_SEC && t2->nanoseconds < NS_PER_SEC); if (t1->seconds < t2->seconds) { - return (-1); + return -1; } if (t1->seconds > t2->seconds) { - return (1); + return 1; } if (t1->nanoseconds < t2->nanoseconds) { - return (-1); + return -1; } if (t1->nanoseconds > t2->nanoseconds) { - return (1); + return 1; } - return (0); + return 0; } isc_result_t @@ -189,20 +191,20 @@ isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) { /* Seconds */ if (ISC_OVERFLOW_ADD(t->seconds, i->seconds, &result->seconds)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* Nanoseconds */ result->nanoseconds = t->nanoseconds + i->nanoseconds; if (result->nanoseconds >= NS_PER_SEC) { if (result->seconds == UINT_MAX) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } result->nanoseconds -= NS_PER_SEC; result->seconds++; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -213,7 +215,7 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, /* Seconds */ if (ISC_OVERFLOW_SUB(t->seconds, i->seconds, &result->seconds)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* Nanoseconds */ @@ -221,14 +223,14 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, result->nanoseconds = t->nanoseconds - i->nanoseconds; } else { if (result->seconds == 0) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } result->seconds--; result->nanoseconds = NS_PER_SEC + t->nanoseconds - i->nanoseconds; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } uint64_t @@ -242,7 +244,7 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { i2 = (uint64_t)t2->seconds * NS_PER_SEC + t2->nanoseconds; if (i1 <= i2) { - return (0); + return 0; } i3 = i1 - i2; @@ -252,7 +254,7 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { */ i3 /= NS_PER_US; - return (i3); + return i3; } uint32_t @@ -260,7 +262,7 @@ isc_time_seconds(const isc_time_t *t) { REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_SEC); - return ((uint32_t)t->seconds); + return (uint32_t)t->seconds; } isc_result_t @@ -293,12 +295,12 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { INSIST(sizeof(time_t) >= sizeof(uint32_t)); if (t->seconds > (~0U >> 1) && seconds <= (time_t)(~0U >> 1)) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } *secondsp = seconds; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } uint32_t @@ -307,7 +309,7 @@ isc_time_nanoseconds(const isc_time_t *t) { ENSURE(t->nanoseconds < NS_PER_SEC); - return ((uint32_t)t->nanoseconds); + return (uint32_t)t->nanoseconds; } uint32_t @@ -315,7 +317,7 @@ isc_time_miliseconds(const isc_time_t *t) { REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_SEC); - return ((t->seconds * MS_PER_SEC) + (t->nanoseconds / NS_PER_MS)); + return (t->seconds * MS_PER_SEC) + (t->nanoseconds / NS_PER_MS); } void @@ -372,14 +374,14 @@ isc_time_parsehttptimestamp(char *buf, isc_time_t *t) { p = isc_tm_strptime(buf, "%a, %d %b %Y %H:%M:%S", &t_tm); if (p == NULL) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } when = isc_tm_timegm(&t_tm); if (when == -1) { - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } isc_time_set(t, when, 0); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isc/tls.c b/lib/isc/tls.c index 16e8ba15f8..79bb2e5385 100644 --- a/lib/isc/tls.c +++ b/lib/isc/tls.c @@ -125,7 +125,7 @@ isc_tlsctx_createclient(isc_tlsctx_t **ctxp) { *ctxp = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; ssl_error: err = ERR_get_error(); @@ -134,7 +134,7 @@ ssl_error: ISC_LOG_ERROR, "Error initializing TLS context: %s", errbuf); - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } isc_result_t @@ -147,14 +147,14 @@ isc_tlsctx_load_certificate(isc_tlsctx_t *ctx, const char *keyfile, rv = SSL_CTX_use_certificate_chain_file(ctx, certfile); if (rv != 1) { - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } rv = SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM); if (rv != 1) { - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -325,7 +325,7 @@ isc_tlsctx_createserver(const char *keyfile, const char *certfile, sslkeylogfile_init(ctx); *ctxp = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; ssl_error: err = ERR_get_error(); @@ -356,7 +356,7 @@ ssl_error: } #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ - return (ISC_R_TLSERROR); + return ISC_R_TLSERROR; } static long @@ -383,12 +383,12 @@ get_tls_version_disable_bit(const isc_tls_protocol_version_t tls_ver) { break; }; - return (bit); + return bit; } bool isc_tls_protocol_supported(const isc_tls_protocol_version_t tls_ver) { - return (get_tls_version_disable_bit(tls_ver) != 0); + return get_tls_version_disable_bit(tls_ver) != 0; } isc_tls_protocol_version_t @@ -396,12 +396,12 @@ isc_tls_protocol_name_to_version(const char *name) { REQUIRE(name != NULL); if (strcasecmp(name, "TLSv1.2") == 0) { - return (ISC_TLS_PROTO_VER_1_2); + return ISC_TLS_PROTO_VER_1_2; } else if (strcasecmp(name, "TLSv1.3") == 0) { - return (ISC_TLS_PROTO_VER_1_3); + return ISC_TLS_PROTO_VER_1_3; } - return (ISC_TLS_PROTO_VER_UNDEFINED); + return ISC_TLS_PROTO_VER_UNDEFINED; } void @@ -476,18 +476,18 @@ isc_tlsctx_load_dhparams(isc_tlsctx_t *ctx, const char *dhparams_file) { fclose(paramfile); if (dh == NULL) { - return (false); + return false; } else if (DH_check(dh, &check) != 1 || check != 0) { DH_free(dh); - return (false); + return false; } } else { - return (false); + return false; } if (SSL_CTX_set_tmp_dh(ctx, dh) != 1) { DH_free(dh); - return (false); + return false; } DH_free(dh); @@ -498,19 +498,19 @@ isc_tlsctx_load_dhparams(isc_tlsctx_t *ctx, const char *dhparams_file) { bio = BIO_new_file(dhparams_file, "r"); if (bio == NULL) { - return (false); + return false; } dh = PEM_read_bio_Parameters(bio, NULL); if (dh == NULL) { BIO_free(bio); - return (false); + return false; } if (SSL_CTX_set0_tmp_dh_pkey(ctx, dh) != 1) { BIO_free(bio); EVP_PKEY_free(dh); - return (false); + return false; } /* No need to call EVP_PKEY_free(dh) as the "dh" is owned by the @@ -519,7 +519,7 @@ isc_tlsctx_load_dhparams(isc_tlsctx_t *ctx, const char *dhparams_file) { BIO_free(bio); #endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ - return (true); + return true; } bool @@ -530,23 +530,23 @@ isc_tls_cipherlist_valid(const char *cipherlist) { REQUIRE(cipherlist != NULL); if (*cipherlist == '\0') { - return (false); + return false; } method = TLS_server_method(); if (method == NULL) { - return (false); + return false; } tmp_ctx = SSL_CTX_new(method); if (tmp_ctx == NULL) { - return (false); + return false; } result = SSL_CTX_set_cipher_list(tmp_ctx, cipherlist) == 1; isc_tlsctx_free(&tmp_ctx); - return (result); + return result; } void @@ -566,23 +566,23 @@ isc_tls_cipher_suites_valid(const char *cipher_suites) { REQUIRE(cipher_suites != NULL); if (*cipher_suites == '\0') { - return (false); + return false; } method = TLS_server_method(); if (method == NULL) { - return (false); + return false; } tmp_ctx = SSL_CTX_new(method); if (tmp_ctx == NULL) { - return (false); + return false; } result = SSL_CTX_set_ciphersuites(tmp_ctx, cipher_suites) == 1; isc_tlsctx_free(&tmp_ctx); - return (result); + return result; } void @@ -633,7 +633,7 @@ isc_tls_create(isc_tlsctx_t *ctx) { errbuf); } - return (newctx); + return newctx; } void @@ -650,7 +650,7 @@ const char * isc_tls_verify_peer_result_string(isc_tls_t *tls) { REQUIRE(tls != NULL); - return (X509_verify_cert_error_string(SSL_get_verify_result(tls))); + return X509_verify_cert_error_string(SSL_get_verify_result(tls)); } #if HAVE_LIBNGHTTP2 @@ -665,9 +665,9 @@ select_next_proto_cb(SSL *ssl, unsigned char **out, unsigned char *outlen, UNUSED(arg); if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) { - return (SSL_TLSEXT_ERR_NOACK); + return SSL_TLSEXT_ERR_NOACK; } - return (SSL_TLSEXT_ERR_OK); + return SSL_TLSEXT_ERR_OK; } #endif /* !OPENSSL_NO_NEXTPROTONEG */ @@ -692,7 +692,7 @@ next_proto_cb(isc_tls_t *ssl, const unsigned char **data, unsigned int *len, *data = (const unsigned char *)NGHTTP2_PROTO_ALPN; *len = (unsigned int)NGHTTP2_PROTO_ALPN_LEN; - return (SSL_TLSEXT_ERR_OK); + return SSL_TLSEXT_ERR_OK; } #endif /* !OPENSSL_NO_NEXTPROTONEG */ @@ -708,10 +708,10 @@ alpn_select_proto_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, outlen, in, inlen); if (ret != 1) { - return (SSL_TLSEXT_ERR_NOACK); + return SSL_TLSEXT_ERR_NOACK; } - return (SSL_TLSEXT_ERR_OK); + return SSL_TLSEXT_ERR_OK; } void @@ -748,10 +748,10 @@ protoneg_check_protocol(const uint8_t **pout, uint8_t *pout_len, if (memcmp(&in[i], key, key_len) == 0) { *pout = (const uint8_t *)(&in[i + 1]); *pout_len = in[i]; - return (true); + return true; } } - return (false); + return false; } /* dot prepended by its length (3 bytes) */ @@ -761,9 +761,9 @@ protoneg_check_protocol(const uint8_t **pout, uint8_t *pout_len, static bool dot_select_next_protocol(const uint8_t **pout, uint8_t *pout_len, const uint8_t *in, size_t in_len) { - return (protoneg_check_protocol(pout, pout_len, in, in_len, - (const uint8_t *)DOT_PROTO_ALPN, - DOT_PROTO_ALPN_LEN)); + return protoneg_check_protocol(pout, pout_len, in, in_len, + (const uint8_t *)DOT_PROTO_ALPN, + DOT_PROTO_ALPN_LEN); } void @@ -786,10 +786,10 @@ dot_alpn_select_proto_cb(SSL *ssl, const unsigned char **out, ret = dot_select_next_protocol(out, outlen, in, inlen); if (!ret) { - return (SSL_TLSEXT_ERR_NOACK); + return SSL_TLSEXT_ERR_NOACK; } - return (SSL_TLSEXT_ERR_OK); + return SSL_TLSEXT_ERR_OK; } void @@ -826,7 +826,7 @@ isc_tlsctx_enable_peer_verification(isc_tlsctx_t *tlsctx, const bool is_server, } if (ret != 1) { ERR_clear_error(); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } #ifdef X509_CHECK_FLAG_NEVER_CHECK_SUBJECT @@ -865,7 +865,7 @@ isc_tlsctx_enable_peer_verification(isc_tlsctx_t *tlsctx, const bool is_server, SSL_CTX_set_verify(tlsctx, SSL_VERIFY_PEER, NULL); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -877,12 +877,12 @@ isc_tlsctx_load_client_ca_names(isc_tlsctx_t *ctx, const char *ca_bundle_file) { cert_names = SSL_load_client_CA_file(ca_bundle_file); if (cert_names == NULL) { ERR_clear_error(); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } SSL_CTX_set_client_CA_list(ctx, cert_names); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -914,14 +914,14 @@ isc_tls_cert_store_create(const char *ca_bundle_filename, } *pstore = store; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; error: ERR_clear_error(); if (store != NULL) { X509_STORE_free(store); } - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } void @@ -1148,7 +1148,7 @@ isc_tlsctx_cache_add( RWUNLOCK(&cache->rwlock, isc_rwlocktype_write); - return (result); + return result; } isc_result_t @@ -1205,7 +1205,7 @@ isc_tlsctx_cache_find( RWUNLOCK(&cache->rwlock, isc_rwlocktype_read); - return (result); + return result; } typedef struct client_session_cache_entry client_session_cache_entry_t; @@ -1499,7 +1499,7 @@ const isc_tlsctx_t * isc_tlsctx_client_session_cache_getctx( isc_tlsctx_client_session_cache_t *cache) { REQUIRE(VALID_TLSCTX_CLIENT_SESSION_CACHE(cache)); - return (cache->ctx); + return cache->ctx; } void @@ -1544,7 +1544,7 @@ isc__tls_toresult(isc_result_t fallback) { break; } - return (result); + return result; } isc_result_t @@ -1589,5 +1589,5 @@ isc__tlserr2result(isc_logcategory_t category, isc_logmodule_t module, done: ERR_clear_error(); - return (result); + return result; } diff --git a/lib/isc/tm.c b/lib/isc/tm.c index eafa118790..07842be3db 100644 --- a/lib/isc/tm.c +++ b/lib/isc/tm.c @@ -92,7 +92,7 @@ conv_num(const char **buf, int *dest, int llim, int ulim) { int rulim = ulim; if (!isdigit((unsigned char)**buf)) { - return (0); + return 0; } do { @@ -102,11 +102,11 @@ conv_num(const char **buf, int *dest, int llim, int ulim) { isdigit((unsigned char)**buf)); if (result < llim || result > ulim) { - return (0); + return 0; } *dest = result; - return (1); + return 1; } time_t @@ -130,7 +130,7 @@ isc_tm_timegm(struct tm *tm) { (86400 * (yday + ((tm->tm_year - 70) * 365) + ((tm->tm_year - 69) / 4) - ((tm->tm_year - 1) / 100) + ((tm->tm_year + 299) / 400))); - return (ret); + return ret; } char * @@ -171,7 +171,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case '%': /* "%%" is converted to "%". */ literal: if (c != *bp++) { - return (0); + return 0; } break; @@ -195,49 +195,49 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'c': /* Date and time, using the locale's format. */ LEGAL_ALT(ALT_E); if (!(bp = isc_tm_strptime(bp, "%x %X", tm))) { - return (0); + return 0; } break; case 'D': /* The date as "%m/%d/%y". */ LEGAL_ALT(0); if (!(bp = isc_tm_strptime(bp, "%m/%d/%y", tm))) { - return (0); + return 0; } break; case 'R': /* The time as "%H:%M". */ LEGAL_ALT(0); if (!(bp = isc_tm_strptime(bp, "%H:%M", tm))) { - return (0); + return 0; } break; case 'r': /* The time in 12-hour clock representation. */ LEGAL_ALT(0); if (!(bp = isc_tm_strptime(bp, "%I:%M:%S %p", tm))) { - return (0); + return 0; } break; case 'T': /* The time as "%H:%M:%S". */ LEGAL_ALT(0); if (!(bp = isc_tm_strptime(bp, "%H:%M:%S", tm))) { - return (0); + return 0; } break; case 'X': /* The time, using the locale's format. */ LEGAL_ALT(ALT_E); if (!(bp = isc_tm_strptime(bp, "%H:%M:%S", tm))) { - return (0); + return 0; } break; case 'x': /* The date, using the locale's format. */ LEGAL_ALT(ALT_E); if (!(bp = isc_tm_strptime(bp, "%m/%d/%y", tm))) { - return (0); + return 0; } break; @@ -263,7 +263,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { /* Nothing matched. */ if (i == 7) { - return (0); + return 0; } tm->tm_wday = i; @@ -290,7 +290,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { /* Nothing matched. */ if (i == 12) { - return (0); + return 0; } tm->tm_mon = i; @@ -300,7 +300,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'C': /* The century number. */ LEGAL_ALT(ALT_E); if (!(conv_num(&bp, &i, 0, 99))) { - return (0); + return 0; } if (split_year) { @@ -315,7 +315,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'e': LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_mday, 1, 31))) { - return (0); + return 0; } break; @@ -325,7 +325,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'H': LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_hour, 0, 23))) { - return (0); + return 0; } break; @@ -335,7 +335,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'I': LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_hour, 1, 12))) { - return (0); + return 0; } if (tm->tm_hour == 12) { tm->tm_hour = 0; @@ -345,7 +345,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'j': /* The day of year. */ LEGAL_ALT(0); if (!(conv_num(&bp, &i, 1, 366))) { - return (0); + return 0; } tm->tm_yday = i - 1; break; @@ -353,14 +353,14 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'M': /* The minute. */ LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_min, 0, 59))) { - return (0); + return 0; } break; case 'm': /* The month. */ LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &i, 1, 12))) { - return (0); + return 0; } tm->tm_mon = i - 1; break; @@ -370,7 +370,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { /* AM? */ if (strcasecmp(am_pm[0], bp) == 0) { if (tm->tm_hour > 11) { - return (0); + return 0; } bp += strlen(am_pm[0]); @@ -380,7 +380,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { else if (strcasecmp(am_pm[1], bp) == 0) { if (tm->tm_hour > 11) { - return (0); + return 0; } tm->tm_hour += 12; @@ -389,12 +389,12 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { } /* Nothing matched. */ - return (0); + return 0; case 'S': /* The seconds. */ LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_sec, 0, 61))) { - return (0); + return 0; } break; @@ -408,21 +408,21 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { * range for now. */ if (!(conv_num(&bp, &i, 0, 53))) { - return (0); + return 0; } break; case 'w': /* The day of week, beginning on sunday. */ LEGAL_ALT(ALT_O); if (!(conv_num(&bp, &tm->tm_wday, 0, 6))) { - return (0); + return 0; } break; case 'Y': /* The year. */ LEGAL_ALT(ALT_E); if (!(conv_num(&bp, &i, 0, 9999))) { - return (0); + return 0; } tm->tm_year = i - TM_YEAR_BASE; @@ -431,7 +431,7 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { case 'y': /* The year within 100 years of the epoch. */ LEGAL_ALT(ALT_E | ALT_O); if (!(conv_num(&bp, &i, 0, 99))) { - return (0); + return 0; } if (split_year) { @@ -458,10 +458,10 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { break; default: /* Unknown/unsupported conversion. */ - return (0); + return 0; } } /* LINTED functional specification */ - return (UNCONST(bp)); + return UNCONST(bp); } diff --git a/lib/isc/url.c b/lib/isc/url.c index 320a8638e4..6ba4cb4991 100644 --- a/lib/isc/url.c +++ b/lib/isc/url.c @@ -222,12 +222,12 @@ typedef enum { static state_t parse_url_char(state_t s, const char ch) { if (ch == ' ' || ch == '\r' || ch == '\n') { - return (s_dead); + return s_dead; } #if HTTP_PARSER_STRICT if (ch == '\t' || ch == '\f') { - return (s_dead); + return s_dead; } #endif @@ -239,77 +239,77 @@ parse_url_char(state_t s, const char ch) { */ if (ch == '/' || ch == '*') { - return (s_req_path); + return s_req_path; } if (isalpha((unsigned char)ch)) { - return (s_req_schema); + return s_req_schema; } break; case s_req_schema: if (isalpha((unsigned char)ch)) { - return (s); + return s; } if (ch == ':') { - return (s_req_schema_slash); + return s_req_schema_slash; } break; case s_req_schema_slash: if (ch == '/') { - return (s_req_schema_slash_slash); + return s_req_schema_slash_slash; } break; case s_req_schema_slash_slash: if (ch == '/') { - return (s_req_server_start); + return s_req_server_start; } break; case s_req_server_with_at: if (ch == '@') { - return (s_dead); + return s_dead; } FALLTHROUGH; case s_req_server_start: case s_req_server: if (ch == '/') { - return (s_req_path); + return s_req_path; } if (ch == '?') { - return (s_req_query_string_start); + return s_req_query_string_start; } if (ch == '@') { - return (s_req_server_with_at); + return s_req_server_with_at; } if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') { - return (s_req_server); + return s_req_server; } break; case s_req_path: if (IS_URL_CHAR(ch)) { - return (s); + return s; } switch (ch) { case '?': - return (s_req_query_string_start); + return s_req_query_string_start; case '#': - return (s_req_fragment_start); + return s_req_fragment_start; } break; @@ -317,44 +317,44 @@ parse_url_char(state_t s, const char ch) { case s_req_query_string_start: case s_req_query_string: if (IS_URL_CHAR(ch)) { - return (s_req_query_string); + return s_req_query_string; } switch (ch) { case '?': /* allow extra '?' in query string */ - return (s_req_query_string); + return s_req_query_string; case '#': - return (s_req_fragment_start); + return s_req_fragment_start; } break; case s_req_fragment_start: if (IS_URL_CHAR(ch)) { - return (s_req_fragment); + return s_req_fragment; } switch (ch) { case '?': - return (s_req_fragment); + return s_req_fragment; case '#': - return (s); + return s; } break; case s_req_fragment: if (IS_URL_CHAR(ch)) { - return (s); + return s; } switch (ch) { case '?': case '#': - return (s); + return s; } break; @@ -367,7 +367,7 @@ parse_url_char(state_t s, const char ch) { * We should never fall out of the switch above unless there's an * error. */ - return (s_dead); + return s_dead; } static host_state_t @@ -376,57 +376,57 @@ http_parse_host_char(host_state_t s, const char ch) { case s_http_userinfo: case s_http_userinfo_start: if (ch == '@') { - return (s_http_host_start); + return s_http_host_start; } if (IS_USERINFO_CHAR(ch)) { - return (s_http_userinfo); + return s_http_userinfo; } break; case s_http_host_start: if (ch == '[') { - return (s_http_host_v6_start); + return s_http_host_v6_start; } if (IS_HOST_CHAR(ch)) { - return (s_http_host); + return s_http_host; } break; case s_http_host: if (IS_HOST_CHAR(ch)) { - return (s_http_host); + return s_http_host; } FALLTHROUGH; case s_http_host_v6_end: if (ch == ':') { - return (s_http_host_port_start); + return s_http_host_port_start; } break; case s_http_host_v6: if (ch == ']') { - return (s_http_host_v6_end); + return s_http_host_v6_end; } FALLTHROUGH; case s_http_host_v6_start: if (isxdigit((unsigned char)ch) || ch == ':' || ch == '.') { - return (s_http_host_v6); + return s_http_host_v6; } if (s == s_http_host_v6 && ch == '%') { - return (s_http_host_v6_zone_start); + return s_http_host_v6_zone_start; } break; case s_http_host_v6_zone: if (ch == ']') { - return (s_http_host_v6_end); + return s_http_host_v6_end; } FALLTHROUGH; @@ -435,14 +435,14 @@ http_parse_host_char(host_state_t s, const char ch) { if (isalnum((unsigned char)ch) || ch == '%' || ch == '.' || ch == '-' || ch == '_' || ch == '~') { - return (s_http_host_v6_zone); + return s_http_host_v6_zone; } break; case s_http_host_port: case s_http_host_port_start: if (isdigit((unsigned char)ch)) { - return (s_http_host_port); + return s_http_host_port; } break; @@ -451,7 +451,7 @@ http_parse_host_char(host_state_t s, const char ch) { break; } - return (s_http_host_dead); + return s_http_host_dead; } static isc_result_t @@ -471,7 +471,7 @@ http_parse_host(const char *buf, isc_url_parser_t *up, int found_at) { host_state_t new_s = http_parse_host_char(s, *p); if (new_s == s_http_host_dead) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } switch (new_s) { @@ -533,12 +533,12 @@ http_parse_host(const char *buf, isc_url_parser_t *up, int found_at) { case s_http_host_port_start: case s_http_userinfo: case s_http_userinfo_start: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; default: break; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -550,7 +550,7 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, const char *p = NULL; if (buflen == 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } up->port = up->field_set = 0; @@ -563,7 +563,7 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, /* Figure out the next field that we're operating on */ switch (s) { case s_dead: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; /* Skip delimiters */ case s_req_schema_slash: @@ -618,7 +618,7 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, if ((up->field_set & (1 << ISC_UF_SCHEMA)) && (up->field_set & (1 << ISC_UF_HOST)) == 0) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (up->field_set & (1 << ISC_UF_HOST)) { @@ -626,7 +626,7 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, result = http_parse_host(buf, up, found_at); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -634,7 +634,7 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, if (is_connect && up->field_set != ((1 << ISC_UF_HOST) | (1 << ISC_UF_PORT))) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (up->field_set & (1 << ISC_UF_PORT)) { @@ -661,12 +661,12 @@ isc_url_parse(const char *buf, size_t buflen, bool is_connect, /* Ports have a max value of 2^16 */ if (v > 0xffff) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } } up->port = (uint16_t)v; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isc/utf8.c b/lib/isc/utf8.c index a348c5dab2..9bc2a74fb9 100644 --- a/lib/isc/utf8.c +++ b/lib/isc/utf8.c @@ -43,7 +43,7 @@ isc_utf8_valid(const unsigned char *buf, size_t len) { w = (buf[i] & 0x1f) << 6; w |= (buf[++i] & 0x3f); if (w < 0x80) { - return (false); + return false; } continue; } @@ -55,7 +55,7 @@ isc_utf8_valid(const unsigned char *buf, size_t len) { w |= (buf[++i] & 0x3f) << 6; w |= (buf[++i] & 0x3f); if (w < 0x0800) { - return (false); + return false; } continue; } @@ -69,13 +69,13 @@ isc_utf8_valid(const unsigned char *buf, size_t len) { w |= (buf[++i] & 0x3f) << 6; w |= (buf[++i] & 0x3f); if (w < 0x10000 || w > 0x10FFFF) { - return (false); + return false; } continue; } - return (false); + return false; } - return (true); + return true; } bool @@ -83,7 +83,7 @@ isc_utf8_bom(const unsigned char *buf, size_t len) { REQUIRE(buf != NULL); if (len >= 3U && !memcmp(buf, "\xef\xbb\xbf", 3)) { - return (true); + return true; } - return (false); + return false; } diff --git a/lib/isc/uv.c b/lib/isc/uv.c index 41b926d270..7ad878cf7f 100644 --- a/lib/isc/uv.c +++ b/lib/isc/uv.c @@ -28,68 +28,68 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line, const char *func) { switch (uverr) { case 0: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case UV_ENOTDIR: case UV_ELOOP: case UV_EINVAL: /* XXX sometimes this is not for files */ case UV_ENAMETOOLONG: case UV_EBADF: - return (ISC_R_INVALIDFILE); + return ISC_R_INVALIDFILE; case UV_ENOENT: - return (ISC_R_FILENOTFOUND); + return ISC_R_FILENOTFOUND; case UV_EAGAIN: - return (ISC_R_NOCONN); + return ISC_R_NOCONN; case UV_EACCES: case UV_EPERM: - return (ISC_R_NOPERM); + return ISC_R_NOPERM; case UV_EEXIST: - return (ISC_R_FILEEXISTS); + return ISC_R_FILEEXISTS; case UV_EIO: - return (ISC_R_IOERROR); + return ISC_R_IOERROR; case UV_ENOMEM: - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; case UV_ENFILE: case UV_EMFILE: - return (ISC_R_TOOMANYOPENFILES); + return ISC_R_TOOMANYOPENFILES; case UV_ENOSPC: - return (ISC_R_DISCFULL); + return ISC_R_DISCFULL; case UV_EPIPE: case UV_ECONNRESET: case UV_ECONNABORTED: - return (ISC_R_CONNECTIONRESET); + return ISC_R_CONNECTIONRESET; case UV_ENOTCONN: - return (ISC_R_NOTCONNECTED); + return ISC_R_NOTCONNECTED; case UV_ETIMEDOUT: - return (ISC_R_TIMEDOUT); + return ISC_R_TIMEDOUT; case UV_ENOBUFS: - return (ISC_R_NORESOURCES); + return ISC_R_NORESOURCES; case UV_EAFNOSUPPORT: - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; case UV_ENETDOWN: - return (ISC_R_NETDOWN); + return ISC_R_NETDOWN; case UV_EHOSTDOWN: - return (ISC_R_HOSTDOWN); + return ISC_R_HOSTDOWN; case UV_ENETUNREACH: - return (ISC_R_NETUNREACH); + return ISC_R_NETUNREACH; case UV_EHOSTUNREACH: - return (ISC_R_HOSTUNREACH); + return ISC_R_HOSTUNREACH; case UV_EADDRINUSE: - return (ISC_R_ADDRINUSE); + return ISC_R_ADDRINUSE; case UV_EADDRNOTAVAIL: - return (ISC_R_ADDRNOTAVAIL); + return ISC_R_ADDRNOTAVAIL; case UV_ECONNREFUSED: - return (ISC_R_CONNREFUSED); + return ISC_R_CONNREFUSED; case UV_ECANCELED: - return (ISC_R_CANCELED); + return ISC_R_CANCELED; case UV_EOF: - return (ISC_R_EOF); + return ISC_R_EOF; case UV_EMSGSIZE: - return (ISC_R_MAXSIZE); + return ISC_R_MAXSIZE; case UV_ENOTSUP: - return (ISC_R_FAMILYNOSUPPORT); + return ISC_R_FAMILYNOSUPPORT; case UV_ENOPROTOOPT: case UV_EPROTONOSUPPORT: - return (ISC_R_INVALIDPROTO); + return ISC_R_INVALIDPROTO; default: if (dolog) { UNEXPECTED_ERROR("unable to convert libuv error code " @@ -97,7 +97,7 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line, func, file, line, uverr, uv_strerror(uverr)); } - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -106,17 +106,17 @@ static isc_mem_t *isc__uv_mctx = NULL; static void * isc__uv_malloc(size_t size) { - return (isc_mem_allocate(isc__uv_mctx, size)); + return isc_mem_allocate(isc__uv_mctx, size); } static void * isc__uv_realloc(void *ptr, size_t size) { - return (isc_mem_reallocate(isc__uv_mctx, ptr, size)); + return isc_mem_reallocate(isc__uv_mctx, ptr, size); } static void * isc__uv_calloc(size_t count, size_t size) { - return (isc_mem_callocate(isc__uv_mctx, count, size)); + return isc_mem_callocate(isc__uv_mctx, count, size); } static void diff --git a/lib/isc/xml.c b/lib/isc/xml.c index bfea645ea5..7dd9424fe5 100644 --- a/lib/isc/xml.c +++ b/lib/isc/xml.c @@ -23,17 +23,17 @@ static isc_mem_t *isc__xml_mctx = NULL; static void * isc__xml_malloc(size_t size) { - return (isc_mem_allocate(isc__xml_mctx, size)); + return isc_mem_allocate(isc__xml_mctx, size); } static void * isc__xml_realloc(void *ptr, size_t size) { - return (isc_mem_reallocate(isc__xml_mctx, ptr, size)); + return isc_mem_reallocate(isc__xml_mctx, ptr, size); } static char * isc__xml_strdup(const char *str) { - return (isc_mem_strdup(isc__xml_mctx, str)); + return isc_mem_strdup(isc__xml_mctx, str); } static void diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c index 255de24423..937bc57604 100644 --- a/lib/isccc/alist.c +++ b/lib/isccc/alist.c @@ -55,15 +55,15 @@ isccc_alist_create(void) { tag = isccc_sexpr_fromstring(ALIST_TAG); if (tag == NULL) { - return (NULL); + return NULL; } alist = isccc_sexpr_cons(tag, NULL); if (alist == NULL) { isccc_sexpr_free(&tag); - return (NULL); + return NULL; } - return (alist); + return alist; } bool @@ -71,16 +71,16 @@ isccc_alist_alistp(isccc_sexpr_t *alist) { isccc_sexpr_t *car; if (alist == NULL || alist->type != ISCCC_SEXPRTYPE_DOTTEDPAIR) { - return (false); + return false; } car = CAR(alist); if (car == NULL || car->type != ISCCC_SEXPRTYPE_STRING) { - return (false); + return false; } if (strcmp(car->value.as_string, ALIST_TAG) != 0) { - return (false); + return false; } - return (true); + return true; } bool @@ -88,16 +88,16 @@ isccc_alist_emptyp(isccc_sexpr_t *alist) { REQUIRE(isccc_alist_alistp(alist)); if (CDR(alist) == NULL) { - return (true); + return true; } - return (false); + return false; } isccc_sexpr_t * isccc_alist_first(isccc_sexpr_t *alist) { REQUIRE(isccc_alist_alistp(alist)); - return (CDR(alist)); + return CDR(alist); } isccc_sexpr_t * @@ -119,12 +119,12 @@ isccc_alist_assq(isccc_sexpr_t *alist, const char *key) { if (caar->type == ISCCC_SEXPRTYPE_STRING && strcmp(caar->value.as_string, key) == 0) { - return (car); + return car; } alist = CDR(alist); } - return (NULL); + return NULL; } void @@ -165,17 +165,17 @@ isccc_alist_define(isccc_sexpr_t *alist, const char *key, */ k = isccc_sexpr_fromstring(key); if (k == NULL) { - return (NULL); + return NULL; } kv = isccc_sexpr_cons(k, value); if (kv == NULL) { isccc_sexpr_free(&kv); - return (NULL); + return NULL; } elt = isccc_sexpr_addtolist(&alist, kv); if (elt == NULL) { isccc_sexpr_free(&kv); - return (NULL); + return NULL; } } else { /* @@ -185,7 +185,7 @@ isccc_alist_define(isccc_sexpr_t *alist, const char *key, CDR(kv) = value; } - return (kv); + return kv; } isccc_sexpr_t * @@ -195,14 +195,14 @@ isccc_alist_definestring(isccc_sexpr_t *alist, const char *key, v = isccc_sexpr_fromstring(str); if (v == NULL) { - return (NULL); + return NULL; } kv = isccc_alist_define(alist, key, v); if (kv == NULL) { isccc_sexpr_free(&v); } - return (kv); + return kv; } isccc_sexpr_t * @@ -212,14 +212,14 @@ isccc_alist_definebinary(isccc_sexpr_t *alist, const char *key, v = isccc_sexpr_frombinary(r); if (v == NULL) { - return (NULL); + return NULL; } kv = isccc_alist_define(alist, key, v); if (kv == NULL) { isccc_sexpr_free(&v); } - return (kv); + return kv; } isccc_sexpr_t * @@ -228,9 +228,9 @@ isccc_alist_lookup(isccc_sexpr_t *alist, const char *key) { kv = isccc_alist_assq(alist, key); if (kv != NULL) { - return (CDR(kv)); + return CDR(kv); } - return (NULL); + return NULL; } isc_result_t @@ -244,13 +244,13 @@ isccc_alist_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) { if (strp != NULL) { *strp = isccc_sexpr_tostring(v); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -265,13 +265,13 @@ isccc_alist_lookupbinary(isccc_sexpr_t *alist, const char *key, if (r != NULL) { *r = isccc_sexpr_tobinary(v); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } void diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c index fd0f3811c6..3ead3633e7 100644 --- a/lib/isccc/base64.c +++ b/lib/isccc/base64.c @@ -51,11 +51,11 @@ isccc_base64_encode(isccc_region_t *source, int wordlength, result = isc_base64_totext(&sr, wordlength, wordbreak, &tb); if (result != ISC_R_SUCCESS) { - return (result); + return result; } source->rstart = source->rend; target->rstart = isc_buffer_used(&tb); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -67,8 +67,8 @@ isccc_base64_decode(const char *cstr, isccc_region_t *target) { (unsigned int)(target->rend - target->rstart)); result = isc_base64_decodestring(cstr, &b); if (result != ISC_R_SUCCESS) { - return (result); + return result; } target->rstart = isc_buffer_used(&b); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 8c80732b2a..8bb50a616d 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -118,14 +118,14 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { len = REGION_SIZE(*vr); result = isc_buffer_reserve(*buffer, 1 + 4); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(*buffer, ISCCC_CCMSGTYPE_BINARYDATA); isc_buffer_putuint32(*buffer, len); result = isc_buffer_reserve(*buffer, len); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putmem(*buffer, vr->rstart, len); } else if (isccc_alist_alistp(elt)) { @@ -134,7 +134,7 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { result = isc_buffer_reserve(*buffer, 1 + 4); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(*buffer, ISCCC_CCMSGTYPE_TABLE); /* @@ -148,7 +148,7 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { */ result = table_towire(elt, buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } len = (*buffer)->used - used; @@ -168,7 +168,7 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { result = isc_buffer_reserve(*buffer, 1 + 4); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(*buffer, ISCCC_CCMSGTYPE_LIST); /* @@ -182,7 +182,7 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { */ result = list_towire(elt, buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } len = (*buffer)->used - used; @@ -198,7 +198,7 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { isc_buffer_putuint32(&b, len); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -222,7 +222,7 @@ table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) { */ result = isc_buffer_reserve(*buffer, 1 + len); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } isc_buffer_putuint8(*buffer, (uint8_t)len); isc_buffer_putmem(*buffer, (const unsigned char *)ks, len); @@ -231,11 +231,11 @@ table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) { */ result = value_towire(v, buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -245,12 +245,12 @@ list_towire(isccc_sexpr_t *list, isc_buffer_t **buffer) { while (list != NULL) { result = value_towire(ISCCC_SEXPR_CAR(list), buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } list = ISCCC_SEXPR_CDR(list); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -285,13 +285,13 @@ sign(unsigned char *data, unsigned int length, unsigned char *out, md_type = ISC_MD_SHA512; break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = isc_hmac(md_type, secret->rstart, REGION_SIZE(*secret), data, length, digest, &digestlen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } source.rend = digest + digestlen; @@ -300,14 +300,14 @@ sign(unsigned char *data, unsigned int length, unsigned char *out, target.rend = digestb64 + sizeof(digestb64); result = isccc_base64_encode(&source, 64, "", &target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (algorithm == ISCCC_ALG_HMACMD5) { PUT_MEM(digestb64, HMD5_LENGTH, out); } else { PUT_MEM(digestb64, HSHA_LENGTH, out); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -321,7 +321,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, uint32_t algorithm, ? sizeof(auth_hmd5) : sizeof(auth_hsha))); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } /* @@ -363,15 +363,15 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, uint32_t algorithm, */ result = table_towire(alist, buffer); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (secret != NULL) { - return (sign((unsigned char *)(*buffer)->base + signed_base, - (*buffer)->used - signed_base, - (unsigned char *)(*buffer)->base + hmac_base, - algorithm, secret)); + return sign((unsigned char *)(*buffer)->base + signed_base, + (*buffer)->used - signed_base, + (unsigned char *)(*buffer)->base + hmac_base, + algorithm, secret); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -391,7 +391,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, */ _auth = isccc_alist_lookup(alist, "_auth"); if (!isccc_alist_alistp(_auth)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (algorithm == ISCCC_ALG_HMACMD5) { hmacvalue = isccc_alist_lookup(_auth, "hmd5"); @@ -399,7 +399,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, hmacvalue = isccc_alist_lookup(_auth, "hsha"); } if (!isccc_sexpr_binaryp(hmacvalue)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * Compute digest. @@ -426,13 +426,13 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, md_type = ISC_MD_SHA512; break; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } result = isc_hmac(md_type, secret->rstart, REGION_SIZE(*secret), data, length, digest, &digestlen); if (result != ISC_R_SUCCESS) { - return (result); + return result; } source.rend = digest + digestlen; @@ -441,7 +441,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, memset(digestb64, 0, sizeof(digestb64)); result = isccc_base64_encode(&source, 64, "", &target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -453,11 +453,11 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, region = isccc_sexpr_tobinary(hmacvalue); if ((region->rend - region->rstart) != HMD5_LENGTH) { - return (ISCCC_R_BADAUTH); + return ISCCC_R_BADAUTH; } value = region->rstart; if (!isc_safe_memequal(value, digestb64, HMD5_LENGTH)) { - return (ISCCC_R_BADAUTH); + return ISCCC_R_BADAUTH; } } else { isccc_region_t *region; @@ -471,18 +471,18 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, * to identify which algorithm is in use. */ if ((region->rend - region->rstart) != HSHA_LENGTH + 1) { - return (ISCCC_R_BADAUTH); + return ISCCC_R_BADAUTH; } value = region->rstart; GET8(valalg, value); if ((valalg != algorithm) || !isc_safe_memequal(value, digestb64, HSHA_LENGTH)) { - return (ISCCC_R_BADAUTH); + return ISCCC_R_BADAUTH; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -503,16 +503,16 @@ value_fromwire(isccc_region_t *source, unsigned int depth, isc_result_t result; if (depth > ISCCC_MAXDEPTH) { - return (ISCCC_R_MAXDEPTH); + return ISCCC_R_MAXDEPTH; } if (REGION_SIZE(*source) < 1 + 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } GET8(msgtype, source->rstart); GET32(len, source->rstart); if (REGION_SIZE(*source) < len) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } active.rstart = source->rstart; active.rend = active.rstart + len; @@ -533,7 +533,7 @@ value_fromwire(isccc_region_t *source, unsigned int depth, result = ISCCC_R_SYNTAX; } - return (result); + return result; } static isc_result_t @@ -549,14 +549,14 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret, REQUIRE(alistp != NULL && *alistp == NULL); if (depth > ISCCC_MAXDEPTH) { - return (ISCCC_R_MAXDEPTH); + return ISCCC_R_MAXDEPTH; } checksum_rstart = NULL; first_tag = true; alist = isccc_alist_create(); if (alist == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } while (!REGION_EMPTY(*source)) { @@ -602,7 +602,7 @@ bad: isccc_sexpr_free(&alist); } - return (result); + return result; } static isc_result_t @@ -612,7 +612,7 @@ list_fromwire(isccc_region_t *source, unsigned int depth, isc_result_t result; if (depth > ISCCC_MAXDEPTH) { - return (ISCCC_R_MAXDEPTH); + return ISCCC_R_MAXDEPTH; } list = NULL; @@ -621,18 +621,18 @@ list_fromwire(isccc_region_t *source, unsigned int depth, result = value_fromwire(source, depth + 1, &value); if (result != ISC_R_SUCCESS) { isccc_sexpr_free(&list); - return (result); + return result; } if (isccc_sexpr_addtolist(&list, value) == NULL) { isccc_sexpr_free(&value); isccc_sexpr_free(&list); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } } *listp = list; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -643,14 +643,14 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, size = REGION_SIZE(*source); if (size < 4) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } GET32(version, source->rstart); if (version != 1) { - return (ISCCC_R_UNKNOWNVERSION); + return ISCCC_R_UNKNOWNVERSION; } - return (table_fromwire(source, secret, algorithm, 0, alistp)); + return table_fromwire(source, secret, algorithm, 0, alistp); } static isc_result_t @@ -663,12 +663,12 @@ createmessage(uint32_t version, const char *from, const char *to, REQUIRE(alistp != NULL && *alistp == NULL); if (version != 1) { - return (ISCCC_R_UNKNOWNVERSION); + return ISCCC_R_UNKNOWNVERSION; } alist = isccc_alist_create(); if (alist == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } result = ISC_R_NOMEMORY; @@ -708,20 +708,20 @@ createmessage(uint32_t version, const char *from, const char *to, *alistp = alist; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; bad: isccc_sexpr_free(&alist); - return (result); + return result; } isc_result_t isccc_cc_createmessage(uint32_t version, const char *from, const char *to, uint32_t serial, isccc_time_t now, isccc_time_t expires, isccc_sexpr_t **alistp) { - return (createmessage(version, from, to, serial, now, expires, alistp, - true)); + return createmessage(version, from, to, serial, now, expires, alistp, + true); } isc_result_t @@ -739,7 +739,7 @@ isccc_cc_createack(isccc_sexpr_t *message, bool ok, isccc_sexpr_t **ackp) { isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS || isccc_cc_lookupuint32(_ctrl, "_tim", &t) != ISC_R_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * _frm and _to are optional. @@ -754,7 +754,7 @@ isccc_cc_createack(isccc_sexpr_t *message, bool ok, isccc_sexpr_t **ackp) { ack = NULL; result = createmessage(1, _to, _frm, serial, t, 0, &ack, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } _ctrl = isccc_alist_lookup(ack, "_ctrl"); @@ -769,12 +769,12 @@ isccc_cc_createack(isccc_sexpr_t *message, bool ok, isccc_sexpr_t **ackp) { *ackp = ack; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; bad: isccc_sexpr_free(&ack); - return (result); + return result; } bool @@ -783,12 +783,12 @@ isccc_cc_isack(isccc_sexpr_t *message) { _ctrl = isccc_alist_lookup(message, "_ctrl"); if (!isccc_alist_alistp(_ctrl)) { - return (false); + return false; } if (isccc_cc_lookupstring(_ctrl, "_ack", NULL) == ISC_R_SUCCESS) { - return (true); + return true; } - return (false); + return false; } bool @@ -797,12 +797,12 @@ isccc_cc_isreply(isccc_sexpr_t *message) { _ctrl = isccc_alist_lookup(message, "_ctrl"); if (!isccc_alist_alistp(_ctrl)) { - return (false); + return false; } if (isccc_cc_lookupstring(_ctrl, "_rpl", NULL) == ISC_R_SUCCESS) { - return (true); + return true; } - return (false); + return false; } isc_result_t @@ -821,7 +821,7 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS || isccc_cc_lookupstring(_data, "type", &type) != ISC_R_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * _frm and _to are optional. @@ -837,7 +837,7 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, result = isccc_cc_createmessage(1, _to, _frm, serial, now, expires, &alist); if (result != ISC_R_SUCCESS) { - return (result); + return result; } _ctrl = isccc_alist_lookup(alist, "_ctrl"); @@ -861,11 +861,11 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, *alistp = alist; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; bad: isccc_sexpr_free(&alist); - return (result); + return result; } isccc_sexpr_t * @@ -877,7 +877,7 @@ isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) { r.rstart = UNCONST(str); r.rend = r.rstart + len; - return (isccc_alist_definebinary(alist, key, &r)); + return isccc_alist_definebinary(alist, key, &r); } isccc_sexpr_t * @@ -891,7 +891,7 @@ isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i) { r.rstart = (unsigned char *)b; r.rend = (unsigned char *)b + len; - return (isccc_alist_definebinary(alist, key, &r)); + return isccc_alist_definebinary(alist, key, &r); } isc_result_t @@ -907,13 +907,13 @@ isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) { if (strp != NULL) { *strp = isccc_sexpr_tostring(v); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } isc_result_t @@ -928,13 +928,13 @@ isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, uint32_t *uintp) { *uintp = (uint32_t)strtoul( isccc_sexpr_tostring(v), NULL, 10); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static void @@ -957,18 +957,18 @@ symtab_clean(char *key, unsigned int type, isccc_symvalue_t value, void *arg) { now = arg; if (*now < value.as_uinteger) { - return (false); + return false; } if ((*now - value.as_uinteger) < DUP_LIFETIME) { - return (false); + return false; } - return (true); + return true; } isc_result_t isccc_cc_createsymtab(isccc_symtab_t **symtabp) { - return (isccc_symtab_create(11897, symtab_undefine, NULL, false, - symtabp)); + return isccc_symtab_create(11897, symtab_undefine, NULL, false, + symtabp); } void @@ -981,14 +981,14 @@ has_whitespace(const char *str) { char c; if (str == NULL) { - return (false); + return false; } while ((c = *str++) != '\0') { if (c == ' ' || c == '\t' || c == '\n') { - return (true); + return true; } } - return (false); + return false; } isc_result_t @@ -1008,7 +1008,7 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, isccc_cc_lookupstring(_ctrl, "_ser", &_ser) != ISC_R_SUCCESS || isccc_cc_lookupstring(_ctrl, "_tim", &_tim) != ISC_R_SUCCESS) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } INSIST(_ser != NULL); @@ -1038,12 +1038,12 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, if (has_whitespace(_frm) || has_whitespace(_to) || has_whitespace(_ser) || has_whitespace(_tim)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } len = strlen(_frm) + strlen(_to) + strlen(_ser) + strlen(_tim) + 4; key = malloc(len); if (key == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } snprintf(key, len, "%s;%s;%s;%s", _frm, _to, _ser, _tim); value.as_uinteger = now; @@ -1051,8 +1051,8 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, isccc_symexists_reject); if (result != ISC_R_SUCCESS) { free(key); - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c index a883455a66..d964a8f123 100644 --- a/lib/isccc/ccmsg.c +++ b/lib/isccc/ccmsg.c @@ -53,22 +53,22 @@ try_parse_message(isccc_ccmsg_t *ccmsg) { uint32_t len = 0; if (isc_buffer_peekuint32(ccmsg->buffer, &len) != ISC_R_SUCCESS) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } if (len == 0) { - return (ISC_R_UNEXPECTEDEND); + return ISC_R_UNEXPECTEDEND; } if (len > ccmsg->maxsize) { - return (ISC_R_RANGE); + return ISC_R_RANGE; } if (isc_buffer_remaininglength(ccmsg->buffer) < sizeof(uint32_t) + len) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } /* Skip the size we just peeked */ isc_buffer_forward(ccmsg->buffer, sizeof(uint32_t)); ccmsg->size = len; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c index bfaacbf3a4..788e17dff1 100644 --- a/lib/isccc/sexpr.c +++ b/lib/isccc/sexpr.c @@ -50,18 +50,18 @@ isccc_sexpr_cons(isccc_sexpr_t *car, isccc_sexpr_t *cdr) { sexpr = malloc(sizeof(*sexpr)); if (sexpr == NULL) { - return (NULL); + return NULL; } sexpr->type = ISCCC_SEXPRTYPE_DOTTEDPAIR; CAR(sexpr) = car; CDR(sexpr) = cdr; - return (sexpr); + return sexpr; } isccc_sexpr_t * isccc_sexpr_tconst(void) { - return (&sexpr_t); + return &sexpr_t; } isccc_sexpr_t * @@ -70,16 +70,16 @@ isccc_sexpr_fromstring(const char *str) { sexpr = malloc(sizeof(*sexpr)); if (sexpr == NULL) { - return (NULL); + return NULL; } sexpr->type = ISCCC_SEXPRTYPE_STRING; sexpr->value.as_string = strdup(str); if (sexpr->value.as_string == NULL) { free(sexpr); - return (NULL); + return NULL; } - return (sexpr); + return sexpr; } isccc_sexpr_t * @@ -89,7 +89,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region) { sexpr = malloc(sizeof(*sexpr)); if (sexpr == NULL) { - return (NULL); + return NULL; } sexpr->type = ISCCC_SEXPRTYPE_BINARY; region_size = REGION_SIZE(*region); @@ -103,7 +103,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region) { sexpr->value.as_region.rstart = malloc(region_size + 1); if (sexpr->value.as_region.rstart == NULL) { free(sexpr); - return (NULL); + return NULL; } sexpr->value.as_region.rend = sexpr->value.as_region.rstart + region_size; @@ -113,7 +113,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region) { */ sexpr->value.as_region.rstart[region_size] = '\0'; - return (sexpr); + return sexpr; } void @@ -154,12 +154,12 @@ printable(isccc_region_t *r) { curr = r->rstart; while (curr != r->rend) { if (!isprint(*curr)) { - return (false); + return false; } curr++; } - return (true); + return true; } void @@ -218,14 +218,14 @@ isccc_sexpr_t * isccc_sexpr_car(isccc_sexpr_t *list) { REQUIRE(list->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); - return (CAR(list)); + return CAR(list); } isccc_sexpr_t * isccc_sexpr_cdr(isccc_sexpr_t *list) { REQUIRE(list->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); - return (CDR(list)); + return CDR(list); } void @@ -252,50 +252,50 @@ isccc_sexpr_addtolist(isccc_sexpr_t **l1p, isccc_sexpr_t *l2) { elt = isccc_sexpr_cons(l2, NULL); if (elt == NULL) { - return (NULL); + return NULL; } if (l1 == NULL) { *l1p = elt; - return (elt); + return elt; } for (last = l1; CDR(last) != NULL; last = CDR(last)) { /* Nothing */ } CDR(last) = elt; - return (elt); + return elt; } bool isccc_sexpr_listp(isccc_sexpr_t *sexpr) { if (sexpr == NULL || sexpr->type == ISCCC_SEXPRTYPE_DOTTEDPAIR) { - return (true); + return true; } - return (false); + return false; } bool isccc_sexpr_emptyp(isccc_sexpr_t *sexpr) { if (sexpr == NULL) { - return (true); + return true; } - return (false); + return false; } bool isccc_sexpr_stringp(isccc_sexpr_t *sexpr) { if (sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_STRING) { - return (true); + return true; } - return (false); + return false; } bool isccc_sexpr_binaryp(isccc_sexpr_t *sexpr) { if (sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_BINARY) { - return (true); + return true; } - return (false); + return false; } char * @@ -304,13 +304,13 @@ isccc_sexpr_tostring(isccc_sexpr_t *sexpr) { sexpr->type == ISCCC_SEXPRTYPE_BINARY)); if (sexpr->type == ISCCC_SEXPRTYPE_BINARY) { - return ((char *)sexpr->value.as_region.rstart); + return (char *)sexpr->value.as_region.rstart; } - return (sexpr->value.as_string); + return sexpr->value.as_string; } isccc_region_t * isccc_sexpr_tobinary(isccc_sexpr_t *sexpr) { REQUIRE(sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_BINARY); - return (&sexpr->value.as_region); + return &sexpr->value.as_region; } diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c index c6757c7f68..6d2e8ba0de 100644 --- a/lib/isccc/symtab.c +++ b/lib/isccc/symtab.c @@ -75,12 +75,12 @@ isccc_symtab_create(unsigned int size, symtab = malloc(sizeof(*symtab)); if (symtab == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } symtab->table = calloc(size, sizeof(eltlist_t)); if (symtab->table == NULL) { free(symtab); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } for (i = 0; i < size; i++) { ISC_LIST_INIT(symtab->table[i]); @@ -93,7 +93,7 @@ isccc_symtab_create(unsigned int size, *symtabp = symtab; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -160,7 +160,7 @@ hash(const char *key, bool case_sensitive) { } } - return (h); + return h; } #define FIND(s, k, t, b, e) \ @@ -195,12 +195,12 @@ isccc_symtab_lookup(isccc_symtab_t *symtab, const char *key, unsigned int type, FIND(symtab, key, type, bucket, elt); if (elt == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } SET_IF_NOT_NULL(value, elt->value); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -217,7 +217,7 @@ isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type, if (exists_policy != isccc_symexists_add && elt != NULL) { if (exists_policy == isccc_symexists_reject) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } INSIST(exists_policy == isccc_symexists_replace); ISC_LIST_UNLINK(symtab->table[bucket], elt, link); @@ -229,7 +229,7 @@ isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type, } else { elt = malloc(sizeof(*elt)); if (elt == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } ISC_LINK_INIT(elt, link); } @@ -243,7 +243,7 @@ isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type, */ ISC_LIST_PREPEND(symtab->table[bucket], elt, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -258,12 +258,12 @@ isccc_symtab_undefine(isccc_symtab_t *symtab, const char *key, FIND(symtab, key, type, bucket, elt); if (elt == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } free_elt(symtab, bucket, elt); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index daf012d0ed..642ef27306 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -55,7 +55,7 @@ cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) { #endif /* if defined(HAVE_GEOIP2) */ *ret = actx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -99,7 +99,7 @@ get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) { result = cfg_map_get(cctx, "acl", &acls); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (elt = cfg_list_first(acls); elt != NULL; elt = cfg_list_next(elt)) { @@ -110,10 +110,10 @@ get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) { if (ret != NULL) { *ret = cfg_tuple_get(acl, "value"); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -134,10 +134,10 @@ convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx, if (ISC_MAGIC_VALID(dacl, LOOP_MAGIC)) { cfg_obj_log(nameobj, ISC_LOG_ERROR, "acl loop detected: %s", aclname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } dns_acl_attach(dacl, target); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } /* Not yet converted. Convert now. */ @@ -145,7 +145,7 @@ convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx, if (result != ISC_R_SUCCESS) { cfg_obj_log(nameobj, ISC_LOG_WARNING, "undefined ACL '%s'", aclname); - return (result); + return result; } /* * Add a loop detection element. @@ -160,12 +160,12 @@ convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx, loop.magic = 0; loop.name = NULL; if (result != ISC_R_SUCCESS) { - return (result); + return result; } dacl->name = isc_mem_strdup(dacl->mctx, aclname); ISC_LIST_APPEND(ctx->named_acl_cache, dacl, nextincache); dns_acl_attach(dacl, target); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -186,10 +186,10 @@ convert_keyname(const cfg_obj_t *keyobj, isc_mem_t *mctx, dns_name_t *dnsname) { cfg_obj_log(keyobj, ISC_LOG_WARNING, "key name '%s' is not a valid domain name", txtname); - return (result); + return result; } dns_name_dup(dns_fixedname_name(&fixname), mctx, dnsname); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -236,7 +236,7 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, result = count_acl_elements(ce, cctx, ctx, mctx, &sub, &negative); if (result != ISC_R_SUCCESS) { - return (result); + return result; } n += sub; if (negative) { @@ -271,14 +271,14 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, } dns_acl_detach(&inneracl); } else { - return (result); + return result; } } } } *count = n; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #if defined(HAVE_GEOIP2) @@ -286,66 +286,66 @@ static dns_geoip_subtype_t get_subtype(const cfg_obj_t *obj, dns_geoip_subtype_t subtype, const char *dbname) { if (dbname == NULL) { - return (subtype); + return subtype; } switch (subtype) { case dns_geoip_countrycode: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_countrycode); + return dns_geoip_city_countrycode; } else if (strcasecmp(dbname, "country") == 0) { - return (dns_geoip_country_code); + return dns_geoip_country_code; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "country search: ignored"); - return (subtype); + return subtype; case dns_geoip_countryname: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_countryname); + return dns_geoip_city_countryname; } else if (strcasecmp(dbname, "country") == 0) { - return (dns_geoip_country_name); + return dns_geoip_country_name; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "country search: ignored"); - return (subtype); + return subtype; case dns_geoip_continentcode: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_continentcode); + return dns_geoip_city_continentcode; } else if (strcasecmp(dbname, "country") == 0) { - return (dns_geoip_country_continentcode); + return dns_geoip_country_continentcode; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "continent search: ignored"); - return (subtype); + return subtype; case dns_geoip_continent: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_continent); + return dns_geoip_city_continent; } else if (strcasecmp(dbname, "country") == 0) { - return (dns_geoip_country_continent); + return dns_geoip_country_continent; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "continent search: ignored"); - return (subtype); + return subtype; case dns_geoip_region: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_region); + return dns_geoip_city_region; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "region/subdivision search: ignored"); - return (subtype); + return subtype; case dns_geoip_regionname: if (strcasecmp(dbname, "city") == 0) { - return (dns_geoip_city_regionname); + return dns_geoip_city_regionname; } cfg_obj_log(obj, ISC_LOG_ERROR, "invalid database specified for " "region/subdivision search: ignored"); - return (subtype); + return subtype; /* * Log a warning if the wrong database was specified @@ -361,42 +361,42 @@ get_subtype(const cfg_obj_t *obj, dns_geoip_subtype_t subtype, "invalid database specified for " "a 'city'-only search type: ignoring"); } - return (subtype); + return subtype; case dns_geoip_isp_name: if (strcasecmp(dbname, "isp") != 0) { cfg_obj_log(obj, ISC_LOG_WARNING, "invalid database specified for " "an 'isp' search: ignoring"); } - return (subtype); + return subtype; case dns_geoip_org_name: if (strcasecmp(dbname, "org") != 0) { cfg_obj_log(obj, ISC_LOG_WARNING, "invalid database specified for " "an 'org' search: ignoring"); } - return (subtype); + return subtype; case dns_geoip_as_asnum: if (strcasecmp(dbname, "asnum") != 0) { cfg_obj_log(obj, ISC_LOG_WARNING, "invalid database specified for " "an 'asnum' search: ignoring"); } - return (subtype); + return subtype; case dns_geoip_domain_name: if (strcasecmp(dbname, "domain") != 0) { cfg_obj_log(obj, ISC_LOG_WARNING, "invalid database specified for " "a 'domain' search: ignoring"); } - return (subtype); + return subtype; case dns_geoip_netspeed_id: if (strcasecmp(dbname, "netspeed") != 0) { cfg_obj_log(obj, ISC_LOG_WARNING, "invalid database specified for " "a 'netspeed' search: ignoring"); } - return (subtype); + return subtype; default: UNREACHABLE(); } @@ -405,7 +405,7 @@ get_subtype(const cfg_obj_t *obj, dns_geoip_subtype_t subtype, static bool geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) { if (ctx->geoip == NULL) { - return (true); + return true; } switch (elt->geoip_elem.subtype) { @@ -414,7 +414,7 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) { case dns_geoip_continentcode: case dns_geoip_continent: if (ctx->geoip->country != NULL || ctx->geoip->city != NULL) { - return (true); + return true; } break; case dns_geoip_country_code: @@ -422,7 +422,7 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) { case dns_geoip_country_continentcode: case dns_geoip_country_continent: if (ctx->geoip->country != NULL) { - return (true); + return true; } /* city db can answer these too, so: */ FALLTHROUGH; @@ -440,30 +440,30 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) { case dns_geoip_city_continent: case dns_geoip_city_timezonecode: if (ctx->geoip->city != NULL) { - return (true); + return true; } break; case dns_geoip_isp_name: if (ctx->geoip->isp != NULL) { - return (true); + return true; } break; case dns_geoip_as_asnum: case dns_geoip_org_name: if (ctx->geoip->as != NULL) { - return (true); + return true; } break; case dns_geoip_domain_name: if (ctx->geoip->domain != NULL) { - return (true); + return true; } break; default: break; } - return (false); + return false; } static isc_result_t @@ -495,7 +495,7 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, cfg_obj_log(obj, ISC_LOG_ERROR, "database '%s' is not defined for GeoIP2", dbname); - return (ISC_R_UNEXPECTED); + return ISC_R_UNEXPECTED; } } @@ -506,7 +506,7 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, if (len == 0) { cfg_obj_log(obj, ISC_LOG_ERROR, "zero-length geoip search field"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (strcasecmp(stype, "country") == 0 && len == 2) { @@ -519,7 +519,7 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, cfg_obj_log(obj, ISC_LOG_ERROR, "three-letter country codes are unavailable " "in GeoIP2 databases"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } else if (strcasecmp(stype, "country") == 0) { /* Country name */ subtype = dns_geoip_countryname; @@ -564,7 +564,7 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, } else { cfg_obj_log(obj, ISC_LOG_ERROR, "geoiop postal code (%s) too long", search); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else if (strcasecmp(stype, "metro") == 0 || strcasecmp(stype, "metrocode") == 0) @@ -598,7 +598,7 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, "type '%s' is unavailable " "in GeoIP2 databases", stype); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } de.geoip_elem.subtype = get_subtype(obj, subtype, dbname); @@ -608,12 +608,12 @@ parse_geoip_element(const cfg_obj_t *obj, cfg_aclconfctx_t *ctx, "no GeoIP2 database installed which can answer " "queries of type '%s'", stype); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *dep = de; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } #endif /* HAVE_GEOIP2 */ @@ -677,7 +677,7 @@ cfg_acl_fromconfig(const cfg_obj_t *acl_data, const cfg_obj_t *cctx, result = count_acl_elements(caml, cctx, ctx, mctx, &nelem, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } else { nelem = cfg_list_length(caml, false); @@ -977,5 +977,5 @@ cleanup: dns_acl_detach(&inneracl); } dns_acl_detach(&dacl); - return (result); + return result; } diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c index 4271801290..f4a449ea13 100644 --- a/lib/isccfg/check.c +++ b/lib/isccfg/check.c @@ -187,7 +187,7 @@ check_orderent(const cfg_obj_t *ent) { result = ISC_R_FAILURE; } } - return (result); + return result; } static isc_result_t @@ -198,7 +198,7 @@ check_order(const cfg_obj_t *options) { const cfg_obj_t *obj = NULL; if (cfg_map_get(options, "rrset-order", &obj) != ISC_R_SUCCESS) { - return (result); + return result; } for (element = cfg_list_first(obj); element != NULL; @@ -209,7 +209,7 @@ check_order(const cfg_obj_t *options) { result = tresult; } } - return (result); + return result; } static isc_result_t @@ -228,7 +228,7 @@ check_dual_stack(const cfg_obj_t *options) { (void)cfg_map_get(options, "dual-stack-servers", &alternates); if (alternates == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } obj = cfg_tuple_get(alternates, "port"); @@ -275,7 +275,7 @@ check_dual_stack(const cfg_obj_t *options) { } } } - return (result); + return result; } static isc_result_t @@ -288,7 +288,7 @@ validate_tls(const cfg_obj_t *config, const cfg_obj_t *obj, const char *str) { if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, ISC_LOG_ERROR, "'%s' is not a valid name", str); - return (result); + return result; } if (strcasecmp(str, "ephemeral") != 0) { @@ -297,11 +297,11 @@ validate_tls(const cfg_obj_t *config, const cfg_obj_t *obj, const char *str) { if (tlsmap == NULL) { cfg_obj_log(obj, ISC_LOG_ERROR, "tls '%s' is not defined", str); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -322,12 +322,12 @@ check_forward(const cfg_obj_t *config, const cfg_obj_t *options, "forwarders declared in root zone and " "in general configuration: %s:%u", file, line); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (forward != NULL && forwarders == NULL) { cfg_obj_log(forward, ISC_LOG_ERROR, "no matching 'forwarders' statement"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (forwarders != NULL) { isc_result_t result = ISC_R_SUCCESS; @@ -338,7 +338,7 @@ check_forward(const cfg_obj_t *config, const cfg_obj_t *options, if (tls != NULL) { result = validate_tls(config, tlspobj, tls); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } @@ -352,13 +352,13 @@ check_forward(const cfg_obj_t *config, const cfg_obj_t *options, if (tls != NULL) { result = validate_tls(config, faddresses, tls); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -401,7 +401,7 @@ disabled_algorithms(const cfg_obj_t *disabled) { result = tresult; } } - return (result); + return result; } static isc_result_t @@ -445,7 +445,7 @@ disabled_ds_digests(const cfg_obj_t *disabled) { result = tresult; } } - return (result); + return result; } static isc_result_t @@ -474,7 +474,7 @@ exists(const cfg_obj_t *obj, const char *name, int value, isc_symtab_t *symtab, isc_mem_free(mctx, key); result = ISC_R_EXISTS; } - return (result); + return result; } static isc_result_t @@ -502,7 +502,7 @@ mustbesecure(const cfg_obj_t *secure, isc_symtab_t *symtab, isc_mem_t *mctx) { "previous definition: %s:%u", mctx); } - return (result); + return result; } static isc_result_t @@ -528,7 +528,7 @@ checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, } } if (aclobj == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = cfg_acl_fromconfig(aclobj, config, actx, mctx, 0, &acl); if (acl != NULL) { @@ -577,7 +577,7 @@ checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, } } } - return (result); + return result; } static isc_result_t @@ -605,7 +605,7 @@ check_viewacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, result = tresult; } } - return (result); + return result; } static void @@ -643,7 +643,7 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } } if (dns64 == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (element = cfg_list_first(dns64); element != NULL; @@ -721,7 +721,7 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } } - return (result); + return result; } #define CHECK_RRL(cond, pat, val1, val2) \ @@ -772,7 +772,7 @@ check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } } if (map == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } min_entries = 500; @@ -857,7 +857,7 @@ check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } } - return (result); + return result; } static isc_result_t @@ -878,7 +878,7 @@ check_fetchlimit(const cfg_obj_t *voptions, const cfg_obj_t *config) { } } if (map == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } obj = cfg_tuple_get(map, "low"); @@ -888,7 +888,7 @@ check_fetchlimit(const cfg_obj_t *voptions, const cfg_obj_t *config) { "fetch-quota-param low value (%0.1f) " "out of range", low); - return (ISC_R_RANGE); + return ISC_R_RANGE; } obj = cfg_tuple_get(map, "high"); @@ -898,7 +898,7 @@ check_fetchlimit(const cfg_obj_t *voptions, const cfg_obj_t *config) { "fetch-quota-param high value (%0.1f) " "out of range", high); - return (ISC_R_RANGE); + return ISC_R_RANGE; } obj = cfg_tuple_get(map, "discount"); @@ -908,10 +908,10 @@ check_fetchlimit(const cfg_obj_t *voptions, const cfg_obj_t *config) { "fetch-quota-param discount value (%0.1f) " "out of range", discount); - return (ISC_R_RANGE); + return ISC_R_RANGE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -994,7 +994,7 @@ check_recursionacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } } - return (result); + return result; } typedef struct { @@ -1023,8 +1023,8 @@ check_name(const char *str) { dns_fixedname_t fixed; dns_fixedname_init(&fixed); - return (dns_name_fromstring(dns_fixedname_name(&fixed), str, - dns_rootname, 0, NULL)); + return dns_name_fromstring(dns_fixedname_name(&fixed), str, + dns_rootname, 0, NULL); } static bool @@ -1033,15 +1033,15 @@ kasp_name_allowed(const cfg_listelt_t *element) { cfg_tuple_get(cfg_listelt_value(element), "name")); if (strcmp("none", name) == 0) { - return (false); + return false; } if (strcmp("default", name) == 0) { - return (false); + return false; } if (strcmp("insecure", name) == 0) { - return (false); + return false; } - return (true); + return true; } static const cfg_obj_t * @@ -1055,7 +1055,7 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { result = cfg_map_get(config, listname, &maplist); if (result != ISC_R_SUCCESS) { - return (NULL); + return NULL; } for (elt = cfg_list_first(maplist); elt != NULL; @@ -1065,11 +1065,11 @@ find_maplist(const cfg_obj_t *config, const char *listname, const char *name) { if (strcasecmp(cfg_obj_asstring(cfg_map_getname(map)), name) == 0) { - return (map); + return map; } } - return (NULL); + return NULL; } static isc_result_t @@ -1185,7 +1185,7 @@ check_listener(const cfg_obj_t *listener, const cfg_obj_t *config, dns_acl_detach(&acl); } - return (result); + return result; } static isc_result_t @@ -1203,7 +1203,7 @@ check_listeners(const cfg_obj_t *list, const cfg_obj_t *config, } } - return (result); + return result; } static isc_result_t @@ -1213,17 +1213,17 @@ check_port(const cfg_obj_t *options, const char *type, in_port_t *portp) { result = cfg_map_get(options, type, &portobj); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (cfg_obj_asuint32(portobj) >= UINT16_MAX) { cfg_obj_log(portobj, ISC_LOG_ERROR, "port '%u' out of range", cfg_obj_asuint32(portobj)); - return (ISC_R_RANGE); + return ISC_R_RANGE; } SET_IF_NOT_NULL(portp, (in_port_t)cfg_obj_asuint32(portobj)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2114,7 +2114,7 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config, cfg_aclconfctx_detach(&actx); } - return (result); + return result; } /* @@ -2130,7 +2130,7 @@ check_remoteserverlist(const cfg_obj_t *cctx, const char *list, result = cfg_map_get(cctx, list, &obj); if (result != ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } elt = cfg_list_first(obj); @@ -2169,7 +2169,7 @@ check_remoteserverlist(const cfg_obj_t *cctx, const char *list, elt = cfg_list_next(elt); } - return (result); + return result; } /* @@ -2182,7 +2182,7 @@ check_primarylists(const cfg_obj_t *cctx, isc_mem_t *mctx) { result = isc_symtab_create(mctx, 100, freekey, mctx, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } tresult = check_remoteserverlist(cctx, "primaries", symtab, mctx); if (tresult != ISC_R_SUCCESS) { @@ -2193,7 +2193,7 @@ check_primarylists(const cfg_obj_t *cctx, isc_mem_t *mctx) { result = tresult; } isc_symtab_destroy(&symtab); - return (result); + return result; } /* @@ -2206,14 +2206,14 @@ check_parentalagentlists(const cfg_obj_t *cctx, isc_mem_t *mctx) { result = isc_symtab_create(mctx, 100, freekey, mctx, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } tresult = check_remoteserverlist(cctx, "parental-agents", symtab, mctx); if (tresult != ISC_R_SUCCESS) { result = tresult; } isc_symtab_destroy(&symtab); - return (result); + return result; } #if HAVE_LIBNGHTTP2 @@ -2276,7 +2276,7 @@ check_httpserver(const cfg_obj_t *http, isc_symtab_t *symtab) { } } - return (result); + return result; } static isc_result_t @@ -2288,7 +2288,7 @@ check_httpservers(const cfg_obj_t *config, isc_mem_t *mctx) { result = isc_symtab_create(mctx, 100, NULL, NULL, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = cfg_map_get(config, "http", &obj); @@ -2307,7 +2307,7 @@ check_httpservers(const cfg_obj_t *config, isc_mem_t *mctx) { done: isc_symtab_destroy(&symtab); - return (result); + return result; } #endif /* HAVE_LIBNGHTTP2 */ @@ -2443,7 +2443,7 @@ check_tls_defintion(const cfg_obj_t *tlsobj, const char *name, } } - return (result); + return result; } static isc_result_t @@ -2456,12 +2456,12 @@ check_tls_definitions(const cfg_obj_t *config, isc_mem_t *mctx) { result = cfg_map_get(config, "tls", &obj); if (result != ISC_R_SUCCESS) { result = ISC_R_SUCCESS; - return (result); + return result; } result = isc_symtab_create(mctx, 100, NULL, NULL, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } for (elt = cfg_list_first(obj); elt != NULL; elt = cfg_list_next(elt)) { @@ -2476,7 +2476,7 @@ check_tls_definitions(const cfg_obj_t *config, isc_mem_t *mctx) { isc_symtab_destroy(&symtab); - return (result); + return result; } static isc_result_t @@ -2488,7 +2488,7 @@ get_remotes(const cfg_obj_t *cctx, const char *list, const char *name, result = cfg_map_get(cctx, list, &obj); if (result != ISC_R_SUCCESS) { - return (result); + return result; } elt = cfg_list_first(obj); @@ -2500,13 +2500,13 @@ get_remotes(const cfg_obj_t *cctx, const char *list, const char *name, if (strcasecmp(listname, name) == 0) { *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } elt = cfg_list_next(elt); } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } static isc_result_t @@ -2522,7 +2522,7 @@ get_remoteservers_def(const char *list, const char *name, const cfg_obj_t *cctx, } else if (strcmp(list, "parental-agents") == 0) { result = get_remotes(cctx, "parental-agents", name, ret); } - return (result); + return result; } static isc_result_t @@ -2542,7 +2542,7 @@ validate_remotes(const char *list, const cfg_obj_t *obj, result = isc_symtab_create(mctx, 100, NULL, NULL, false, &symtab); if (result != ISC_R_SUCCESS) { *countp = count; - return (result); + return result; } newlist: @@ -2659,7 +2659,7 @@ resume: } isc_symtab_destroy(&symtab); *countp = count; - return (result); + return result; } static isc_result_t @@ -2678,7 +2678,7 @@ check_update_policy(const cfg_obj_t *policy) { if (cfg_obj_isstring(policy) && strcmp("local", cfg_obj_asstring(policy)) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* Now check the grant policy */ @@ -2836,7 +2836,7 @@ check_update_policy(const cfg_obj_t *policy) { } } } - return (result); + return result; } typedef struct { @@ -2866,7 +2866,7 @@ check_nonzero(const cfg_obj_t *options) { result = ISC_R_FAILURE; } } - return (result); + return result; } /*% @@ -2883,7 +2883,7 @@ check_mirror_zone_notify(const cfg_obj_t *zoptions, const char *znamestr) { /* * "notify" not set at zone level. This is fine. */ - return (true); + return true; } if (cfg_obj_isboolean(obj)) { @@ -2911,7 +2911,7 @@ check_mirror_zone_notify(const cfg_obj_t *zoptions, const char *znamestr) { znamestr); } - return (notify_configuration_ok); + return notify_configuration_ok; } /*% @@ -2971,7 +2971,7 @@ cleanup: dns_acl_detach(&acl); } - return (retval); + return retval; } static isc_result_t @@ -3093,7 +3093,7 @@ check: } } - return (result); + return result; } static isc_result_t @@ -3158,7 +3158,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, if (obj == NULL) { cfg_obj_log(zconfig, ISC_LOG_ERROR, "zone '%s': type not present", znamestr); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } typestr = cfg_obj_asstring(obj); @@ -3186,13 +3186,13 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, cfg_obj_log(obj, ISC_LOG_ERROR, "zone '%s': invalid type %s", znamestr, typestr); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (ztype == CFG_ZONE_REDIRECT && strcmp(znamestr, ".") != 0) { cfg_obj_log(zconfig, ISC_LOG_ERROR, "redirect zones must be called \".\""); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -3207,14 +3207,14 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, cfg_obj_log(obj, ISC_LOG_ERROR, "zone '%s': invalid class %s", znamestr, r.base); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (zclass != defclass) { cfg_obj_log(obj, ISC_LOG_ERROR, "zone '%s': class '%s' does not " "match view/default class", znamestr, r.base); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else { zclass = defclass; @@ -3333,7 +3333,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, result = ISC_R_FAILURE; } } - return (result); + return result; } /* @@ -3991,10 +3991,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, tresult = cfg_map_get(zoptions, "file", &fileobj); obj = NULL; res1 = cfg_map_get(zoptions, "inline-signing", &obj); - if ((tresult != ISC_R_SUCCESS && - (ztype == CFG_ZONE_PRIMARY || ztype == CFG_ZONE_HINT || - (ztype == CFG_ZONE_SECONDARY && res1 == ISC_R_SUCCESS && - cfg_obj_asboolean(obj))))) + if (tresult != ISC_R_SUCCESS && + (ztype == CFG_ZONE_PRIMARY || ztype == CFG_ZONE_HINT || + (ztype == CFG_ZONE_SECONDARY && res1 == ISC_R_SUCCESS && + cfg_obj_asboolean(obj)))) { cfg_obj_log(zconfig, ISC_LOG_ERROR, "zone '%s': missing 'file' entry", @@ -4020,7 +4020,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, } } - return (result); + return result; } typedef struct keyalgorithms { @@ -4058,7 +4058,7 @@ isccfg_check_key(const cfg_obj_t *key) { "key '%s' must have both 'secret' and " "'algorithm' defined", keyname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } isc_buffer_init(&buf, secretbuf, sizeof(secretbuf)); @@ -4066,7 +4066,7 @@ isccfg_check_key(const cfg_obj_t *key) { if (result != ISC_R_SUCCESS) { cfg_obj_log(secretobj, ISC_LOG_ERROR, "bad secret '%s'", isc_result_totext(result)); - return (result); + return result; } algorithm = cfg_obj_asstring(algobj); @@ -4082,7 +4082,7 @@ isccfg_check_key(const cfg_obj_t *key) { if (algorithms[i].name == NULL) { cfg_obj_log(algobj, ISC_LOG_ERROR, "unknown algorithm '%s'", algorithm); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (algorithm[len] == '-') { uint16_t digestbits; @@ -4096,20 +4096,20 @@ isccfg_check_key(const cfg_obj_t *key) { "[%u..%u]", keyname, algorithms[i].size / 2, algorithms[i].size); - return (ISC_R_RANGE); + return ISC_R_RANGE; } if ((digestbits % 8) != 0) { cfg_obj_log(algobj, ISC_LOG_ERROR, "key '%s' digest-bits not multiple" " of 8", keyname); - return (ISC_R_RANGE); + return ISC_R_RANGE; } /* * Recommended minima for hmac algorithms. */ - if ((digestbits < (algorithms[i].size / 2U) || - (digestbits < 80U))) + if (digestbits < (algorithms[i].size / 2U) || + (digestbits < 80U)) { cfg_obj_log(algobj, ISC_LOG_WARNING, "key '%s' digest-bits too small " @@ -4120,10 +4120,10 @@ isccfg_check_key(const cfg_obj_t *key) { cfg_obj_log(algobj, ISC_LOG_ERROR, "key '%s': unable to parse digest-bits", keyname); - return (result); + return result; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -4142,7 +4142,7 @@ fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable) { "writeable file '%s': already in use: " "%s:%u", cfg_obj_asstring(obj), file, line); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } result = isc_symtab_lookup(symtab, cfg_obj_asstring(obj), 2, &symvalue); @@ -4153,16 +4153,16 @@ fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable) { "writeable file '%s': already in use: " "%s:%u", cfg_obj_asstring(obj), file, line); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } symvalue.as_cpointer = obj; result = isc_symtab_define(symtab, cfg_obj_asstring(obj), writeable ? 2 : 1, symvalue, isc_symexists_reject); - return (result); + return result; } static isc_result_t @@ -4178,7 +4178,7 @@ keydirexist(const cfg_obj_t *zcfg, const char *optname, dns_name_t *zname, size_t n; if (kaspnamestr == NULL || strcmp(kaspnamestr, "none") == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_format(zname, keydirbuf, sizeof(keydirbuf)); @@ -4210,7 +4210,7 @@ keydirexist(const cfg_obj_t *zcfg, const char *optname, dns_name_t *zname, strcmp(cfg_obj_asstring(kasp), "none") == 0 || strcmp(cfg_obj_asstring(kasp), kaspnamestr) == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_obj_log(zcfg, ISC_LOG_ERROR, @@ -4219,7 +4219,7 @@ keydirexist(const cfg_obj_t *zcfg, const char *optname, dns_name_t *zname, optname, keydir, cfg_obj_asstring(cfg_tuple_get(exist, "name")), cfg_obj_asstring(kasp), file, line); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /* @@ -4230,7 +4230,7 @@ keydirexist(const cfg_obj_t *zcfg, const char *optname, dns_name_t *zname, result = isc_symtab_define(symtab, symkey, 2, symvalue, isc_symexists_reject); RUNTIME_CHECK(result == ISC_R_SUCCESS); - return (result); + return result; } /* @@ -4269,7 +4269,7 @@ check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_mem_t *mctx) { } tresult = isccfg_check_key(key); if (tresult != ISC_R_SUCCESS) { - return (tresult); + return tresult; } dns_name_format(name, namebuf, sizeof(namebuf)); @@ -4298,10 +4298,10 @@ check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_mem_t *mctx) { result = tresult; } else if (tresult != ISC_R_SUCCESS) { isc_mem_free(mctx, keyname); - return (tresult); + return tresult; } } - return (result); + return result; } /* @@ -4316,7 +4316,7 @@ rndckey_exists(const cfg_obj_t *keylist, const char *keyname) { const char *str; if (keylist == NULL) { - return (false); + return false; } for (element = cfg_list_first(keylist); element != NULL; @@ -4325,10 +4325,10 @@ rndckey_exists(const cfg_obj_t *keylist, const char *keyname) { obj = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_map_getname(obj)); if (!strcasecmp(str, keyname)) { - return (true); + return true; } } - return (false); + return false; } static struct { @@ -4390,7 +4390,7 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, (void)cfg_map_get(config, "server", &servers); } if (servers == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (e1 = cfg_list_first(servers); e1 != NULL; e1 = cfg_list_next(e1)) { @@ -4538,7 +4538,7 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, } dns_peer_detach(&peer); } - return (result); + return result; } #define ROOT_KSK_STATIC 0x01 @@ -4824,7 +4824,7 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp) { } cleanup: - return (result); + return result; } static isc_result_t @@ -4888,7 +4888,7 @@ record_static_keys(isc_symtab_t *symtab, isc_mem_t *mctx, } } - return (ret); + return ret; } static isc_result_t @@ -4944,7 +4944,7 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist) { } } - return (ret); + return ret; } static isc_result_t @@ -4993,7 +4993,7 @@ record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, } } - return (ret); + return ret; } /* @@ -5108,7 +5108,7 @@ cleanup: if (dstab != NULL) { isc_symtab_destroy(&dstab); } - return (result); + return result; } typedef enum { special_zonetype_rpz, special_zonetype_catz } special_zonetype_t; @@ -5151,7 +5151,7 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, "more than 64 response policy " "zones in view '%s'", viewname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } @@ -5194,7 +5194,7 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, } } } - return (result); + return result; } static isc_result_t @@ -5238,7 +5238,7 @@ check_rpz(const cfg_obj_t *rpz_obj) { } } - return (result); + return result; } static isc_result_t @@ -5259,7 +5259,7 @@ check_catz(const cfg_obj_t *catz_obj, const char *viewname, isc_mem_t *mctx) { result = isc_symtab_create(mctx, 100, freekey, mctx, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } obj = cfg_tuple_get(catz_obj, "zone list"); @@ -5315,7 +5315,7 @@ check_catz(const cfg_obj_t *catz_obj, const char *viewname, isc_mem_t *mctx) { isc_symtab_destroy(&symtab); } - return (result); + return result; } /*% @@ -5349,7 +5349,7 @@ check_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, "%s: plugin check failed: " "unable to get full plugin path: %s", plugin_path, isc_result_totext(result)); - return (result); + return result; } result = ns_plugin_check(full_path, parameters, config, @@ -5361,7 +5361,7 @@ check_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, *data->check_result = result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -5387,15 +5387,15 @@ check_dnstap(const cfg_obj_t *voptions, const cfg_obj_t *config) { cfg_obj_log(obj, ISC_LOG_ERROR, "'dnstap-output' must be set if 'dnstap' " "is set"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #else /* ifdef HAVE_DNSTAP */ UNUSED(voptions); UNUSED(config); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; #endif /* ifdef HAVE_DNSTAP */ } @@ -5445,7 +5445,7 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, */ tresult = isc_symtab_create(mctx, 1000, freekey, mctx, false, &symtab); if (tresult != ISC_R_SUCCESS) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } cfg_aclconfctx_create(mctx, &actx); @@ -5833,7 +5833,7 @@ cleanup: cfg_aclconfctx_detach(&actx); } - return (result); + return result; } static const char *default_channels[] = { "default_syslog", "default_stderr", @@ -5862,12 +5862,12 @@ check_logging(const cfg_obj_t *config, isc_mem_t *mctx) { (void)cfg_map_get(config, "logging", &logobj); if (logobj == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = isc_symtab_create(mctx, 100, NULL, NULL, false, &symtab); if (result != ISC_R_SUCCESS) { - return (result); + return result; } symvalue.as_cpointer = NULL; @@ -5945,7 +5945,7 @@ check_logging(const cfg_obj_t *config, isc_mem_t *mctx) { } } isc_symtab_destroy(&symtab); - return (result); + return result; } static isc_result_t @@ -5958,7 +5958,7 @@ check_controlskeys(const cfg_obj_t *control, const cfg_obj_t *keylist) { control_keylist = cfg_tuple_get(control, "keys"); if (cfg_obj_isvoid(control_keylist)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } for (element = cfg_list_first(control_keylist); element != NULL; @@ -5973,7 +5973,7 @@ check_controlskeys(const cfg_obj_t *control, const cfg_obj_t *keylist) { result = ISC_R_NOTFOUND; } } - return (result); + return result; } static isc_result_t @@ -5995,7 +5995,7 @@ check_controls(const cfg_obj_t *config, isc_mem_t *mctx) { (void)cfg_map_get(config, "controls", &controlslist); if (controlslist == NULL) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } (void)cfg_map_get(config, "key", &keylist); @@ -6069,7 +6069,7 @@ cleanup: if (symtab != NULL) { isc_symtab_destroy(&symtab); } - return (result); + return result; } isc_result_t @@ -6332,5 +6332,5 @@ cleanup: isc_symtab_destroy(&keydirs); } - return (result); + return result; } diff --git a/lib/isccfg/duration.c b/lib/isccfg/duration.c index ee1c570786..96342f0002 100644 --- a/lib/isccfg/duration.c +++ b/lib/isccfg/duration.c @@ -50,7 +50,7 @@ isccfg_duration_fromtext(isc_textregion_t *source, * Copy the buffer as it may not be NULL terminated. */ if (source->length > sizeof(buf) - 1) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } /* Copy source->length bytes and NULL terminate. */ snprintf(buf, sizeof(buf), "%.*s", (int)source->length, source->base); @@ -65,7 +65,7 @@ isccfg_duration_fromtext(isc_textregion_t *source, /* Every duration starts with 'P' */ if (toupper((unsigned char)str[0]) != 'P') { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } P = str; @@ -79,10 +79,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, endptr = NULL; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[0] = (uint32_t)lli; str = X; @@ -100,10 +100,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[1] = (uint32_t)lli; str = X; @@ -116,10 +116,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[3] = (uint32_t)lli; str = X; @@ -138,10 +138,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[4] = (uint32_t)lli; str = X; @@ -159,10 +159,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[5] = (uint32_t)lli; str = X; @@ -175,10 +175,10 @@ isccfg_duration_fromtext(isc_textregion_t *source, errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *X) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[6] = (uint32_t)lli; str = X; @@ -190,15 +190,15 @@ isccfg_duration_fromtext(isc_textregion_t *source, if (W != NULL) { if (not_weeks) { /* Mix of weeks and other indicators is not allowed */ - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } else { errno = 0; lli = strtoll(str + 1, &endptr, 10); if (*endptr != *W) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (errno != 0 || lli < 0 || lli > UINT32_MAX) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->parts[2] = (uint32_t)lli; str = W; @@ -207,11 +207,11 @@ isccfg_duration_fromtext(isc_textregion_t *source, /* Deal with trailing garbage. */ if (str[1] != '\0') { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } duration->iso8601 = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -236,7 +236,7 @@ isccfg_parse_duration(isc_textregion_t *source, isccfg_duration_t *duration) { } } - return (result); + return result; } uint32_t @@ -257,5 +257,5 @@ isccfg_duration_toseconds(const isccfg_duration_t *duration) { seconds += (uint64_t)duration->parts[1] * 86400 * 31; /* Months */ seconds += (uint64_t)duration->parts[0] * 86400 * 365; /* Years */ - return (seconds > UINT32_MAX ? UINT32_MAX : (uint32_t)seconds); + return seconds > UINT32_MAX ? UINT32_MAX : (uint32_t)seconds; } diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c index f8637958fc..e5fd220834 100644 --- a/lib/isccfg/kaspconf.c +++ b/lib/isccfg/kaspconf.c @@ -46,10 +46,10 @@ static isc_result_t confget(cfg_obj_t const *const *maps, const char *name, const cfg_obj_t **obj) { for (size_t i = 0;; i++) { if (maps[i] == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (cfg_map_get(maps[i], name, obj) == ISC_R_SUCCESS) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } @@ -70,7 +70,7 @@ parse_duration(const char *str) { if (result == ISC_R_SUCCESS) { time = isccfg_duration_toseconds(&duration); } - return (time); + return time; } /* @@ -84,10 +84,10 @@ get_duration(const cfg_obj_t **maps, const char *option, const char *dfl) { result = confget(maps, option, &obj); if (result == ISC_R_NOTFOUND) { - return (parse_duration(dfl)); + return parse_duration(dfl); } INSIST(result == ISC_R_SUCCESS); - return (cfg_obj_asduration(obj)); + return cfg_obj_asduration(obj); } /* @@ -101,10 +101,10 @@ get_string(const cfg_obj_t **maps, const char *option) { result = confget(maps, option, &obj); if (result == ISC_R_NOTFOUND) { - return (NULL); + return NULL; } INSIST(result == ISC_R_SUCCESS); - return (cfg_obj_asstring(obj)); + return cfg_obj_asstring(obj); } /* @@ -122,7 +122,7 @@ cfg_kaspkey_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp, /* Create a new key reference. */ result = dns_kasp_key_create(kasp, &key); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (config == NULL) { @@ -327,12 +327,12 @@ cfg_kaspkey_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp, } dns_kasp_addkey(kasp, key); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: dns_kasp_key_destroy(key); - return (result); + return result; } static isc_result_t @@ -377,7 +377,7 @@ cfg_nsec3param_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp) { obj, ISC_LOG_ERROR, "dnssec-policy: cannot use nsec3 with algorithm '%s'", algstr); - return (DNS_R_NSEC3BADALG); + return DNS_R_NSEC3BADALG; } if (iter != DEFAULT_NSEC3PARAM_ITER) { @@ -385,7 +385,7 @@ cfg_nsec3param_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp) { "dnssec-policy: nsec3 iterations value %u " "not allowed, must be zero", iter); - return (DNS_R_NSEC3ITERRANGE); + return DNS_R_NSEC3ITERRANGE; } /* Opt-out? */ @@ -403,11 +403,11 @@ cfg_nsec3param_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp) { cfg_obj_log(obj, ISC_LOG_ERROR, "dnssec-policy: nsec3 salt length %u too high", saltlen); - return (DNS_R_NSEC3SALTRANGE); + return DNS_R_NSEC3SALTRANGE; } dns_kasp_setnsec3param(kasp, iter, optout, saltlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -433,7 +433,7 @@ add_digest(dns_kasp_t *kasp, const cfg_obj_t *digest) { } else { dns_kasp_adddigest(kasp, alg); } - return (result); + return result; } isc_result_t @@ -478,17 +478,17 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp, "dnssec-policy: duplicately named policy found '%s'", kaspname); dns_kasp_detach(&kasp); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } if (result != ISC_R_NOTFOUND) { - return (result); + return result; } /* No kasp with configured name was found in list, create new one. */ INSIST(kasp == NULL); result = dns_kasp_create(mctx, kaspname, &kasp); if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(kasp != NULL); @@ -785,13 +785,13 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp, dns_kasp_attach(kasp, kaspp); /* Don't detach as kasp is on '*kasplist' */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: /* Something bad happened, detach (destroys kasp) and return error. */ dns_kasp_detach(&kasp); - return (result); + return result; } isc_result_t @@ -819,13 +819,13 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, cfg_obj_log(config, ISC_LOG_ERROR, "key-store: duplicate key-store found '%s'", name); dns_keystore_detach(&keystore); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } if (result != ISC_R_NOTFOUND) { cfg_obj_log(config, ISC_LOG_ERROR, "key-store: lookup '%s' failed: %s", name, isc_result_totext(result)); - return (result); + return result; } /* @@ -834,7 +834,7 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, INSIST(keystore == NULL); result = dns_keystore_create(mctx, name, &keystore); if (result != ISC_R_SUCCESS) { - return (result); + return result; } INSIST(keystore != NULL); @@ -862,5 +862,5 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, } /* Don't detach as keystore is on '*keystorelist' */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 143ca6c773..8eb846b9a1 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -315,10 +315,10 @@ parse_matchtype(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { { pctx->flags |= CFG_PCTX_SKIP; } - return (cfg_parse_enum(pctx, type, ret)); + return cfg_parse_enum(pctx, type, ret); cleanup: - return (result); + return result; } static isc_result_t @@ -335,7 +335,7 @@ parse_matchname(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { *ret = obj; cleanup: - return (result); + return result; } static void @@ -403,7 +403,7 @@ parse_updatepolicy(cfg_parser_t *pctx, const cfg_type_t *type, pctx->token.value.as_char == '{') { cfg_ungettoken(pctx); - return (cfg_parse_bracketed_list(pctx, type, ret)); + return cfg_parse_bracketed_list(pctx, type, ret); } if (pctx->token.type == isc_tokentype_string && @@ -417,14 +417,14 @@ parse_updatepolicy(cfg_parser_t *pctx, const cfg_type_t *type, memmove(obj->value.string.base, "local", 5); obj->value.string.base[5] = '\0'; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_ungettoken(pctx); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; cleanup: - return (result); + return result; } static void @@ -496,7 +496,7 @@ static cfg_type_t cfg_type_category = { "category", cfg_parse_tuple, static isc_result_t parse_maxduration(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_duration, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_duration, ret); } static void @@ -536,7 +536,7 @@ static cfg_type_t cfg_type_dnsseckey = { "dnsseckey", cfg_parse_tuple, static isc_result_t parse_optional_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_void, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_void, ret); } static void @@ -608,7 +608,7 @@ parse_keystore(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { *ret = obj; cleanup: - return (result); + return result; } static void @@ -701,7 +701,7 @@ parse_optionaltagrange(cfg_parser_t *pctx, const cfg_type_t *type, *ret = obj; cleanup: - return (result); + return result; } static cfg_type_t cfg_type_optional_tagrange = { @@ -866,7 +866,7 @@ static cfg_type_t cfg_type_updatemethod = { static const char *zonestat_enums[] = { "full", "terse", "none", NULL }; static isc_result_t parse_zonestat(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_zonestat(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -981,12 +981,12 @@ parse_qstringornone(cfg_parser_t *pctx, const cfg_type_t *type, if (pctx->token.type == isc_tokentype_string && strcasecmp(TOKEN_STRING(pctx), "none") == 0) { - return (cfg_create_obj(pctx, &cfg_type_none, ret)); + return cfg_create_obj(pctx, &cfg_type_none, ret); } cfg_ungettoken(pctx); - return (cfg_parse_qstring(pctx, type, ret)); + return cfg_parse_qstring(pctx, type, ret); cleanup: - return (result); + return result; } static void @@ -1023,12 +1023,12 @@ parse_boolorauto(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (pctx->token.type == isc_tokentype_string && strcasecmp(TOKEN_STRING(pctx), "auto") == 0) { - return (cfg_create_obj(pctx, &cfg_type_auto, ret)); + return cfg_create_obj(pctx, &cfg_type_auto, ret); } cfg_ungettoken(pctx); - return (cfg_parse_boolean(pctx, type, ret)); + return cfg_parse_boolean(pctx, type, ret); cleanup: - return (result); + return result; } static void @@ -1077,7 +1077,7 @@ parse_serverid(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (pctx->token.type == isc_tokentype_string && strcasecmp(TOKEN_STRING(pctx), "none") == 0) { - return (cfg_create_obj(pctx, &cfg_type_none, ret)); + return cfg_create_obj(pctx, &cfg_type_none, ret); } if (pctx->token.type == isc_tokentype_string && strcasecmp(TOKEN_STRING(pctx), "hostname") == 0) @@ -1086,12 +1086,12 @@ parse_serverid(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (result == ISC_R_SUCCESS) { (*ret)->value.boolean = true; } - return (result); + return result; } cfg_ungettoken(pctx); - return (cfg_parse_qstring(pctx, type, ret)); + return cfg_parse_qstring(pctx, type, ret); cleanup: - return (result); + return result; } static void @@ -1578,11 +1578,11 @@ parse_dtout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static void @@ -1694,11 +1694,11 @@ cfg_parse_rpz_policy(cfg_parser_t *pctx, const cfg_type_t *type, } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } /* @@ -1753,11 +1753,11 @@ cfg_parse_kv_tuple(cfg_parser_t *pctx, const cfg_type_t *type, } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static void @@ -1952,7 +1952,7 @@ parse_optional_uint32(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_parse_obj(pctx, &cfg_type_void, ret)); } cleanup: - return (result); + return result; } static void @@ -2001,7 +2001,7 @@ static const char *staleanswerclienttimeout_enums[] = { "disabled", "off", static isc_result_t parse_staleanswerclienttimeout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_uint32, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_uint32, ret); } static void @@ -2198,7 +2198,7 @@ static const char *checkds_enums[] = { "explicit", NULL }; static isc_result_t parse_checkds_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_checkds_type(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -2639,7 +2639,7 @@ static const char *printtime_enums[] = { "iso8601", "iso8601-utc", "iso8601-tzinfo", "local", NULL }; static isc_result_t parse_printtime(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_printtime(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -2724,12 +2724,12 @@ parse_unitstring(char *str, uint64_t *valuep) { value = strtoull(str, &endp, 10); if (*endp == 0) { *valuep = value; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } len = strlen(str); if (len < 2 || endp[1] != '\0') { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } switch (str[len - 1]) { @@ -2746,13 +2746,13 @@ parse_unitstring(char *str, uint64_t *valuep) { unit = 1024 * 1024 * 1024; break; default: - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } if (value > ((uint64_t)UINT64_MAX / unit)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *valuep = value * unit; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -2773,12 +2773,12 @@ parse_sizeval(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_create_obj(pctx, &cfg_type_uint64, &obj)); obj->value.uint64 = val; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected integer and optional unit"); - return (result); + return result; } static isc_result_t @@ -2804,19 +2804,19 @@ parse_sizeval_percent(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_create_obj(pctx, &cfg_type_percentage, &obj)); obj->value.uint32 = (uint32_t)percent; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { CHECK(parse_unitstring(TOKEN_STRING(pctx), &val)); CHECK(cfg_create_obj(pctx, &cfg_type_uint64, &obj)); obj->value.uint64 = val; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected integer and optional unit or percent"); - return (result); + return result; } static void @@ -2843,7 +2843,7 @@ static cfg_type_t cfg_type_sizeval = { "sizeval", parse_sizeval, static isc_result_t parse_size(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval, ret); } static void @@ -2881,8 +2881,8 @@ static cfg_type_t cfg_type_sizeval_percent = { static isc_result_t parse_size_or_percent(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval_percent, - ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval_percent, + ret); } static void @@ -2907,7 +2907,7 @@ static cfg_type_t cfg_type_sizeorpercent = { static isc_result_t parse_ixfrratio(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_percentage, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_percentage, ret); } static void @@ -2953,18 +2953,18 @@ parse_maybe_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, *ret = obj; cleanup: - return (result); + return result; } static isc_result_t parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (parse_maybe_optional_keyvalue(pctx, type, false, ret)); + return parse_maybe_optional_keyvalue(pctx, type, false, ret); } static isc_result_t parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (parse_maybe_optional_keyvalue(pctx, type, true, ret)); + return parse_maybe_optional_keyvalue(pctx, type, true, ret); } static void @@ -2997,7 +2997,7 @@ static const char *notify_enums[] = { "explicit", "master-only", "primary-only", NULL }; static isc_result_t parse_notify_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_notify_type(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -3011,7 +3011,7 @@ static cfg_type_t cfg_type_notifytype = { static const char *minimal_enums[] = { "no-auth", "no-auth-recursive", NULL }; static isc_result_t parse_minimal(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_minimal(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -3027,7 +3027,7 @@ static const char *ixfrdiff_enums[] = { "primary", "master", "secondary", static isc_result_t parse_ixfrdiff_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret); } static void doc_ixfrdiff_type(cfg_printer_t *pctx, const cfg_type_t *type) { @@ -3200,7 +3200,7 @@ parse_optional_class(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_parse_obj(pctx, &cfg_type_void, ret)); } cleanup: - return (result); + return result; } static void @@ -3226,7 +3226,7 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (result != ISC_R_SUCCESS) { cfg_parser_error(pctx, CFG_LOG_NEAR, "invalid query source"); } - return (result); + return result; } static void @@ -3320,7 +3320,7 @@ parse_server_key_kludge(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_parse_special(pctx, '}')); } cleanup: - return (result); + return result; } static cfg_type_t cfg_type_server_key_kludge = { "server_key", parse_server_key_kludge, NULL, cfg_doc_terminal, NULL, @@ -3346,7 +3346,7 @@ parse_optional_facility(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_parse_obj(pctx, &cfg_type_void, ret)); } cleanup: - return (result); + return result; } static void @@ -3399,7 +3399,7 @@ parse_logseverity(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_obj(pctx, &cfg_type_loglevel, ret)); } cleanup: - return (result); + return result; } static cfg_type_t cfg_type_logseverity = { "log_severity", parse_logseverity, @@ -3414,7 +3414,7 @@ static cfg_type_t cfg_type_logseverity = { "log_severity", parse_logseverity, static const char *logversions_enums[] = { "unlimited", NULL }; static isc_result_t parse_logversions(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_enum_or_other(pctx, type, &cfg_type_uint32, ret)); + return cfg_parse_enum_or_other(pctx, type, &cfg_type_uint32, ret); } static void @@ -3493,11 +3493,11 @@ parse_logfile(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static void @@ -3677,10 +3677,10 @@ parse_sockaddrnameport(cfg_parser_t *pctx, const cfg_type_t *type, } else { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected IP address or hostname"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } cleanup: - return (result); + return result; } static cfg_type_t cfg_type_sockaddrnameport = { "sockaddrnameport_element", @@ -3757,11 +3757,11 @@ parse_remoteselement(cfg_parser_t *pctx, const cfg_type_t *type, cfg_parser_error(pctx, CFG_LOG_NEAR, "expected IP address or remote servers list " "name"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static cfg_type_t cfg_type_remoteselement = { "remotes_element", @@ -3775,7 +3775,7 @@ static int cmp_clause(const void *ap, const void *bp) { const cfg_clausedef_t *a = (const cfg_clausedef_t *)ap; const cfg_clausedef_t *b = (const cfg_clausedef_t *)bp; - return (strcmp(a->name, b->name)); + return strcmp(a->name, b->name); } bool @@ -3800,7 +3800,7 @@ cfg_clause_validforzone(const char *name, unsigned int ztype) { valid = true; } - return (valid); + return valid; } void diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 491cf159b2..0b9e2626c8 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -244,10 +244,10 @@ cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { result = type->parse(pctx, type, ret); if (result != ISC_R_SUCCESS) { - return (result); + return result; } ENSURE(*ret != NULL); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -304,13 +304,13 @@ cfg_create_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { obj->value.tuple[i] = NULL; } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (obj != NULL) { isc_mem_put(pctx->mctx, obj, sizeof(*obj)); } - return (result); + return result; } isc_result_t @@ -333,11 +333,11 @@ cfg_parse_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } void @@ -405,7 +405,7 @@ free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj) { bool cfg_obj_istuple(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_tuple); + return obj->type->rep == &cfg_rep_tuple; } const cfg_obj_t * @@ -420,7 +420,7 @@ cfg_tuple_get(const cfg_obj_t *tupleobj, const char *name) { fields = tupleobj->type->of; for (f = fields, i = 0; f->name != NULL; f++, i++) { if (strcmp(f->name, name) == 0) { - return (tupleobj->value.tuple[i]); + return tupleobj->value.tuple[i]; } } UNREACHABLE(); @@ -436,13 +436,13 @@ cfg_parse_special(cfg_parser_t *pctx, int special) { if (pctx->token.type == isc_tokentype_special && pctx->token.value.as_char == special) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_parser_error(pctx, CFG_LOG_NEAR, "'%c' expected", special); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; cleanup: - return (result); + return result; } /* @@ -460,13 +460,13 @@ parse_semicolon(cfg_parser_t *pctx) { if (pctx->token.type == isc_tokentype_special && pctx->token.value.as_char == ';') { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_parser_error(pctx, CFG_LOG_BEFORE, "missing ';'"); cfg_ungettoken(pctx); cleanup: - return (result); + return result; } /* @@ -479,13 +479,13 @@ parse_eof(cfg_parser_t *pctx) { CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type == isc_tokentype_eof) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_parser_error(pctx, CFG_LOG_NEAR, "syntax error"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; cleanup: - return (result); + return result; } /* A list of files, used internally for pctx->files. */ @@ -543,7 +543,7 @@ cfg_parser_create(isc_mem_t *mctx, cfg_parser_t **ret) { CHECK(cfg_create_list(pctx, &cfg_type_filelist, &pctx->closed_files)); *ret = pctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (pctx->lexer != NULL) { @@ -552,7 +552,7 @@ cleanup: CLEANUP_OBJ(pctx->open_files); CLEANUP_OBJ(pctx->closed_files); isc_mem_putanddetach(&pctx->mctx, pctx, sizeof(*pctx)); - return (result); + return result; } void @@ -584,10 +584,10 @@ parser_openfile(cfg_parser_t *pctx, const char *filename) { elt->obj = stringobj; ISC_LIST_APPEND(pctx->open_files->value.list, elt, link); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(stringobj); - return (result); + return result; } void @@ -643,11 +643,11 @@ parse2(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(parse_eof(pctx)); *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } isc_result_t @@ -672,7 +672,7 @@ cfg_parse_file(cfg_parser_t *pctx, const char *filename, const cfg_type_t *type, ISC_LIST_APPEND(pctx->closed_files->value.list, elt, link); cleanup: - return (result); + return result; } isc_result_t @@ -701,7 +701,7 @@ cfg_parse_buffer(cfg_parser_t *pctx, isc_buffer_t *buffer, const char *file, pctx->buf_name = NULL; cleanup: - return (result); + return result; } void @@ -744,7 +744,7 @@ cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { UNUSED(type); - return (cfg_create_obj(pctx, &cfg_type_void, ret)); + return cfg_create_obj(pctx, &cfg_type_void, ret); } void @@ -768,7 +768,7 @@ cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type) { bool cfg_obj_isvoid(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_void); + return obj->type->rep == &cfg_rep_void; } cfg_type_t cfg_type_void = { "void", cfg_parse_void, cfg_print_void, @@ -793,13 +793,13 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type != isc_tokentype_string) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected percentage"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } percent = strtoull(TOKEN_STRING(pctx), &endp, 10); if (*endp != '%' || *(endp + 1) != 0) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected percentage"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } CHECK(cfg_create_obj(pctx, &cfg_type_percentage, &obj)); @@ -807,7 +807,7 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type, *ret = obj; cleanup: - return (result); + return result; } void @@ -826,7 +826,7 @@ cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) { uint32_t cfg_obj_aspercentage(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_percentage); - return (obj->value.uint32); + return obj->value.uint32; } cfg_type_t cfg_type_percentage = { "percentage", cfg_parse_percentage, @@ -836,7 +836,7 @@ cfg_type_t cfg_type_percentage = { "percentage", cfg_parse_percentage, bool cfg_obj_ispercentage(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_percentage); + return obj->type->rep == &cfg_rep_percentage; } /* @@ -859,7 +859,7 @@ cfg_parse_fixedpoint(cfg_parser_t *pctx, const cfg_type_t *type, if (pctx->token.type != isc_tokentype_string) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected fixed point number"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } p = TOKEN_STRING(pctx); @@ -872,7 +872,7 @@ cfg_parse_fixedpoint(cfg_parser_t *pctx, const cfg_type_t *type, { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected fixed point number"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } CHECK(cfg_create_obj(pctx, &cfg_type_fixedpoint, &obj)); @@ -889,7 +889,7 @@ cfg_parse_fixedpoint(cfg_parser_t *pctx, const cfg_type_t *type, *ret = obj; cleanup: - return (result); + return result; } void @@ -909,7 +909,7 @@ cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) { uint32_t cfg_obj_asfixedpoint(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_fixedpoint); - return (obj->value.uint32); + return obj->value.uint32; } cfg_type_t cfg_type_fixedpoint = { "fixedpoint", cfg_parse_fixedpoint, @@ -919,7 +919,7 @@ cfg_type_t cfg_type_fixedpoint = { "fixedpoint", cfg_parse_fixedpoint, bool cfg_obj_isfixedpoint(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_fixedpoint); + return obj->type->rep == &cfg_rep_fixedpoint; } /* @@ -938,7 +938,7 @@ cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_gettoken(pctx, ISC_LEXOPT_NUMBER | ISC_LEXOPT_CNUMBER)); if (pctx->token.type != isc_tokentype_number) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected number"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } CHECK(cfg_create_obj(pctx, &cfg_type_uint32, &obj)); @@ -946,7 +946,7 @@ cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { obj->value.uint32 = pctx->token.value.as_ulong; *ret = obj; cleanup: - return (result); + return result; } void @@ -970,13 +970,13 @@ cfg_print_uint32(cfg_printer_t *pctx, const cfg_obj_t *obj) { bool cfg_obj_isuint32(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_uint32); + return obj->type->rep == &cfg_rep_uint32; } uint32_t cfg_obj_asuint32(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint32); - return (obj->value.uint32); + return obj->value.uint32; } cfg_type_t cfg_type_uint32 = { "integer", cfg_parse_uint32, @@ -989,13 +989,13 @@ cfg_type_t cfg_type_uint32 = { "integer", cfg_parse_uint32, bool cfg_obj_isuint64(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_uint64); + return obj->type->rep == &cfg_rep_uint64; } uint64_t cfg_obj_asuint64(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint64); - return (obj->value.uint64); + return obj->value.uint64; } void @@ -1019,13 +1019,13 @@ numlen(uint32_t num) { size_t count = 0; if (period == 0) { - return (1); + return 1; } while (period > 0) { count++; period /= 10; } - return (count); + return count; } /* @@ -1136,13 +1136,13 @@ cfg_print_duration_or_unlimited(cfg_printer_t *pctx, const cfg_obj_t *obj) { bool cfg_obj_isduration(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_duration); + return obj->type->rep == &cfg_rep_duration; } uint32_t cfg_obj_asduration(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_duration); - return (isccfg_duration_toseconds(&(obj->value.duration))); + return isccfg_duration_toseconds(&(obj->value.duration)); } static isc_result_t @@ -1157,7 +1157,7 @@ parse_duration(cfg_parser_t *pctx, cfg_obj_t **ret) { if (result == ISC_R_RANGE) { cfg_parser_error(pctx, CFG_LOG_NEAR, "duration or TTL out of range"); - return (result); + return result; } else if (result != ISC_R_SUCCESS) { goto cleanup; } @@ -1166,12 +1166,12 @@ parse_duration(cfg_parser_t *pctx, cfg_obj_t **ret) { obj->value.duration = duration; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected ISO 8601 duration or TTL value"); - return (result); + return result; } isc_result_t @@ -1187,12 +1187,12 @@ cfg_parse_duration(cfg_parser_t *pctx, const cfg_type_t *type, goto cleanup; } - return (parse_duration(pctx, ret)); + return parse_duration(pctx, ret); cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected ISO 8601 duration or TTL value"); - return (result); + return result; } isc_result_t @@ -1220,15 +1220,15 @@ cfg_parse_duration_or_unlimited(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_create_obj(pctx, &cfg_type_duration, &obj)); obj->value.duration = duration; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - return (parse_duration(pctx, ret)); + return parse_duration(pctx, ret); cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected ISO 8601 duration, TTL value, or unlimited"); - return (result); + return result; } /*% @@ -1275,14 +1275,14 @@ create_string(cfg_parser_t *pctx, const char *contents, const cfg_type_t *type, obj->value.string.base = isc_mem_get(pctx->mctx, len + 1); if (obj->value.string.base == 0) { isc_mem_put(pctx->mctx, obj, sizeof(*obj)); - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } memmove(obj->value.string.base, contents, len); obj->value.string.base[len] = '\0'; *ret = obj; cleanup: - return (result); + return result; } isc_result_t @@ -1297,12 +1297,11 @@ cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_gettoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type != isc_tokentype_qstring) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected quoted string"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } - return (create_string(pctx, TOKEN_STRING(pctx), &cfg_type_qstring, - ret)); + return create_string(pctx, TOKEN_STRING(pctx), &cfg_type_qstring, ret); cleanup: - return (result); + return result; } static isc_result_t @@ -1315,12 +1314,11 @@ parse_ustring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { if (pctx->token.type != isc_tokentype_string) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected unquoted string"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } - return (create_string(pctx, TOKEN_STRING(pctx), &cfg_type_ustring, - ret)); + return create_string(pctx, TOKEN_STRING(pctx), &cfg_type_ustring, ret); cleanup: - return (result); + return result; } isc_result_t @@ -1333,10 +1331,9 @@ cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { UNUSED(type); CHECK(cfg_getstringtoken(pctx)); - return (create_string(pctx, TOKEN_STRING(pctx), &cfg_type_qstring, - ret)); + return create_string(pctx, TOKEN_STRING(pctx), &cfg_type_qstring, ret); cleanup: - return (result); + return result; } isc_result_t @@ -1349,10 +1346,9 @@ cfg_parse_sstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { UNUSED(type); CHECK(cfg_getstringtoken(pctx)); - return (create_string(pctx, TOKEN_STRING(pctx), &cfg_type_sstring, - ret)); + return create_string(pctx, TOKEN_STRING(pctx), &cfg_type_sstring, ret); cleanup: - return (result); + return result; } static isc_result_t @@ -1364,12 +1360,12 @@ parse_btext(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_gettoken(pctx, ISC_LEXOPT_BTEXT)); if (pctx->token.type != isc_tokentype_btext) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected bracketed text"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } - return (create_string(pctx, TOKEN_STRING(pctx), - &cfg_type_bracketed_text, ret)); + return create_string(pctx, TOKEN_STRING(pctx), &cfg_type_bracketed_text, + ret); cleanup: - return (result); + return result; } static void @@ -1403,10 +1399,10 @@ cfg_is_enum(const char *s, const char *const *enums) { for (p = enums; *p != NULL; p++) { if (strcasecmp(*p, s) == 0) { - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -1414,10 +1410,10 @@ check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) { const char *s = obj->value.string.base; if (cfg_is_enum(s, enums)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } cfg_parser_error(pctx, 0, "'%s' unexpected", s); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } isc_result_t @@ -1432,10 +1428,10 @@ cfg_parse_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(parse_ustring(pctx, NULL, &obj)); CHECK(check_enum(pctx, obj, type->of)); *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } void @@ -1468,7 +1464,7 @@ cfg_parse_enum_or_other(cfg_parser_t *pctx, const cfg_type_t *enumtype, CHECK(cfg_parse_obj(pctx, othertype, ret)); } cleanup: - return (result); + return result; } void @@ -1562,13 +1558,13 @@ free_sockaddrtls(cfg_parser_t *pctx, cfg_obj_t *obj) { bool cfg_obj_isstring(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_string); + return obj->type->rep == &cfg_rep_string; } const char * cfg_obj_asstring(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_string); - return (obj->value.string.base); + return obj->value.string.base; } /* Quoted string only */ @@ -1658,11 +1654,11 @@ parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_obj(pctx, fields[3].type, &obj->value.tuple[3])); *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static void @@ -1716,7 +1712,7 @@ parse_addrmatchelt(cfg_parser_t *pctx, const cfg_type_t *type, cfg_parser_error(pctx, CFG_LOG_NEAR, "'geoip' " "not supported in this build"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; #endif /* if defined(HAVE_GEOIP2) */ } else { if (cfg_lookingat_netaddr( @@ -1743,10 +1739,10 @@ parse_addrmatchelt(cfg_parser_t *pctx, const cfg_type_t *type, bad: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected IP match list element"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } cleanup: - return (result); + return result; } /*% @@ -1804,7 +1800,7 @@ parse_optional_btext(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(cfg_parse_obj(pctx, &cfg_type_void, ret)); } cleanup: - return (result); + return result; } static void @@ -1840,13 +1836,13 @@ cfg_type_t cfg_type_optional_bracketed_text = { "optional_btext", bool cfg_obj_isboolean(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_boolean); + return obj->type->rep == &cfg_rep_boolean; } bool cfg_obj_asboolean(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_boolean); - return (obj->value.boolean); + return obj->value.boolean; } isc_result_t @@ -1862,7 +1858,7 @@ cfg_parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { result = cfg_gettoken(pctx, 0); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (pctx->token.type != isc_tokentype_string) { @@ -1886,14 +1882,14 @@ cfg_parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_create_obj(pctx, &cfg_type_boolean, &obj)); obj->value.boolean = value; *ret = obj; - return (result); + return result; bad_boolean: cfg_parser_error(pctx, CFG_LOG_NEAR, "boolean expected"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; cleanup: - return (result); + return result; } void @@ -1927,7 +1923,7 @@ cfg_create_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **obj) { CHECK(cfg_create_obj(pctx, type, obj)); ISC_LIST_INIT((*obj)->value.list); cleanup: - return (result); + return result; } static isc_result_t @@ -1938,7 +1934,7 @@ create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp) { elt->obj = NULL; ISC_LINK_INIT(elt, link); *eltp = elt; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1979,11 +1975,11 @@ cfg_parse_listelt(cfg_parser_t *pctx, const cfg_type_t *elttype, elt->obj = value; *ret = elt; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_mem_put(pctx->mctx, elt, sizeof(*elt)); - return (result); + return result; } /* @@ -2012,14 +2008,14 @@ parse_list(cfg_parser_t *pctx, const cfg_type_t *listtype, cfg_obj_t **ret) { elt = NULL; } *ret = listobj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (elt != NULL) { free_listelt(pctx, elt); } CLEANUP_OBJ(listobj); - return (result); + return result; } static void @@ -2054,7 +2050,7 @@ cfg_parse_bracketed_list(cfg_parser_t *pctx, const cfg_type_t *type, CHECK(parse_list(pctx, type, ret)); CHECK(cfg_parse_special(pctx, '}')); cleanup: - return (result); + return result; } void @@ -2110,11 +2106,11 @@ cfg_parse_spacelist(cfg_parser_t *pctx, const cfg_type_t *listtype, ISC_LIST_APPEND(listobj->value.list, elt, link); } *ret = listobj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(listobj); - return (result); + return result; } void @@ -2140,22 +2136,22 @@ cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) { bool cfg_obj_islist(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_list); + return obj->type->rep == &cfg_rep_list; } const cfg_listelt_t * cfg_list_first(const cfg_obj_t *obj) { REQUIRE(obj == NULL || obj->type->rep == &cfg_rep_list); if (obj == NULL) { - return (NULL); + return NULL; } - return (ISC_LIST_HEAD(obj->value.list)); + return ISC_LIST_HEAD(obj->value.list); } const cfg_listelt_t * cfg_list_next(const cfg_listelt_t *elt) { REQUIRE(elt != NULL); - return (ISC_LIST_NEXT(elt, link)); + return ISC_LIST_NEXT(elt, link); } /* @@ -2168,7 +2164,7 @@ cfg_list_length(const cfg_obj_t *obj, bool recurse) { unsigned int count = 0; if (obj == NULL || !cfg_obj_islist(obj)) { - return (0U); + return 0U; } for (elt = cfg_list_first(obj); elt != NULL; elt = cfg_list_next(elt)) { if (recurse && cfg_obj_islist(elt->obj)) { @@ -2177,13 +2173,13 @@ cfg_list_length(const cfg_obj_t *obj, bool recurse) { count++; } } - return (count); + return count; } cfg_obj_t * cfg_listelt_value(const cfg_listelt_t *elt) { REQUIRE(elt != NULL); - return (elt->obj); + return elt->obj; } /* @@ -2421,14 +2417,14 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { } *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(value); CLEANUP_OBJ(obj); CLEANUP_OBJ(eltobj); CLEANUP_OBJ(includename); - return (result); + return result; } static isc_result_t @@ -2446,11 +2442,11 @@ parse_symtab_elt(cfg_parser_t *pctx, const char *name, cfg_type_t *elttype, symval.as_pointer = obj; CHECK(isc_symtab_define(symtab, name, 1, symval, isc_symexists_reject)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } /* @@ -2468,7 +2464,7 @@ cfg_parse_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_mapbody(pctx, type, ret)); CHECK(cfg_parse_special(pctx, '}')); cleanup: - return (result); + return result; } /* @@ -2490,11 +2486,11 @@ parse_any_named_map(cfg_parser_t *pctx, cfg_type_t *nametype, CHECK(cfg_parse_map(pctx, type, &mapobj)); mapobj->value.map.id = idobj; *ret = mapobj; - return (result); + return result; cleanup: CLEANUP_OBJ(idobj); CLEANUP_OBJ(mapobj); - return (result); + return result; } /* @@ -2504,7 +2500,7 @@ cleanup: isc_result_t cfg_parse_named_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (parse_any_named_map(pctx, &cfg_type_astring, type, ret)); + return parse_any_named_map(pctx, &cfg_type_astring, type, ret); } /* @@ -2514,7 +2510,7 @@ cfg_parse_named_map(cfg_parser_t *pctx, const cfg_type_t *type, isc_result_t cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (parse_any_named_map(pctx, &cfg_type_netaddr, type, ret)); + return parse_any_named_map(pctx, &cfg_type_netaddr, type, ret); } /* @@ -2524,7 +2520,7 @@ cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, isc_result_t cfg_parse_netprefix_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (parse_any_named_map(pctx, &cfg_type_netprefix, type, ret)); + return parse_any_named_map(pctx, &cfg_type_netprefix, type, ret); } static void @@ -2713,7 +2709,7 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) { bool cfg_obj_ismap(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_map); + return obj->type->rep == &cfg_rep_map; } isc_result_t @@ -2730,16 +2726,16 @@ cfg_map_get(const cfg_obj_t *mapobj, const char *name, const cfg_obj_t **obj) { result = isc_symtab_lookup(map->symtab, name, MAP_SYM, &val); if (result != ISC_R_SUCCESS) { - return (result); + return result; } *obj = val.as_pointer; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } const cfg_obj_t * cfg_map_getname(const cfg_obj_t *mapobj) { REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); - return (mapobj->value.map.id); + return mapobj->value.map.id; } unsigned int @@ -2749,7 +2745,7 @@ cfg_map_count(const cfg_obj_t *mapobj) { REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); map = &mapobj->value.map; - return (isc_symtab_count(map->symtab)); + return isc_symtab_count(map->symtab); } const char * @@ -2763,17 +2759,17 @@ cfg_map_firstclause(const cfg_type_t *map, const void **clauses, clauseset = map->of; if (*clauseset == NULL) { - return (NULL); + return NULL; } *clauses = *clauseset; *idx = 0; while ((*clauseset)[*idx].name == NULL) { *clauses = (*++clauseset); if (*clauses == NULL) { - return (NULL); + return NULL; } } - return ((*clauseset)[*idx].name); + return (*clauseset)[*idx].name; } const char * @@ -2795,10 +2791,10 @@ cfg_map_nextclause(const cfg_type_t *map, const void **clauses, *idx = 0; *clauses = (*++clauseset); if (*clauses == NULL) { - return (NULL); + return NULL; } } - return ((*clauseset)[*idx].name); + return (*clauseset)[*idx].name; } /* Parse an arbitrary token, storing its raw text representation. */ @@ -2825,13 +2821,13 @@ parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { memmove(obj->value.string.base, r.base, r.length); obj->value.string.base[r.length] = '\0'; *ret = obj; - return (result); + return result; cleanup: if (obj != NULL) { isc_mem_put(pctx->mctx, obj, sizeof(*obj)); } - return (result); + return result; } cfg_type_t cfg_type_token = { "token", parse_token, @@ -2878,11 +2874,11 @@ parse_unsupported(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { } INSIST(braces == 0); *ret = listobj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(listobj); - return (result); + return result; } cfg_type_t cfg_type_unsupported = { "unsupported", parse_unsupported, @@ -2905,17 +2901,17 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { struct in6_addr in6a; if (pctx->token.type != isc_tokentype_string) { - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } s = TOKEN_STRING(pctx); if ((flags & CFG_ADDR_WILDOK) != 0 && strcmp(s, "*") == 0) { if ((flags & CFG_ADDR_V4OK) != 0) { isc_netaddr_any(na); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if ((flags & CFG_ADDR_V6OK) != 0) { isc_netaddr_any6(na); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else { UNREACHABLE(); } @@ -2923,7 +2919,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { if ((flags & (CFG_ADDR_V4OK | CFG_ADDR_V4PREFIXOK)) != 0) { if (inet_pton(AF_INET, s, &in4a) == 1) { isc_netaddr_fromin(na, &in4a); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } if ((flags & CFG_ADDR_V4PREFIXOK) != 0 && strlen(s) <= 15U) { @@ -2935,7 +2931,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { strlcat(buf, ".0", sizeof(buf)); if (inet_pton(AF_INET, buf, &in4a) == 1) { isc_netaddr_fromin(na, &in4a); - return (ISC_R_IPV4PREFIX); + return ISC_R_IPV4PREFIX; } } } @@ -2957,17 +2953,17 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { result = isc_netscope_pton( AF_INET6, d + 1, &in6a, &zone); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } isc_netaddr_fromin6(na, &in6a); isc_netaddr_setzone(na, zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } } - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } isc_result_t @@ -3003,7 +2999,7 @@ cfg_parse_rawaddr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { } } cleanup: - return (result); + return result; } bool @@ -3014,7 +3010,7 @@ cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags) { REQUIRE(pctx != NULL); result = token_addr(pctx, flags, &na_dummy); - return (result == ISC_R_SUCCESS || result == ISC_R_IPV4PREFIX); + return result == ISC_R_SUCCESS || result == ISC_R_IPV4PREFIX; } isc_result_t @@ -3031,22 +3027,22 @@ cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port) { strcmp(TOKEN_STRING(pctx), "*") == 0) { *port = 0; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (pctx->token.type != isc_tokentype_number) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected port number or '*'"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } if (pctx->token.value.as_ulong >= 65536U) { cfg_parser_error(pctx, CFG_LOG_NEAR, "port number out of range"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } *port = (in_port_t)(pctx->token.value.as_ulong); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: - return (result); + return result; } void @@ -3084,10 +3080,10 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, 0); *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: CLEANUP_OBJ(obj); - return (result); + return result; } static void @@ -3183,13 +3179,13 @@ cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, if (pctx->token.type != isc_tokentype_number) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected prefix length"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } prefixlen = pctx->token.value.as_ulong; if (prefixlen > addrlen) { cfg_parser_error(pctx, CFG_LOG_NOPREP, "invalid prefix length"); - return (ISC_R_RANGE); + return ISC_R_RANGE; } result = isc_netaddr_prefixok(&netaddr, prefixlen); if (result != ISC_R_SUCCESS) { @@ -3199,13 +3195,13 @@ cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, "'%s/%u': address/prefix length " "mismatch", buf, prefixlen); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } else { if (expectprefix) { cfg_parser_error(pctx, CFG_LOG_NEAR, "incomplete IPv4 address or prefix"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } prefixlen = addrlen; } @@ -3213,10 +3209,10 @@ cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, obj->value.netprefix.address = netaddr; obj->value.netprefix.prefixlen = prefixlen; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: cfg_parser_error(pctx, CFG_LOG_NEAR, "expected network prefix"); - return (result); + return result; } static void @@ -3231,7 +3227,7 @@ print_netprefix(cfg_printer_t *pctx, const cfg_obj_t *obj) { bool cfg_obj_isnetprefix(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_netprefix); + return obj->type->rep == &cfg_rep_netprefix; } void @@ -3343,14 +3339,14 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, } isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, port); *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (tls.base != NULL) { isc_mem_put(pctx->mctx, tls.base, tls.length + 1); } CLEANUP_OBJ(obj); - return (result); + return result; } isc_result_t @@ -3365,7 +3361,7 @@ cfg_parse_sockaddr_generic(cfg_parser_t *pctx, cfg_type_t *klass, flagp = type->of; - return (parse_sockaddrsub(pctx, klass, *flagp, ret)); + return parse_sockaddrsub(pctx, klass, *flagp, ret); } static unsigned int sockaddr_flags = CFG_ADDR_V4OK | CFG_ADDR_V6OK | @@ -3383,15 +3379,14 @@ cfg_type_t cfg_type_sockaddrtls = { "sockaddrtls", cfg_parse_sockaddrtls, isc_result_t cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_sockaddr_generic(pctx, &cfg_type_sockaddr, type, - ret)); + return cfg_parse_sockaddr_generic(pctx, &cfg_type_sockaddr, type, ret); } isc_result_t cfg_parse_sockaddrtls(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { - return (cfg_parse_sockaddr_generic(pctx, &cfg_type_sockaddrtls, type, - ret)); + return cfg_parse_sockaddr_generic(pctx, &cfg_type_sockaddrtls, type, + ret); } void @@ -3463,13 +3458,13 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) { bool cfg_obj_issockaddr(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_sockaddr); + return obj->type->rep == &cfg_rep_sockaddr; } bool cfg_obj_issockaddrtls(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->type->rep == &cfg_rep_sockaddrtls); + return obj->type->rep == &cfg_rep_sockaddrtls; } const isc_sockaddr_t * @@ -3477,13 +3472,13 @@ cfg_obj_assockaddr(const cfg_obj_t *obj) { REQUIRE(obj != NULL); REQUIRE(obj->type->rep == &cfg_rep_sockaddr || obj->type->rep == &cfg_rep_sockaddrtls); - return (&obj->value.sockaddr); + return &obj->value.sockaddr; } const char * cfg_obj_getsockaddrtls(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_sockaddrtls); - return (obj->value.sockaddrtls.tls.base); + return obj->value.sockaddrtls.tls.base; } isc_result_t @@ -3493,7 +3488,7 @@ cfg_gettoken(cfg_parser_t *pctx, int options) { REQUIRE(pctx != NULL); if (pctx->seen_eof) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } options |= (ISC_LEXOPT_EOF | ISC_LEXOPT_NOMORE); @@ -3543,7 +3538,7 @@ redo: isc_result_totext(result)); break; } - return (result); + return result; } void @@ -3566,7 +3561,7 @@ cfg_peektoken(cfg_parser_t *pctx, int options) { CHECK(cfg_gettoken(pctx, options)); cfg_ungettoken(pctx); cleanup: - return (result); + return result; } /* @@ -3579,16 +3574,16 @@ cfg_getstringtoken(cfg_parser_t *pctx) { result = cfg_gettoken(pctx, CFG_LEXOPT_QSTRING); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (pctx->token.type != isc_tokentype_string && pctx->token.type != isc_tokentype_qstring) { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected string"); - return (ISC_R_UNEXPECTEDTOKEN); + return ISC_R_UNEXPECTEDTOKEN; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -3624,15 +3619,15 @@ static bool have_current_file(cfg_parser_t *pctx) { cfg_listelt_t *elt; if (pctx->open_files == NULL) { - return (false); + return false; } elt = ISC_LIST_TAIL(pctx->open_files->value.list); if (elt == NULL) { - return (false); + return false; } - return (true); + return true; } static char * @@ -3642,17 +3637,17 @@ current_file(cfg_parser_t *pctx) { cfg_obj_t *fileobj; if (!have_current_file(pctx)) { - return (none); + return none; } elt = ISC_LIST_TAIL(pctx->open_files->value.list); if (elt == NULL) { /* shouldn't be possible, but... */ - return (none); + return none; } fileobj = elt->obj; INSIST(fileobj->type == &cfg_type_qstring); - return (fileobj->value.string.base); + return fileobj->value.string.base; } static void @@ -3750,14 +3745,14 @@ const char * cfg_obj_file(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->file); + return obj->file; } unsigned int cfg_obj_line(const cfg_obj_t *obj) { REQUIRE(obj != NULL); - return (obj->line); + return obj->line; } isc_result_t @@ -3777,7 +3772,7 @@ cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -3805,13 +3800,13 @@ create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { obj->value.map.id = NULL; *ret = obj; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: if (obj != NULL) { isc_mem_put(pctx->mctx, obj, sizeof(*obj)); } - return (result); + return result; } static void @@ -3825,7 +3820,7 @@ cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) { REQUIRE(obj != NULL); REQUIRE(type != NULL); - return (obj->type == type); + return obj->type == type; } /* @@ -3921,7 +3916,7 @@ cfg_parser_mapadd(cfg_parser_t *pctx, cfg_obj_t *mapobj, cfg_obj_t *obj, breakout: if (clause == NULL || clause->name == NULL) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } result = isc_symtab_lookup(map->symtab, clausename, 0, &symval); @@ -3962,7 +3957,7 @@ cleanup: } CLEANUP_OBJ(destobj); - return (result); + return result; } isc_result_t @@ -3990,7 +3985,7 @@ cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, if (strcasecmp(type, "query") != 0) { cfg_obj_log(obj, ISC_LOG_ERROR, "unsupported plugin type"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } library = cfg_obj_asstring(cfg_tuple_get(plugin, "library")); @@ -4007,5 +4002,5 @@ cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, } } - return (result); + return result; } diff --git a/lib/ns/client.c b/lib/ns/client.c index c4838cf2f3..2c7babe903 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -123,10 +123,10 @@ can_log_sigchecks_quota(void) { isc_stdtime_t now = isc_stdtime_now(); last = atomic_exchange_relaxed(&last_sigchecks_quota_log, now); if (now != last) { - return (true); + return true; } - return (false); + return false; } static void @@ -147,7 +147,7 @@ ns_client_transport_type(const ns_client_t *client) { * When DoQ support this had to be removed to get correct DoQ entries. */ if (!TCP_CLIENT(client)) { - return (DNS_TRANSPORT_UDP); + return DNS_TRANSPORT_UDP; } INSIST(client->handle != NULL); @@ -157,31 +157,31 @@ ns_client_transport_type(const ns_client_t *client) { case isc_nm_udplistener: case isc_nm_proxyudpsocket: case isc_nm_proxyudplistener: - return (DNS_TRANSPORT_UDP); + return DNS_TRANSPORT_UDP; case isc_nm_tlssocket: case isc_nm_tlslistener: - return (DNS_TRANSPORT_TLS); + return DNS_TRANSPORT_TLS; case isc_nm_httpsocket: case isc_nm_httplistener: - return (DNS_TRANSPORT_HTTP); + return DNS_TRANSPORT_HTTP; case isc_nm_streamdnslistener: case isc_nm_streamdnssocket: case isc_nm_proxystreamlistener: case isc_nm_proxystreamsocket: /* If it isn't DoT, it is DNS-over-TCP */ if (isc_nm_has_encryption(client->handle)) { - return (DNS_TRANSPORT_TLS); + return DNS_TRANSPORT_TLS; } FALLTHROUGH; case isc_nm_tcpsocket: case isc_nm_tcplistener: - return (DNS_TRANSPORT_TCP); + return DNS_TRANSPORT_TCP; case isc_nm_maxsocket: case isc_nm_nonesocket: UNREACHABLE(); } - return (DNS_TRANSPORT_UDP); + return DNS_TRANSPORT_UDP; } void @@ -888,11 +888,11 @@ ns_client_dropport(in_port_t port) { case 13: /* daytime */ case 19: /* chargen */ case 37: /* time */ - return (DROPPORT_REQUEST); + return DROPPORT_REQUEST; case 464: /* kpasswd */ - return (DROPPORT_RESPONSE); + return DROPPORT_RESPONSE; } - return (DROPPORT_NO); + return DROPPORT_NO; } #endif /* if NS_CLIENT_DROPPORT */ @@ -1278,7 +1278,7 @@ no_nsid: result = dns_message_buildopt(message, opt, 0, udpsize, flags, ednsopts, count); - return (result); + return result; } static void @@ -1434,7 +1434,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { */ if ((client->attributes & NS_CLIENTATTR_HAVEECS) != 0) { isc_buffer_forward(buf, (unsigned int)optlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1447,7 +1447,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(2), "EDNS client-subnet option too short"); - return (DNS_R_FORMERR); + return DNS_R_FORMERR; } family = isc_buffer_getuint16(buf); @@ -1459,7 +1459,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(2), "EDNS client-subnet option: invalid scope"); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } memset(&caddr, 0, sizeof(caddr)); @@ -1477,7 +1477,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { "EDNS client-subnet option: invalid " "address length (%u) for FAMILY=0", addrlen); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } caddr.family = AF_UNSPEC; break; @@ -1488,7 +1488,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { "EDNS client-subnet option: invalid " "address length (%u) for IPv4", addrlen); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } caddr.family = AF_INET; break; @@ -1499,7 +1499,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { "EDNS client-subnet option: invalid " "address length (%u) for IPv6", addrlen); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } caddr.family = AF_INET6; break; @@ -1507,7 +1507,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(2), "EDNS client-subnet option: invalid family"); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } addrbytes = (addrlen + 7) / 8; @@ -1515,7 +1515,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(2), "EDNS client-subnet option: address too short"); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } paddr = (uint8_t *)&caddr.type; @@ -1528,7 +1528,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { uint8_t bits = ~0U << (8 - (addrlen % 8)); bits &= paddr[addrbytes - 1]; if (bits != paddr[addrbytes - 1]) { - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } } } @@ -1539,20 +1539,20 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { client->attributes |= NS_CLIENTATTR_HAVEECS; isc_buffer_forward(buf, (unsigned int)optlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { if (optlen == 0 || (optlen % 2) != 0) { isc_buffer_forward(buf, (unsigned int)optlen); - return (DNS_R_OPTERR); + return DNS_R_OPTERR; } /* Silently drop additional keytag options. */ if (client->keytag != NULL) { isc_buffer_forward(buf, (unsigned int)optlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } client->keytag = isc_mem_get(client->manager->mctx, optlen); @@ -1561,7 +1561,7 @@ process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { memmove(client->keytag, isc_buffer_current(buf), optlen); } isc_buffer_forward(buf, (unsigned int)optlen); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1605,7 +1605,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { result = DNS_R_BADVERS; } ns_client_error(client, result); - return (result); + return result; } /* Check for NSID request */ @@ -1644,7 +1644,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { result = process_ecs(client, &optbuf, optlen); if (result != ISC_R_SUCCESS) { ns_client_error(client, result); - return (result); + return result; } ns_stats_increment( client->manager->sctx->nsstats, @@ -1673,7 +1673,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { optlen); if (result != ISC_R_SUCCESS) { ns_client_error(client, result); - return (result); + return result; } ns_stats_increment( client->manager->sctx->nsstats, @@ -1693,7 +1693,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { ns_statscounter_edns0in); client->attributes |= NS_CLIENTATTR_WANTOPT; - return (result); + return result; } static void @@ -1802,7 +1802,7 @@ ns_client_setup_view(ns_client_t *client, isc_netaddr_t *netaddr) { /* Async mode. */ if (result == DNS_R_WAIT) { INSIST(client->async == true); - return (DNS_R_WAIT); + return DNS_R_WAIT; } /* @@ -1815,7 +1815,7 @@ ns_client_setup_view(ns_client_t *client, isc_netaddr_t *netaddr) { /* Non-async mode. */ ns_client_async_reset(client); - return (result); + return result; } /* @@ -2504,7 +2504,7 @@ ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { int match; if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (handle != NULL) { @@ -2516,7 +2516,7 @@ ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { &match, NULL) == ISC_R_SUCCESS) && match > 0) { - return (ISC_R_CONNREFUSED); + return ISC_R_CONNREFUSED; } } @@ -2524,7 +2524,7 @@ ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { ns_stats_update_if_greater(sctx->nsstats, ns_statscounter_tcphighwater, tcpquota); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2649,7 +2649,7 @@ ns_clientmgr_create(ns_server_t *sctx, isc_loopmgr_t *loopmgr, *managerp = manager; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -2671,12 +2671,12 @@ ns_clientmgr_shutdown(ns_clientmgr_t *manager) { isc_sockaddr_t * ns_client_getsockaddr(ns_client_t *client) { - return (&client->peeraddr); + return &client->peeraddr; } isc_sockaddr_t * ns_client_getdestaddr(ns_client_t *client) { - return (&client->destsockaddr); + return &client->destsockaddr; } isc_result_t @@ -2718,10 +2718,10 @@ ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr, goto deny; /* Negative match or no match. */ allow: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; deny: - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } isc_result_t @@ -2748,7 +2748,7 @@ ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr, NS_LOGMODULE_CLIENT, log_level, "%s denied", opname); } - return (result); + return result; } static void @@ -2969,7 +2969,7 @@ ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp) { REQUIRE(addrp != NULL); *addrp = &client->peeraddr; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_rdataset_t * @@ -2981,7 +2981,7 @@ ns_client_newrdataset(ns_client_t *client) { rdataset = NULL; dns_message_gettemprdataset(client->message, &rdataset); - return (rdataset); + return rdataset; } void @@ -3011,7 +3011,7 @@ ns_client_newnamebuf(ns_client_t *client) { ISC_LIST_APPEND(client->query.namebufs, dbuf, link); CTRACE("ns_client_newnamebuf: done"); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_t * @@ -3031,7 +3031,7 @@ ns_client_newname(ns_client_t *client, isc_buffer_t *dbuf, isc_buffer_t *nbuf) { client->query.attributes |= NS_QUERYATTR_NAMEBUFUSED; CTRACE("ns_client_newname: done"); - return (name); + return name; } isc_buffer_t * @@ -3059,7 +3059,7 @@ ns_client_getnamebuf(ns_client_t *client) { INSIST(r.length >= 255); } CTRACE("ns_client_getnamebuf: done"); - return (dbuf); + return dbuf; } void @@ -3107,7 +3107,7 @@ ns_client_newdbversion(ns_client_t *client, unsigned int n) { link); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static ns_dbversion_t * @@ -3121,7 +3121,7 @@ client_getdbversion(ns_client_t *client) { INSIST(dbversion != NULL); ISC_LIST_UNLINK(client->query.freeversions, dbversion, link); - return (dbversion); + return dbversion; } ns_dbversion_t * @@ -3143,7 +3143,7 @@ ns_client_findversion(ns_client_t *client, dns_db_t *db) { */ dbversion = client_getdbversion(client); if (dbversion == NULL) { - return (NULL); + return NULL; } dns_db_attach(db, &dbversion->db); dns_db_currentversion(db, &dbversion->version); @@ -3152,5 +3152,5 @@ ns_client_findversion(ns_client_t *client, dns_db_t *db) { ISC_LIST_APPEND(client->query.activeversions, dbversion, link); } - return (dbversion); + return dbversion; } diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c index aaf9d07dd8..915f476c3b 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -74,11 +74,11 @@ ns_plugin_expandpath(const char *src, char *dst, size_t dstsize) { } if (result < 0) { - return (isc_errno_toresult(errno)); + return isc_errno_toresult(errno); } else if ((size_t)result >= dstsize) { - return (ISC_R_NOSPACE); + return ISC_R_NOSPACE; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -102,12 +102,12 @@ load_symbol(uv_lib_t *handle, const char *modpath, const char *symbol_name, "failed to look up symbol %s in " "plugin '%s': %s", symbol_name, modpath, errmsg); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } *symbolp = symbol; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -168,7 +168,7 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) { *pluginp = plugin; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup: isc_log_write(NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_HOOKS, ISC_LOG_ERROR, @@ -177,7 +177,7 @@ cleanup: unload_plugin(&plugin); - return (result); + return result; } static void @@ -230,7 +230,7 @@ cleanup: unload_plugin(&plugin); } - return (result); + return result; } isc_result_t @@ -250,7 +250,7 @@ cleanup: unload_plugin(&plugin); } - return (result); + return result; } void @@ -274,7 +274,7 @@ ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep) { *tablep = hooktable; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index 6f227143d6..836ee05a85 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -90,14 +90,14 @@ clearlistenon(ns_interfacemgr_t *mgr); static bool need_rescan(ns_interfacemgr_t *mgr, struct MSGHDR *rtm, size_t len) { if (rtm->MSGTYPE != RTM_NEWADDR && rtm->MSGTYPE != RTM_DELADDR) { - return (false); + return false; } #ifndef LINUX_NETLINK_AVAILABLE UNUSED(mgr); UNUSED(len); /* On most systems, any NEWADDR or DELADDR means we rescan */ - return (true); + return true; #else /* LINUX_NETLINK_AVAILABLE */ /* ...but on linux we need to check the messages more carefully */ for (struct MSGHDR *nlh = rtm; @@ -168,7 +168,7 @@ need_rescan(ns_interfacemgr_t *mgr, struct MSGHDR *rtm, size_t len) { (existed && was_listening && rtm->MSGTYPE == RTM_DELADDR)) { - return (true); + return true; } } else if (rth->rta_type == IFA_ADDRESS && ifa->ifa_family == AF_INET) @@ -177,20 +177,20 @@ need_rescan(ns_interfacemgr_t *mgr, struct MSGHDR *rtm, size_t len) { * It seems that the IPv4 P2P link state * has changed. */ - return (true); + return true; } else if (rth->rta_type == IFA_LOCAL) { /* * Local address state has changed - do * rescan. */ - return (true); + return true; } rth = RTA_NEXT(rth, rtl); } } #endif /* LINUX_NETLINK_AVAILABLE */ - return (false); + return false; } static void @@ -330,13 +330,13 @@ ns_interfacemgr_create(isc_mem_t *mctx, ns_server_t *sctx, RUNTIME_CHECK(result == ISC_R_SUCCESS); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_lock: isc_mutex_destroy(&mgr->lock); ns_server_detach(&mgr->sctx); isc_mem_putanddetach(&mgr->mctx, mgr, sizeof(*mgr)); - return (result); + return result; } void @@ -416,7 +416,7 @@ ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr) { aclenv = mgr->aclenv; UNLOCK(&mgr->lock); - return (aclenv); + return aclenv; } ISC_REFCOUNT_IMPL(ns_interfacemgr, ns_interfacemgr__destroy); @@ -494,7 +494,7 @@ ns_interface_listenudp(ns_interface_t *ifp, isc_nm_proxy_type_t proxy) { &ifp->addr, ns_client_request, ifp, &ifp->udplistensocket); } - return (result); + return result; } static isc_result_t @@ -523,7 +523,7 @@ ns_interface_listentcp(ns_interface_t *ifp, isc_nm_proxy_type_t proxy) { isc_result_totext(result)); } - return (result); + return result; } /* @@ -545,7 +545,7 @@ ns_interface_listentls(ns_interface_t *ifp, isc_nm_proxy_type_t proxy, isc_log_write(NS_LOGCATEGORY_NETWORK, NS_LOGMODULE_INTERFACEMGR, ISC_LOG_ERROR, "creating TLS socket: %s", isc_result_totext(result)); - return (result); + return result; } /* @@ -560,7 +560,7 @@ ns_interface_listentls(ns_interface_t *ifp, isc_nm_proxy_type_t proxy, isc_result_totext(result)); } - return (result); + return result; } #ifdef HAVE_LIBNGHTTP2 @@ -577,7 +577,7 @@ load_http_endpoints(isc_nm_http_endpoints_t *epset, ns_interface_t *ifp, } } - return (result); + return result; } #endif /* HAVE_LIBNGHTTP2 */ @@ -621,7 +621,7 @@ ns_interface_listenhttp(ns_interface_t *ifp, isc_nm_proxy_type_t proxy, ISC_LOG_ERROR, "creating %s socket: %s", sslctx ? "HTTPS" : "HTTP", isc_result_totext(result)); - return (result); + return result; } if (sslctx) { @@ -642,7 +642,7 @@ ns_interface_listenhttp(ns_interface_t *ifp, isc_nm_proxy_type_t proxy, isc_result_totext(result)); } - return (result); + return result; #else UNUSED(ifp); UNUSED(proxy); @@ -651,7 +651,7 @@ ns_interface_listenhttp(ns_interface_t *ifp, isc_nm_proxy_type_t proxy, UNUSED(neps); UNUSED(max_clients); UNUSED(max_concurrent_streams); - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; #endif } @@ -688,7 +688,7 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, goto cleanup_interface; } *ifpret = ifp; - return (result); + return result; } if (elt->sslctx != NULL) { @@ -697,7 +697,7 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, goto cleanup_interface; } *ifpret = ifp; - return (result); + return result; } result = ns_interface_listenudp(ifp, elt->proxy); @@ -708,7 +708,7 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, goto cleanup_interface; } - if (((mgr->sctx->options & NS_SERVER_NOTCP) == 0)) { + if ((mgr->sctx->options & NS_SERVER_NOTCP) == 0) { result = ns_interface_listentcp(ifp, elt->proxy); if (result != ISC_R_SUCCESS) { if ((result == ISC_R_ADDRINUSE) && @@ -727,11 +727,11 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, } } *ifpret = ifp; - return (result); + return result; cleanup_interface: ns_interface_shutdown(ifp); - return (result); + return result; } void @@ -802,7 +802,7 @@ find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) { } } UNLOCK(&mgr->lock); - return (ifp); + return ifp; } static void @@ -848,7 +848,7 @@ purge_old_interfaces(ns_interfacemgr_t *mgr) { static bool listenon_is_ip6_any(ns_listenelt_t *elt) { REQUIRE(elt && elt->acl); - return (dns_acl_isany(elt->acl)); + return dns_acl_isany(elt->acl); } static isc_result_t @@ -865,7 +865,7 @@ setup_locals(isc_interface_t *interface, dns_acl_t *localhost, result = dns_iptable_addprefix(localhost->iptable, netaddr, prefixlen, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Then add localnets prefix */ @@ -873,7 +873,7 @@ setup_locals(isc_interface_t *interface, dns_acl_t *localhost, /* Non contiguous netmasks not allowed by IPv6 arch. */ if (result != ISC_R_SUCCESS && netaddr->family == AF_INET6) { - return (result); + return result; } if (result != ISC_R_SUCCESS) { @@ -882,7 +882,7 @@ setup_locals(isc_interface_t *interface, dns_acl_t *localhost, "omitting IPv4 interface %s from " "localnets ACL: %s", interface->name, isc_result_totext(result)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (prefixlen == 0U) { @@ -892,16 +892,16 @@ setup_locals(isc_interface_t *interface, dns_acl_t *localhost, "zero prefix length detected", (netaddr->family == AF_INET) ? "IPv4" : "IPv6", interface->name); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } result = dns_iptable_addprefix(localnets->iptable, netaddr, prefixlen, true); if (result != ISC_R_SUCCESS) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -1053,7 +1053,7 @@ same_listener_type(ns_interface_t *ifp, ns_listenelt_t *new_le) { * Check if transport type of the listener has not changed. That * implies that PROXY type has not been changed as well. */ - return (same_transport_type && new_le->proxy == ifp->proxy_type); + return same_transport_type && new_le->proxy == ifp->proxy_type; } static bool @@ -1074,10 +1074,10 @@ interface_update_or_shutdown(ns_interfacemgr_t *mgr, ns_interface_t *ifp, if (config) { update_listener_configuration(mgr, ifp, le); } - return (true); + return true; } } - return (false); + return false; } static isc_result_t @@ -1179,7 +1179,7 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { result = isc_interfaceiter_create(mgr->mctx, &iter); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_acl_create(mgr->mctx, 0, &localhost); @@ -1369,7 +1369,7 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { dns_acl_detach(&localhost); isc_interfaceiter_destroy(&iter); - return (result); + return result; } isc_result_t @@ -1406,7 +1406,7 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { "not listening on any interfaces"); } - return (result); + return result; } void @@ -1452,7 +1452,7 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, * return true. */ if (atomic_load(&mgr->shuttingdown)) { - return (true); + return true; } LOCK(&mgr->lock); for (old = ISC_LIST_HEAD(mgr->listenon); old != NULL; @@ -1465,14 +1465,14 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, } UNLOCK(&mgr->lock); - return (result); + return result; } ns_server_t * ns_interfacemgr_getserver(ns_interfacemgr_t *mgr) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); - return (mgr->sctx); + return mgr->sctx; } ns_clientmgr_t * @@ -1483,7 +1483,7 @@ ns_interfacemgr_getclientmgr(ns_interfacemgr_t *mgr) { REQUIRE(tid >= 0); REQUIRE((uint32_t)tid < mgr->ncpus); - return (mgr->clientmgrs[tid]); + return mgr->clientmgrs[tid]; } bool @@ -1494,8 +1494,8 @@ ns_interfacemgr_dynamic_updates_are_reliable(void) { * reliable kernel-based mechanism for tracking interface state * changes is available. */ - return (true); + return true; #else - return (false); + return false; #endif /* LINUX_NETLINK_AVAILABLE */ } diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c index 6e66fbe122..1ef4a2918a 100644 --- a/lib/ns/listenlist.c +++ b/lib/ns/listenlist.c @@ -200,7 +200,7 @@ listenelt_create(isc_mem_t *mctx, in_port_t port, dns_acl_t *acl, elt->proxy = proxy; *target = elt; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; tls_error: if (sslctx != NULL) { isc_tlsctx_free(&sslctx); @@ -209,7 +209,7 @@ tls_error: if (store != NULL && store != found_store) { isc_tls_cert_store_free(&store); } - return (result); + return result; } isc_result_t @@ -218,8 +218,8 @@ ns_listenelt_create(isc_mem_t *mctx, in_port_t port, dns_acl_t *acl, const ns_listen_tls_params_t *tls_params, isc_tlsctx_cache_t *tlsctx_cache, isc_nm_proxy_type_t proxy, ns_listenelt_t **target) { - return (listenelt_create(mctx, port, acl, family, false, tls, - tls_params, tlsctx_cache, proxy, target)); + return listenelt_create(mctx, port, acl, family, false, tls, tls_params, + tlsctx_cache, proxy, target); } isc_result_t @@ -258,7 +258,7 @@ ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, dns_acl_t *acl, } isc_mem_free(mctx, endpoints); } - return (result); + return result; } void @@ -292,7 +292,7 @@ ns_listenlist_create(isc_mem_t *mctx, ns_listenlist_t **target) { list->refcount = 1; ISC_LIST_INIT(list->elts); *target = list; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -355,12 +355,12 @@ ns_listenlist_default(isc_mem_t *mctx, in_port_t port, bool enabled, ISC_LIST_APPEND(list->elts, elt, link); *target = list; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_listenelt: ns_listenelt_destroy(elt); cleanup_acl: dns_acl_detach(&acl); cleanup: - return (result); + return result; } diff --git a/lib/ns/query.c b/lib/ns/query.c index b49a853ad5..bf11644c75 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -253,10 +253,10 @@ static ns_hooktable_t * get_hooktab(query_ctx_t *qctx) { if (qctx == NULL || qctx->view == NULL || qctx->view->hooktable == NULL) { - return (ns__hook_table); + return ns__hook_table; } - return (qctx->view->hooktable); + return qctx->view->hooktable; } /* @@ -999,9 +999,9 @@ query_checkcacheaccess(ns_client_t *client, const dns_name_t *name, client->query.attributes |= NS_QUERYATTR_CACHEACLOKVALID; } - return ((client->query.attributes & NS_QUERYATTR_CACHEACLOK) != 0 - ? ISC_R_SUCCESS - : DNS_R_REFUSED); + return (client->query.attributes & NS_QUERYATTR_CACHEACLOK) != 0 + ? ISC_R_SUCCESS + : DNS_R_REFUSED; } static isc_result_t @@ -1020,7 +1020,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, * Mirror zone data is treated as cache data. */ if (dns_zone_gettype(zone) == dns_zone_mirror) { - return (query_checkcacheaccess(client, name, qtype, options)); + return query_checkcacheaccess(client, name, qtype, options); } /* @@ -1034,7 +1034,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, !(WANTRECURSION(client) && RECURSIONOK(client)) && client->query.authdbset && db != client->query.authdb) { - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } /* @@ -1045,7 +1045,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, if (dns_zone_gettype(zone) == dns_zone_staticstub && !RECURSIONOK(client)) { - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } /* @@ -1062,7 +1062,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, dbversion = ns_client_findversion(client, db); if (dbversion == NULL) { CTRACE(ISC_LOG_ERROR, "unable to get db version"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } if (options.ignoreacl) { @@ -1070,7 +1070,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, } if (dbversion->acl_checked) { if (!dbversion->queryok) { - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } goto approved; } @@ -1091,7 +1091,7 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, 0) { dbversion->queryok = false; - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } dbversion->queryok = true; goto approved; @@ -1162,14 +1162,14 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, dbversion->acl_checked = true; if (result != ISC_R_SUCCESS) { dbversion->queryok = false; - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } dbversion->queryok = true; approved: /* Transfer ownership, if necessary. */ SET_IF_NOT_NULL(versionp, dbversion->version); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -1219,9 +1219,9 @@ query_getzonedb(ns_client_t *client, const dns_name_t *name, *dbp = db; if (partial && options.partial) { - return (DNS_R_PARTIALMATCH); + return DNS_R_PARTIALMATCH; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; fail: if (zone != NULL) { @@ -1231,7 +1231,7 @@ fail: dns_db_detach(&db); } - return (result); + return result; } static void @@ -1395,11 +1395,11 @@ rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, p_namebuf); } *versionp = rpz_version; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, p_name, rpz_type, "query_getzonedb()", result); - return (result); + return result; } /*% @@ -1416,7 +1416,7 @@ query_getcachedb(ns_client_t *client, const dns_name_t *name, REQUIRE(dbp != NULL && *dbp == NULL); if (!USECACHE(client)) { - return (DNS_R_REFUSED); + return DNS_R_REFUSED; } dns_db_attach(client->view->cachedb, &db); @@ -1432,7 +1432,7 @@ query_getcachedb(ns_client_t *client, const dns_name_t *name, */ *dbp = db; - return (result); + return result; } static isc_result_t @@ -1535,7 +1535,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, } *is_zonep = false; } - return (result); + return result; } static bool @@ -1558,7 +1558,7 @@ query_isduplicate(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, */ CTRACE(ISC_LOG_DEBUG(3), "query_isduplicate: true: " "done"); - return (true); + return true; } else if (result == DNS_R_NXRRSET) { /* * The name exists, but the rdataset does not. @@ -1575,7 +1575,7 @@ query_isduplicate(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, SET_IF_NOT_NULL(mnamep, mname); CTRACE(ISC_LOG_DEBUG(3), "query_isduplicate: false: done"); - return (false); + return false; } /* @@ -1638,7 +1638,7 @@ query_additionalauthfind(dns_db_t *db, dns_dbversion_t *version, dns_db_detachnode(db, &node); } - return (result); + return result; } /* @@ -1652,7 +1652,7 @@ query_additionalauthfind(dns_db_t *db, dns_dbversion_t *version, *nodep = node; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1693,12 +1693,12 @@ query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, * additional data. */ if (!client->query.authdbset || client->query.authdb == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dbversion = ns_client_findversion(client, client->query.authdb); if (dbversion == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dns_db_attach(client->query.authdb, &db); @@ -1722,7 +1722,7 @@ query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, result = query_getzonedb(client, name, type, options, &zone, &db, &version); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_zone_detach(&zone); @@ -1743,7 +1743,7 @@ query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, db = NULL; } - return (result); + return result; } static isc_result_t @@ -1772,7 +1772,7 @@ query_additional_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, REQUIRE(qtype != dns_rdatatype_any); if (!WANTDNSSEC(client) && dns_rdatatype_isdnssec(qtype)) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } CTRACE(ISC_LOG_DEBUG(3), "query_additional_cb"); @@ -2167,7 +2167,7 @@ cleanup: } CTRACE(ISC_LOG_DEBUG(3), "query_additional_cb: done"); - return (eresult); + return eresult; } /* @@ -2398,7 +2398,7 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, result = dns_db_findnodeext(db, &rrsig->signer, false, &cm, &ci, &node); if (result != ISC_R_SUCCESS) { - return (false); + return false; } result = dns_db_findrdataset(db, node, NULL, @@ -2406,11 +2406,11 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, client->now, keyrdataset, NULL); dns_db_detachnode(db, &node); if (result != ISC_R_SUCCESS) { - return (false); + return false; } if (keyrdataset->trust != dns_trust_secure) { - return (false); + return false; } result = dns_rdataset_first(keyrdataset); @@ -2440,7 +2440,7 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, } dst_key_free(keyp); } - return (secure); + return secure; } static bool @@ -2461,9 +2461,9 @@ again: goto again; } if (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD) { - return (true); + return true; } - return (false); + return false; } /* @@ -2479,7 +2479,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, dns_rdataset_t keyrdataset; if (sigrdataset == NULL || !dns_rdataset_isassociated(sigrdataset)) { - return (false); + return false; } for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; @@ -2507,7 +2507,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, dns_rdataset_disassociate(&keyrdataset); mark_secure(client, db, name, &rrsig, rdataset, sigrdataset); - return (true); + return true; } dst_key_free(&key); } while (1); @@ -2515,7 +2515,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, dns_rdataset_disassociate(&keyrdataset); } } - return (false); + return false; } static void @@ -2584,7 +2584,7 @@ recursionquotatype_attach(ns_client_t *client, bool soft_limit) { isc_quota_release(&client->manager->sctx->recursionquota); FALLTHROUGH; default: - return (result); + return result; } recurscount = ns_stats_increment(client->manager->sctx->nsstats, @@ -2594,17 +2594,17 @@ recursionquotatype_attach(ns_client_t *client, bool soft_limit) { ns_statscounter_recurshighwater, recurscount + 1); - return (result); + return result; } static isc_result_t recursionquotatype_attach_hard(ns_client_t *client) { - return (recursionquotatype_attach(client, false)); + return recursionquotatype_attach(client, false); } static isc_result_t recursionquotatype_attach_soft(ns_client_t *client) { - return (recursionquotatype_attach(client, true)); + return recursionquotatype_attach(client, true); } static void @@ -2889,7 +2889,7 @@ rpz_ready(ns_client_t *client, dns_rdataset_t **rdatasetp) { } else if (dns_rdataset_isassociated(*rdatasetp)) { dns_rdataset_disassociate(*rdatasetp); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -2989,7 +2989,7 @@ rpz_get_zbits(ns_client_t *client, dns_rdatatype_t ip_type, zbits &= st->popt.no_rd_ok; } - return (zbits); + return zbits; } static void @@ -3043,13 +3043,13 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, st->m.policy = DNS_RPZ_POLICY_ERROR; result = DNS_R_SERVFAIL; } - return (result); + return result; } result = rpz_ready(client, rdatasetp); if (result != ISC_R_SUCCESS) { st->m.policy = DNS_RPZ_POLICY_ERROR; - return (result); + return result; } if (*dbp != NULL) { is_zone = false; @@ -3068,7 +3068,7 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, if (zone != NULL) { dns_zone_detach(&zone); } - return (result); + return result; } if (zone != NULL) { dns_zone_detach(&zone); @@ -3118,7 +3118,7 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, } } } - return (result); + return result; } /* @@ -3182,7 +3182,7 @@ rpz_get_p_name(ns_client_t *client, dns_name_t *p_name, dns_rpz_zone_t *rpz, if (labels - first < 2) { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, suffix, rpz_type, "concatenate()", result); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } /* * Complain once about trimming the trigger name. @@ -3193,7 +3193,7 @@ rpz_get_p_name(ns_client_t *client, dns_name_t *p_name, dns_rpz_zone_t *rpz, } ++first; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3235,12 +3235,12 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, result = rpz_ready(client, rdatasetp); if (result != ISC_R_SUCCESS) { CTRACE(ISC_LOG_ERROR, "rpz_ready() failed"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } *versionp = NULL; result = rpz_getdb(client, p_name, rpz_type, zonep, dbp, versionp); if (result != ISC_R_SUCCESS) { - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; } found = dns_fixedname_initname(&foundf); @@ -3261,7 +3261,7 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, rpz_type, "allrdatasets()", result); CTRACE(ISC_LOG_ERROR, "rpz_find_p: allrdatasets failed"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } if (qtype == dns_rdatatype_aaaa && !ISC_LIST_EMPTY(client->view->dns64)) @@ -3297,7 +3297,7 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, result); CTRACE(ISC_LOG_ERROR, "rpz_find_p: " "rdatasetiter failed"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } /* * Ask again to get the right DNS_R_DNAME/NXRRSET/... @@ -3332,17 +3332,17 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, qtype != dns_rdatatype_cname && qtype != dns_rdatatype_any) { - return (DNS_R_CNAME); + return DNS_R_CNAME; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case DNS_R_NXRRSET: if (found_a) { *policyp = DNS_RPZ_POLICY_DNS64; } else { *policyp = DNS_RPZ_POLICY_NODATA; } - return (result); + return result; case DNS_R_DNAME: /* * DNAME policy RRs have very few if any uses that are not @@ -3356,12 +3356,12 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, */ case DNS_R_NXDOMAIN: case DNS_R_EMPTYNAME: - return (DNS_R_NXDOMAIN); + return DNS_R_NXDOMAIN; default: rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, p_name, rpz_type, "", result); CTRACE(ISC_LOG_ERROR, "rpz_find_p: unexpected result"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } } @@ -3483,7 +3483,7 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, case DNS_R_SERVFAIL: rpz_clean(&p_zone, &p_db, &p_node, p_rdatasetp); st->m.policy = DNS_RPZ_POLICY_ERROR; - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; default: /* * Forget this policy if it is not preferable @@ -3535,7 +3535,7 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, } rpz_clean(&p_zone, &p_db, &p_node, p_rdatasetp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3561,7 +3561,7 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, do { zbits = rpz_get_zbits(client, ip_type, rpz_type); if (zbits == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3582,17 +3582,17 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, case DNS_R_NXRRSET: case DNS_R_NCACHENXRRSET: case ISC_R_NOTFOUND: - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case DNS_R_DELEGATION: case DNS_R_DUPLICATE: case DNS_R_DROP: - return (result); + return result; case DNS_R_CNAME: case DNS_R_DNAME: rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, name, rpz_type, "NS address rewrite rrset", result); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; default: if (client->query.rpz_st->m.policy != DNS_RPZ_POLICY_ERROR) @@ -3607,7 +3607,7 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, CTRACE(ISC_LOG_ERROR, "rpz_rewrite_ip_rrset: unexpected " "result"); - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; } /* @@ -3648,13 +3648,13 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, result = rpz_rewrite_ip(client, &netaddr, qtype, rpz_type, zbits, p_rdatasetp); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } } while (!done && client->query.rpz_st->m.policy == DNS_RPZ_POLICY_MISS); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3711,7 +3711,7 @@ rpz_rewrite_ip_rrsets(ns_client_t *client, dns_name_t *name, dns_db_detach(&ip_db); } ns_client_putrdataset(client, &p_rdataset); - return (result); + return result; } /* @@ -3747,7 +3747,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, zbits = rpz_get_zbits(client, qtype, rpz_type); zbits &= allowed_zbits; if (zbits == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -3758,7 +3758,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, */ zbits = dns_rpz_find_name(rpzs, rpz_type, zbits, trig_name); if (zbits == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } p_name = dns_fixedname_initname(&p_namef); @@ -3821,7 +3821,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, case DNS_R_SERVFAIL: rpz_clean(&p_zone, &p_db, &p_node, rdatasetp); st->m.policy = DNS_RPZ_POLICY_ERROR; - return (DNS_R_SERVFAIL); + return DNS_R_SERVFAIL; default: /* * With more than one applicable policy, prefer @@ -3851,7 +3851,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, * are irrelevant */ rpz_clean(&p_zone, &p_db, &p_node, rdatasetp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* * Log DNS_RPZ_POLICY_DISABLED zones @@ -3864,7 +3864,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, } rpz_clean(&p_zone, &p_db, &p_node, rdatasetp); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void @@ -3923,13 +3923,13 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, st = client->query.rpz_st; if (rpzs == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (st != NULL && (st->state & DNS_RPZ_REWRITTEN) != 0) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } if (RECURSING(client)) { - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } RWLOCK(&rpzs->search_lock, isc_rwlocktype_read); @@ -3938,7 +3938,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, !rpz_ck_dnssec(client, qresult, ordataset, osigset)) { RWUNLOCK(&rpzs->search_lock, isc_rwlocktype_read); - return (DNS_R_DISALLOWED); + return DNS_R_DISALLOWED; } have = rpzs->have; popt = rpzs->p; @@ -4006,13 +4006,13 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL3, NULL, DNS_RPZ_TYPE_QNAME, "stop on qresult in rpz_rewrite()", qresult); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; default: rpz_log_fail(client, DNS_RPZ_DEBUG_LEVEL1, NULL, DNS_RPZ_TYPE_QNAME, "stop on unrecognized qresult in rpz_rewrite()", qresult); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } rdataset = NULL; @@ -4031,7 +4031,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, */ allowed = st->have.qname_skip_recurse; if (allowed == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } else { allowed = DNS_RPZ_ALL_ZBITS; @@ -4317,7 +4317,7 @@ cleanup: rpz_clean(NULL, &st->r.db, NULL, &st->r.ns_rdataset); } - return (result); + return result; } /* @@ -4336,7 +4336,7 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, CTRACE(ISC_LOG_DEBUG(3), "rpz_ck_dnssec"); if (client->view->rpzs->p.break_dnssec || !WANTDNSSEC(client)) { - return (true); + return true; } /* @@ -4344,21 +4344,21 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, * for them. */ if (qresult == DNS_R_DELEGATION || qresult == ISC_R_NOTFOUND) { - return (false); + return false; } if (sigrdataset == NULL) { - return (true); + return true; } if (dns_rdataset_isassociated(sigrdataset)) { - return (false); + return false; } /* * We are happy to rewrite nothing. */ if (rdataset == NULL || !dns_rdataset_isassociated(rdataset)) { - return (true); + return true; } /* * Do not rewrite if there is any sign of signatures. @@ -4367,14 +4367,14 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, rdataset->type == dns_rdatatype_nsec3 || rdataset->type == dns_rdatatype_rrsig) { - return (false); + return false; } /* * Look for a signature in a negative cache rdataset. */ if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) == 0) { - return (true); + return true; } found = dns_fixedname_initname(&fixed); dns_rdataset_init(&trdataset); @@ -4387,10 +4387,10 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, if (type == dns_rdatatype_nsec || type == dns_rdatatype_nsec3 || type == dns_rdatatype_rrsig) { - return (false); + return false; } } - return (true); + return true; } /* @@ -4411,14 +4411,14 @@ rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) { INSIST(rdata->length == 4); memmove(&ina.s_addr, rdata->data, 4); isc_netaddr_fromin(netaddr, &ina); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; case dns_rdatatype_aaaa: INSIST(rdata->length == 16); memmove(in6a.s6_addr, rdata->data, 16); isc_netaddr_fromin6(netaddr, &in6a); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; default: - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } } @@ -4663,7 +4663,7 @@ cleanup: if (node != NULL) { dns_db_detachnode(db, &node); } - return (ttl); + return ttl; } static bool @@ -4682,7 +4682,7 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, INSIST(client->query.dns64_sigaaaa == NULL); if (dns64 == NULL) { - return (true); + return true; } if (RECURSIONOK(client)) { @@ -4713,13 +4713,13 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, isc_mem_cput(client->manager->mctx, aaaaok, count, sizeof(bool)); } - return (true); + return true; } if (aaaaok != NULL) { isc_mem_cput(client->manager->mctx, aaaaok, count, sizeof(bool)); } - return (false); + return false; } /* @@ -4748,7 +4748,7 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, CTRACE(ISC_LOG_DEBUG(3), "redirect"); if (client->view->redirect == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } found = dns_fixedname_initname(&fixed); @@ -4760,18 +4760,18 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (WANTDNSSEC(client) && dns_rdataset_isassociated(rdataset)) { if (rdataset->trust == dns_trust_secure) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (rdataset->trust == dns_trust_ultimate && (rdataset->type == dns_rdatatype_nsec || rdataset->type == dns_rdatatype_nsec3)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { for (result = dns_rdataset_first(rdataset); @@ -4785,7 +4785,7 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, type == dns_rdatatype_nsec3 || type == dns_rdatatype_rrsig) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } } @@ -4795,18 +4795,18 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, client, NULL, dns_zone_getqueryacl(client->view->redirect), true); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } result = dns_zone_getdb(client->view->redirect, &db); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } dbversion = ns_client_findversion(client, db); if (dbversion == NULL) { dns_db_detach(&db); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } /* @@ -4831,7 +4831,7 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_db_detachnode(db, &node); } dns_db_detach(&db); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } CTRACE(ISC_LOG_DEBUG(3), "redirect: found data: done"); @@ -4857,7 +4857,7 @@ nxrrset: client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); - return (result); + return result; } static isc_result_t @@ -4882,11 +4882,11 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, CTRACE(ISC_LOG_DEBUG(3), "redirect2"); if (client->view->redirectzone == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (dns_name_issubdomain(name, client->view->redirectzone)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } found = dns_fixedname_initname(&fixed); @@ -4898,18 +4898,18 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (WANTDNSSEC(client) && dns_rdataset_isassociated(rdataset)) { if (rdataset->trust == dns_trust_secure) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (rdataset->trust == dns_trust_ultimate && (rdataset->type == dns_rdatatype_nsec || rdataset->type == dns_rdatatype_nsec3)) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { for (result = dns_rdataset_first(rdataset); @@ -4923,7 +4923,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, type == dns_rdatatype_nsec3 || type == dns_rdatatype_rrsig) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } } @@ -4941,7 +4941,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, client->view->redirectzone, redirectname, NULL); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } } else { dns_name_copy(redirectname, client->view->redirectzone); @@ -4951,7 +4951,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, (dns_getdb_options_t){ 0 }, &zone, &db, &version, &is_zone); if (result != ISC_R_SUCCESS) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } if (zone != NULL) { dns_zone_detach(&zone); @@ -4993,10 +4993,10 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, NS_QUERYATTR_RECURSING; client->query.attributes |= NS_QUERYATTR_REDIRECT; - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } } - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } else if (result != ISC_R_SUCCESS) { if (dns_rdataset_isassociated(&trdataset)) { dns_rdataset_disassociate(&trdataset); @@ -5005,7 +5005,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_db_detachnode(db, &node); } dns_db_detach(&db); - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } CTRACE(ISC_LOG_DEBUG(3), "redirect2: found data: done"); @@ -5043,7 +5043,7 @@ nxrrset: client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); - return (result); + return result; } /*% @@ -5276,16 +5276,16 @@ get_root_key_sentinel_id(query_ctx_t *qctx, const char *ndata) { for (i = 0; i < 5; i++) { if (!isdigit((unsigned char)ndata[i])) { - return (false); + return false; } v *= 10; v += ndata[i] - '0'; } if (v > 65535U) { - return (false); + return false; } qctx->client->query.root_key_sentinel_keyid = v; - return (true); + return true; } /*% @@ -5434,7 +5434,7 @@ ns__query_start(query_ctx_t *qctx) { qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AD; qctx->client->message->rcode = dns_rcode_badcookie; qctx->client->attributes &= ~NS_CLIENTATTR_WANTRC; - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* @@ -5444,7 +5444,7 @@ ns__query_start(query_ctx_t *qctx) { qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AA; qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AD; qctx->client->message->flags |= DNS_MESSAGEFLAG_TC; - return (ns_query_done(qctx)); + return ns_query_done(qctx); } if (qctx->view->checknames && @@ -5466,7 +5466,7 @@ ns__query_start(query_ctx_t *qctx) { "check-names failure %s/%s/%s", namebuf, typebuf, classbuf); QUERY_ERROR(qctx, DNS_R_REFUSED); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* @@ -5574,7 +5574,7 @@ ns__query_start(query_ctx_t *qctx) { "failed"); QUERY_ERROR(qctx, result); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* @@ -5651,7 +5651,7 @@ ns__query_start(query_ctx_t *qctx) { qctx->options.stalefirst = false; cleanup: - return (result); + return result; } static void @@ -5693,7 +5693,7 @@ qctx_prepare_buffers(query_ctx_t *qctx, isc_buffer_t *buffer) { qctx->sigrdataset = ns_client_newrdataset(qctx->client); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -5709,9 +5709,9 @@ stale_client_answer(isc_result_t result) { case DNS_R_NCACHENXRRSET: case DNS_R_CNAME: case DNS_R_DNAME: - return (true); + return true; default: - return (false); + return false; } UNREACHABLE(); @@ -5756,7 +5756,7 @@ query_lookup(query_ctx_t *qctx) { result = qctx_prepare_buffers(qctx, &buffer); if (result != ISC_R_SUCCESS) { QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* @@ -5888,7 +5888,7 @@ query_lookup(query_ctx_t *qctx) { * can do, return SERVFAIL. */ QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } else if (stale_refresh_window) { /* @@ -5913,7 +5913,7 @@ query_lookup(query_ctx_t *qctx) { * to refresh the data, because a recent lookup failed. */ QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } else if (stale_timeout) { if (qctx->options.stalefirst) { @@ -5935,7 +5935,7 @@ query_lookup(query_ctx_t *qctx) { &FETCH_RECTYPE_NORMAL( qctx->client)); } - return (query_lookup(qctx)); + return query_lookup(qctx); } else if (stale_client_answer(result)) { /* * Immediately return the stale answer, start a @@ -5974,7 +5974,7 @@ query_lookup(query_ctx_t *qctx) { result = query_gotanswer(qctx, result); cleanup: - return (result); + return result; } /* @@ -6162,10 +6162,10 @@ recparam_match(const ns_query_recparam_t *param, dns_rdatatype_t qtype, const dns_name_t *qname, const dns_name_t *qdomain) { REQUIRE(param != NULL); - return (param->qtype == qtype && param->qname != NULL && - qname != NULL && param->qdomain != NULL && qdomain != NULL && - dns_name_equal(param->qname, qname) && - dns_name_equal(param->qdomain, qdomain)); + return param->qtype == qtype && param->qname != NULL && qname != NULL && + param->qdomain != NULL && qdomain != NULL && + dns_name_equal(param->qname, qname) && + dns_name_equal(param->qdomain, qdomain); } /*% @@ -6233,7 +6233,7 @@ acquire_recursionquota(ns_client_t *client) { "no more recursive clients (%u/%u/%u)", &client->manager->sctx->recursionquota); ns_client_killoldestquery(client); - return (result); + return result; default: UNREACHABLE(); } @@ -6241,7 +6241,7 @@ acquire_recursionquota(ns_client_t *client) { dns_message_clonebuffer(client->message); ns_client_recursing(client); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -6275,7 +6275,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, if (recparam_match(&client->query.recparam, qtype, qname, qdomain)) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_QUERY, ISC_LOG_INFO, "recursion loop detected"); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } recparam_update(&client->query.recparam, qtype, qname, qdomain); @@ -6286,7 +6286,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, result = acquire_recursionquota(client); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -6334,7 +6334,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, * have been received. */ - return (result); + return result; } /*% @@ -6489,7 +6489,7 @@ query_resume(query_ctx_t *qctx) { qctx->view->rpzs->rpz_ver, qctx->rpz_st->rpz_ver); QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } @@ -6525,10 +6525,10 @@ query_resume(query_ctx_t *qctx) { qctx->resuming = true; - return (query_gotanswer(qctx, result)); + return query_gotanswer(qctx, result); cleanup: - return (result); + return result; } static void @@ -6706,7 +6706,7 @@ ns_query_hookasync(query_ctx_t *qctx, ns_query_starthookasync_t runasync, * the client task or pausing it. */ isc_nmhandle_attach(client->handle, &HANDLE_RECTYPE_HOOK(client)); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; cleanup_and_detach_from_quota: release_recursionquota(client); @@ -6732,7 +6732,7 @@ cleanup: sizeof(*saved_qctx)); } qctx->detach_client = true; - return (result); + return result; } /*% @@ -6751,7 +6751,7 @@ ns__query_sfcache(query_ctx_t *qctx) { * The SERVFAIL cache doesn't apply to authoritative queries. */ if (!RECURSIONOK(qctx->client)) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } flags = 0; @@ -6768,7 +6768,7 @@ ns__query_sfcache(query_ctx_t *qctx) { } if (failcache != ISC_R_SUCCESS) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (((flags & NS_FAILCACHE_CD) != 0) || @@ -6793,10 +6793,10 @@ ns__query_sfcache(query_ctx_t *qctx) { qctx->client->attributes |= NS_CLIENTATTR_NOSETFC; QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } static void @@ -6994,12 +6994,12 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) { } } } - return (DNS_R_DROP); + return DNS_R_DROP; } } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -7019,7 +7019,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { break; case ISC_R_NOTFOUND: case DNS_R_DISALLOWED: - return (result); + return result; case DNS_R_DELEGATION: /* * recursing for NS names or addresses, @@ -7037,10 +7037,10 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { dns_name_copy(qctx->fname, qctx->rpz_st->fname); qctx->rpz_st->q.result = result; qctx->client->query.attributes |= NS_QUERYATTR_RECURSING; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; default: QUERY_ERROR(qctx, rresult); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } if (qctx->rpz_st->m.policy != DNS_RPZ_POLICY_MISS) { @@ -7082,7 +7082,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { DNS_SECTION_ADDITIONAL); if (rresult != ISC_R_SUCCESS) { QUERY_ERROR(qctx, result); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } } @@ -7100,7 +7100,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { qctx->rpz_st->m.type, qctx->zone, qctx->rpz_st->p_name, NULL, qctx->rpz_st->m.rpz->num); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case DNS_RPZ_POLICY_DROP: QUERY_ERROR(qctx, DNS_R_DROP); rpz_log_rewrite(qctx->client, false, @@ -7108,7 +7108,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { qctx->rpz_st->m.type, qctx->zone, qctx->rpz_st->p_name, NULL, qctx->rpz_st->m.rpz->num); - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; case DNS_RPZ_POLICY_NXDOMAIN: result = DNS_R_NXDOMAIN; qctx->nxrewrite = true; @@ -7156,11 +7156,11 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { dns_rdata_reset(&rdata); result = query_rpzcname(qctx, &cname.cname); if (result != ISC_R_SUCCESS) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } qctx->fname = NULL; qctx->want_restart = true; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } case DNS_RPZ_POLICY_CNAME: /* @@ -7170,11 +7170,11 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { result = query_rpzcname(qctx, &qctx->rpz_st->m.rpz->cname); if (result != ISC_R_SUCCESS) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } qctx->fname = NULL; qctx->want_restart = true; - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; default: UNREACHABLE(); } @@ -7202,7 +7202,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) { qctx->rpz_st->m.rpz->num); } - return (result); + return result; } /*% @@ -7238,7 +7238,7 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) { if (result == DNS_R_NAMETOOLONG) { client->message->rcode = dns_rcode_yxdomain; } else if (result != ISC_R_SUCCESS) { - return (result); + return result; } } else { dns_name_copy(cname, qctx->fname); @@ -7261,7 +7261,7 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) { client->attributes &= ~(NS_CLIENTATTR_WANTDNSSEC | NS_CLIENTATTR_WANTAD); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -7280,7 +7280,7 @@ has_ta(query_ctx_t *qctx) { result = dns_view_getsecroots(qctx->view, &keytable); if (result != ISC_R_SUCCESS) { - return (false); + return false; } result = dns_keytable_find(keytable, dns_rootname, &keynode); @@ -7289,7 +7289,7 @@ has_ta(query_ctx_t *qctx) { dns_keynode_detach(&keynode); } dns_keytable_detach(&keytable); - return (false); + return false; } dns_rdataset_init(&dsset); @@ -7309,7 +7309,7 @@ has_ta(query_ctx_t *qctx) { dns_keynode_detach(&keynode); dns_keytable_detach(&keytable); dns_rdataset_disassociate(&dsset); - return (true); + return true; } } dns_rdataset_disassociate(&dsset); @@ -7321,7 +7321,7 @@ has_ta(query_ctx_t *qctx) { dns_keytable_detach(&keytable); - return (false); + return false; } /*% @@ -7335,7 +7335,7 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) { if (!qctx->client->query.root_key_sentinel_is_ta && !qctx->client->query.root_key_sentinel_not_ta) { - return (false); + return false; } /* @@ -7350,7 +7350,7 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) { case DNS_R_NCACHENXRRSET: break; default: - return (false); + return false; } /* @@ -7360,7 +7360,7 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) { ((qctx->client->query.root_key_sentinel_is_ta && !has_ta(qctx)) || (qctx->client->query.root_key_sentinel_not_ta && has_ta(qctx)))) { - return (true); + return true; } /* @@ -7370,7 +7370,7 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) { qctx->client->query.root_key_sentinel_is_ta = false; qctx->client->query.root_key_sentinel_not_ta = false; - return (false); + return false; } /*% @@ -7384,7 +7384,7 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) { * Query was already using stale, if that didn't work the * last time, it won't work this time either. */ - return (false); + return false; } if (result == DNS_R_DUPLICATE || result == DNS_R_DROP) { @@ -7392,7 +7392,7 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) { * Don't enable serve-stale if the result signals a duplicate * query or query that is being dropped. */ - return (false); + return false; } qctx_clean(qctx); @@ -7409,7 +7409,7 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) { * Failed to get the database, unexpected, but let us * at least abandon serve-stale. */ - return (false); + return false; } qctx->client->query.dboptions |= DNS_DBFIND_STALEOK; @@ -7425,10 +7425,10 @@ query_usestale(query_ctx_t *qctx, isc_result_t result) { if (qctx->resuming && result == ISC_R_TIMEDOUT) { qctx->client->query.dboptions |= DNS_DBFIND_STALESTART; } - return (true); + return true; } - return (false); + return false; } /*% @@ -7445,7 +7445,7 @@ query_gotanswer(query_ctx_t *qctx, isc_result_t result) { CALL_HOOK(NS_QUERY_GOT_ANSWER_BEGIN, qctx); if (query_checkrrl(qctx, result) != ISC_R_SUCCESS) { - return (ns_query_done(qctx)); + return ns_query_done(qctx); } if (!dns_name_equal(qctx->client->query.qname, dns_rootname)) { @@ -7464,10 +7464,10 @@ query_gotanswer(query_ctx_t *qctx, isc_result_t result) { * bail out and wait for recursion to complete, as we * we can't perform the RPZ rewrite rules. */ - return (result); + return result; } if (result == ISC_R_COMPLETE) { - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } @@ -7482,51 +7482,51 @@ root_key_sentinel: */ qctx->client->attributes |= NS_CLIENTATTR_NOSETFC; QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } switch (result) { case ISC_R_SUCCESS: - return (query_prepresponse(qctx)); + return query_prepresponse(qctx); case DNS_R_GLUE: case DNS_R_ZONECUT: INSIST(qctx->is_zone); qctx->authoritative = false; - return (query_prepresponse(qctx)); + return query_prepresponse(qctx); case ISC_R_NOTFOUND: - return (query_notfound(qctx)); + return query_notfound(qctx); case DNS_R_DELEGATION: - return (query_delegation(qctx)); + return query_delegation(qctx); case DNS_R_EMPTYNAME: case DNS_R_NXRRSET: - return (query_nodata(qctx, result)); + return query_nodata(qctx, result); case DNS_R_EMPTYWILD: case DNS_R_NXDOMAIN: - return (query_nxdomain(qctx, result)); + return query_nxdomain(qctx, result); case DNS_R_COVERINGNSEC: - return (query_coveringnsec(qctx)); + return query_coveringnsec(qctx); case DNS_R_NCACHENXDOMAIN: result = query_redirect(qctx, result); if (result != ISC_R_COMPLETE) { - return (result); + return result; } - return (query_ncache(qctx, DNS_R_NCACHENXDOMAIN)); + return query_ncache(qctx, DNS_R_NCACHENXDOMAIN); case DNS_R_NCACHENXRRSET: - return (query_ncache(qctx, DNS_R_NCACHENXRRSET)); + return query_ncache(qctx, DNS_R_NCACHENXRRSET); case DNS_R_CNAME: - return (query_cname(qctx)); + return query_cname(qctx); case DNS_R_DNAME: - return (query_dname(qctx)); + return query_dname(qctx); default: /* @@ -7541,7 +7541,7 @@ root_key_sentinel: * If serve-stale is enabled, query_usestale() already * set up 'qctx' for looking up a stale response. */ - return (query_lookup(qctx)); + return query_lookup(qctx); } /* @@ -7551,11 +7551,11 @@ root_key_sentinel: qctx->client->rcode_override = dns_rcode_servfail; QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } cleanup: - return (result); + return result; } static void @@ -7643,7 +7643,7 @@ query_respond_any(query_ctx_t *qctx) { CCTRACE(ISC_LOG_ERROR, "query_respond_any: allrdatasets " "failed"); QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* @@ -7780,7 +7780,7 @@ query_respond_any(query_ctx_t *qctx) { CCTRACE(ISC_LOG_ERROR, "query_respond_any: rdataset iterator " "failed"); QUERY_ERROR(qctx, DNS_R_SERVFAIL); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } if (found) { @@ -7812,7 +7812,7 @@ query_respond_any(query_ctx_t *qctx) { qctx->authoritative = false; qctx->client->attributes &= ~NS_CLIENTATTR_RA; query_addauth(qctx); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } if (qctx->qtype == dns_rdatatype_rrsig && @@ -7827,7 +7827,7 @@ query_respond_any(query_ctx_t *qctx) { } qctx->fname = ns_client_newname(qctx->client, qctx->dbuf, &b); - return (query_sign_nodata(qctx)); + return query_sign_nodata(qctx); } else if (!hidden) { /* * No matching rdatasets were found and nothing was @@ -7836,10 +7836,10 @@ query_respond_any(query_ctx_t *qctx) { QUERY_ERROR(qctx, DNS_R_SERVFAIL); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /* @@ -7936,24 +7936,24 @@ query_addanswer(query_ctx_t *qctx) { #ifndef dns64_bis_return_excluded_addresses if (qctx->dns64_exclude) { if (!qctx->is_zone) { - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* * Add a fake SOA record. */ (void)query_addsoa(qctx, 600, DNS_SECTION_AUTHORITY); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } #endif /* ifndef dns64_bis_return_excluded_addresses */ if (qctx->is_zone) { - return (query_nodata(qctx, DNS_R_NXDOMAIN)); + return query_nodata(qctx, DNS_R_NXDOMAIN); } else { - return (query_ncache(qctx, DNS_R_NXDOMAIN)); + return query_ncache(qctx, DNS_R_NXDOMAIN); } } else if (result != ISC_R_SUCCESS) { qctx->result = result; - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } else if (qctx->client->query.dns64_aaaaok != NULL) { query_filter64(qctx); @@ -7972,10 +7972,10 @@ query_addanswer(query_ctx_t *qctx) { sigrdatasetp, qctx->dbuf, DNS_SECTION_ANSWER); } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; cleanup: - return (result); + return result; } /*% @@ -8010,7 +8010,7 @@ query_respond(query_ctx_t *qctx) { qctx->type = qctx->qtype = dns_rdatatype_a; qctx->dns64_exclude = qctx->dns64 = true; - return (query_lookup(qctx)); + return query_lookup(qctx); } /* @@ -8061,7 +8061,7 @@ query_respond(query_ctx_t *qctx) { result = query_addanswer(qctx); if (result != ISC_R_COMPLETE) { - return (result); + return result; } query_addnoqnameproof(qctx); @@ -8080,10 +8080,10 @@ query_respond(query_ctx_t *qctx) { query_addauth(qctx); - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } static isc_result_t @@ -8140,7 +8140,7 @@ query_dns64(query_ctx_t *qctx) { if (qctx->dbuf != NULL) { ns_client_releasename(client, &qctx->fname); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } else if (result == DNS_R_NXDOMAIN) { /* * The name doesn't exist. @@ -8268,7 +8268,7 @@ cleanup: } CTRACE(ISC_LOG_DEBUG(3), "query_dns64: done"); - return (result); + return result; } static void @@ -8481,24 +8481,24 @@ query_notfound(query_ctx_t *qctx) { * already set up 'qctx' for looking up a * stale response. */ - return (query_lookup(qctx)); + return query_lookup(qctx); } else { QUERY_ERROR(qctx, result); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); } else { /* Unable to give root server referral. */ CCTRACE(ISC_LOG_ERROR, "unable to give root server " "referral"); QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } - return (query_delegation(qctx)); + return query_delegation(qctx); cleanup: - return (result); + return result; } /*% @@ -8549,10 +8549,10 @@ query_prepare_delegation_response(query_ctx_t *qctx) { */ query_addds(qctx); - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /*% @@ -8614,7 +8614,7 @@ query_zone_delegation(query_ctx_t *qctx) { RESTORE(qctx->zone, tzone); qctx->authoritative = true; - return (query_lookup(qctx)); + return query_lookup(qctx); } } @@ -8642,13 +8642,13 @@ query_zone_delegation(query_ctx_t *qctx) { dns_db_attach(qctx->view->cachedb, &qctx->db); qctx->is_zone = false; - return (query_lookup(qctx)); + return query_lookup(qctx); } - return (query_prepare_delegation_response(qctx)); + return query_prepare_delegation_response(qctx); cleanup: - return (result); + return result; } /*% @@ -8670,7 +8670,7 @@ query_delegation(query_ctx_t *qctx) { qctx->authoritative = false; if (qctx->is_zone) { - return (query_zone_delegation(qctx)); + return query_zone_delegation(qctx); } if (qctx->zfname != NULL && @@ -8720,13 +8720,13 @@ query_delegation(query_ctx_t *qctx) { result = query_delegation_recurse(qctx); if (result != ISC_R_COMPLETE) { - return (result); + return result; } - return (query_prepare_delegation_response(qctx)); + return query_prepare_delegation_response(qctx); cleanup: - return (result); + return result; } /*% @@ -8741,7 +8741,7 @@ query_delegation_recurse(query_ctx_t *qctx) { CCTRACE(ISC_LOG_DEBUG(3), "query_delegation_recurse"); if (!RECURSIONOK(qctx->client)) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } CALL_HOOK(NS_QUERY_DELEGATION_RECURSE_BEGIN, qctx); @@ -8791,15 +8791,15 @@ query_delegation_recurse(query_ctx_t *qctx) { * If serve-stale is enabled, query_usestale() already set up * 'qctx' for looking up a stale response. */ - return (query_lookup(qctx)); + return query_lookup(qctx); } else { QUERY_ERROR(qctx, result); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /*% @@ -8995,7 +8995,7 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) { * Resume the diverted processing of the AAAA response? */ if (qctx->dns64_exclude) { - return (query_prepresponse(qctx)); + return query_prepresponse(qctx); } #endif /* ifdef dns64_bis_return_excluded_addresses */ } else if ((result == DNS_R_NXRRSET || result == DNS_R_NCACHENXRRSET) && @@ -9038,11 +9038,11 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) { dns_db_detachnode(qctx->db, &qctx->node); qctx->type = qctx->qtype = dns_rdatatype_a; qctx->dns64 = true; - return (query_lookup(qctx)); + return query_lookup(qctx); } if (qctx->is_zone) { - return (query_sign_nodata(qctx)); + return query_sign_nodata(qctx); } else { /* * We don't call query_addrrset() because we don't need any @@ -9060,10 +9060,10 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) { } } - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /*% @@ -9079,7 +9079,7 @@ query_sign_nodata(query_ctx_t *qctx) { * Look for a NSEC3 record if we don't have a NSEC record. */ if (qctx->redirected) { - return (ns_query_done(qctx)); + return ns_query_done(qctx); } if (!dns_rdataset_isassociated(qctx->rdataset) && WANTDNSSEC(qctx->client)) @@ -9139,7 +9139,7 @@ query_sign_nodata(query_ctx_t *qctx) { "closest " "encloser"); QUERY_ERROR(qctx, ISC_R_NOMEMORY); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /* * 'nearest' doesn't exist so @@ -9180,7 +9180,7 @@ query_sign_nodata(query_ctx_t *qctx) { result = query_addsoa(qctx, UINT32_MAX, DNS_SECTION_AUTHORITY); if (result != ISC_R_SUCCESS) { QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } @@ -9193,7 +9193,7 @@ query_sign_nodata(query_ctx_t *qctx) { query_addnxrrsetnsec(qctx); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); } static void @@ -9268,7 +9268,7 @@ query_nxdomain(query_ctx_t *qctx, isc_result_t result) { if (!empty_wild) { result = query_redirect(qctx, result); if (result != ISC_R_COMPLETE) { - return (result); + return result; } } @@ -9311,7 +9311,7 @@ query_nxdomain(query_ctx_t *qctx, isc_result_t result) { result = query_addsoa(qctx, ttl, section); if (result != ISC_R_SUCCESS) { QUERY_ERROR(qctx, result); - return (ns_query_done(qctx)); + return ns_query_done(qctx); } } @@ -9336,10 +9336,10 @@ query_nxdomain(query_ctx_t *qctx, isc_result_t result) { qctx->client->message->rcode = dns_rcode_nxdomain; } - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /* @@ -9364,15 +9364,15 @@ query_redirect(query_ctx_t *qctx, isc_result_t saved_result) { switch (result) { case ISC_R_SUCCESS: inc_stats(qctx->client, ns_statscounter_nxdomainredirect); - return (query_prepresponse(qctx)); + return query_prepresponse(qctx); case DNS_R_NXRRSET: qctx->redirected = true; qctx->is_zone = true; - return (query_nodata(qctx, DNS_R_NXRRSET)); + return query_nodata(qctx, DNS_R_NXRRSET); case DNS_R_NCACHENXRRSET: qctx->redirected = true; qctx->is_zone = false; - return (query_ncache(qctx, DNS_R_NCACHENXRRSET)); + return query_ncache(qctx, DNS_R_NCACHENXRRSET); default: break; } @@ -9383,7 +9383,7 @@ query_redirect(query_ctx_t *qctx, isc_result_t saved_result) { switch (result) { case ISC_R_SUCCESS: inc_stats(qctx->client, ns_statscounter_nxdomainredirect); - return (query_prepresponse(qctx)); + return query_prepresponse(qctx); case DNS_R_CONTINUE: inc_stats(qctx->client, ns_statscounter_nxdomainredirect_rlookup); @@ -9400,20 +9400,20 @@ query_redirect(query_ctx_t *qctx, isc_result_t saved_result) { qctx->client->query.redirect.authoritative = qctx->authoritative; qctx->client->query.redirect.is_zone = qctx->is_zone; - return (ns_query_done(qctx)); + return ns_query_done(qctx); case DNS_R_NXRRSET: qctx->redirected = true; qctx->is_zone = true; - return (query_nodata(qctx, DNS_R_NXRRSET)); + return query_nodata(qctx, DNS_R_NXRRSET); case DNS_R_NCACHENXRRSET: qctx->redirected = true; qctx->is_zone = false; - return (query_ncache(qctx, DNS_R_NCACHENXRRSET)); + return query_ncache(qctx, DNS_R_NCACHENXRRSET); default: break; } - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } /*% @@ -9461,7 +9461,7 @@ query_synthttl(dns_rdataset_t *soardataset, dns_rdataset_t *sigsoardataset, ttl = ISC_MIN(ttl, sigp2rdataset->ttl); } - return (ttl); + return ttl; } /* @@ -9518,7 +9518,7 @@ query_synthnodata(query_ctx_t *qctx, const dns_name_t *signer, if (name != NULL) { ns_client_releasename(qctx->client, &name); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9585,7 +9585,7 @@ query_synthwildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, if (clonesigset != NULL) { ns_client_putrdataset(qctx->client, &clonesigset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9603,7 +9603,7 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, result = query_synthwildcard(qctx, rdataset, sigrdataset); if (result != ISC_R_SUCCESS) { - return (result); + return result; } qctx->client->query.attributes |= NS_QUERYATTR_PARTIALANSWER; @@ -9617,7 +9617,7 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { dns_message_puttempname(qctx->client->message, &tname); - return (result); + return result; } dns_rdataset_current(rdataset, &rdata); @@ -9628,7 +9628,7 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, if (dns_name_equal(qctx->client->query.qname, &cname.cname)) { dns_message_puttempname(qctx->client->message, &tname); dns_rdata_freestruct(&cname); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_name_copy(&cname.cname, tname); @@ -9640,7 +9640,7 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, qctx->options.nolog = true; } - return (result); + return result; } /* @@ -9734,7 +9734,7 @@ query_synthnxdomainnodata(query_ctx_t *qctx, bool nodata, dns_name_t *nowild, if (clonesigset != NULL) { ns_client_putrdataset(qctx->client, &clonesigset); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -9756,11 +9756,11 @@ checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) { if (dns_name_countlabels(signer) == 0) { dns_name_copy(&rrsig.signer, signer); } else if (!dns_name_equal(signer, &rrsig.signer)) { - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -10055,7 +10055,7 @@ cleanup: } if (redirected) { - return (result); + return result; } if (!done) { @@ -10073,10 +10073,10 @@ cleanup: if (qctx->sigrdataset != NULL) { ns_client_putrdataset(qctx->client, &qctx->sigrdataset); } - return (query_lookup(qctx)); + return query_lookup(qctx); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); } /*% @@ -10114,10 +10114,10 @@ query_ncache(query_ctx_t *qctx, isc_result_t result) { } } - return (query_nodata(qctx, result)); + return query_nodata(qctx, result); cleanup: - return (result); + return result; } /* @@ -10132,7 +10132,7 @@ query_zerottl_refetch(query_ctx_t *qctx) { if (qctx->is_zone || qctx->resuming || STALE(qctx->rdataset) || qctx->rdataset->ttl != 0 || !RECURSIONOK(qctx->client)) { - return (ISC_R_COMPLETE); + return ISC_R_COMPLETE; } qctx_clean(qctx); @@ -10161,10 +10161,10 @@ query_zerottl_refetch(query_ctx_t *qctx) { QUERY_ERROR(qctx, result); } - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /* @@ -10259,10 +10259,10 @@ query_cname(query_ctx_t *qctx) { query_addauth(qctx); - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /* @@ -10412,10 +10412,10 @@ query_dname(query_ctx_t *qctx) { query_addauth(qctx); - return (ns_query_done(qctx)); + return ns_query_done(qctx); cleanup: - return (result); + return result; } /*% @@ -10488,7 +10488,7 @@ query_prepresponse(query_ctx_t *qctx) { } if (qctx->type == dns_rdatatype_any) { - return (query_respond_any(qctx)); + return query_respond_any(qctx); } result = query_zerottl_refetch(qctx); @@ -10496,10 +10496,10 @@ query_prepresponse(query_ctx_t *qctx) { goto cleanup; } - return (query_respond(qctx)); + return query_respond(qctx); cleanup: - return (result); + return result; } /*% @@ -10530,7 +10530,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, if (((client->manager->sctx->options & NS_SERVER_NOSOA) != 0) && (!WANTDNSSEC(client) || !dns_rdataset_isassociated(qctx->rdataset))) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -10630,7 +10630,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, dns_db_detachnode(qctx->db, &node); } - return (eresult); + return eresult; } /*% @@ -10715,7 +10715,7 @@ query_addns(query_ctx_t *qctx) { } CTRACE(ISC_LOG_DEBUG(3), "query_addns: done"); - return (eresult); + return eresult; } /*% @@ -11280,9 +11280,9 @@ query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) { isc_netaddr_t netaddr; if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS) { - return (INT_MAX); + return INT_MAX; } - return (ns_sortlist_addrorder2(&netaddr, arg)); + return ns_sortlist_addrorder2(&netaddr, arg); } /* @@ -11294,9 +11294,9 @@ query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) { isc_netaddr_t netaddr; if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS) { - return (INT_MAX); + return INT_MAX; } - return (ns_sortlist_addrorder1(&netaddr, arg)); + return ns_sortlist_addrorder1(&netaddr, arg); } /* @@ -11433,7 +11433,7 @@ ns_query_done(query_ctx_t *qctx) { &qctx->client->restarthandle); isc_async_run(qctx->client->manager->loop, async_restart, saved_qctx); - return (DNS_R_CONTINUE); + return DNS_R_CONTINUE; } else { /* * This is e.g. a long CNAME chain which we cut short. @@ -11483,7 +11483,7 @@ ns_query_done(query_ctx_t *qctx) { } qctx->detach_client = true; - return (qctx->result); + return qctx->result; } /* @@ -11494,7 +11494,7 @@ ns_query_done(query_ctx_t *qctx) { (!QUERY_STALETIMEOUT(&qctx->client->query) || qctx->options.stalefirst)) { - return (qctx->result); + return qctx->result; } /* @@ -11545,10 +11545,10 @@ ns_query_done(query_ctx_t *qctx) { qctx->detach_client = true; - return (qctx->result); + return qctx->result; cleanup: - return (result); + return result; } static void diff --git a/lib/ns/server.c b/lib/ns/server.c index 94ee48b76c..3aa90cd8d2 100644 --- a/lib/ns/server.c +++ b/lib/ns/server.c @@ -228,7 +228,7 @@ ns_server_setserverid(ns_server_t *sctx, const char *serverid) { sctx->server_id = isc_mem_strdup(sctx->mctx, serverid); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -245,7 +245,7 @@ bool ns_server_getoption(ns_server_t *sctx, unsigned int option) { REQUIRE(SCTX_VALID(sctx)); - return ((sctx->options & option) != 0); + return (sctx->options & option) != 0; } void diff --git a/lib/ns/sortlist.c b/lib/ns/sortlist.c index bebc2c8c9a..2d1766e443 100644 --- a/lib/ns/sortlist.c +++ b/lib/ns/sortlist.c @@ -73,14 +73,14 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, if (order_elt == NULL) { INSIST(matched_elt != NULL); *argp = matched_elt; - return (NS_SORTLISTTYPE_1ELEMENT); + return NS_SORTLISTTYPE_1ELEMENT; } if (order_elt->type == dns_aclelementtype_nestedacl) { dns_acl_t *inner = NULL; dns_acl_attach(order_elt->nestedacl, &inner); *argp = inner; - return (NS_SORTLISTTYPE_2ELEMENT); + return NS_SORTLISTTYPE_2ELEMENT; } if (order_elt->type == dns_aclelementtype_localhost) { @@ -89,7 +89,7 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, if (inner != NULL) { *argp = dns_acl_ref(inner); rcu_read_unlock(); - return (NS_SORTLISTTYPE_2ELEMENT); + return NS_SORTLISTTYPE_2ELEMENT; } rcu_read_unlock(); } @@ -100,7 +100,7 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, if (inner != NULL) { *argp = dns_acl_ref(inner); rcu_read_unlock(); - return (NS_SORTLISTTYPE_2ELEMENT); + return NS_SORTLISTTYPE_2ELEMENT; } rcu_read_unlock(); } @@ -111,12 +111,12 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, * sortlist statement. */ *argp = order_elt; - return (NS_SORTLISTTYPE_1ELEMENT); + return NS_SORTLISTTYPE_1ELEMENT; } dont_sort: *argp = NULL; - return (NS_SORTLISTTYPE_NONE); + return NS_SORTLISTTYPE_NONE; } int @@ -128,11 +128,11 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) { (void)dns_acl_match(addr, NULL, sortacl, env, &match, NULL); if (match > 0) { - return (match); + return match; } else if (match < 0) { - return (INT_MAX - (-match)); + return INT_MAX - (-match); } else { - return (INT_MAX / 2); + return INT_MAX / 2; } } @@ -143,8 +143,8 @@ ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) { const dns_aclelement_t *element = sla->element; if (dns_aclelement_match(addr, NULL, element, env, NULL)) { - return (0); + return 0; } - return (INT_MAX); + return INT_MAX; } diff --git a/lib/ns/stats.c b/lib/ns/stats.c index 791c08a756..6bc7c1f346 100644 --- a/lib/ns/stats.c +++ b/lib/ns/stats.c @@ -82,7 +82,7 @@ isc_statscounter_t ns_stats_increment(ns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(NS_STATS_VALID(stats)); - return (isc_stats_increment(stats->counters, counter)); + return isc_stats_increment(stats->counters, counter); } void @@ -96,7 +96,7 @@ isc_stats_t * ns_stats_get(ns_stats_t *stats) { REQUIRE(NS_STATS_VALID(stats)); - return (stats->counters); + return stats->counters; } void @@ -111,5 +111,5 @@ isc_statscounter_t ns_stats_get_counter(ns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(NS_STATS_VALID(stats)); - return (isc_stats_get_counter(stats->counters, counter)); + return isc_stats_get_counter(stats->counters, counter); } diff --git a/lib/ns/update.c b/lib/ns/update.c index dbc2a1590c..c0d7bb8457 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -374,7 +374,7 @@ checkqueryacl(ns_client_t *client, dns_acl_t *queryacl, dns_name_t *zonename, NS_LOGMODULE_UPDATE, ISC_LOG_INFO, "update '%s/%s' denied", namebuf, classbuf); } - return (result); + return result; } /*% @@ -429,7 +429,7 @@ checkupdateacl(ns_client_t *client, dns_acl_t *acl, const char *message, ns_client_log(client, NS_LOGCATEGORY_UPDATE_SECURITY, NS_LOGMODULE_UPDATE, level, "%s '%s/%s' %s", message, namebuf, classbuf, msg); - return (result); + return result; } /*% @@ -459,7 +459,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, ISC_LIST_UNLINK(temp_diff.tuples, *tuple, link); if (result != ISC_R_SUCCESS) { dns_difftuple_free(tuple); - return (result); + return result; } /* @@ -470,7 +470,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, /* * Do not clear temp_diff. */ - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -489,11 +489,11 @@ do_diff(dns_diff_t *updates, dns_db_t *db, dns_dbversion_t *ver, ISC_LIST_UNLINK(updates->tuples, t, link); CHECK(do_one_tuple(&t, db, ver, diff)); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: dns_diff_clear(diff); - return (result); + return result; } static isc_result_t @@ -503,7 +503,7 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_difftuple_t *tuple = NULL; dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); - return (do_one_tuple(&tuple, db, ver, diff)); + return do_one_tuple(&tuple, db, ver, diff); } /**************************************************************************/ @@ -562,13 +562,13 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { rr.ttl = rdataset->ttl; result = (*ctx->rr_action)(ctx->rr_action_data, &rr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } if (result != ISC_R_NOMORE) { - return (result); + return result; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -601,10 +601,10 @@ foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, node = NULL; result = dns_db_findnodeext(db, name, false, &cm, &ci, &node); if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } iter = NULL; @@ -638,7 +638,7 @@ cleanup_iterator: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /*% @@ -655,7 +655,7 @@ foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, foreach_node_rr_ctx_t ctx; ctx.rr_action = rr_action; ctx.rr_action_data = rr_action_data; - return (foreach_rrset(db, ver, name, foreach_node_rr_action, &ctx)); + return foreach_rrset(db, ver, name, foreach_node_rr_action, &ctx); } /*% @@ -690,8 +690,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_db_closeversion(db, &oldver, false); if (type == dns_rdatatype_any) { - return (foreach_node_rr(db, ver, name, rr_action, - rr_action_data)); + return foreach_node_rr(db, ver, name, rr_action, + rr_action_data); } node = NULL; @@ -703,10 +703,10 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, result = dns_db_findnodeext(db, name, false, &cm, &ci, &node); } if (result == ISC_R_NOTFOUND) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdataset_init(&rdataset); @@ -749,7 +749,7 @@ cleanup_rdataset: cleanup_node: dns_db_detachnode(db, &node); - return (result); + return result; } /**************************************************************************/ @@ -772,7 +772,7 @@ count_action(void *data, rr_t *rr) { (*ui)++; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -782,7 +782,7 @@ static isc_result_t rrset_exists_action(void *data, rr_t *rr) { UNUSED(data); UNUSED(rr); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /*% @@ -827,9 +827,9 @@ cname_compatibility_action(void *data, dns_rdataset_t *rrset) { if (rrset->type != dns_rdatatype_cname && !dns_rdatatype_atcname(rrset->type)) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -856,7 +856,7 @@ count_rr_action(void *data, rr_t *rr) { int *countp = data; UNUSED(rr); (*countp)++; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -866,8 +866,7 @@ static isc_result_t rr_count(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, int *countp) { *countp = 0; - return (foreach_rr(db, ver, name, type, covers, count_rr_action, - countp)); + return foreach_rr(db, ver, name, type, covers, count_rr_action, countp); } /*% @@ -878,7 +877,7 @@ static isc_result_t name_exists_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); UNUSED(rrset); - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } /*% @@ -932,7 +931,7 @@ ssu_checkrule(void *data, dns_rdataset_t *rrset) { if (rrset->type == dns_rdatatype_rrsig || rrset->type == dns_rdatatype_nsec) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -987,7 +986,7 @@ ssu_checkrule(void *data, dns_rdataset_t *rrset) { ssuinfo->addr, ssuinfo->tcp, ssuinfo->aclenv, rrset->type, NULL, ssuinfo->key, NULL); } - return (rule_ok ? ISC_R_SUCCESS : ISC_R_FAILURE); + return rule_ok ? ISC_R_SUCCESS : ISC_R_FAILURE; } static bool @@ -1005,7 +1004,7 @@ ssu_checkall(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, ssuinfo.tcp = tcp; ssuinfo.key = key; result = foreach_rrset(db, ver, name, ssu_checkrule, &ssuinfo); - return (result == ISC_R_SUCCESS); + return result == ISC_R_SUCCESS; } static isc_result_t @@ -1032,7 +1031,7 @@ ssu_checkrr(void *data, rr_t *rr) { ssuinfo->table, ssuinfo->signer, ssuinfo->name, ssuinfo->addr, ssuinfo->tcp, ssuinfo->aclenv, rr->rdata.type, target, ssuinfo->key, NULL); - return (answer ? ISC_R_SUCCESS : ISC_R_FAILURE); + return answer ? ISC_R_SUCCESS : ISC_R_FAILURE; } /**************************************************************************/ @@ -1077,15 +1076,15 @@ temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) { INSIST(a->rdata.type == b->rdata.type); INSIST(dns_name_equal(&a->name, &b->name)); if (dns_rdata_casecompare(&a->rdata, &b->rdata) != 0) { - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } a = ISC_LIST_NEXT(a, link); b = ISC_LIST_NEXT(b, link); } if (a != NULL || b != NULL) { - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /*% @@ -1102,14 +1101,14 @@ temp_order(const void *av, const void *bv) { int r; r = dns_name_compare(&a->name, &b->name); if (r != 0) { - return (r); + return r; } r = (b->rdata.type - a->rdata.type); if (r != 0) { - return (r); + return r; } r = dns_rdata_casecompare(&a->rdata, &b->rdata); - return (r); + return r; } /*% @@ -1149,11 +1148,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, result = dns_db_findnode(db, name, false, &node); if (result == ISC_R_NOTFOUND) { dns_diff_clear(&trash); - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } if (result != ISC_R_SUCCESS) { dns_diff_clear(&trash); - return (result); + return result; } /* A new unique type begins here. */ @@ -1173,7 +1172,7 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, } else if (type == dns_rdatatype_any) { dns_db_detachnode(db, &node); dns_diff_clear(&trash); - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } else { covers = 0; } @@ -1189,7 +1188,7 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, if (result != ISC_R_SUCCESS) { dns_db_detachnode(db, &node); dns_diff_clear(&trash); - return (DNS_R_NXRRSET); + return DNS_R_NXRRSET; } dns_diff_init(mctx, &d_rrs); @@ -1249,14 +1248,14 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, dns_diff_clear(&trash); dns_rdataset_disassociate(&rdataset); dns_db_detachnode(db, &node); - return (result); + return result; } dns_db_detachnode(db, &node); } dns_diff_clear(&trash); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /**************************************************************************/ @@ -1288,13 +1287,13 @@ typedef struct { static bool type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); - return ((db_rr->type != dns_rdatatype_soa && - db_rr->type != dns_rdatatype_ns && - db_rr->type != dns_rdatatype_nsec3param && - db_rr->type != dns_rdatatype_rrsig && - db_rr->type != dns_rdatatype_nsec) - ? true - : false); + return (db_rr->type != dns_rdatatype_soa && + db_rr->type != dns_rdatatype_ns && + db_rr->type != dns_rdatatype_nsec3param && + db_rr->type != dns_rdatatype_rrsig && + db_rr->type != dns_rdatatype_nsec) + ? true + : false; } /*% @@ -1303,10 +1302,10 @@ type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { static bool type_not_dnssec(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); - return ((db_rr->type != dns_rdatatype_rrsig && - db_rr->type != dns_rdatatype_nsec) - ? true - : false); + return (db_rr->type != dns_rdatatype_rrsig && + db_rr->type != dns_rdatatype_nsec) + ? true + : false; } /*% @@ -1316,7 +1315,7 @@ static bool true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); UNUSED(db_rr); - return (true); + return true; } /*% @@ -1329,7 +1328,7 @@ rr_equal_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { * dns_rdata_equal() (that used dns_name_equal()), since it * would be faster. Not a priority. */ - return (dns_rdata_casecompare(update_rr, db_rr) == 0 ? true : false); + return dns_rdata_casecompare(update_rr, db_rr) == 0 ? true : false; } /*% @@ -1350,19 +1349,19 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { isc_result_t result; if (db_rr->type != update_rr->type) { - return (false); + return false; } if (db_rr->type == dns_rdatatype_cname) { - return (true); + return true; } if (db_rr->type == dns_rdatatype_dname) { - return (true); + return true; } if (db_rr->type == dns_rdatatype_soa) { - return (true); + return true; } if (db_rr->type == dns_rdatatype_nsec) { - return (true); + return true; } if (db_rr->type == dns_rdatatype_rrsig) { /* @@ -1377,7 +1376,7 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { dbsig.covered == updatesig.covered && dbsig.algorithm == updatesig.algorithm) { - return (true); + return true; } } if (db_rr->type == dns_rdatatype_wks) { @@ -1388,13 +1387,13 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { * dns_rdata_tostruct() might be cleaner in some ways. */ INSIST(db_rr->length >= 5 && update_rr->length >= 5); - return (memcmp(db_rr->data, update_rr->data, 5) == 0 ? true - : false); + return memcmp(db_rr->data, update_rr->data, 5) == 0 ? true + : false; } if (db_rr->type == dns_rdatatype_nsec3param) { if (db_rr->length != update_rr->length) { - return (false); + return false; } INSIST(db_rr->length >= 4 && update_rr->length >= 4); /* @@ -1405,10 +1404,10 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { memcmp(db_rr->data + 2, update_rr->data + 2, update_rr->length - 2) == 0) { - return (true); + return true; } } - return (false); + return false; } /*% @@ -1422,9 +1421,9 @@ delete_if_action(void *data, rr_t *rr) { result = update_one_rr(ctx->db, ctx->ver, ctx->diff, DNS_DIFFOP_DEL, ctx->name, rr->ttl, &rr->rdata); - return (result); + return result; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -1446,8 +1445,7 @@ delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, ctx.diff = diff; ctx.name = name; ctx.update_rr = update_rr; - return (foreach_rr(db, ver, name, type, covers, delete_if_action, - &ctx)); + return foreach_rr(db, ver, name, type, covers, delete_if_action, &ctx); } /**************************************************************************/ @@ -1475,7 +1473,7 @@ add_rr_prepare_action(void *data, rr_t *rr) { equal = (dns_rdata_casecompare(&rr->rdata, ctx->update_rr) == 0); if (equal && case_equal && ttl_equal) { ctx->ignore_add = true; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1486,7 +1484,7 @@ add_rr_prepare_action(void *data, rr_t *rr) { dns_difftuple_create(ctx->del_diff.mctx, DNS_DIFFOP_DEL, ctx->oldname, rr->ttl, &rr->rdata, &tuple); dns_diff_append(&ctx->del_diff, &tuple); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -1505,7 +1503,7 @@ add_rr_prepare_action(void *data, rr_t *rr) { } } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /**************************************************************************/ @@ -1579,7 +1577,7 @@ failure: if (deltuple != NULL) { dns_difftuple_free(&deltuple); } - return (result); + return result; } /*% @@ -1613,7 +1611,7 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, result = dns_db_getsoaserial(db, ver, &db_serial); if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (DNS_SERIAL_GE(db_serial, update_serial)) { @@ -1622,7 +1620,7 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, *ok = true; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /**************************************************************************/ @@ -1906,7 +1904,7 @@ failure: dns_ssutable_detach(&ssutable); } - return (result); + return result; } static void @@ -2081,7 +2079,7 @@ failure: ISC_LIST_UNLINK(temp_diff.tuples, tuple, link); dns_diff_appendminimal(diff, &tuple); } - return (result); + return result; } /* @@ -2193,7 +2191,7 @@ check_mx(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, ok = false; } } - return (ok ? ISC_R_SUCCESS : DNS_R_REFUSED); + return ok ? ISC_R_SUCCESS : DNS_R_REFUSED; } static isc_result_t @@ -2245,7 +2243,7 @@ failure: if (node != NULL) { dns_db_detachnode(db, &node); } - return (result); + return result; } static isc_result_t @@ -2261,7 +2259,7 @@ get_iterations(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype, result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_findrdataset(db, node, ver, dns_rdatatype_nsec3param, 0, (isc_stdtime_t)0, &rdataset, NULL); @@ -2341,7 +2339,7 @@ failure: if (dns_rdataset_isassociated(&rdataset)) { dns_rdataset_disassociate(&rdataset); } - return (result); + return result; } /* @@ -2373,7 +2371,7 @@ check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, } failure: - return (result); + return result; } /* @@ -2648,7 +2646,7 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, result = ISC_R_SUCCESS; failure: dns_diff_clear(&temp_diff); - return (result); + return result; } static isc_result_t @@ -2662,7 +2660,7 @@ rollback_private(dns_db_t *db, dns_rdatatype_t privatetype, isc_result_t result; if (privatetype == 0) { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } dns_diff_init(mctx, &temp_diff); @@ -2707,7 +2705,7 @@ rollback_private(dns_db_t *db, dns_rdatatype_t privatetype, failure: dns_diff_clear(&temp_diff); - return (result); + return result; } static bool @@ -2716,13 +2714,13 @@ isdnssec(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype) { bool build_nsec, build_nsec3; if (dns_db_issecure(db)) { - return (true); + return true; } result = dns_private_chains(db, ver, privatetype, &build_nsec, &build_nsec3); RUNTIME_CHECK(result == ISC_R_SUCCESS); - return (build_nsec || build_nsec3); + return build_nsec || build_nsec3; } static void @@ -3575,7 +3573,7 @@ send_forward(ns_client_t *client, dns_zone_t *zone) { "update forwarding", dns_zone_getorigin(zone), true, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = isc_quota_acquire(&client->manager->sctx->updquota); @@ -3588,7 +3586,7 @@ send_forward(ns_client_t *client, dns_zone_t *zone) { isc_result_totext(result)); ns_stats_increment(client->manager->sctx->nsstats, ns_statscounter_updatequota); - return (DNS_R_DROP); + return DNS_R_DROP; } uev = isc_mem_get(client->manager->mctx, sizeof(*uev)); @@ -3609,5 +3607,5 @@ send_forward(ns_client_t *client, dns_zone_t *zone) { isc_nmhandle_attach(client->handle, &client->updatehandle); isc_async_run(dns_zone_getloop(zone), forward_action, uev); - return (result); + return result; } diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 35a08c38aa..a47ddadcc0 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -247,23 +247,23 @@ ixfr_rrstream_create(isc_mem_t *mctx, const char *journal_filename, sizep)); *sp = (rrstream_t *)s; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: ixfr_rrstream_destroy((rrstream_t **)(void *)&s); - return (result); + return result; } static isc_result_t ixfr_rrstream_first(rrstream_t *rs) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)rs; - return (dns_journal_first_rr(s->journal)); + return dns_journal_first_rr(s->journal); } static isc_result_t ixfr_rrstream_next(rrstream_t *rs) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)rs; - return (dns_journal_next_rr(s->journal)); + return dns_journal_next_rr(s->journal); } static void @@ -328,11 +328,11 @@ axfr_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, s->it_valid = true; *sp = (rrstream_t *)s; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: axfr_rrstream_destroy((rrstream_t **)(void *)&s); - return (result); + return result; } static isc_result_t @@ -341,7 +341,7 @@ axfr_rrstream_first(rrstream_t *rs) { isc_result_t result; result = dns_rriterator_first(&s->it); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* Skip SOA records. */ for (;;) { @@ -358,7 +358,7 @@ axfr_rrstream_first(rrstream_t *rs) { break; } } - return (result); + return result; } static isc_result_t @@ -381,7 +381,7 @@ axfr_rrstream_next(rrstream_t *rs) { break; } } - return (result); + return result; } static void @@ -448,23 +448,23 @@ soa_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, &s->soa_tuple)); *sp = (rrstream_t *)s; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; failure: soa_rrstream_destroy((rrstream_t **)(void *)&s); - return (result); + return result; } static isc_result_t soa_rrstream_first(rrstream_t *rs) { UNUSED(rs); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t soa_rrstream_next(rrstream_t *rs) { UNUSED(rs); - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } static void @@ -552,7 +552,7 @@ compound_rrstream_create(isc_mem_t *mctx, rrstream_t **soa_stream, *data_stream = NULL; *soa_stream = NULL; *sp = (rrstream_t *)s; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -563,7 +563,7 @@ compound_rrstream_first(rrstream_t *rs) { rrstream_t *curstream = s->components[s->state]; s->result = curstream->methods->first(curstream); } while (s->result == ISC_R_NOMORE && s->state < 2); - return (s->result); + return s->result; } static isc_result_t @@ -578,13 +578,13 @@ compound_rrstream_next(rrstream_t *rs) { */ curstream->methods->pause(curstream); if (s->state == 2) { - return (ISC_R_NOMORE); + return ISC_R_NOMORE; } s->state++; curstream = s->components[s->state]; s->result = curstream->methods->first(curstream); } - return (s->result); + return s->result; } static void diff --git a/tests/bench/ascii.c b/tests/bench/ascii.c index 2899b53b55..e2123cb294 100644 --- a/tests/bench/ascii.c +++ b/tests/bench/ascii.c @@ -70,10 +70,10 @@ static bool cmp_tolower1(void *va, void *vb, unsigned int size) { for (uint8_t *a = va, *b = vb; size-- > 0; a++, b++) { if (TOLOWER(*a) != TOLOWER(*b)) { - return (false); + return false; } } - return (true); + return true; } static bool oldskool_result; diff --git a/tests/bench/compress.c b/tests/bench/compress.c index f255d298a2..0df6abd22d 100644 --- a/tests/bench/compress.c +++ b/tests/bench/compress.c @@ -100,5 +100,5 @@ main(void) { isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/tests/bench/dns_name_fromwire.c b/tests/bench/dns_name_fromwire.c index f89c0cebd1..a1d25b156a 100644 --- a/tests/bench/dns_name_fromwire.c +++ b/tests/bench/dns_name_fromwire.c @@ -47,7 +47,7 @@ old_bench(const uint8_t *data, size_t size) { } count++; } - return (count); + return count; } static uint32_t @@ -70,7 +70,7 @@ new_bench(const uint8_t *data, size_t size) { } count++; } - return (count); + return count; } static void diff --git a/tests/bench/load-names.c b/tests/bench/load-names.c index 11fd6272d0..b4790961b7 100644 --- a/tests/bench/load-names.c +++ b/tests/bench/load-names.c @@ -63,7 +63,7 @@ static size_t item_makekey(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { UNUSED(ctx); assert(pval == &item[ival]); - return (dns_qpkey_fromname(key, &item[ival].fixed.name)); + return dns_qpkey_fromname(key, &item[ival].fixed.name); } static void @@ -105,7 +105,7 @@ static void * new_lfht(isc_mem_t *mem ISC_ATTR_UNUSED) { struct cds_lfht *lfht = cds_lfht_new( 1, 1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL); - return (lfht); + return lfht; } static int @@ -114,7 +114,7 @@ lfht_match(struct cds_lfht_node *ht_node, const void *_key) { ht_node); const dns_name_t *key = _key; - return (dns_name_equal(key, &i->fixed.name)); + return dns_name_equal(key, &i->fixed.name); } static isc_result_t @@ -126,10 +126,10 @@ add_lfht(void *lfht, size_t count) { &item[count].ht_node); if (ht_node != &item[count].ht_node) { - return (ISC_R_EXISTS); + return ISC_R_EXISTS; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -141,11 +141,11 @@ get_lfht(void *lfht, size_t count, void **pval) { struct cds_lfht_node *ht_node = cds_lfht_iter_get_node(&iter); if (ht_node == NULL) { - return (ISC_R_NOTFOUND); + return ISC_R_NOTFOUND; } *pval = caa_container_of(ht_node, struct item_s, ht_node); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static void * @@ -173,7 +173,7 @@ thread_lfht(void *arg0) { arg->d0 = isc_time_microdiff(&t1, &t0); arg->d1 = isc_time_microdiff(&t2, &t1); - return (NULL); + return NULL; } /* @@ -185,13 +185,13 @@ new_hashmap(isc_mem_t *mem) { isc_hashmap_t *hashmap = NULL; isc_hashmap_create(mem, 1, &hashmap); - return (hashmap); + return hashmap; } static bool name_match(void *node, const void *key) { const struct item_s *i = node; - return (dns_name_equal(&i->fixed.name, key)); + return dns_name_equal(&i->fixed.name, key); } static isc_result_t @@ -199,7 +199,7 @@ add_hashmap(void *hashmap, size_t count) { isc_result_t result = isc_hashmap_add( hashmap, dns_name_hash(&item[count].fixed.name), name_match, &item[count].fixed.name, &item[count], NULL); - return (result); + return result; } static isc_result_t @@ -207,7 +207,7 @@ get_hashmap(void *hashmap, size_t count, void **pval) { isc_result_t result = isc_hashmap_find( hashmap, dns_name_hash(&item[count].fixed.name), name_match, &item[count].fixed.name, pval); - return (result); + return result; } static void * @@ -238,7 +238,7 @@ thread_hashmap(void *arg0) { arg->d0 = isc_time_microdiff(&t1, &t0); arg->d1 = isc_time_microdiff(&t2, &t1); - return (NULL); + return NULL; } /* @@ -249,7 +249,7 @@ static void * new_ht(isc_mem_t *mem) { isc_ht_t *ht = NULL; isc_ht_init(&ht, mem, 1, 0); - return (ht); + return ht; } static isc_result_t @@ -257,14 +257,14 @@ add_ht(void *ht, size_t count) { isc_result_t result = isc_ht_add(ht, item[count].fixed.name.ndata, item[count].fixed.name.length, &item[count]); - return (result); + return result; } static isc_result_t get_ht(void *ht, size_t count, void **pval) { isc_result_t result = isc_ht_find(ht, item[count].fixed.name.ndata, item[count].fixed.name.length, pval); - return (result); + return result; } static void * @@ -295,7 +295,7 @@ thread_ht(void *arg0) { arg->d0 = isc_time_microdiff(&t1, &t0); arg->d1 = isc_time_microdiff(&t2, &t1); - return (NULL); + return NULL; } /* @@ -306,13 +306,13 @@ static void * new_qp(isc_mem_t *mem) { dns_qpmulti_t *qpmulti = NULL; dns_qpmulti_create(mem, &qpmethods, NULL, &qpmulti); - return (qpmulti); + return qpmulti; } static isc_result_t add_qp(void *qp, size_t count) { isc_result_t result = dns_qp_insert(qp, &item[count], count); - return (result); + return result; } static void @@ -322,7 +322,7 @@ sqz_qp(void *qp) { static isc_result_t get_qp(void *qp, size_t count, void **pval) { - return (dns_qp_getname(qp, &item[count].fixed.name, pval, NULL)); + return dns_qp_getname(qp, &item[count].fixed.name, pval, NULL); } static void * @@ -366,22 +366,22 @@ _thread_qp(void *arg0, bool sqz, bool brr) { arg->d0 = isc_time_microdiff(&t1, &t0); arg->d1 = isc_time_microdiff(&t2, &t1); - return (NULL); + return NULL; } static void * thread_qp(void *arg0) { - return (_thread_qp(arg0, true, false)); + return _thread_qp(arg0, true, false); } static void * thread_qp_nosqz(void *arg0) { - return (_thread_qp(arg0, false, false)); + return _thread_qp(arg0, false, false); } static void * thread_qp_brr(void *arg0) { - return (_thread_qp(arg0, true, true)); + return _thread_qp(arg0, true, true); } /* diff --git a/tests/bench/qp-dump.c b/tests/bench/qp-dump.c index e0896fb9ff..795fb3a662 100644 --- a/tests/bench/qp-dump.c +++ b/tests/bench/qp-dump.c @@ -30,29 +30,29 @@ static inline size_t smallname_length(void *pval, uint32_t ival) { UNUSED(pval); - return (ival & 0xff); + return ival & 0xff; } static inline size_t smallname_labels(void *pval, uint32_t ival) { UNUSED(pval); - return (ival >> 8); + return ival >> 8; } static inline isc_refcount_t * smallname_refcount(void *pval, uint32_t ival) { UNUSED(ival); - return (pval); + return pval; } static inline uint8_t * smallname_ndata(void *pval, uint32_t ival) { - return ((uint8_t *)(smallname_refcount(pval, ival) + 1)); + return (uint8_t *)(smallname_refcount(pval, ival) + 1); } static inline uint8_t * smallname_offsets(void *pval, uint32_t ival) { - return (smallname_ndata(pval, ival) + smallname_length(pval, ival)); + return smallname_ndata(pval, ival) + smallname_length(pval, ival); } static void @@ -90,7 +90,7 @@ qpkey_from_smallname(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { UNUSED(ctx); dns_name_t name = DNS_NAME_INITEMPTY; name_from_smallname(&name, pval, ival); - return (dns_qpkey_fromname(key, &name)); + return dns_qpkey_fromname(key, &name); } static void @@ -274,5 +274,5 @@ main(int argc, char *argv[]) { qp_test_dumpdot(qp); } - return (0); + return 0; } diff --git a/tests/bench/qplookups.c b/tests/bench/qplookups.c index aa97d7cec1..fd478f3e6f 100644 --- a/tests/bench/qplookups.c +++ b/tests/bench/qplookups.c @@ -31,29 +31,29 @@ static inline size_t smallname_length(void *pval, uint32_t ival) { UNUSED(pval); - return (ival & 0xff); + return ival & 0xff; } static inline size_t smallname_labels(void *pval, uint32_t ival) { UNUSED(pval); - return (ival >> 8); + return ival >> 8; } static inline isc_refcount_t * smallname_refcount(void *pval, uint32_t ival) { UNUSED(ival); - return (pval); + return pval; } static inline uint8_t * smallname_ndata(void *pval, uint32_t ival) { - return ((uint8_t *)(smallname_refcount(pval, ival) + 1)); + return (uint8_t *)(smallname_refcount(pval, ival) + 1); } static inline uint8_t * smallname_offsets(void *pval, uint32_t ival) { - return (smallname_ndata(pval, ival) + smallname_length(pval, ival)); + return smallname_ndata(pval, ival) + smallname_length(pval, ival); } static void @@ -91,7 +91,7 @@ qpkey_from_smallname(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { UNUSED(ctx); dns_name_t name = DNS_NAME_INITEMPTY; name_from_smallname(&name, pval, ival); - return (dns_qpkey_fromname(key, &name)); + return dns_qpkey_fromname(key, &name); } static void @@ -191,7 +191,7 @@ load_qp(dns_qp_t *qp, const char *filename) { names++; } - return (names); + return names; } int @@ -283,5 +283,5 @@ main(int argc, char **argv) { printf("%-57s%7.3fsec\n", buf, (stop - start) / (double)NS_PER_SEC); isc_mem_cput(mctx, items, n, sizeof(dns_fixedname_t)); - return (0); + return 0; } diff --git a/tests/bench/qpmulti.c b/tests/bench/qpmulti.c index a72b4c6161..ec4d3e4244 100644 --- a/tests/bench/qpmulti.c +++ b/tests/bench/qpmulti.c @@ -77,7 +77,7 @@ rand_zipf(uint32_t max, double skew) { double ratio = sample <= 1 ? pow(sample, -s) : pow(sample, -s) / pow(invB, -s); if (ratio > (double)isc_random32() / UINT32_MAX) { - return (sample - 1); + return sample - 1; } } } @@ -101,7 +101,7 @@ item_makekey(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { UNUSED(ctx); UNUSED(pval); memmove(key, item[ival].key, item[ival].len); - return (item[ival].len); + return item[ival].len; } static void @@ -119,7 +119,7 @@ const dns_qpmethods_t item_methods = { static uint8_t random_byte(void) { - return (isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE); + return isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE; } static void @@ -889,5 +889,5 @@ main(void) { isc_mem_checkdestroyed(stdout); isc_mem_destroy(&mctx); - return (0); + return 0; } diff --git a/tests/dns/dbiterator_test.c b/tests/dns/dbiterator_test.c index 04164e707e..30980700b9 100644 --- a/tests/dns/dbiterator_test.c +++ b/tests/dns/dbiterator_test.c @@ -40,7 +40,7 @@ make_name(const char *src, dns_name_t *name) { isc_buffer_t b; isc_buffer_constinit(&b, src, strlen(src)); isc_buffer_add(&b, strlen(src)); - return (dns_name_fromtext(name, &b, dns_rootname, 0, NULL)); + return dns_name_fromtext(name, &b, dns_rootname, 0, NULL); } /* create: make sure we can create a dbiterator */ diff --git a/tests/dns/dbversion_test.c b/tests/dns/dbversion_test.c index 8b7a8a4ab4..ac6ebca31d 100644 --- a/tests/dns/dbversion_test.c +++ b/tests/dns/dbversion_test.c @@ -90,7 +90,7 @@ setup_test(void **state) { dns_db_newversion(db2, &v2); assert_non_null(v1); - return (0); + return 0; } static int @@ -119,7 +119,7 @@ teardown_test(void **state) { assert_null(db2); } - return (0); + return 0; } /* diff --git a/tests/dns/dispatch_test.c b/tests/dns/dispatch_test.c index b207add205..5257df79ab 100644 --- a/tests/dns/dispatch_test.c +++ b/tests/dns/dispatch_test.c @@ -113,7 +113,7 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { fd = socket(AF_INET6, family, 0); if (fd < 0) { perror("setup_ephemeral_port: socket()"); - return (-1); + return -1; } r = bind(fd, (const struct sockaddr *)&addr->type.sa, @@ -121,14 +121,14 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { if (r != 0) { perror("setup_ephemeral_port: bind()"); close(fd); - return (r); + return r; } r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen); if (r != 0) { perror("setup_ephemeral_port: getsockname()"); close(fd); - return (r); + return r; } #if IPV6_RECVERR @@ -139,11 +139,11 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { if (r != 0) { perror("setup_ephemeral_port"); close(fd); - return (r); + return r; } #endif - return (fd); + return fd; } static int @@ -173,21 +173,21 @@ setup_test(void **state) { udp_server_addr = (isc_sockaddr_t){ .length = 0 }; socket = setup_ephemeral_port(&udp_server_addr, SOCK_DGRAM); if (socket < 0) { - return (-1); + return -1; } close(socket); tcp_server_addr = (isc_sockaddr_t){ .length = 0 }; socket = setup_ephemeral_port(&tcp_server_addr, SOCK_STREAM); if (socket < 0) { - return (-1); + return -1; } close(socket); tls_server_addr = (isc_sockaddr_t){ .length = 0 }; socket = setup_ephemeral_port(&tls_server_addr, SOCK_STREAM); if (socket < 0) { - return (-1); + return -1; } close(socket); @@ -211,7 +211,7 @@ setup_test(void **state) { if (isc_tlsctx_createserver(NULL, NULL, &tls_listen_tlsctx) != ISC_R_SUCCESS) { - return (-1); + return -1; } dns_name_init(&tls_name, NULL); @@ -221,14 +221,14 @@ setup_test(void **state) { if (dns_name_fromtext(&tls_name, &namesrc, dns_rootname, DNS_NAME_DOWNCASE, &namebuf) != ISC_R_SUCCESS) { - return (-1); + return -1; } transport_list = dns_transport_list_new(mctx); tls_transport = dns_transport_new(&tls_name, DNS_TRANSPORT_TLS, transport_list); dns_transport_set_tlsname(tls_transport, tls_name_str); - return (0); + return 0; } static int @@ -242,7 +242,7 @@ teardown_test(void **state) { teardown_netmgr(state); teardown_loopmgr(state); - return (0); + return 0; } static isc_result_t @@ -255,13 +255,13 @@ make_dispatchset(dns_dispatchmgr_t *dispatchmgr, unsigned int ndisps, isc_sockaddr_any(&any); result = dns_dispatch_createudp(dispatchmgr, &any, &disp); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_dispatchset_create(mctx, disp, dsetp, ndisps); dns_dispatch_detach(&disp); - return (result); + return result; } /* create dispatch set */ @@ -400,7 +400,7 @@ accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) { UNUSED(handle); UNUSED(arg); - return (eresult); + return eresult; } static void diff --git a/tests/dns/dnstap_test.c b/tests/dns/dnstap_test.c index 6d37979c3d..8e7b46894e 100644 --- a/tests/dns/dnstap_test.c +++ b/tests/dns/dnstap_test.c @@ -48,7 +48,7 @@ cleanup(void **state ISC_ATTR_UNUSED) { (void)isc_file_remove(TAPFILE); (void)isc_file_remove(TAPSOCK); - return (0); + return 0; } static int @@ -63,7 +63,7 @@ setup(void **state) { * the testdata was originally generated. */ setenv("TZ", "PDT8", 1); - return (0); + return 0; } /* set up dnstap environment */ diff --git a/tests/dns/dst_test.c b/tests/dns/dst_test.c index 3c3f72ec35..79c7fb5170 100644 --- a/tests/dns/dst_test.c +++ b/tests/dns/dst_test.c @@ -110,7 +110,7 @@ sig_fromfile(const char *path, isc_buffer_t *buf) { err: isc_mem_put(mctx, data, size + 1); - return (result); + return result; } static void diff --git a/tests/dns/geoip_test.c b/tests/dns/geoip_test.c index d008117fbc..89a7fc6e30 100644 --- a/tests/dns/geoip_test.c +++ b/tests/dns/geoip_test.c @@ -52,7 +52,7 @@ setup_test(void **state) { /* Use databases from the geoip system test */ load_geoip(TEST_GEOIP_DATA); - return (0); + return 0; } static int @@ -61,7 +61,7 @@ teardown_test(void **state) { close_geoip(); - return (0); + return 0; } static MMDB_s * @@ -72,10 +72,10 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { snprintf(pathbuf, sizeof(pathbuf), "%s/%s", dir, dbfile); ret = MMDB_open(pathbuf, MMDB_MODE_MMAP, mmdb); if (ret == MMDB_SUCCESS) { - return (mmdb); + return mmdb; } - return (NULL); + return NULL; } static void @@ -114,7 +114,7 @@ entry_exists(dns_geoip_subtype_t subtype, const char *addr) { db = geoip2_database(&geoip, fix_subtype(&geoip, subtype)); - return (db != NULL && get_entry_for(db, &na) != NULL); + return db != NULL && get_entry_for(db, &na) != NULL; } /* @@ -180,7 +180,7 @@ do_lookup_string(const char *addr, dns_geoip_subtype_t subtype, elt.subtype = subtype; strlcpy(elt.as_string, string, sizeof(elt.as_string)); - return (dns_geoip_match(&na, &geoip, &elt)); + return dns_geoip_match(&na, &geoip, &elt); } static bool @@ -198,7 +198,7 @@ do_lookup_string_v6(const char *addr, dns_geoip_subtype_t subtype, elt.subtype = subtype; strlcpy(elt.as_string, string, sizeof(elt.as_string)); - return (dns_geoip_match(&na, &geoip, &elt)); + return dns_geoip_match(&na, &geoip, &elt); } /* GeoIP country matching */ diff --git a/tests/dns/keytable_test.c b/tests/dns/keytable_test.c index 2442876340..581e161b80 100644 --- a/tests/dns/keytable_test.c +++ b/tests/dns/keytable_test.c @@ -46,14 +46,14 @@ static int setup_test(void **state) { setup_loopmgr(state); - return (0); + return 0; } static int teardown_test(void **state) { teardown_loopmgr(state); - return (0); + return 0; } dns_keytable_t *keytable = NULL; @@ -99,7 +99,7 @@ str2name(const char *namestr) { dns_name_fromtext(name, &namebuf, dns_rootname, 0, NULL), ISC_R_SUCCESS); - return (name); + return name; } static void diff --git a/tests/dns/master_test.c b/tests/dns/master_test.c index fed3c903c2..5c1a9bcc0b 100644 --- a/tests/dns/master_test.c +++ b/tests/dns/master_test.c @@ -73,7 +73,7 @@ add_callback(void *arg, const dns_name_t *owner, isc_buffer_init(&target, buf, BIGBUFLEN); result = dns_rdataset_totext(dataset, owner, false, false, &target); - return (result); + return result; } static void @@ -103,7 +103,7 @@ setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...), result = dns_name_fromtext(&dns_origin, &source, dns_rootname, 0, &target); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdatacallbacks_init_stdio(&callbacks); @@ -117,7 +117,7 @@ setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...), callbacks.error = error; } headerset = false; - return (result); + return result; } static isc_result_t @@ -129,7 +129,7 @@ test_master(const char *workdir, const char *testfile, result = setup_master(warn, error); if (result != ISC_R_SUCCESS) { - return (result); + return result; } dns_rdatacallbacks_init_stdio(&callbacks); @@ -146,7 +146,7 @@ test_master(const char *workdir, const char *testfile, if (workdir != NULL) { result = isc_dir_chdir(workdir); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -154,7 +154,7 @@ test_master(const char *workdir, const char *testfile, dns_rdataclass_in, true, 0, &callbacks, NULL, NULL, mctx, format, 0); - return (result); + return result; } static void diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index 8af378f484..4cb3b9cce7 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -562,12 +562,12 @@ ISC_RUN_TEST_IMPL(istat) { static bool name_attr_zero(struct dns_name_attrs attributes) { - return (!(attributes.absolute | attributes.readonly | - attributes.dynamic | attributes.dynoffsets | - attributes.nocompress | attributes.cache | attributes.answer | - attributes.ncache | attributes.chaining | attributes.chase | - attributes.wildcard | attributes.prerequisite | - attributes.update | attributes.hasupdaterec)); + return !(attributes.absolute | attributes.readonly | + attributes.dynamic | attributes.dynoffsets | + attributes.nocompress | attributes.cache | attributes.answer | + attributes.ncache | attributes.chaining | attributes.chase | + attributes.wildcard | attributes.prerequisite | + attributes.update | attributes.hasupdaterec); } /* dns_name_init */ @@ -962,7 +962,7 @@ ISC_RUN_TEST_IMPL(fromwire_thread(void *arg) { (void)dns_name_fromwire(&name, &source, &dctx, &target); } - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(benchmark) { diff --git a/tests/dns/nametree_test.c b/tests/dns/nametree_test.c index 147f37382b..71197ba345 100644 --- a/tests/dns/nametree_test.c +++ b/tests/dns/nametree_test.c @@ -79,7 +79,7 @@ setup(void **state ISC_ATTR_UNUSED) { dns_test_namefromstring("sub.example.com.", &fn); assert_int_equal(dns_nametree_add(bitstree, name, 2), ISC_R_SUCCESS); - return (0); + return 0; } static int @@ -88,7 +88,7 @@ teardown(void **state ISC_ATTR_UNUSED) { dns_nametree_detach(&bitstree); dns_nametree_detach(&counttree); rcu_barrier(); - return (0); + return 0; } ISC_RUN_TEST_IMPL(add_bool) { diff --git a/tests/dns/nsec3param_test.c b/tests/dns/nsec3param_test.c index b0282d7e07..e907d72dfb 100644 --- a/tests/dns/nsec3param_test.c +++ b/tests/dns/nsec3param_test.c @@ -95,7 +95,7 @@ rdata_fromparams(uint8_t hash, uint8_t flags, uint16_t iter, uint8_t saltlen, nsec3param.iterations = iter; nsec3param.salt_length = saltlen; nsec3param.salt = salt; - return (nsec3param); + return nsec3param; } /*% diff --git a/tests/dns/qp_test.c b/tests/dns/qp_test.c index 7206d6c3cf..f8c0954bee 100644 --- a/tests/dns/qp_test.c +++ b/tests/dns/qp_test.c @@ -196,7 +196,7 @@ qpiter_makekey(dns_qpkey_t key, void *uctx, void *pval, uint32_t ival) { } key[i++] = SHIFT_NOBYTE; - return (i); + return i; } static void @@ -353,10 +353,10 @@ qpkey_fromstring(dns_qpkey_t key, void *uctx, void *pval, uint32_t ival) { UNUSED(uctx); UNUSED(ival); if (*(char *)pval == '\0') { - return (0); + return 0; } dns_test_namefromstring(pval, &fixed); - return (dns_qpkey_fromname(key, dns_fixedname_name(&fixed))); + return dns_qpkey_fromname(key, dns_fixedname_name(&fixed)); } const dns_qpmethods_t string_methods = { diff --git a/tests/dns/qpmulti_test.c b/tests/dns/qpmulti_test.c index 5bb9262cac..90d246ec7a 100644 --- a/tests/dns/qpmulti_test.c +++ b/tests/dns/qpmulti_test.c @@ -118,7 +118,7 @@ item_makekey(dns_qpkey_t key, void *ctx, void *pval, uint32_t ival) { ISC_INSIST(pval == &item[ival]); } memmove(key, item[ival].key, item[ival].len); - return (item[ival].len); + return item[ival].len; } static void @@ -136,7 +136,7 @@ const dns_qpmethods_t test_methods = { static uint8_t random_byte(void) { - return (isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE); + return isc_random_uniform(SHIFT_OFFSET - SHIFT_NOBYTE) + SHIFT_NOBYTE; } static void @@ -184,7 +184,7 @@ checkkey(dns_qpreadable_t qpr, size_t i, bool exists, const char *rubric) { rubric); UNUSED(rubric); } - return (ok); + return ok; } static bool @@ -197,7 +197,7 @@ checkallro(dns_qpreadable_t qp) { qp_test_dumptrie(qp); TRACE("checkallro failed"); } - return (ok); + return ok; } static bool @@ -210,7 +210,7 @@ checkallrw(dns_qpreadable_t qp) { qp_test_dumptrie(qp); TRACE("checkallrw failed"); } - return (ok); + return ok; } static void diff --git a/tests/dns/qpzone_test.c b/tests/dns/qpzone_test.c index 364995fa3b..2b0537022c 100644 --- a/tests/dns/qpzone_test.c +++ b/tests/dns/qpzone_test.c @@ -150,7 +150,7 @@ ownercase_test_one(const char *str1, const char *str2) { NODE_DESTROYLOCK(&qpdb.node_locks[0].lock); - return (dns_name_caseequal(name1, name2)); + return dns_name_caseequal(name1, name2); } ISC_RUN_TEST_IMPL(ownercase) { diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index 57be904cbc..6830b3b071 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -152,7 +152,7 @@ wire_to_rdata(const unsigned char *src, size_t srclen, dns_rdataclass_t rdclass, DNS_DECOMPRESS_ALWAYS, &target); detect_uncleared_libcrypto_error(); - return (result); + return result; } /* @@ -180,7 +180,7 @@ rdata_towire(dns_rdata_t *rdata, unsigned char *dst, size_t dstlen, *length = isc_buffer_usedlength(&target); - return (result); + return result; } static isc_result_t @@ -190,7 +190,7 @@ additionaldata_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, UNUSED(name); UNUSED(qtype); UNUSED(found); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -198,8 +198,8 @@ additionaldata_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, */ static isc_result_t rdata_additionadata(dns_rdata_t *rdata) { - return (dns_rdata_additionaldata(rdata, dns_rootname, additionaldata_cb, - NULL)); + return dns_rdata_additionaldata(rdata, dns_rootname, additionaldata_cb, + NULL); } /* diff --git a/tests/dns/resolver_test.c b/tests/dns/resolver_test.c index f53cfd684a..200c20e1c1 100644 --- a/tests/dns/resolver_test.c +++ b/tests/dns/resolver_test.c @@ -59,7 +59,7 @@ setup_test(void **state) { dns_dispatchmgr_detach(&dispatchmgr); - return (0); + return 0; } static int @@ -68,7 +68,7 @@ teardown_test(void **state) { dns_view_detach(&view); teardown_managers(state); - return (0); + return 0; } static void diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c index 029014ed9b..5dd7a423b5 100644 --- a/tests/dns/tsig_test.c +++ b/tests/dns/tsig_test.c @@ -66,7 +66,7 @@ add_mac(dst_context_t *tsigctx, isc_buffer_t *buf) { result = dst_context_adddata(tsigctx, &r); dns_rdata_freestruct(&tsig); cleanup: - return (result); + return result; } static isc_result_t @@ -147,7 +147,7 @@ cleanup: } dns_compress_invalidate(&cctx); - return (result); + return result; } static void diff --git a/tests/dns/update_test.c b/tests/dns/update_test.c index 7832cbcf7e..653f34ebbe 100644 --- a/tests/dns/update_test.c +++ b/tests/dns/update_test.c @@ -51,7 +51,7 @@ setup_test(void **state) { setenv("TZ", "", 1); - return (0); + return 0; } static uint32_t mystdtime; @@ -69,7 +69,7 @@ set_mystdtime(int year, int month, int day) { isc_stdtime_t isc_stdtime_now(void) { - return (mystdtime); + return mystdtime; } /* simple increment by 1 */ diff --git a/tests/dns/zonemgr_test.c b/tests/dns/zonemgr_test.c index 268d65f75e..0424e911d5 100644 --- a/tests/dns/zonemgr_test.c +++ b/tests/dns/zonemgr_test.c @@ -38,7 +38,7 @@ setup_test(void **state) { setup_loopmgr(state); setup_netmgr(state); - return (0); + return 0; } static int @@ -46,7 +46,7 @@ teardown_test(void **state) { teardown_netmgr(state); teardown_loopmgr(state); - return (0); + return 0; } /* create zone manager */ diff --git a/tests/dns/zt_test.c b/tests/dns/zt_test.c index 2ca5f14a2d..3e4dc37b06 100644 --- a/tests/dns/zt_test.c +++ b/tests/dns/zt_test.c @@ -50,7 +50,7 @@ count_zone(dns_zone_t *zone, void *uap) { UNUSED(zone); *nzones += 1; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* apply a function to a zone table */ @@ -110,7 +110,7 @@ load_done_last(void *uap) { isc_loopmgr_shutdown(loopmgr); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -125,7 +125,7 @@ load_done_new_only(void *uap) { dns_zone_asyncload(zone, true, load_done_last, zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static isc_result_t @@ -148,7 +148,7 @@ load_done_first(void *uap) { dns_zone_asyncload(zone, true, load_done_new_only, zone); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* asynchronous zone load */ @@ -220,7 +220,7 @@ all_done(void *arg ISC_ATTR_UNUSED) { dns_view_detach(&view); isc_loopmgr_shutdown(loopmgr); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* asynchronous zone table load */ diff --git a/tests/irs/resconf_test.c b/tests/irs/resconf_test.c index 770e980feb..ac21bbf1dd 100644 --- a/tests/irs/resconf_test.c +++ b/tests/irs/resconf_test.c @@ -47,39 +47,39 @@ setup_test(void) { static isc_result_t check_number(unsigned int n, unsigned int expected) { - return ((n == expected) ? ISC_R_SUCCESS : ISC_R_BADNUMBER); + return (n == expected) ? ISC_R_SUCCESS : ISC_R_BADNUMBER; } static isc_result_t check_attempts(irs_resconf_t *resconf) { - return (check_number(irs_resconf_getattempts(resconf), 4)); + return check_number(irs_resconf_getattempts(resconf), 4); } static isc_result_t check_timeout(irs_resconf_t *resconf) { - return (check_number(irs_resconf_gettimeout(resconf), 1)); + return check_number(irs_resconf_gettimeout(resconf), 1); } static isc_result_t check_ndots(irs_resconf_t *resconf) { - return (check_number(irs_resconf_getndots(resconf), 2)); + return check_number(irs_resconf_getndots(resconf), 2); } static isc_result_t check_options(irs_resconf_t *resconf) { if (irs_resconf_getattempts(resconf) != 3) { - return (ISC_R_BADNUMBER); /* default value only */ + return ISC_R_BADNUMBER; /* default value only */ } if (irs_resconf_getndots(resconf) != 2) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } if (irs_resconf_gettimeout(resconf) != 1) { - return (ISC_R_BADNUMBER); + return ISC_R_BADNUMBER; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* test irs_resconf_load() */ @@ -166,7 +166,7 @@ main(void) { cmocka_unit_test(irs_resconf_load_test), }; - return (cmocka_run_group_tests(tests, NULL, NULL)); + return cmocka_run_group_tests(tests, NULL, NULL); } #else /* HAVE_CMOCKA */ @@ -176,7 +176,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (SKIPPED_TEST_EXIT_CODE); + return SKIPPED_TEST_EXIT_CODE; } #endif /* if HAVE_CMOCKA */ diff --git a/tests/isc/dnsstream_utils_test.c b/tests/isc/dnsstream_utils_test.c index 2d8d6d690f..68a0133eae 100644 --- a/tests/isc/dnsstream_utils_test.c +++ b/tests/isc/dnsstream_utils_test.c @@ -42,14 +42,14 @@ setup_test_dnsbuf(void **state) { isc_buffer_t **pdnsbuf = (isc_buffer_t **)state; isc_buffer_allocate(mctx, pdnsbuf, STATIC_BUFFER_SIZE); - return (0); + return 0; } static int teardown_test_dnsbuf(void **state) { isc_buffer_free((isc_buffer_t **)state); - return (0); + return 0; } static bool @@ -60,7 +60,7 @@ dnsasm_dummy(isc_dnsstream_assembler_t *dnsasm, const isc_result_t result, UNUSED(region); UNUSED(cbarg); UNUSED(userarg); - return (true); + return true; } static int @@ -69,14 +69,14 @@ setup_test_dnsasm(void **state) { (isc_dnsstream_assembler_t **)state; *pdnsasm = isc_dnsstream_assembler_new(mctx, dnsasm_dummy, NULL); - return (0); + return 0; } static int teardown_test_dnsasm(void **state) { isc_dnsstream_assembler_free((isc_dnsstream_assembler_t **)state); - return (0); + return 0; } ISC_RUN_TEST_IMPL(dnsbuffer_generic_test) { @@ -279,7 +279,7 @@ verify_dnsmsg(isc_dnsstream_assembler_t *dnsasm, const isc_result_t result, } if (result != ISC_R_SUCCESS) { - return (true); + return true; } if (vdata->verify_message != NULL && @@ -295,7 +295,7 @@ verify_dnsmsg(isc_dnsstream_assembler_t *dnsasm, const isc_result_t result, (isc_dnsstream_assembler_t *)dnsasm); } - return (vdata->cont_on_success); + return vdata->cont_on_success; } typedef struct verify_regions_cbdata { @@ -320,7 +320,7 @@ verify_dnsmsg_regions(isc_dnsstream_assembler_t *dnsasm, } if (result != ISC_R_SUCCESS) { - return (true); + return true; } if (vdata->packets != NULL && @@ -333,7 +333,7 @@ verify_dnsmsg_regions(isc_dnsstream_assembler_t *dnsasm, vdata->packets++; - return (vdata->cont_on_success); + return vdata->cont_on_success; } ISC_RUN_TEST_IMPL(dnsasm_sequence_test) { diff --git a/tests/isc/doh_test.c b/tests/isc/doh_test.c index c8240281f9..d9001468bc 100644 --- a/tests/isc/doh_test.c +++ b/tests/isc/doh_test.c @@ -138,12 +138,12 @@ static isc_nm_t **nm = NULL; static isc_nm_proxy_type_t get_proxy_type(void) { if (!atomic_load(&use_PROXY)) { - return (ISC_NM_PROXY_NONE); + return ISC_NM_PROXY_NONE; } else if (atomic_load(&use_TLS) && atomic_load(&use_PROXY_over_TLS)) { - return (ISC_NM_PROXY_ENCRYPTED); + return ISC_NM_PROXY_ENCRYPTED; } - return (ISC_NM_PROXY_PLAIN); + return ISC_NM_PROXY_PLAIN; } static void @@ -229,7 +229,7 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { fd = socket(AF_INET6, family, 0); if (fd < 0) { perror("setup_ephemeral_port: socket()"); - return (-1); + return -1; } r = bind(fd, (const struct sockaddr *)&addr->type.sa, @@ -237,14 +237,14 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { if (r != 0) { perror("setup_ephemeral_port: bind()"); isc__nm_closesocket(fd); - return (r); + return r; } r = getsockname(fd, (struct sockaddr *)&addr->type.sa, &addrlen); if (r != 0) { perror("setup_ephemeral_port: getsockname()"); isc__nm_closesocket(fd); - return (r); + return r; } result = isc__nm_socket_reuse(fd, 1); @@ -253,7 +253,7 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { "setup_ephemeral_port: isc__nm_socket_reuse(): %s", isc_result_totext(result)); close(fd); - return (-1); + return -1; } result = isc__nm_socket_reuse_lb(fd); @@ -262,7 +262,7 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { "setup_ephemeral_port: isc__nm_socket_reuse_lb(): %s", isc_result_totext(result)); close(fd); - return (-1); + return -1; } #if IPV6_RECVERR @@ -273,11 +273,11 @@ setup_ephemeral_port(isc_sockaddr_t *addr, sa_family_t family) { if (r != 0) { perror("setup_ephemeral_port"); close(fd); - return (r); + return r; } #endif - return (fd); + return fd; } /* Generic */ @@ -302,7 +302,7 @@ setup_test(void **state) { tcp_listen_addr = (isc_sockaddr_t){ .length = 0 }; tcp_listen_sock = setup_ephemeral_port(&tcp_listen_addr, SOCK_STREAM); if (tcp_listen_sock < 0) { - return (-1); + return -1; } close(tcp_listen_sock); tcp_listen_sock = -1; @@ -341,7 +341,7 @@ setup_test(void **state) { isc_nonce_buf(&send_magic, sizeof(send_magic)); isc_nonce_buf(&stop_magic, sizeof(stop_magic)); if (send_magic == stop_magic) { - return (-1); + return -1; } setup_loopmgr(state); @@ -371,7 +371,7 @@ setup_test(void **state) { *state = nm; - return (0); + return 0; } static int @@ -397,7 +397,7 @@ teardown_test(void **state ISC_ATTR_UNUSED) { isc_nm_http_endpoints_detach(&endpoints); - return (0); + return 0; } thread_local size_t nwrites = NWRITES; @@ -416,7 +416,7 @@ init_listener_quota(size_t nthreads) { isc_quota_max(&listener_quota, max_quota); quotap = &listener_quota; } - return (quotap); + return quotap; } static void @@ -705,7 +705,7 @@ doh_timeout_recovery(void *arg ISC_ATTR_UNUSED) { static int doh_timeout_recovery_teardown(void **state) { assert_true(atomic_load(&ctimeouts) == 5); - return (teardown_test(state)); + return teardown_test(state); } ISC_LOOP_TEST_IMPL(doh_timeout_recovery_POST) { @@ -835,7 +835,7 @@ doh_recv_one_teardown(void **state) { assert_int_equal(atomic_load(&sreads), 1); assert_int_equal(atomic_load(&ssends), 1); - return (teardown_test(state)); + return teardown_test(state); } ISC_LOOP_TEST_IMPL(doh_recv_one_POST) { @@ -966,7 +966,7 @@ doh_recv_two_teardown(void **state) { assert_int_equal(atomic_load(&sreads), 2); assert_int_equal(atomic_load(&ssends), 2); - return (teardown_test(state)); + return teardown_test(state); } ISC_LOOP_TEST_IMPL(doh_recv_two_POST) { @@ -1062,7 +1062,7 @@ doh_recv_send_teardown(void **state) { CHECK_RANGE_FULL(sreads); CHECK_RANGE_FULL(ssends); - return (res); + return res; } ISC_LOOP_TEST_IMPL(doh_recv_send_POST) { @@ -1127,7 +1127,7 @@ doh_bad_connect_uri_teardown(void **state) { assert_int_equal(atomic_load(&sreads), 0); assert_int_equal(atomic_load(&ssends), 0); - return (teardown_test(state)); + return teardown_test(state); } /* See: GL #2858, !5319 */ diff --git a/tests/isc/hashmap_test.c b/tests/isc/hashmap_test.c index 6ef710cf21..7ff9327351 100644 --- a/tests/isc/hashmap_test.c +++ b/tests/isc/hashmap_test.c @@ -46,7 +46,7 @@ static bool nodes_match(void *node0, const void *key) { struct test_node *node = node0; - return (memcmp(node->key, key, 16) == 0); + return memcmp(node->key, key, 16) == 0; } static bool @@ -54,14 +54,14 @@ long_nodes_match(void *node0, const void *key) { struct test_node *node = node0; size_t len = strlen(key); - return (memcmp(node->key, key, len) == 0); + return memcmp(node->key, key, len) == 0; } static bool upper_nodes_match(void *node0, const void *key) { struct test_node *node = node0; - return (isc_ascii_lowerequal((uint8_t *)node->key, key, 16)); + return isc_ascii_lowerequal((uint8_t *)node->key, key, 16); } static void @@ -431,7 +431,7 @@ case_match(void *node0, const void *key) { struct test_node *node = node0; size_t len = strlen(key); - return (memcmp(node->key, key, len) == 0); + return memcmp(node->key, key, len) == 0; } static bool @@ -439,7 +439,7 @@ nocase_match(void *node0, const void *key) { struct test_node *node = node0; size_t len = strlen(key); - return (isc_ascii_lowerequal((uint8_t *)node->key, key, len)); + return isc_ascii_lowerequal((uint8_t *)node->key, key, len); } ISC_RUN_TEST_IMPL(isc_hashmap_case) { diff --git a/tests/isc/heap_test.c b/tests/isc/heap_test.c index 19e3ba5a8c..eba2b6b97a 100644 --- a/tests/isc/heap_test.c +++ b/tests/isc/heap_test.c @@ -40,7 +40,7 @@ compare(void *p1, void *p2) { struct e *e1 = p1; struct e *e2 = p2; - return (e1->value < e2->value); + return e1->value < e2->value; } static void diff --git a/tests/isc/histo_test.c b/tests/isc/histo_test.c index 8f905120b5..88c322f160 100644 --- a/tests/isc/histo_test.c +++ b/tests/isc/histo_test.c @@ -47,7 +47,7 @@ static double millis_since(isc_nanosecs_t start) { isc_nanosecs_t end = isc_time_monotonic(); - return ((double)(end - start) / NS_PER_MS); + return (double)(end - start) / NS_PER_MS; } #else diff --git a/tests/isc/hmac_test.c b/tests/isc/hmac_test.c index 531e8cc3f6..5784a8aec1 100644 --- a/tests/isc/hmac_test.c +++ b/tests/isc/hmac_test.c @@ -48,30 +48,30 @@ static int _setup(void **state) { isc_hmac_t *hmac_st = isc_hmac_new(); if (hmac_st == NULL) { - return (-1); + return -1; } *state = hmac_st; - return (0); + return 0; } static int _teardown(void **state) { if (*state == NULL) { - return (-1); + return -1; } isc_hmac_free(*state); - return (0); + return 0; } static int _reset(void **state) { if (*state == NULL) { - return (-1); + return -1; } if (isc_hmac_reset(*state) != ISC_R_SUCCESS) { - return (-1); + return -1; } - return (0); + return 0; } ISC_RUN_TEST_IMPL(isc_hmac_new) { diff --git a/tests/isc/md_test.c b/tests/isc/md_test.c index 579078cb7e..69051b93c9 100644 --- a/tests/isc/md_test.c +++ b/tests/isc/md_test.c @@ -41,30 +41,30 @@ static int _setup(void **state) { isc_md_t *md = isc_md_new(); if (md == NULL) { - return (-1); + return -1; } *state = md; - return (0); + return 0; } static int _teardown(void **state) { if (*state == NULL) { - return (-1); + return -1; } isc_md_free(*state); - return (0); + return 0; } static int _reset(void **state) { if (*state == NULL) { - return (-1); + return -1; } if (isc_md_reset(*state) != ISC_R_SUCCESS) { - return (-1); + return -1; } - return (0); + return 0; } ISC_RUN_TEST_IMPL(isc_md_new) { diff --git a/tests/isc/mem_test.c b/tests/isc/mem_test.c index 22f6be9893..cdf2546656 100644 --- a/tests/isc/mem_test.c +++ b/tests/isc/mem_test.c @@ -478,7 +478,7 @@ mem_thread(void *arg) { } } - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(isc_mem_benchmark) { diff --git a/tests/isc/mutex_test.c b/tests/isc/mutex_test.c index 35e2d598d6..d45c694aba 100644 --- a/tests/isc/mutex_test.c +++ b/tests/isc/mutex_test.c @@ -54,7 +54,7 @@ setup_env(void **unused __attribute__((__unused__))) { } assert_int_not_equal(delay_loop, 0); - return (0); + return 0; } ISC_RUN_TEST_IMPL(isc_mutex) { @@ -95,7 +95,7 @@ pthread_mutex_thread(void *arg) { isc_pause_n(cont); } - return (NULL); + return NULL; } static void * @@ -111,7 +111,7 @@ isc_mutex_thread(void *arg) { isc_pause_n(cont); } - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(isc_mutex_benchmark) { diff --git a/tests/isc/netmgr_common.c b/tests/isc/netmgr_common.c index a65c1d5ebc..bf7a31d400 100644 --- a/tests/isc/netmgr_common.c +++ b/tests/isc/netmgr_common.c @@ -195,10 +195,10 @@ setup_netmgr_test(void **state) { if (isc_tlsctx_createserver(NULL, NULL, &tcp_listen_tlsctx) != ISC_R_SUCCESS) { - return (-1); + return -1; } if (isc_tlsctx_createclient(&tcp_connect_tlsctx) != ISC_R_SUCCESS) { - return (-1); + return -1; } isc_tlsctx_enable_dot_client_alpn(tcp_connect_tlsctx); @@ -208,7 +208,7 @@ setup_netmgr_test(void **state) { ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE, &tcp_tlsctx_client_sess_cache); - return (0); + return 0; } int @@ -236,7 +236,7 @@ teardown_netmgr_test(void **state ISC_ATTR_UNUSED) { proxy_info = NULL; - return (0); + return 0; } void @@ -265,7 +265,7 @@ noop_accept_cb(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t eresult, (void)atomic_fetch_add(&saccepts, 1); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -495,7 +495,7 @@ listen_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { F(); if (eresult != ISC_R_SUCCESS) { - return (eresult); + return eresult; } if (have_expected_saccepts(atomic_fetch_add(&saccepts, 1) + 1)) { @@ -505,7 +505,7 @@ listen_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { isc_nmhandle_attach(handle, &(isc_nmhandle_t *){ NULL }); isc_refcount_increment0(&active_sreads); - return (eresult); + return eresult; } isc_result_t @@ -517,7 +517,7 @@ stream_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { F(); if (eresult != ISC_R_SUCCESS) { - return (eresult); + return eresult; } if (have_expected_saccepts(atomic_fetch_add(&saccepts, 1) + 1)) { @@ -534,7 +534,7 @@ stream_accept_cb(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) { isc_nmhandle_attach(handle, &readhandle); isc_nm_read(handle, listen_read_cb, readhandle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } void @@ -583,7 +583,7 @@ tcp_listener_init_quota(size_t nthreads) { isc_quota_max(&listener_quota, max_quota); quotap = &listener_quota; } - return (quotap); + return quotap; } static void @@ -608,7 +608,7 @@ set_proxyheader_info(isc_nm_proxyheader_info_t *pi) { isc_nm_proxyheader_info_t * get_proxyheader_info(void) { if (proxy_info != NULL) { - return (proxy_info); + return proxy_info; } /* @@ -616,10 +616,10 @@ get_proxyheader_info(void) { * too. */ if (isc_random_uniform(2)) { - return (&proxy_info_data); + return &proxy_info_data; } - return (NULL); + return NULL; } static void @@ -637,11 +637,11 @@ proxystream_connect(isc_nm_t *nm) { stream_connect_function get_stream_connect_function(void) { if (stream_use_TLS && !stream_PROXY_over_TLS) { - return (tls_connect); + return tls_connect; } else if (stream_use_PROXY) { - return (proxystream_connect); + return proxystream_connect; } else { - return (tcp_connect); + return tcp_connect; } UNREACHABLE(); @@ -657,19 +657,19 @@ stream_listen(isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog, listen_nm, ISC_NM_LISTEN_ALL, &tcp_listen_addr, accept_cb, accept_cbarg, backlog, quota, tcp_listen_tlsctx, stream_use_PROXY, sockp); - return (result); + return result; } else if (stream_use_PROXY) { isc_tlsctx_t *tlsctx = stream_PROXY_over_TLS ? tcp_listen_tlsctx : NULL; result = isc_nm_listenproxystream( listen_nm, ISC_NM_LISTEN_ALL, &tcp_listen_addr, accept_cb, accept_cbarg, backlog, quota, tlsctx, sockp); - return (result); + return result; } else { result = isc_nm_listentcp(listen_nm, ISC_NM_LISTEN_ALL, &tcp_listen_addr, accept_cb, accept_cbarg, backlog, quota, sockp); - return (result); + return result; } UNREACHABLE(); @@ -708,12 +708,12 @@ stream_connect(isc_nm_cb_t cb, void *cbarg, unsigned int timeout) { isc_nm_proxy_type_t get_proxy_type(void) { if (!stream_use_PROXY) { - return (ISC_NM_PROXY_NONE); + return ISC_NM_PROXY_NONE; } else if (stream_PROXY_over_TLS) { - return (ISC_NM_PROXY_ENCRYPTED); + return ISC_NM_PROXY_ENCRYPTED; } - return (ISC_NM_PROXY_PLAIN); + return ISC_NM_PROXY_PLAIN; } void @@ -736,19 +736,19 @@ int stream_noop_setup(void **state ISC_ATTR_UNUSED) { int r = setup_netmgr_test(state); expected_cconnects = 1; - return (r); + return r; } int proxystream_noop_setup(void **state) { stream_use_PROXY = true; - return (stream_noop_setup(state)); + return stream_noop_setup(state); } int proxystreamtls_noop_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_noop_setup(state)); + return proxystream_noop_setup(state); } void @@ -770,7 +770,7 @@ stream_noop_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(creads, 0); atomic_assert_int_eq(sreads, 0); atomic_assert_int_eq(ssends, 0); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -778,7 +778,7 @@ proxystream_noop_teardown(void **state) { int r = stream_noop_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int @@ -786,7 +786,7 @@ proxystreamtls_noop_teardown(void **state) { int r = proxystream_noop_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } static void @@ -851,33 +851,33 @@ stream_noresponse_setup(void **state ISC_ATTR_UNUSED) { int r = setup_netmgr_test(state); expected_cconnects = 1; expected_saccepts = 1; - return (r); + return r; } int proxystream_noresponse_setup(void **state) { stream_use_PROXY = true; - return (stream_noresponse_setup(state)); + return stream_noresponse_setup(state); } int proxystream_noresponse_teardown(void **state) { int r = stream_noresponse_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_noresponse_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_noresponse_setup(state)); + return proxystream_noresponse_setup(state); } int proxystreamtls_noresponse_teardown(void **state) { int r = proxystream_noresponse_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -904,7 +904,7 @@ stream_noresponse_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(sreads, 0); atomic_assert_int_eq(ssends, 0); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -917,7 +917,7 @@ stream_timeout_recovery_setup(void **state ISC_ATTR_UNUSED) { expected_sreads = 5; sreads_shutdown = true; - return (r); + return r; } typedef struct proxy_addrs { @@ -986,27 +986,27 @@ proxy_verify_endpoints(isc_nmhandle_t *handle) { int proxystream_timeout_recovery_setup(void **state) { stream_use_PROXY = true; - return (stream_timeout_recovery_setup(state)); + return stream_timeout_recovery_setup(state); } int proxystream_timeout_recovery_teardown(void **state) { int r = stream_timeout_recovery_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_timeout_recovery_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_timeout_recovery_setup(state)); + return proxystream_timeout_recovery_setup(state); } int proxystreamtls_timeout_recovery_teardown(void **state) { int r = proxystream_timeout_recovery_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -1033,7 +1033,7 @@ stream_timeout_recovery(void **state ISC_ATTR_UNUSED) { int stream_timeout_recovery_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(ctimeouts, expected_ctimeouts); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -1058,33 +1058,33 @@ stream_recv_one_setup(void **state ISC_ATTR_UNUSED) { expected_creads = 1; creads_shutdown = true; - return (r); + return r; } int proxystream_recv_one_setup(void **state) { stream_use_PROXY = true; - return (stream_recv_one_setup(state)); + return stream_recv_one_setup(state); } int proxystream_recv_one_teardown(void **state) { int r = stream_recv_one_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_recv_one_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_recv_one_setup(state)); + return proxystream_recv_one_setup(state); } int proxystreamtls_recv_one_teardown(void **state) { int r = proxystream_recv_one_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -1111,7 +1111,7 @@ stream_recv_one_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(ssends, expected_ssends); atomic_assert_int_eq(creads, expected_creads); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -1136,33 +1136,33 @@ stream_recv_two_setup(void **state ISC_ATTR_UNUSED) { expected_creads = 2; creads_shutdown = true; - return (r); + return r; } int proxystream_recv_two_setup(void **state) { stream_use_PROXY = true; - return (stream_recv_two_setup(state)); + return stream_recv_two_setup(state); } int proxystream_recv_two_teardown(void **state) { int r = stream_recv_two_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_recv_two_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_recv_two_setup(state)); + return proxystream_recv_two_setup(state); } int proxystreamtls_recv_two_teardown(void **state) { int r = proxystream_recv_two_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -1191,7 +1191,7 @@ stream_recv_two_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(ssends, expected_ssends); atomic_assert_int_eq(creads, expected_creads); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -1202,33 +1202,33 @@ stream_recv_send_setup(void **state ISC_ATTR_UNUSED) { nsends = expected_creads = workers; do_send = true; - return (r); + return r; } int proxystream_recv_send_setup(void **state) { stream_use_PROXY = true; - return (stream_recv_send_setup(state)); + return stream_recv_send_setup(state); } int proxystream_recv_send_teardown(void **state) { int r = stream_recv_send_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_recv_send_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_recv_send_setup(state)); + return proxystream_recv_send_setup(state); } int proxystreamtls_recv_send_teardown(void **state) { int r = proxystream_recv_send_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -1261,7 +1261,7 @@ stream_recv_send_teardown(void **state ISC_ATTR_UNUSED) { CHECK_RANGE_FULL(sreads); CHECK_RANGE_FULL(ssends); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } int @@ -1308,7 +1308,7 @@ setup_udp_test(void **state) { connect_readcb = connect_read_cb; - return (0); + return 0; } int @@ -1324,7 +1324,7 @@ teardown_udp_test(void **state) { teardown_netmgr(state); teardown_loopmgr(state); - return (0); + return 0; } static void @@ -1511,14 +1511,14 @@ udp_noop_setup(void **state) { setup_udp_test(state); expected_cconnects = 1; cconnects_shutdown = true; - return (0); + return 0; } int udp_noop_teardown(void **state) { atomic_assert_int_eq(cconnects, 1); teardown_udp_test(state); - return (0); + return 0; } void @@ -1541,14 +1541,14 @@ udp_noop(void **arg ISC_ATTR_UNUSED) { int proxyudp_noop_setup(void **state) { udp_use_PROXY = true; - return (udp_noop_setup(state)); + return udp_noop_setup(state); } int proxyudp_noop_teardown(void **state) { int ret = udp_noop_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -1619,14 +1619,14 @@ int udp_noresponse_setup(void **state) { setup_udp_test(state); expected_csends = 1; - return (0); + return 0; } int udp_noresponse_teardown(void **state) { atomic_assert_int_eq(csends, expected_csends); teardown_udp_test(state); - return (0); + return 0; } void @@ -1640,14 +1640,14 @@ udp_noresponse(void **arg ISC_ATTR_UNUSED) { int proxyudp_noresponse_setup(void **state) { udp_use_PROXY = true; - return (udp_noresponse_setup(state)); + return udp_noresponse_setup(state); } int proxyudp_noresponse_teardown(void **state) { int ret = udp_noresponse_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -1759,7 +1759,7 @@ udp_timeout_recovery_setup(void **state) { expected_csends = 1; expected_creads = 1; expected_ctimeouts = 4; - return (0); + return 0; } int @@ -1769,7 +1769,7 @@ udp_timeout_recovery_teardown(void **state) { atomic_assert_int_eq(csends, expected_creads); atomic_assert_int_eq(ctimeouts, expected_ctimeouts); teardown_udp_test(state); - return (0); + return 0; } void @@ -1791,14 +1791,14 @@ udp_timeout_recovery(void **arg ISC_ATTR_UNUSED) { int proxyudp_timeout_recovery_setup(void **state) { udp_use_PROXY = true; - return (udp_timeout_recovery_setup(state)); + return udp_timeout_recovery_setup(state); } int proxyudp_timeout_recovery_teardown(void **state) { int ret = udp_timeout_recovery_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -1835,14 +1835,14 @@ int udp_shutdown_connect_setup(void **state) { setup_udp_test(state); expected_cconnects = 2; - return (0); + return 0; } int udp_shutdown_connect_teardown(void **state) { atomic_assert_int_eq(cconnects, expected_cconnects); teardown_udp_test(state); - return (0); + return 0; } void @@ -1858,14 +1858,14 @@ udp_shutdown_connect(void **arg ISC_ATTR_UNUSED) { int proxyudp_shutdown_connect_setup(void **state) { udp_use_PROXY = true; - return (udp_shutdown_connect_setup(state)); + return udp_shutdown_connect_setup(state); } int proxyudp_shutdown_connect_teardown(void **state) { int ret = udp_shutdown_connect_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -1951,7 +1951,7 @@ udp_shutdown_read_setup(void **state) { setup_udp_test(state); expected_cconnects = 1; expected_creads = 1; - return (0); + return 0; } int @@ -1959,7 +1959,7 @@ udp_shutdown_read_teardown(void **state) { atomic_assert_int_eq(cconnects, expected_cconnects); atomic_assert_int_eq(creads, expected_creads); teardown_udp_test(state); - return (0); + return 0; } void @@ -1973,14 +1973,14 @@ udp_shutdown_read(void **arg ISC_ATTR_UNUSED) { int proxyudp_shutdown_read_setup(void **state) { udp_use_PROXY = true; - return (udp_shutdown_read_setup(state)); + return udp_shutdown_read_setup(state); } int proxyudp_shutdown_read_teardown(void **state) { int ret = udp_shutdown_read_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -2081,7 +2081,7 @@ udp_cancel_read_setup(void **state) { setup_udp_test(state); expected_cconnects = 1; expected_creads = 1; - return (0); + return 0; } int @@ -2089,7 +2089,7 @@ udp_cancel_read_teardown(void **state) { atomic_assert_int_eq(cconnects, expected_cconnects); atomic_assert_int_eq(creads, expected_creads); teardown_udp_test(state); - return (0); + return 0; } void @@ -2103,14 +2103,14 @@ udp_cancel_read(void **arg ISC_ATTR_UNUSED) { int proxyudp_cancel_read_setup(void **state) { udp_use_PROXY = true; - return (udp_cancel_read_setup(state)); + return udp_cancel_read_setup(state); } int proxyudp_cancel_read_teardown(void **state) { int ret = udp_cancel_read_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } int @@ -2134,7 +2134,7 @@ udp_recv_one_setup(void **state) { expected_creads = 1; creads_shutdown = true; - return (0); + return 0; } int @@ -2147,7 +2147,7 @@ udp_recv_one_teardown(void **state) { teardown_udp_test(state); - return (0); + return 0; } void @@ -2160,14 +2160,14 @@ udp_recv_one(void **arg ISC_ATTR_UNUSED) { int proxyudp_recv_one_setup(void **state) { udp_use_PROXY = true; - return (udp_recv_one_setup(state)); + return udp_recv_one_setup(state); } int proxyudp_recv_one_teardown(void **state) { int ret = udp_recv_one_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } int @@ -2191,7 +2191,7 @@ udp_recv_two_setup(void **state) { expected_creads = 2; creads_shutdown = true; - return (0); + return 0; } int @@ -2203,7 +2203,7 @@ udp_recv_two_teardown(void **state) { atomic_assert_int_eq(creads, expected_creads); teardown_udp_test(state); - return (0); + return 0; } void @@ -2217,14 +2217,14 @@ udp_recv_two(void **arg ISC_ATTR_UNUSED) { int proxyudp_recv_two_setup(void **state) { udp_use_PROXY = true; - return (udp_recv_two_setup(state)); + return udp_recv_two_setup(state); } int proxyudp_recv_two_teardown(void **state) { int ret = udp_recv_two_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } int @@ -2238,7 +2238,7 @@ udp_recv_send_setup(void **state) { expected_creads = workers * NSENDS; do_send = true; - return (0); + return 0; } int @@ -2250,7 +2250,7 @@ udp_recv_send_teardown(void **state) { atomic_assert_int_ge(creads, expected_creads); teardown_udp_test(state); - return (0); + return 0; } void @@ -2266,14 +2266,14 @@ udp_recv_send(void **arg ISC_ATTR_UNUSED) { int proxyudp_recv_send_setup(void **state) { udp_use_PROXY = true; - return (udp_recv_send_setup(state)); + return udp_recv_send_setup(state); } int proxyudp_recv_send_teardown(void **state) { int ret = udp_recv_send_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } static void @@ -2428,7 +2428,7 @@ udp_double_read_setup(void **state) { connect_readcb = udp_double_read_cb; - return (0); + return 0; } int @@ -2437,7 +2437,7 @@ udp_double_read_teardown(void **state) { teardown_udp_test(state); - return (0); + return 0; } void @@ -2450,12 +2450,12 @@ udp_double_read(void **arg ISC_ATTR_UNUSED) { int proxyudp_double_read_setup(void **state) { udp_use_PROXY = true; - return (udp_double_read_setup(state)); + return udp_double_read_setup(state); } int proxyudp_double_read_teardown(void **state) { int ret = udp_double_read_teardown(state); udp_use_PROXY = false; - return (ret); + return ret; } diff --git a/tests/isc/proxyheader_test.c b/tests/isc/proxyheader_test.c index 6762e6d5d6..1f15dd6394 100644 --- a/tests/isc/proxyheader_test.c +++ b/tests/isc/proxyheader_test.c @@ -68,7 +68,7 @@ dummy_subtlv_iter_cb(const uint8_t client, const bool client_cert_verified, break; }; - return (true); + return true; } static bool @@ -92,7 +92,7 @@ dummy_tlv_iter_cb(const isc_proxy2_tlv_type_t tlv_type, assert_true(result == ISC_R_SUCCESS); } - return (true); + return true; } static void @@ -146,14 +146,14 @@ static int setup_test_proxy(void **state) { isc_proxy2_handler_t **handler = (isc_proxy2_handler_t **)state; *handler = isc_proxy2_handler_new(mctx, 0, proxy2_handler_dummy, NULL); - return (0); + return 0; } static int teardown_test_proxy(void **state) { isc_proxy2_handler_free((isc_proxy2_handler_t **)state); - return (0); + return 0; } static void @@ -714,7 +714,7 @@ rebuild_subtlv_iter_cb(const uint8_t client, const bool client_cert_verified, result = isc_proxy2_append_tlv(outbuf, tls_subtlv_type, data); assert_true(result == ISC_R_SUCCESS); - return (true); + return true; } static bool @@ -756,7 +756,7 @@ rebuild_tlv_iter_cb(const isc_proxy2_tlv_type_t tlv_type, assert_true(result == ISC_R_SUCCESS); } - return (true); + return true; } static void diff --git a/tests/isc/proxystream_test.c b/tests/isc/proxystream_test.c index 3fa0b9fd9f..295f63718c 100644 --- a/tests/isc/proxystream_test.c +++ b/tests/isc/proxystream_test.c @@ -312,7 +312,7 @@ proxystream_setup(void **state ISC_ATTR_UNUSED) { stream_use_TLS = false; stream = true; - return (0); + return 0; } ISC_TEST_MAIN_CUSTOM(proxystream_setup, NULL) diff --git a/tests/isc/quota_test.c b/tests/isc/quota_test.c index 25753d59a4..1f802e06ee 100644 --- a/tests/isc/quota_test.c +++ b/tests/isc/quota_test.c @@ -238,7 +238,7 @@ static void * quota_release(void *arg) { uv_sleep(10); isc_quota_release((isc_quota_t *)arg); - return (NULL); + return NULL; } static void @@ -263,7 +263,7 @@ quota_thread(void *qtip) { &g_threads[tnum]); } } - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(isc_quota_callback_mt) { diff --git a/tests/isc/random_test.c b/tests/isc/random_test.c index 05e3bea0ea..21a33167d9 100644 --- a/tests/isc/random_test.c +++ b/tests/isc/random_test.c @@ -78,17 +78,17 @@ igamc(double a, double x) { double pkm1, pkm2, qkm1, qkm2; if ((x <= 0) || (a <= 0)) { - return (1.0); + return 1.0; } if ((x < 1.0) || (x < a)) { - return (1.0 - igam(a, x)); + return 1.0 - igam(a, x); } ax = a * log(x) - x - lgamma(a); if (ax < -MAXLOG) { print_error("# igamc: UNDERFLOW, ax=%f\n", ax); - return (0.0); + return 0.0; } ax = exp(ax); @@ -131,7 +131,7 @@ igamc(double a, double x) { } } while (t > MACHEP); - return (ans * ax); + return ans * ax; } static double @@ -139,18 +139,18 @@ igam(double a, double x) { double ans, ax, c, r; if ((x <= 0) || (a <= 0)) { - return (0.0); + return 0.0; } if ((x > 1.0) && (x > a)) { - return (1.0 - igamc(a, x)); + return 1.0 - igamc(a, x); } /* Compute x**a * exp(-x) / md_gamma(a) */ ax = a * log(x) - x - lgamma(a); if (ax < -MAXLOG) { print_error("# igam: UNDERFLOW, ax=%f\n", ax); - return (0.0); + return 0.0; } ax = exp(ax); @@ -165,7 +165,7 @@ igam(double a, double x) { ans += c; } while (c / ans > MACHEP); - return (ans * ax / a); + return ans * ax / a; } static int8_t scounts_table[65536]; @@ -190,7 +190,7 @@ scount_calculate(uint16_t n) { n >>= 1; } - return (sc); + return sc; } static uint8_t @@ -210,7 +210,7 @@ bitcount_calculate(uint16_t n) { n >>= 1; } - return (bc); + return bc; } static void @@ -252,7 +252,7 @@ matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) { } } - return (rank); + return rank; } rank++; @@ -273,7 +273,7 @@ matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) { rt++; } - return (rank); + return rank; } static void @@ -417,7 +417,7 @@ monobit(uint16_t *values, size_t length) { s_obs = abs(scount) / sqrt(numbits); p_value = erfc(s_obs / sqrt(2.0)); - return (p_value); + return p_value; } /* @@ -459,7 +459,7 @@ runs(uint16_t *values, size_t length) { * cases. */ if (fabs(pi - 0.5) >= tau) { - return (0.0); + return 0.0; } /* Compute v_obs */ @@ -490,7 +490,7 @@ runs(uint16_t *values, size_t length) { p_value = erfc(numer / denom); - return (p_value); + return p_value; } /* @@ -547,7 +547,7 @@ blockfrequency(uint16_t *values, size_t length) { p_value = igamc(numblocks * 0.5, chi_square * 0.5); - return (p_value); + return p_value; } /* @@ -633,7 +633,7 @@ binarymatrixrank(uint16_t *values, size_t length) { p_value = exp(-chi_square * 0.5); - return (p_value); + return p_value; } /*** diff --git a/tests/isc/ratelimiter_test.c b/tests/isc/ratelimiter_test.c index 4bc987970f..4183fb23a7 100644 --- a/tests/isc/ratelimiter_test.c +++ b/tests/isc/ratelimiter_test.c @@ -282,10 +282,10 @@ setup_test(void **state) { r = setup_loopmgr(state); if (r != 0) { - return (r); + return r; } - return (0); + return 0; } static int @@ -294,10 +294,10 @@ teardown_test(void **state) { r = teardown_loopmgr(state); if (r != 0) { - return (r); + return r; } - return (0); + return 0; } ISC_TEST_LIST_START diff --git a/tests/isc/rwlock_test.c b/tests/isc/rwlock_test.c index 4c5b8e0575..dee4e382f3 100644 --- a/tests/isc/rwlock_test.c +++ b/tests/isc/rwlock_test.c @@ -76,14 +76,14 @@ setup_env(void **unused __attribute__((__unused__))) { rnd[i] = (uint8_t)isc_random_uniform(100); } - return (0); + return 0; } static int teardown_env(void **state __attribute__((__unused__))) { isc_mem_cput(mctx, rnd, loops, sizeof(rnd[0])); - return (0); + return 0; } static int @@ -93,23 +93,23 @@ rwlock_setup(void **state __attribute__((__unused__))) { isc_barrier_init(&barrier1, 2); isc_barrier_init(&barrier2, 2); if (pthread_rwlock_init(&prwlock, NULL) == -1) { - return (errno); + return errno; } - return (0); + return 0; } static int rwlock_teardown(void **state __attribute__((__unused__))) { if (pthread_rwlock_destroy(&prwlock) == -1) { - return (errno); + return errno; } isc_barrier_destroy(&barrier2); isc_barrier_destroy(&barrier1); isc_rwlock_destroy(&rwlock); - return (0); + return 0; } /* @@ -157,7 +157,7 @@ trylock_thread1(void *arg __attribute__((__unused__))) { isc_rwlock_unlock(&rwlock, isc_rwlocktype_read); - return (NULL); + return NULL; } static void * @@ -179,7 +179,7 @@ trylock_thread2(void *arg __attribute__((__unused__))) { isc_rwlock_unlock(&rwlock, isc_rwlocktype_read); - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(isc_rwlock_trylock) { @@ -212,7 +212,7 @@ pthread_rwlock_thread(void *arg __attribute__((__unused__))) { isc_pause_n(cont); } - return (NULL); + return NULL; } static void * @@ -234,7 +234,7 @@ isc_rwlock_thread(void *arg __attribute__((__unused__))) { isc_pause_n(cont); } - return (NULL); + return NULL; } static void diff --git a/tests/isc/spinlock_test.c b/tests/isc/spinlock_test.c index ce500213d9..89db288774 100644 --- a/tests/isc/spinlock_test.c +++ b/tests/isc/spinlock_test.c @@ -59,7 +59,7 @@ setup_env(void **unused __attribute__((__unused__))) { } assert_int_not_equal(delay_loop, 0); - return (0); + return 0; } ISC_RUN_TEST_IMPL(isc_spinlock) { @@ -101,7 +101,7 @@ pthread_spin_thread(void *arg) { isc_pause_n(cont); } - return (NULL); + return NULL; } #endif @@ -120,7 +120,7 @@ isc_spinlock_thread(void *arg) { isc_pause_n(cont); } - return (NULL); + return NULL; } ISC_RUN_TEST_IMPL(isc_spinlock_benchmark) { diff --git a/tests/isc/stream_shutdown.c b/tests/isc/stream_shutdown.c index 09b7ef0b69..a753f076eb 100644 --- a/tests/isc/stream_shutdown.c +++ b/tests/isc/stream_shutdown.c @@ -56,33 +56,33 @@ shutdownconnect_connectcb(isc_nmhandle_t *handle, isc_result_t eresult, int stream_shutdownconnect_setup(void **state ISC_ATTR_UNUSED) { int r = setup_netmgr_test(state); - return (r); + return r; } int proxystream_shutdownconnect_setup(void **state) { stream_use_PROXY = true; - return (stream_shutdownconnect_setup(state)); + return stream_shutdownconnect_setup(state); } int proxystream_shutdownconnect_teardown(void **state) { int r = stream_shutdownconnect_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_shutdownconnect_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_shutdownconnect_setup(state)); + return proxystream_shutdownconnect_setup(state); } int proxystreamtls_shutdownconnect_teardown(void **state) { int r = proxystream_shutdownconnect_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -108,7 +108,7 @@ stream_shutdownconnect_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(csends, 0); atomic_assert_int_eq(creads, 0); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } /* Issue the shutdown before reading */ @@ -171,33 +171,33 @@ shutdownread_connectcb(isc_nmhandle_t *handle, isc_result_t eresult, int stream_shutdownread_setup(void **state ISC_ATTR_UNUSED) { int r = setup_netmgr_test(state); - return (r); + return r; } int proxystream_shutdownread_setup(void **state) { stream_use_PROXY = true; - return (stream_shutdownread_setup(state)); + return stream_shutdownread_setup(state); } int proxystream_shutdownread_teardown(void **state) { int r = stream_shutdownread_teardown(state); stream_use_PROXY = false; - return (r); + return r; } int proxystreamtls_shutdownread_setup(void **state) { stream_PROXY_over_TLS = true; - return (proxystream_shutdownread_setup(state)); + return proxystream_shutdownread_setup(state); } int proxystreamtls_shutdownread_teardown(void **state) { int r = proxystream_shutdownread_teardown(state); stream_PROXY_over_TLS = false; - return (r); + return r; } void @@ -220,5 +220,5 @@ stream_shutdownread_teardown(void **state ISC_ATTR_UNUSED) { atomic_assert_int_eq(csends, 1); atomic_assert_int_eq(creads, 1); - return (teardown_netmgr_test(state)); + return teardown_netmgr_test(state); } diff --git a/tests/isc/tcp_test.c b/tests/isc/tcp_test.c index 79c8505086..2538907e04 100644 --- a/tests/isc/tcp_test.c +++ b/tests/isc/tcp_test.c @@ -158,7 +158,7 @@ tcp_setup(void **state ISC_ATTR_UNUSED) { stream_use_TLS = false; stream = true; - return (0); + return 0; } ISC_TEST_MAIN_CUSTOM(tcp_setup, NULL) diff --git a/tests/isc/tcpdns_test.c b/tests/isc/tcpdns_test.c index 915b4ae3a4..0d3b76d22d 100644 --- a/tests/isc/tcpdns_test.c +++ b/tests/isc/tcpdns_test.c @@ -180,7 +180,7 @@ static int tcpdns_setup(void **state ISC_ATTR_UNUSED) { stream_port = TCPDNS_TEST_PORT; - return (0); + return 0; } ISC_TEST_MAIN_CUSTOM(tcpdns_setup, NULL) diff --git a/tests/isc/tls_test.c b/tests/isc/tls_test.c index 77660b815b..425a767651 100644 --- a/tests/isc/tls_test.c +++ b/tests/isc/tls_test.c @@ -226,7 +226,7 @@ tls_setup(void **state ISC_ATTR_UNUSED) { stream_use_TLS = true; stream = true; - return (0); + return 0; } ISC_TEST_MAIN_CUSTOM(tls_setup, NULL) diff --git a/tests/isc/tlsdns_test.c b/tests/isc/tlsdns_test.c index b37d4ed4ef..d2b290f070 100644 --- a/tests/isc/tlsdns_test.c +++ b/tests/isc/tlsdns_test.c @@ -231,7 +231,7 @@ static int tlsdns_setup(void **state ISC_ATTR_UNUSED) { stream_port = TLSDNS_TEST_PORT; - return (0); + return 0; } ISC_TEST_MAIN_CUSTOM(tlsdns_setup, NULL) diff --git a/tests/isc/uv_wrap.h b/tests/isc/uv_wrap.h index c499fa6db9..5d3aa2b489 100644 --- a/tests/isc/uv_wrap.h +++ b/tests/isc/uv_wrap.h @@ -99,9 +99,9 @@ static atomic_int __state_uv_udp_open = 0; int __wrap_uv_udp_open(uv_udp_t *handle, uv_os_sock_t sock) { if (atomic_load(&__state_uv_udp_open) == 0) { - return (uv_udp_open(handle, sock)); + return uv_udp_open(handle, sock); } - return (atomic_load(&__state_uv_udp_open)); + return atomic_load(&__state_uv_udp_open); } static atomic_int __state_uv_udp_bind = 0; @@ -110,9 +110,9 @@ int __wrap_uv_udp_bind(uv_udp_t *handle, const struct sockaddr *addr, unsigned int flags) { if (atomic_load(&__state_uv_udp_bind) == 0) { - return (uv_udp_bind(handle, addr, flags)); + return uv_udp_bind(handle, addr, flags); } - return (atomic_load(&__state_uv_udp_bind)); + return atomic_load(&__state_uv_udp_bind); } static atomic_int __state_uv_udp_connect ISC_ATTR_UNUSED = 0; @@ -120,9 +120,9 @@ static atomic_int __state_uv_udp_connect ISC_ATTR_UNUSED = 0; int __wrap_uv_udp_connect(uv_udp_t *handle, const struct sockaddr *addr) { if (atomic_load(&__state_uv_udp_connect) == 0) { - return (uv_udp_connect(handle, addr)); + return uv_udp_connect(handle, addr); } - return (atomic_load(&__state_uv_udp_connect)); + return atomic_load(&__state_uv_udp_connect); } static atomic_int __state_uv_udp_getpeername ISC_ATTR_UNUSED = 0; @@ -131,9 +131,9 @@ int __wrap_uv_udp_getpeername(const uv_udp_t *handle, struct sockaddr *name, int *namelen) { if (atomic_load(&__state_uv_udp_getpeername) == 0) { - return (uv_udp_getpeername(handle, name, namelen)); + return uv_udp_getpeername(handle, name, namelen); } - return (atomic_load(&__state_uv_udp_getpeername)); + return atomic_load(&__state_uv_udp_getpeername); } static atomic_int __state_uv_udp_getsockname = 0; @@ -141,9 +141,9 @@ int __wrap_uv_udp_getsockname(const uv_udp_t *handle, struct sockaddr *name, int *namelen) { if (atomic_load(&__state_uv_udp_getsockname) == 0) { - return (uv_udp_getsockname(handle, name, namelen)); + return uv_udp_getsockname(handle, name, namelen); } - return (atomic_load(&__state_uv_udp_getsockname)); + return atomic_load(&__state_uv_udp_getsockname); } static atomic_int __state_uv_udp_send = 0; @@ -152,9 +152,9 @@ __wrap_uv_udp_send(uv_udp_send_t *req, uv_udp_t *handle, const uv_buf_t bufs[], unsigned int nbufs, const struct sockaddr *addr, uv_udp_send_cb send_cb) { if (atomic_load(&__state_uv_udp_send) == 0) { - return (uv_udp_send(req, handle, bufs, nbufs, addr, send_cb)); + return uv_udp_send(req, handle, bufs, nbufs, addr, send_cb); } - return (atomic_load(&__state_uv_udp_send)); + return atomic_load(&__state_uv_udp_send); } static atomic_int __state_uv_udp_recv_start = 0; @@ -162,27 +162,27 @@ int __wrap_uv_udp_recv_start(uv_udp_t *handle, uv_alloc_cb alloc_cb, uv_udp_recv_cb recv_cb) { if (atomic_load(&__state_uv_udp_recv_start) == 0) { - return (uv_udp_recv_start(handle, alloc_cb, recv_cb)); + return uv_udp_recv_start(handle, alloc_cb, recv_cb); } - return (atomic_load(&__state_uv_udp_recv_start)); + return atomic_load(&__state_uv_udp_recv_start); } static atomic_int __state_uv_udp_recv_stop = 0; int __wrap_uv_udp_recv_stop(uv_udp_t *handle) { if (atomic_load(&__state_uv_udp_recv_stop) == 0) { - return (uv_udp_recv_stop(handle)); + return uv_udp_recv_stop(handle); } - return (atomic_load(&__state_uv_udp_recv_stop)); + return atomic_load(&__state_uv_udp_recv_stop); } static atomic_int __state_uv_tcp_open = 0; int __wrap_uv_tcp_open(uv_tcp_t *handle, uv_os_sock_t sock) { if (atomic_load(&__state_uv_tcp_open) == 0) { - return (uv_tcp_open(handle, sock)); + return uv_tcp_open(handle, sock); } - return (atomic_load(&__state_uv_tcp_open)); + return atomic_load(&__state_uv_tcp_open); } static atomic_int __state_uv_tcp_bind = 0; @@ -190,9 +190,9 @@ int __wrap_uv_tcp_bind(uv_tcp_t *handle, const struct sockaddr *addr, unsigned int flags) { if (atomic_load(&__state_uv_tcp_bind) == 0) { - return (uv_tcp_bind(handle, addr, flags)); + return uv_tcp_bind(handle, addr, flags); } - return (atomic_load(&__state_uv_tcp_bind)); + return atomic_load(&__state_uv_tcp_bind); } static atomic_int __state_uv_tcp_getsockname = 0; @@ -200,9 +200,9 @@ int __wrap_uv_tcp_getsockname(const uv_tcp_t *handle, struct sockaddr *name, int *namelen) { if (atomic_load(&__state_uv_tcp_getsockname) == 0) { - return (uv_tcp_getsockname(handle, name, namelen)); + return uv_tcp_getsockname(handle, name, namelen); } - return (atomic_load(&__state_uv_tcp_getsockname)); + return atomic_load(&__state_uv_tcp_getsockname); } static atomic_int __state_uv_tcp_getpeername = 0; @@ -210,9 +210,9 @@ int __wrap_uv_tcp_getpeername(const uv_tcp_t *handle, struct sockaddr *name, int *namelen) { if (atomic_load(&__state_uv_tcp_getpeername) == 0) { - return (uv_tcp_getpeername(handle, name, namelen)); + return uv_tcp_getpeername(handle, name, namelen); } - return (atomic_load(&__state_uv_tcp_getpeername)); + return atomic_load(&__state_uv_tcp_getpeername); } static atomic_int __state_uv_tcp_connect = 0; @@ -220,54 +220,54 @@ int __wrap_uv_tcp_connect(uv_connect_t *req, uv_tcp_t *handle, const struct sockaddr *addr, uv_connect_cb cb) { if (atomic_load(&__state_uv_tcp_connect) == 0) { - return (uv_tcp_connect(req, handle, addr, cb)); + return uv_tcp_connect(req, handle, addr, cb); } - return (atomic_load(&__state_uv_tcp_connect)); + return atomic_load(&__state_uv_tcp_connect); } static atomic_int __state_uv_listen = 0; int __wrap_uv_listen(uv_stream_t *stream, int backlog, uv_connection_cb cb) { if (atomic_load(&__state_uv_listen) == 0) { - return (uv_listen(stream, backlog, cb)); + return uv_listen(stream, backlog, cb); } - return (atomic_load(&__state_uv_listen)); + return atomic_load(&__state_uv_listen); } static atomic_int __state_uv_accept = 0; int __wrap_uv_accept(uv_stream_t *server, uv_stream_t *client) { if (atomic_load(&__state_uv_accept) == 0) { - return (uv_accept(server, client)); + return uv_accept(server, client); } - return (atomic_load(&__state_uv_accept)); + return atomic_load(&__state_uv_accept); } static atomic_int __state_uv_send_buffer_size = 0; int __wrap_uv_send_buffer_size(uv_handle_t *handle, int *value) { if (atomic_load(&__state_uv_send_buffer_size) == 0) { - return (uv_send_buffer_size(handle, value)); + return uv_send_buffer_size(handle, value); } - return (atomic_load(&__state_uv_send_buffer_size)); + return atomic_load(&__state_uv_send_buffer_size); } static atomic_int __state_uv_recv_buffer_size = 0; int __wrap_uv_recv_buffer_size(uv_handle_t *handle, int *value) { if (atomic_load(&__state_uv_recv_buffer_size) == 0) { - return (uv_recv_buffer_size(handle, value)); + return uv_recv_buffer_size(handle, value); } - return (atomic_load(&__state_uv_recv_buffer_size)); + return atomic_load(&__state_uv_recv_buffer_size); } static atomic_int __state_uv_fileno = 0; int __wrap_uv_fileno(const uv_handle_t *handle, uv_os_fd_t *fd) { if (atomic_load(&__state_uv_fileno) == 0) { - return (uv_fileno(handle, fd)); + return uv_fileno(handle, fd); } - return (atomic_load(&__state_uv_fileno)); + return atomic_load(&__state_uv_fileno); } #define uv_udp_open(...) __wrap_uv_udp_open(__VA_ARGS__) diff --git a/tests/isccfg/duration_test.c b/tests/isccfg/duration_test.c index 4a727d597b..660a278e48 100644 --- a/tests/isccfg/duration_test.c +++ b/tests/isccfg/duration_test.c @@ -44,7 +44,7 @@ ISC_SETUP_TEST_IMPL(group) { ISC_LOG_DYNAMIC, ISC_LOGDESTINATION_STDERR, 0, ISC_LOGCATEGORY_DEFAULT, ISC_LOGMODULE_DEFAULT); - return (0); + return 0; } struct duration_conf { diff --git a/tests/isccfg/parser_test.c b/tests/isccfg/parser_test.c index cae29941eb..403b3176db 100644 --- a/tests/isccfg/parser_test.c +++ b/tests/isccfg/parser_test.c @@ -45,7 +45,7 @@ ISC_SETUP_TEST_IMPL(group) { ISC_LOG_DYNAMIC, ISC_LOGDESTINATION_STDERR, 0, ISC_LOGCATEGORY_DEFAULT, ISC_LOGMODULE_DEFAULT); - return (0); + return 0; } /* mimic calling nzf_append() */ diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c index 2d75700b1d..4561340ffe 100644 --- a/tests/libtest/dns.c +++ b/tests/libtest/dns.c @@ -68,7 +68,7 @@ dns_test_makeview(const char *name, bool with_dispatchmgr, bool with_cache, result = dns_dispatchmgr_create(mctx, loopmgr, netmgr, &dispatchmgr); if (result != ISC_R_SUCCESS) { - return (result); + return result; } } @@ -80,7 +80,7 @@ dns_test_makeview(const char *name, bool with_dispatchmgr, bool with_cache, } if (result != ISC_R_SUCCESS) { - return (result); + return result; } if (with_cache) { @@ -88,7 +88,7 @@ dns_test_makeview(const char *name, bool with_dispatchmgr, bool with_cache, &cache); if (result != ISC_R_SUCCESS) { dns_view_detach(&view); - return (result); + return result; } dns_view_setcache(view, cache, false); @@ -102,7 +102,7 @@ dns_test_makeview(const char *name, bool with_dispatchmgr, bool with_cache, *viewp = view; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } isc_result_t @@ -158,12 +158,12 @@ dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, *zonep = zone; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; detach_zone: dns_zone_detach(&zone); - return (result); + return result; } void @@ -179,7 +179,7 @@ dns_test_managezone(dns_zone_t *zone) { REQUIRE(zonemgr != NULL); result = dns_zonemgr_managezone(zonemgr, zone); - return (result); + return result; } void @@ -221,27 +221,27 @@ dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_create(mctx, dbimp, name, dbtype, dns_rdataclass_in, 0, NULL, db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_load(*db, testfile, dns_masterformat_text, 0); - return (result); + return result; } static int fromhex(char c) { if (c >= '0' && c <= '9') { - return (c - '0'); + return c - '0'; } else if (c >= 'a' && c <= 'f') { - return (c - 'a' + 10); + return c - 'a' + 10; } else if (c >= 'A' && c <= 'F') { - return (c - 'A' + 10); + return c - 'A' + 10; } printf("bad input format: %02x\n", c); @@ -265,7 +265,7 @@ dns_test_tohex(const unsigned char *data, size_t len, char *buf, result = isc_hex_totext((isc_region_t *)&source, 1, " ", &target); INSIST(result == ISC_R_SUCCESS); - return (buf); + return buf; } isc_result_t @@ -281,7 +281,7 @@ dns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, result = isc_stdio_open(file, "r", &f); if (result != ISC_R_SUCCESS) { - return (result); + return result; } bp = buf; @@ -326,7 +326,7 @@ dns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, } isc_stdio_close(f); - return (result); + return result; } static void @@ -409,7 +409,7 @@ dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass, destroy_lexer: isc_lex_destroy(&lex); - return (result); + return result; } void @@ -496,5 +496,5 @@ dns_test_difffromchanges(dns_diff_t *diff, const zonechange_t *changes, dns_diff_clear(diff); } - return (result); + return result; } diff --git a/tests/libtest/isc.c b/tests/libtest/isc.c index 7f487f2cda..c53cfff24b 100644 --- a/tests/libtest/isc.c +++ b/tests/libtest/isc.c @@ -66,7 +66,7 @@ setup_workers(void **state ISC_ATTR_UNUSED) { } INSIST(workers != 0); - return (0); + return 0; } int @@ -74,14 +74,14 @@ setup_mctx(void **state ISC_ATTR_UNUSED) { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; isc_mem_create(&mctx); - return (0); + return 0; } int teardown_mctx(void **state ISC_ATTR_UNUSED) { isc_mem_destroy(&mctx); - return (0); + return 0; } int @@ -93,7 +93,7 @@ setup_loopmgr(void **state ISC_ATTR_UNUSED) { isc_loopmgr_create(mctx, workers, &loopmgr); mainloop = isc_loop_main(loopmgr); - return (0); + return 0; } int @@ -103,7 +103,7 @@ teardown_loopmgr(void **state ISC_ATTR_UNUSED) { mainloop = NULL; isc_loopmgr_destroy(&loopmgr); - return (0); + return 0; } int @@ -114,7 +114,7 @@ setup_netmgr(void **state ISC_ATTR_UNUSED) { isc_netmgr_create(mctx, loopmgr, &netmgr); - return (0); + return 0; } int @@ -123,7 +123,7 @@ teardown_netmgr(void **state ISC_ATTR_UNUSED) { isc_netmgr_destroy(&netmgr); - return (0); + return 0; } int @@ -131,7 +131,7 @@ setup_managers(void **state) { setup_loopmgr(state); setup_netmgr(state); - return (0); + return 0; } int @@ -139,5 +139,5 @@ teardown_managers(void **state) { teardown_netmgr(state); teardown_loopmgr(state); - return (0); + return 0; } diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 10038fc059..25bcec7d1f 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -73,7 +73,7 @@ matchview(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, UNUSED(viewp); *viewmatchresultp = ISC_R_NOTIMPLEMENTED; - return (ISC_R_NOTIMPLEMENTED); + return ISC_R_NOTIMPLEMENTED; } static void @@ -113,11 +113,11 @@ setup_server(void **state) { isc_loop_setup(mainloop, scan_interfaces, NULL); - return (0); + return 0; cleanup: teardown_server(state); - return (-1); + return -1; } void @@ -141,7 +141,7 @@ teardown_server(void **state) { } teardown_managers(state); - return (0); + return 0; } static dns_zone_t *served_zone = NULL; @@ -157,7 +157,7 @@ ns_test_serve_zone(const char *zonename, const char *filename, */ result = dns_test_makezone(zonename, &served_zone, view, false); if (result != ISC_R_SUCCESS) { - return (result); + return result; } /* @@ -196,7 +196,7 @@ ns_test_serve_zone(const char *zonename, const char *filename, dns_db_detach(&db); } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; release_zone: dns_test_releasezone(served_zone); @@ -204,7 +204,7 @@ close_zonemgr: dns_test_closezonemgr(); dns_zone_detach(&served_zone); - return (result); + return result; } void @@ -326,7 +326,7 @@ attach_query_msg_to_client(ns_client_t *client, const char *qnamestr, * Parse the rendered query, storing results in client->message. */ isc_buffer_first(&querybuf); - return (dns_message_parse(client->message, &querybuf, 0)); + return dns_message_parse(client->message, &querybuf, 0); put_name: dns_message_puttempname(message, &qname); @@ -334,7 +334,7 @@ put_name: destroy_message: dns_message_detach(&message); - return (result); + return result; } /*% @@ -369,7 +369,7 @@ extract_qctx(void *arg, void *data, isc_result_t *resultp) { *qctxp = qctx; *resultp = ISC_R_UNSET; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } /*% @@ -413,9 +413,9 @@ create_qctx_for_client(ns_client_t *client, query_ctx_t **qctxp) { isc_nmhandle_detach(&client->reqhandle); if (*qctxp == NULL) { - return (ISC_R_NOMEMORY); + return ISC_R_NOMEMORY; } else { - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } } @@ -480,7 +480,7 @@ ns_test_qctx_create(const ns_test_qctx_create_params_t *params, handle = client->handle; isc_nmhandle_detach(&handle); - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; detach_query: dns_message_detach(&client->message); @@ -489,7 +489,7 @@ detach_view: detach_client: isc_nmhandle_detach(&client->handle); - return (result); + return result; } void @@ -522,7 +522,7 @@ ns_test_hook_catch_call(void *arg, void *data, isc_result_t *resultp) { *resultp = ISC_R_UNSET; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } isc_result_t @@ -538,27 +538,27 @@ ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_create(mctx, dbimp, name, dbtype, dns_rdataclass_in, 0, NULL, db); if (result != ISC_R_SUCCESS) { - return (result); + return result; } result = dns_db_load(*db, testfile, dns_masterformat_text, 0); - return (result); + return result; } static int fromhex(char c) { if (c >= '0' && c <= '9') { - return (c - '0'); + return c - '0'; } else if (c >= 'a' && c <= 'f') { - return (c - 'a' + 10); + return c - 'a' + 10; } else if (c >= 'A' && c <= 'F') { - return (c - 'A' + 10); + return c - 'A' + 10; } printf("bad input format: %02x\n", c); @@ -578,7 +578,7 @@ ns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, result = isc_stdio_open(file, "r", &f); if (result != ISC_R_SUCCESS) { - return (result); + return result; } bp = buf; @@ -624,5 +624,5 @@ ns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, cleanup: isc_stdio_close(f); - return (result); + return result; } diff --git a/tests/libtest/qp.c b/tests/libtest/qp.c index fb65962bbf..1b100f8732 100644 --- a/tests/libtest/qp.c +++ b/tests/libtest/qp.c @@ -41,15 +41,15 @@ uint8_t qp_test_bittoascii(dns_qpshift_t bit) { uint8_t byte = dns_qp_byte_for_bit[bit]; if (bit == SHIFT_NOBYTE) { - return ('.'); + return '.'; } else if (qp_common_character(byte)) { - return (byte); + return byte; } else if (byte < '-') { - return ('#'); + return '#'; } else if (byte < '_') { - return ('@'); + return '@'; } else { - return ('~' - SHIFT_OFFSET + bit); + return '~' - SHIFT_OFFSET + bit; } } @@ -59,7 +59,7 @@ qp_test_keytoascii(dns_qpkey_t key, size_t len) { key[offset] = qp_test_bittoascii(key[offset]); } key[len] = '\0'; - return ((const char *)key); + return (const char *)key; } /*********************************************************************** @@ -70,7 +70,7 @@ qp_test_keytoascii(dns_qpkey_t key, size_t len) { static size_t getheight(dns_qp_t *qp, dns_qpnode_t *n) { if (node_tag(n) == LEAF_TAG) { - return (0); + return 0; } size_t max_height = 0; dns_qpnode_t *twigs = branch_twigs(qp, n); @@ -79,20 +79,20 @@ getheight(dns_qp_t *qp, dns_qpnode_t *n) { size_t height = getheight(qp, &twigs[pos]); max_height = ISC_MAX(max_height, height); } - return (max_height + 1); + return max_height + 1; } size_t qp_test_getheight(dns_qp_t *qp) { dns_qpnode_t *root = get_root(qp); - return (root == NULL ? 0 : getheight(qp, root)); + return root == NULL ? 0 : getheight(qp, root); } static size_t maxkeylen(dns_qp_t *qp, dns_qpnode_t *n) { if (node_tag(n) == LEAF_TAG) { dns_qpkey_t key; - return (leaf_qpkey(qp, n, key)); + return leaf_qpkey(qp, n, key); } size_t max_len = 0; dns_qpnode_t *twigs = branch_twigs(qp, n); @@ -101,13 +101,13 @@ maxkeylen(dns_qp_t *qp, dns_qpnode_t *n) { size_t len = maxkeylen(qp, &twigs[pos]); max_len = ISC_MAX(max_len, len); } - return (max_len); + return max_len; } size_t qp_test_maxkeylen(dns_qp_t *qp) { dns_qpnode_t *root = get_root(qp); - return (root == NULL ? 0 : maxkeylen(qp, root)); + return root == NULL ? 0 : maxkeylen(qp, root); } /*********************************************************************** diff --git a/tests/ns/query_test.c b/tests/ns/query_test.c index 6ef0fdd12b..b25ff25eea 100644 --- a/tests/ns/query_test.c +++ b/tests/ns/query_test.c @@ -642,7 +642,7 @@ test_hookasync(query_ctx_t *qctx, isc_mem_t *memctx, void *arg, ns_hook_resume_t *rev = NULL; if (asdata->start_result != ISC_R_SUCCESS) { - return (asdata->start_result); + return asdata->start_result; } ctx = isc_mem_get(memctx, sizeof(*ctx)); @@ -667,7 +667,7 @@ test_hookasync(query_ctx_t *qctx, isc_mem_t *memctx, void *arg, isc_mem_attach(memctx, &ctx->mctx); *ctxp = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } /* @@ -712,121 +712,118 @@ hook_async_common(void *arg, void *data, isc_result_t *resultp, } *resultp = ISC_R_UNSET; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } static ns_hookresult_t hook_async_query_setup(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_SETUP)); + return hook_async_common(arg, data, resultp, NS_QUERY_SETUP); } static ns_hookresult_t hook_async_query_start_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_START_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_START_BEGIN); } static ns_hookresult_t hook_async_query_lookup_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_LOOKUP_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_LOOKUP_BEGIN); } static ns_hookresult_t hook_async_query_resume_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_RESUME_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_RESUME_BEGIN); } static ns_hookresult_t hook_async_query_got_answer_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_GOT_ANSWER_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_GOT_ANSWER_BEGIN); } static ns_hookresult_t hook_async_query_respond_any_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_RESPOND_ANY_BEGIN)); + return hook_async_common(arg, data, resultp, + NS_QUERY_RESPOND_ANY_BEGIN); } static ns_hookresult_t hook_async_query_addanswer_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_ADDANSWER_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_ADDANSWER_BEGIN); } static ns_hookresult_t hook_async_query_notfound_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_NOTFOUND_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_NOTFOUND_BEGIN); } static ns_hookresult_t hook_async_query_prep_delegation_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_PREP_DELEGATION_BEGIN)); + return hook_async_common(arg, data, resultp, + NS_QUERY_PREP_DELEGATION_BEGIN); } static ns_hookresult_t hook_async_query_zone_delegation_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_ZONE_DELEGATION_BEGIN)); + return hook_async_common(arg, data, resultp, + NS_QUERY_ZONE_DELEGATION_BEGIN); } static ns_hookresult_t hook_async_query_delegation_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_DELEGATION_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_DELEGATION_BEGIN); } static ns_hookresult_t hook_async_query_delegation_recurse_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_DELEGATION_RECURSE_BEGIN)); + return hook_async_common(arg, data, resultp, + NS_QUERY_DELEGATION_RECURSE_BEGIN); } static ns_hookresult_t hook_async_query_nodata_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_NODATA_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_NODATA_BEGIN); } static ns_hookresult_t hook_async_query_nxdomain_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_NXDOMAIN_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_NXDOMAIN_BEGIN); } static ns_hookresult_t hook_async_query_ncache_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_NCACHE_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_NCACHE_BEGIN); } static ns_hookresult_t hook_async_query_cname_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_CNAME_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_CNAME_BEGIN); } static ns_hookresult_t hook_async_query_dname_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_DNAME_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_DNAME_BEGIN); } static ns_hookresult_t hook_async_query_respond_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_RESPOND_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_RESPOND_BEGIN); } static ns_hookresult_t hook_async_query_response_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, - NS_QUERY_PREP_RESPONSE_BEGIN)); + return hook_async_common(arg, data, resultp, + NS_QUERY_PREP_RESPONSE_BEGIN); } static ns_hookresult_t hook_async_query_done_begin(void *arg, void *data, isc_result_t *resultp) { - return (hook_async_common(arg, data, resultp, NS_QUERY_DONE_BEGIN)); + return hook_async_common(arg, data, resultp, NS_QUERY_DONE_BEGIN); } /* @@ -840,7 +837,7 @@ ns_test_qctx_destroy_hook(void *arg, void *data, isc_result_t *resultp) { asdata->qctx = *qctx; /* remember passed ctx for inspection */ *resultp = ISC_R_UNSET; - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } static void @@ -1286,7 +1283,7 @@ test_hookasync_e2e(query_ctx_t *qctx, isc_mem_t *memctx, void *arg, hookasync_e2e_data_t *asdata = arg; if (asdata->start_result != ISC_R_SUCCESS) { - return (asdata->start_result); + return asdata->start_result; } ctx = isc_mem_get(memctx, sizeof(*ctx)); @@ -1310,7 +1307,7 @@ test_hookasync_e2e(query_ctx_t *qctx, isc_mem_t *memctx, void *arg, isc_mem_attach(memctx, &ctx->mctx); *ctxp = ctx; - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } static ns_hookresult_t @@ -1324,18 +1321,18 @@ hook_async_e2e(void *arg, void *data, isc_result_t *resultp) { result = ns_query_hookasync(qctx, test_hookasync_e2e, asdata); if (result != ISC_R_SUCCESS) { *resultp = result; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } asdata->async = true; asdata->rev->origresult = *resultp; /* save it for resume */ *resultp = ISC_R_UNSET; - return (NS_HOOK_RETURN); + return NS_HOOK_RETURN; } else { /* Resume from the completion of async event */ asdata->async = false; /* Don't touch 'resultp' */ - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } } @@ -1351,7 +1348,7 @@ hook_donesend(void *arg, void *data, isc_result_t *resultp) { INSIST(qctx->client->message->rcode == asdata->expected_rcode); asdata->done = true; /* Let the test know this hook is called */ *resultp = ISC_R_UNSET; - return (NS_HOOK_CONTINUE); + return NS_HOOK_CONTINUE; } static void diff --git a/util/gen-eddsa-vectors.c b/util/gen-eddsa-vectors.c index c9dcc3e2c2..8172de862c 100644 --- a/util/gen-eddsa-vectors.c +++ b/util/gen-eddsa-vectors.c @@ -40,20 +40,20 @@ main() { if (ctx == NULL || evp_md_ctx == NULL) { ERR_clear_error(); - return (1); + return 1; } if (EVP_PKEY_keygen_init(ctx) != 1 || EVP_PKEY_keygen(ctx, &pkey) != 1 || pkey == NULL) { ERR_clear_error(); - return (1); + return 1; } bytes = sizeof(buf); if (EVP_PKEY_get_raw_public_key(pkey, buf, &bytes) != 1) { ERR_clear_error(); - return (1); + return 1; } printf("unsigned char ed25519_pub[] = \""); @@ -68,7 +68,7 @@ main() { (const unsigned char *)"test", 4) != 1) { ERR_clear_error(); - return (1); + return 1; } printf("unsigned char ed25519_sig[] = \""); @@ -85,20 +85,20 @@ main() { evp_md_ctx = EVP_MD_CTX_create(); if (ctx == NULL || evp_md_ctx == NULL) { ERR_clear_error(); - return (1); + return 1; } if (EVP_PKEY_keygen_init(ctx) != 1 || EVP_PKEY_keygen(ctx, &pkey) != 1 || pkey == NULL) { ERR_clear_error(); - return (1); + return 1; } bytes = sizeof(buf); if (EVP_PKEY_get_raw_public_key(pkey, buf, &bytes) != 1) { ERR_clear_error(); - return (1); + return 1; } printf("unsigned char ed448_pub[] = \""); @@ -113,7 +113,7 @@ main() { (const unsigned char *)"test", 4) != 1) { ERR_clear_error(); - return (1); + return 1; } printf("unsigned char ed448_sig[] = \""); @@ -125,5 +125,5 @@ main() { EVP_MD_CTX_free(evp_md_ctx); EVP_PKEY_free(pkey); - return (0); + return 0; } diff --git a/util/gen-rsa-sha-vectors.c b/util/gen-rsa-sha-vectors.c index 36e5f86036..aa9c9101d5 100644 --- a/util/gen-rsa-sha-vectors.c +++ b/util/gen-rsa-sha-vectors.c @@ -52,7 +52,7 @@ main() { if (e == NULL || n == NULL || ctx == NULL || evp_md_ctx == NULL) { ERR_clear_error(); - return (1); + return 1; } BN_set_bit(e, 0); @@ -64,13 +64,13 @@ main() { EVP_PKEY_keygen(ctx, &pkey) != 1 || pkey == NULL) { ERR_clear_error(); - return (1); + return 1; } EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &n); if (n == NULL) { ERR_clear_error(); - return (1); + return 1; } bytes = BN_num_bytes(e); @@ -94,7 +94,7 @@ main() { EVP_SignFinal(evp_md_ctx, buf, &siglen, pkey) != 1) { ERR_clear_error(); - return (1); + return 1; } bytes = siglen; printf("unsigned char sha1_sig[] = \""); @@ -108,7 +108,7 @@ main() { EVP_SignFinal(evp_md_ctx, buf, &siglen, pkey) != 1) { ERR_clear_error(); - return (1); + return 1; } bytes = siglen; printf("unsigned char sha256_sig[] = \""); @@ -122,7 +122,7 @@ main() { EVP_SignFinal(evp_md_ctx, buf, &siglen, pkey) != 1) { ERR_clear_error(); - return (1); + return 1; } bytes = siglen; printf("unsigned char sha512_sig[] = \""); @@ -134,5 +134,5 @@ main() { EVP_MD_CTX_free(evp_md_ctx); EVP_PKEY_free(pkey); - return (0); + return 0; } diff --git a/util/models.c b/util/models.c index 5ae5f1bc2b..a5fe0f06e9 100644 --- a/util/models.c +++ b/util/models.c @@ -29,9 +29,9 @@ isc__mem_get(void *mem, unsigned int size FLARG) { } __coverity_negative_sink__(size); if (condition) { - return (0); + return 0; } - return (__coverity_alloc__(size)); + return __coverity_alloc__(size); } void @@ -57,9 +57,9 @@ isc__mem_allocate(void *mem, unsigned int size FLARG) { } __coverity_negative_sink__(size); if (condition) { - return (0); + return 0; } - return (__coverity_alloc__(size)); + return __coverity_alloc__(size); } void * @@ -83,7 +83,7 @@ isc__mem_reallocate(void *mem, void *ptr, size_t size FLARG) { } else if (ptr) { __coverity_free__(ptr); } - return (p); + return p; } void @@ -104,11 +104,11 @@ isc__mem_strdup(void *mem, char *s FLARG) { __coverity_panic__(); } if (condition) { - return (0); + return 0; } d = __coverity_alloc__(strlen(s) + 1); __coverity_writeall__(d); - return (d); + return d; } void * @@ -118,9 +118,9 @@ isc__mempool_get(void *mem FLARG) { __coverity_panic__(); } if (condition) { - return (0); + return 0; } - return (__coverity_alloc__(size)); + return __coverity_alloc__(size); } void