diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index d0a36462cb..123f110037 100644 --- a/bin/named/include/named/zoneconf.h +++ b/bin/named/include/named/zoneconf.h @@ -30,7 +30,7 @@ * table in 'cctx'. */ -dns_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, +isc_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, dns_c_zone_t *czone, dns_zone_t *zone); /* diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index 2ec9c7288a..b405de55ee 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -96,7 +96,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, isc_boolean_t udp_only, ns_interface_t **ifpret) { ns_interface_t *ifp; @@ -239,7 +239,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, return (DNS_R_UNEXPECTED); } -static dns_result_t +static isc_result_t ns_interface_destroy(ns_interface_t **ifpret) { ns_interface_t *ifp; REQUIRE(ifpret != NULL); @@ -291,7 +291,7 @@ purge_old_interfaces(ns_interfacemgr_t *mgr) { INSIST(VALID_IFACE(ifp)); next = ISC_LIST_NEXT(ifp, link); if (ifp->generation != mgr->generation) { - dns_result_t result = ns_interface_destroy(&ifp); + isc_result_t result = ns_interface_destroy(&ifp); RUNTIME_CHECK(result == DNS_R_SUCCESS); } } diff --git a/bin/named/notify.c b/bin/named/notify.c index 8fd2008c15..023f511348 100644 --- a/bin/named/notify.c +++ b/bin/named/notify.c @@ -134,7 +134,7 @@ /**************************************************************************/ static void -respond(ns_client_t *client, dns_result_t result) { +respond(ns_client_t *client, isc_result_t result) { dns_rcode_t rcode; dns_message_t *message; isc_result_t msg_result; @@ -157,7 +157,7 @@ void ns_notify_start(ns_client_t *client) { dns_message_t *request = client->message; - dns_result_t result; + isc_result_t result; dns_name_t *zonename; dns_rdataset_t *zone_rdataset; dns_zone_t *zone = NULL; diff --git a/bin/named/query.c b/bin/named/query.c index 3c1da1f035..b39fcef3df 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -432,7 +432,7 @@ query_simplefind(void *arg, dns_name_t *name, dns_rdatatype_t type, db = NULL; result = dns_zt_find(client->view->zonetable, name, NULL, &zone); if (result == DNS_R_SUCCESS || result == DNS_R_PARTIALMATCH) { - dns_result_t tresult; + isc_result_t tresult; tresult = dns_zone_getdb(zone, &db); if (tresult != DNS_R_SUCCESS) result = tresult; @@ -552,7 +552,7 @@ query_isduplicate(ns_client_t *client, dns_name_t *name, { dns_section_t section; dns_name_t *mname = NULL; - dns_result_t result; + isc_result_t result; for (section = DNS_SECTION_ANSWER; section <= DNS_SECTION_ADDITIONAL; @@ -637,7 +637,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { */ result = dns_zt_find(client->view->zonetable, name, NULL, &zone); if (result == DNS_R_SUCCESS || result == DNS_R_PARTIALMATCH) { - dns_result_t tresult; + isc_result_t tresult; tresult = dns_zone_getdb(zone, &db); if (tresult != DNS_R_SUCCESS) result = tresult; diff --git a/bin/named/rootns.c b/bin/named/rootns.c index 7ea1a776a1..43fec6a15c 100644 --- a/bin/named/rootns.c +++ b/bin/named/rootns.c @@ -66,7 +66,7 @@ static char root_ns[] = isc_result_t ns_rootns_init(void) { - dns_result_t result, eresult; + isc_result_t result, eresult; isc_buffer_t source; size_t len; int soacount, nscount; diff --git a/bin/named/server.c b/bin/named/server.c index 23872068d0..a9298ab6d6 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -158,7 +158,7 @@ create_default_view(dns_c_ctx_t *cctx, isc_mem_t *mctx, */ static isc_result_t create_version_view(dns_c_ctx_t *configctx, dns_view_t **viewp) { - dns_result_t result; + isc_result_t result; dns_db_t *db = NULL; dns_zone_t *zone = NULL; dns_dbversion_t *dbver = NULL; diff --git a/bin/named/update.c b/bin/named/update.c index 6067b33ddd..a576ee87c2 100644 --- a/bin/named/update.c +++ b/bin/named/update.c @@ -153,7 +153,7 @@ typedef struct update_event update_event_t; struct update_event { ISC_EVENT_COMMON(update_event_t); dns_zone_t *zone; - dns_result_t result; + isc_result_t result; }; @@ -175,13 +175,13 @@ static void updatedone_action(isc_task_t *task, isc_event_t *event); * '*tuple' == NULL. Either the tuple is freed, or its * ownership has been transferred to the diff. */ -static dns_result_t +static isc_result_t do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff) { dns_diff_t temp_diff; - dns_result_t result; + isc_result_t result; /* Create a singleton diff */ dns_diff_init(diff->mctx, &temp_diff); @@ -202,13 +202,13 @@ do_one_tuple(dns_difftuple_t **tuple, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; - dns_result_t result; + isc_result_t result; result = dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); if (result != DNS_R_SUCCESS) @@ -237,10 +237,10 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, */ /* Function type for foreach_rrset() iterator actions. */ -typedef dns_result_t rrset_func(void *data, dns_rdataset_t *rrset); +typedef isc_result_t rrset_func(void *data, dns_rdataset_t *rrset); /* Function type for foreach_rr() iterator actions. */ -typedef dns_result_t rr_func(void *data, rr_t *rr); +typedef isc_result_t rr_func(void *data, rr_t *rr); /* Internal context struct for foreach_node_rr(). */ typedef struct { @@ -249,10 +249,10 @@ typedef struct { } foreach_node_rr_ctx_t; /* Internal helper function for foreach_node_rr(). */ -static dns_result_t +static isc_result_t foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { - dns_result_t result; + isc_result_t result; foreach_node_rr_ctx_t *ctx = data; for (result = dns_rdataset_first(rdataset); result == DNS_R_SUCCESS; @@ -277,14 +277,14 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) * * If 'action' returns an error, abort iteration and return the error. */ -static dns_result_t +static isc_result_t foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, rrset_func *action, void *action_data) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node; dns_rdatasetiter_t *iter; @@ -336,7 +336,7 @@ foreach_rrset(dns_db_t *db, * If 'action' returns an error, abort iteration * and return the error. */ -static dns_result_t +static isc_result_t foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, @@ -360,7 +360,7 @@ foreach_node_rr(dns_db_t *db, * * If 'action' returns an error, abort iteration and return the error. */ -static dns_result_t +static isc_result_t foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, @@ -370,7 +370,7 @@ foreach_rr(dns_db_t *db, void *rr_action_data) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node; dns_rdataset_t rdataset; @@ -431,7 +431,7 @@ foreach_rr(dns_db_t *db, typedef isc_boolean_t rr_predicate(dns_rdata_t *update_rr, dns_rdata_t *db_rr); /* Helper function for rrset_exists(). */ -static dns_result_t +static isc_result_t rrset_exists_action(void *data, rr_t *rr) /*ARGSUSED*/ { data = data; /* Unused */ @@ -463,19 +463,19 @@ rrset_exists_action(void *data, rr_t *rr) /*ARGSUSED*/ * Set '*exists' to true iff an rrset of the given type exists, * to false otherwise. */ -static dns_result_t +static isc_result_t rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, isc_boolean_t *exists) { - dns_result_t result; + isc_result_t result; result = foreach_rr(db, ver, name, type, covers, rrset_exists_action, NULL); RETURN_EXISTENCE_FLAG; } /* Helper function for cname_incompatible_rrset_exists */ -static dns_result_t +static isc_result_t cname_compatibility_action(void *data, dns_rdataset_t *rrset) /*ARGSUSED*/ { @@ -494,17 +494,17 @@ cname_compatibility_action(void *data, dns_rdataset_t *rrset) * If such an incompatible rrset exists, set '*exists' to ISC_TRUE. * Otherwise, set it to ISC_FALSE. */ -static dns_result_t +static isc_result_t cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *exists) { - dns_result_t result; + isc_result_t result; result = foreach_rrset(db, ver, name, cname_compatibility_action, NULL); RETURN_EXISTENCE_FLAG; } /* Helper function for rr_count(). */ -static dns_result_t +static isc_result_t count_rr_action(void *data, rr_t *rr) /*ARGSUSED*/ { int *countp = data; rr = rr; /* Unused. */ @@ -515,7 +515,7 @@ count_rr_action(void *data, rr_t *rr) /*ARGSUSED*/ { /* * Count the number of RRs of 'type' belonging to 'name' in 'ver' of 'db'. */ -static dns_result_t +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) { @@ -536,7 +536,7 @@ typedef struct { /* Helper function for matching_rr_exists(). */ -static dns_result_t +static isc_result_t matching_rr_exists_action(void *data, rr_t *rr) { matching_rr_exists_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) @@ -550,7 +550,7 @@ matching_rr_exists_action(void *data, rr_t *rr) { * true for at least one of them, set '*exists' to ISC_TRUE. Otherwise, * set it to ISC_FALSE. */ -static dns_result_t +static isc_result_t matching_rr_exists(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, @@ -560,7 +560,7 @@ matching_rr_exists(rr_predicate *predicate, dns_rdata_t *update_rr, isc_boolean_t *exists) { - dns_result_t result; + isc_result_t result; matching_rr_exists_ctx_t ctx; ctx.predicate = predicate; ctx.db = db; @@ -575,7 +575,7 @@ matching_rr_exists(rr_predicate *predicate, /* Context struct and helper function for name_exists() */ -static dns_result_t +static isc_result_t name_exists_action(void *data, dns_rdataset_t *rrset) /*ARGSUSED*/ { data = data; /* Unused */ @@ -586,11 +586,11 @@ name_exists_action(void *data, dns_rdataset_t *rrset) /*ARGSUSED*/ /* * Set '*exists' to true iff the given name exists, to false otherwise. */ -static dns_result_t +static isc_result_t name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *exists) { - dns_result_t result; + isc_result_t result; result = foreach_rrset(db, ver, name, name_exists_action, NULL); RETURN_EXISTENCE_FLAG; @@ -612,10 +612,10 @@ name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * Append a tuple asserting the existence of the RR with * 'name' and 'rdata' to 'diff'. */ -static dns_result_t +static isc_result_t temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *tuple = NULL; REQUIRE(DNS_DIFF_VALID(diff)); @@ -632,7 +632,7 @@ temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) * Return DNS_R_SUCCESS if the rdatasets are equal, rcode(dns_rcode_nxrrset) * if not. */ -static dns_result_t +static isc_result_t temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) { for (;;) { if (a == NULL || b == NULL) @@ -681,11 +681,11 @@ temp_order(const void *av, const void *bv) * rcode(dns_rcode_nxrrset) if not. */ -static dns_result_t +static isc_result_t temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, dns_dbversion_t *ver) { - dns_result_t result; + isc_result_t result; dns_name_t *name; dns_dbnode_t *node; dns_difftuple_t *t; @@ -901,11 +901,11 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { } /* Internal helper function for delete_if(). */ -static dns_result_t +static isc_result_t delete_if_action(void *data, rr_t *rr) { conditional_delete_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) { - dns_result_t result; + isc_result_t result; result = update_one_rr(ctx->db, ctx->ver, ctx->diff, DNS_DIFFOP_DEL, ctx->name, rr->ttl, &rr->rdata); @@ -922,7 +922,7 @@ delete_if_action(void *data, rr_t *rr) { * RRs for which the predicate returns true, and log the * deletions in 'diff'. */ -static dns_result_t +static isc_result_t delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, @@ -963,7 +963,7 @@ get_current_rr(dns_message_t *msg, dns_section_t section, dns_rdataclass_t *update_class) { dns_rdataset_t *rdataset; - dns_result_t result; + isc_result_t result; dns_message_currentname(msg, section, name); rdataset = ISC_LIST_HEAD((*name)->list); INSIST(rdataset != NULL); @@ -990,14 +990,14 @@ get_current_rr(dns_message_t *msg, dns_section_t section, * or the SOA rdataset warrant at least an UNEXPECTED_ERROR(). */ -static dns_result_t +static isc_result_t increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, isc_mem_t *mctx) { dns_difftuple_t *deltuple = NULL; dns_difftuple_t *addtuple = NULL; isc_uint32_t serial; - dns_result_t result; + isc_result_t result; CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_DEL, &deltuple)); CHECK(dns_difftuple_copy(deltuple, &addtuple)); @@ -1043,14 +1043,14 @@ increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver, * Paul says 3.4.2.2 is correct. * */ -static dns_result_t +static isc_result_t check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, dns_rdata_t *update_rdata, isc_boolean_t *ok) { isc_uint32_t db_serial; isc_uint32_t update_serial; - dns_result_t result; + isc_result_t result; update_serial = dns_soa_getserial(update_rdata); @@ -1079,9 +1079,9 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, * We abuse the dns_diff_t type to represent a set of domain names * affected by the update. */ -static dns_result_t +static isc_result_t namelist_append_name(dns_diff_t *list, dns_name_t *name) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *tuple = NULL; static dns_rdata_t dummy_rdata = { NULL, 0, 0, 0, { NULL, NULL } }; CHECK(dns_difftuple_create(list->mctx, DNS_DIFFOP_EXISTS, name, 0, @@ -1091,10 +1091,10 @@ namelist_append_name(dns_diff_t *list, dns_name_t *name) { return (result); } -static dns_result_t +static isc_result_t namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) { - dns_result_t result; + isc_result_t result; dns_fixedname_t fixedname; dns_name_t *child; dns_dbiterator_t *dbit = NULL; @@ -1125,7 +1125,7 @@ namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) /* Helper function for non_nxt_rrset_exists(). */ -static dns_result_t +static isc_result_t is_non_nxt_action(void *data, dns_rdataset_t *rrset) /*ARGSUSED*/ { @@ -1145,10 +1145,10 @@ is_non_nxt_action(void *data, dns_rdataset_t *rrset) * If such an rrset exists, set '*exists' to ISC_TRUE. * Otherwise, set it to ISC_FALSE. */ -static dns_result_t +static isc_result_t non_nxt_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *exists) { - dns_result_t result; + isc_result_t result; result = foreach_rrset(db, ver, name, is_non_nxt_action, NULL); RETURN_EXISTENCE_FLAG; @@ -1167,9 +1167,9 @@ name_order(const void *av, const void *bv) return (dns_name_compare(&a->name, &b->name)); } -static dns_result_t +static isc_result_t uniqify_name_list(dns_diff_t *list) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *p, *q; CHECK(dns_diff_sort(list, name_order)); @@ -1190,11 +1190,11 @@ uniqify_name_list(dns_diff_t *list) { } -static dns_result_t +static isc_result_t is_glue(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *flag) { - dns_result_t result; + isc_result_t result; dns_fixedname_t foundname; dns_fixedname_init(&foundname); result = dns_db_find(db, name, ver, dns_rdatatype_any, @@ -1223,11 +1223,11 @@ is_glue(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * have had their NXTs removed because they are obscured by * a zone cut. */ -static dns_result_t +static isc_result_t next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname, dns_name_t *newname, isc_boolean_t forward) { - dns_result_t result; + isc_result_t result; dns_dbiterator_t *dbit = NULL; isc_boolean_t has_nxt; @@ -1272,9 +1272,9 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname, /* * Add a NXT record for "name", recording the change in "diff". */ -static dns_result_t +static isc_result_t add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; unsigned char buffer[DNS_NXT_BUFFERSIZE]; dns_rdata_t rdata; @@ -1311,9 +1311,9 @@ add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) /* * Add a placeholder NXT record for "name", recording the change in "diff". */ -static dns_result_t +static isc_result_t add_placeholder_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *tuple = NULL; isc_region_t r; unsigned char data[1] = { 0 }; /* The root domain, no bits. */ @@ -1329,11 +1329,11 @@ add_placeholder_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_di return (result); } -static dns_result_t +static isc_result_t find_zone_keys(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node)); CHECK(dns_dnssec_findzonekeys(db, ver, node, dns_db_origin(db), @@ -1347,13 +1347,13 @@ find_zone_keys(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, /* * Add SIG records for an RRset, recording the change in "diff". */ -static dns_result_t +static isc_result_t add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys, isc_mem_t *mctx, isc_stdtime_t now, isc_stdtime_t expire) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; dns_rdata_t sig_rdata; @@ -1400,11 +1400,11 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * The necessary SIG and NXT changes will be applied to "newver" * and added (as a minimal diff) to "diff". */ -static dns_result_t +static isc_result_t update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, dns_diff_t *diff) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *t; dns_diff_t diffnames; dns_diff_t affected; @@ -1697,9 +1697,9 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, * the RFC2136 pseudocode as closely as possible. */ -static dns_result_t +static isc_result_t send_update_event(ns_client_t *client, dns_zone_t *zone) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; update_event_t *event = NULL; isc_task_t *zonetask = NULL; @@ -1721,16 +1721,17 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) { } static void -respond(ns_client_t *client, dns_result_t result) { - int msg_result; +respond(ns_client_t *client, isc_result_t result) { + isc_result_t msg_result; dns_message_t *response = NULL; + msg_result = dns_message_create(client->mctx, DNS_MESSAGE_INTENTRENDER, &response); if (msg_result != DNS_R_SUCCESS) goto msg_failure; response->id = client->message->id; - response->rcode = dns_result_torcode(result)); + response->rcode = dns_result_torcode(result); response->flags = client->message->flags; response->flags |= DNS_MESSAGEFLAG_QR; response->opcode = client->message->opcode; @@ -1752,7 +1753,7 @@ void ns_update_start(ns_client_t *client) { dns_message_t *request = client->message; - dns_result_t result; + isc_result_t result; dns_name_t *zonename; dns_rdataset_t *zone_rdataset; dns_zone_t *zone = NULL; @@ -1821,7 +1822,7 @@ update_action(isc_task_t *task, isc_event_t *event) dns_zone_t *zone = uev->zone; ns_client_t *client = (ns_client_t *) event->arg; - dns_result_t result; + isc_result_t result; dns_db_t *db = NULL; dns_dbversion_t *oldver = NULL; dns_dbversion_t *ver = NULL; diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c index db61d572d0..bb08e1ed2d 100644 --- a/bin/named/xfrout.c +++ b/bin/named/xfrout.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: xfrout.c,v 1.32 1999/12/22 03:22:56 explorer Exp $ */ + /* $Id: xfrout.c,v 1.33 1999/12/23 00:08:23 explorer Exp $ */ #include @@ -99,7 +99,7 @@ typedef struct db_rr_iterator db_rr_iterator_t; struct db_rr_iterator { - dns_result_t result; + isc_result_t result; dns_db_t *db; dns_dbiterator_t *dbit; dns_dbversion_t *ver; @@ -111,23 +111,23 @@ struct db_rr_iterator { dns_rdata_t rdata; }; -dns_result_t db_rr_iterator_init(db_rr_iterator_t *it, dns_db_t *db, +isc_result_t db_rr_iterator_init(db_rr_iterator_t *it, dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now); -dns_result_t db_rr_iterator_first(db_rr_iterator_t *it); +isc_result_t db_rr_iterator_first(db_rr_iterator_t *it); -dns_result_t db_rr_iterator_next(db_rr_iterator_t *it); +isc_result_t db_rr_iterator_next(db_rr_iterator_t *it); void db_rr_iterator_current(db_rr_iterator_t *it, dns_name_t **name, isc_uint32_t *ttl, dns_rdata_t **rdata); void db_rr_iterator_destroy(db_rr_iterator_t *it); -dns_result_t +isc_result_t db_rr_iterator_init(db_rr_iterator_t *it, dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now) { - dns_result_t result; + isc_result_t result; it->db = db; it->dbit = NULL; it->ver = ver; @@ -144,7 +144,7 @@ db_rr_iterator_init(db_rr_iterator_t *it, dns_db_t *db, dns_dbversion_t *ver, return (it->result); } -dns_result_t +isc_result_t db_rr_iterator_first(db_rr_iterator_t *it) { it->result = dns_dbiterator_first(it->dbit); if (it->result != DNS_R_SUCCESS) @@ -171,7 +171,7 @@ db_rr_iterator_first(db_rr_iterator_t *it) { } -dns_result_t +isc_result_t db_rr_iterator_next(db_rr_iterator_t *it) { if (it->result != DNS_R_SUCCESS) return (it->result); @@ -242,7 +242,7 @@ db_rr_iterator_current(db_rr_iterator_t *it, dns_name_t **name, static void log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) { - dns_result_t result; + isc_result_t result; isc_buffer_t buf; char mem[2000]; @@ -292,8 +292,8 @@ typedef struct rrstream { } rrstream_t; struct rrstream_methods { - dns_result_t (*first)(rrstream_t *); - dns_result_t (*next)(rrstream_t *); + isc_result_t (*first)(rrstream_t *); + isc_result_t (*next)(rrstream_t *); void (*current)(rrstream_t *, dns_name_t **, isc_uint32_t *, @@ -327,7 +327,7 @@ static rrstream_methods_t ixfr_rrstream_methods; * may return. */ -static dns_result_t +static isc_result_t ixfr_rrstream_create(isc_mem_t *mctx, const char *journal_filename, isc_uint32_t begin_serial, @@ -335,7 +335,7 @@ ixfr_rrstream_create(isc_mem_t *mctx, rrstream_t **sp) { ixfr_rrstream_t *s; - dns_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -358,14 +358,14 @@ ixfr_rrstream_create(isc_mem_t *mctx, return (result); } -static dns_result_t +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)); } -static dns_result_t +static isc_result_t ixfr_rrstream_next(rrstream_t *rs) { ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; @@ -418,14 +418,14 @@ typedef struct axfr_rrstream { static void axfr_rrstream_destroy(rrstream_t **rsp); static rrstream_methods_t axfr_rrstream_methods; -static dns_result_t +static isc_result_t axfr_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, rrstream_t **sp) { axfr_rrstream_t *s; - dns_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -447,11 +447,11 @@ axfr_rrstream_create(isc_mem_t *mctx, return (result); } -static dns_result_t +static isc_result_t axfr_rrstream_first(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *) rs; - dns_result_t result; + isc_result_t result; result = db_rr_iterator_first(&s->it); /* Skip SOA records. */ for (;;) { @@ -469,11 +469,11 @@ axfr_rrstream_first(rrstream_t *rs) return (result); } -static dns_result_t +static isc_result_t axfr_rrstream_next(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *) rs; - dns_result_t result; + isc_result_t result; /* Skip SOA records. */ for (;;) { @@ -531,14 +531,14 @@ typedef struct soa_rrstream { static void soa_rrstream_destroy(rrstream_t **rsp); static rrstream_methods_t soa_rrstream_methods; -static dns_result_t +static isc_result_t soa_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, rrstream_t **sp) { soa_rrstream_t *s; - dns_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -560,13 +560,13 @@ soa_rrstream_create(isc_mem_t *mctx, return (result); } -static dns_result_t +static isc_result_t soa_rrstream_first(rrstream_t *rs) { rs = rs; /* Unused */ return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t soa_rrstream_next(rrstream_t *rs) { rs = rs; /* Unused */ return (DNS_R_NOMORE); @@ -619,7 +619,7 @@ typedef struct compound_rrstream { /* Forward declarations. */ static void compound_rrstream_destroy(rrstream_t **rsp); -static dns_result_t compound_rrstream_next(rrstream_t *rs); +static isc_result_t compound_rrstream_next(rrstream_t *rs); static rrstream_methods_t compound_rrstream_methods; /* @@ -635,7 +635,7 @@ static rrstream_methods_t compound_rrstream_methods; * The soa and data streams will be destroyed * when the compound_rrstream_t is destroyed. */ -static dns_result_t +static isc_result_t compound_rrstream_create(isc_mem_t *mctx, rrstream_t **soa_stream, rrstream_t **data_stream, @@ -662,7 +662,7 @@ compound_rrstream_create(isc_mem_t *mctx, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t compound_rrstream_first(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *) rs; s->state = 0; @@ -673,7 +673,7 @@ compound_rrstream_first(rrstream_t *rs) { return (s->result); } -static dns_result_t +static isc_result_t compound_rrstream_next(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *) rs; rrstream_t *curstream = s->components[s->state]; @@ -748,7 +748,7 @@ typedef struct { isc_boolean_t shuttingdown; } xfrout_ctx_t; -static dns_result_t +static isc_result_t xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, dns_name_t *qname, dns_rdatatype_t qtype, dns_db_t *db, dns_dbversion_t *ver, @@ -762,7 +762,7 @@ static void sendstream(xfrout_ctx_t *xfr); static void xfrout_senddone(isc_task_t *task, isc_event_t *event); static void xfrout_timeout(isc_task_t *task, isc_event_t *event); -static void xfrout_fail(xfrout_ctx_t *xfr, dns_result_t result, char *msg); +static void xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, char *msg); static void xfrout_maybe_destroy(xfrout_ctx_t *xfr); static void xfrout_ctx_destroy(xfrout_ctx_t **xfrp); @@ -771,7 +771,7 @@ static void xfrout_ctx_destroy(xfrout_ctx_t **xfrp); void ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { - dns_result_t result; + isc_result_t result; dns_name_t *question_name; dns_rdataset_t *question_rdataset; dns_zone_t *zone = NULL; @@ -1013,7 +1013,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) } } -static dns_result_t +static isc_result_t xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, dns_name_t *qname, dns_rdatatype_t qtype, dns_db_t *db, dns_dbversion_t *ver, @@ -1022,7 +1022,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, unsigned int idletime, xfrout_ctx_t **xfrp) { xfrout_ctx_t *xfr; - dns_result_t result; + isc_result_t result; unsigned int len; void *mem; isc_interval_t maxinterval, idleinterval; @@ -1113,7 +1113,7 @@ static void sendstream(xfrout_ctx_t *xfr) { dns_message_t *msg = NULL; - dns_result_t result; + isc_result_t result; isc_region_t used; isc_region_t region; dns_rdataset_t *qrdataset; @@ -1401,7 +1401,7 @@ xfrout_timeout(isc_task_t *task, isc_event_t *event) { } static void -xfrout_fail(xfrout_ctx_t *xfr, dns_result_t result, char *msg) +xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, char *msg) { xfr->shuttingdown = ISC_TRUE; isc_log_write(XFROUT_COMMON_LOGARGS, ISC_LOG_ERROR, diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 9647c5e5f2..17335f9f4e 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -61,7 +61,7 @@ configure_zone_acl(dns_c_zone_t *czone, dns_c_ctx_t *cctx, } } -dns_result_t +isc_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, dns_c_zone_t *czone, dns_zone_t *zone) { diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c index e9623867e5..1e11dc36fd 100644 --- a/bin/tests/adb_test.c +++ b/bin/tests/adb_test.c @@ -126,7 +126,7 @@ static char root_ns[] = isc_result_t ns_rootns_init(void) { - dns_result_t result, eresult; + isc_result_t result, eresult; isc_buffer_t source; size_t len; int soacount, nscount; diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c index 264ed1f944..ab617bead9 100644 --- a/bin/tests/db/t_db.c +++ b/bin/tests/db/t_db.c @@ -49,12 +49,12 @@ #include -static dns_result_t +static isc_result_t t_create(char *db_type, char *origin, char *class, char *cache, isc_mem_t *mctx, dns_db_t **db) { int len; - dns_result_t dns_result; + isc_result_t dns_result; isc_boolean_t iscache; isc_textregion_t textregion; isc_buffer_t origin_buffer; @@ -115,7 +115,7 @@ t_dns_db_load(char **av) { int result; int len; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -126,8 +126,8 @@ t_dns_db_load(char **av) { dns_rdataset_t rdataset; dns_rdatatype_t rdatatype; dns_dbversion_t *versionp; - dns_result_t exp_load_result; - dns_result_t exp_find_result; + isc_result_t exp_load_result; + isc_result_t exp_find_result; result = T_UNRESOLVED; db = NULL; @@ -264,7 +264,7 @@ t_dns_db_zc_x(char *filename, int result; int len; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_rdataclass_t rdataclass; @@ -470,7 +470,7 @@ t_dns_db_origin(char **av) { int result; int len; int order; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_db_t *db; @@ -568,7 +568,7 @@ t_dns_db_class(char **av) { char *class; int result; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_db_t *db; @@ -665,7 +665,7 @@ t_dns_db_currentversion(char **av) { int result; int len; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -895,7 +895,7 @@ t_dns_db_newversion(char **av) { int len; int rval; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -1168,7 +1168,7 @@ t_dns_db_closeversion_1(char **av) { int rval; int nfails; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -1526,7 +1526,7 @@ t_dns_db_closeversion_2(char **av) { int rval; int nfails; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -1936,8 +1936,8 @@ t_dns_db_expirenode(char **av) { int result; int len; dns_db_t *db; - dns_result_t dns_result; - dns_result_t exp_result; + isc_result_t dns_result; + isc_result_t exp_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -2113,7 +2113,7 @@ t_dns_db_findnode_1(char **av) { int result; int len; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -2123,7 +2123,7 @@ t_dns_db_findnode_1(char **av) { isc_textregion_t textregion; dns_fixedname_t dns_name; dns_dbversion_t *cversionp; - dns_result_t exp_result; + isc_result_t exp_result; filename = T_ARG(0); db_type = T_ARG(1); @@ -2261,7 +2261,7 @@ t_dns_db_findnode_2(char **av) { int result; int len; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_mem_t *mctx; dns_dbnode_t *nodep; @@ -2423,11 +2423,11 @@ t_dns_db_find_x(char **av) { int len; int opts; dns_db_t *db; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; isc_stdtime_t ftime; isc_stdtime_t now; - dns_result_t exp_result; + isc_result_t exp_result; isc_mem_t *mctx; dns_dbnode_t *nodep; isc_textregion_t textregion; diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c index cda80d7dad..03a78c0d94 100644 --- a/bin/tests/dispatch_tcp_test.c +++ b/bin/tests/dispatch_tcp_test.c @@ -59,7 +59,7 @@ void my_accept(isc_task_t *, isc_event_t *); void got_request(isc_task_t *, isc_event_t *); void got_response(isc_task_t *, isc_event_t *); void start_response(void); -static inline void CHECKRESULT(dns_result_t, char *); +static inline void CHECKRESULT(isc_result_t, char *); void send_done(isc_task_t *, isc_event_t *); void hex_dump(isc_buffer_t *); @@ -82,7 +82,7 @@ hex_dump(isc_buffer_t *b) } static inline void -CHECKRESULT(dns_result_t result, char *msg) +CHECKRESULT(isc_result_t result, char *msg) { if (result != DNS_R_SUCCESS) { printf("%s: %s\n", msg, isc_result_totext(result)); @@ -286,7 +286,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in) dns_dispentry_t *resp = ev->sender; static int cnt = 0; dns_message_t *msg; - dns_result_t result; + isc_result_t result; printf("App: Got request. Result: %s\n", isc_result_totext(ev->result)); diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c index 76d6656b38..6a2d1be625 100644 --- a/bin/tests/dispatch_test.c +++ b/bin/tests/dispatch_test.c @@ -67,7 +67,7 @@ isc_mutex_t client_lock; void got_request(isc_task_t *, isc_event_t *); void got_response(isc_task_t *, isc_event_t *); void start_response(clictx_t *, char *, isc_task_t *); -static inline void CHECKRESULT(dns_result_t, char *); +static inline void CHECKRESULT(isc_result_t, char *); void send_done(isc_task_t *, isc_event_t *); void hex_dump(isc_buffer_t *); @@ -90,7 +90,7 @@ hex_dump(isc_buffer_t *b) } static inline void -CHECKRESULT(dns_result_t result, char *msg) +CHECKRESULT(isc_result_t result, char *msg) { if (result != DNS_R_SUCCESS) { printf("%s: %s\n", msg, isc_result_totext(result)); @@ -288,7 +288,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in) dns_dispatchevent_t *ev = (dns_dispatchevent_t *)ev_in; clictx_t *cli = (clictx_t *)ev_in->arg; dns_message_t *msg; - dns_result_t result; + isc_result_t result; unsigned int cnt; printf("App: Got request. Result: %s\n", diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c index 03d0f643d5..d0edde30fb 100644 --- a/bin/tests/master/t_master.c +++ b/bin/tests/master/t_master.c @@ -37,19 +37,19 @@ #define BUFLEN 255 #define BIGBUFLEN (64 * 1024) -static dns_result_t t1_add_callback(void *arg, dns_name_t *owner, +static isc_result_t t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset); static void t1(void); isc_mem_t *T1_mctx; char *Tokens[T_MAXTOKS + 1]; -static dns_result_t +static isc_result_t t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { char buf[BIGBUFLEN]; isc_buffer_t target; - dns_result_t result; + isc_result_t result; arg = arg; /*unused*/ @@ -63,11 +63,13 @@ t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { } static int -test_master(char *testfile, char *origin, char *class, dns_result_t exp_result) { +test_master(char *testfile, char *origin, char *class, + isc_result_t exp_result) +{ int result; int len; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_origin; isc_buffer_t source; isc_buffer_t target; diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c index 327e0fc7ae..cf2dc5ebd9 100644 --- a/bin/tests/master_test.c +++ b/bin/tests/master_test.c @@ -30,16 +30,16 @@ #include #include -dns_result_t print_dataset(void *arg, dns_name_t *owner, +isc_result_t print_dataset(void *arg, dns_name_t *owner, dns_rdataset_t *dataset); isc_mem_t *mctx; -dns_result_t +isc_result_t print_dataset(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { char buf[64*1024]; isc_buffer_t target; - dns_result_t result; + isc_result_t result; arg = arg; /*unused*/ @@ -58,7 +58,7 @@ print_dataset(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { int main(int argc, char *argv[]) { - dns_result_t result; + isc_result_t result; dns_name_t origin; isc_buffer_t source; isc_buffer_t target; diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c index e3c2f48f00..0974aea92e 100644 --- a/bin/tests/name_test.c +++ b/bin/tests/name_test.c @@ -50,7 +50,7 @@ print_wirename(isc_region_t *name) { int main(int argc, char *argv[]) { char s[1000]; - dns_result_t result; + isc_result_t result; dns_fixedname_t wname, wname2, oname, compname, downname; isc_buffer_t source; isc_region_t r; diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c index 6da8e16321..3f5da14298 100644 --- a/bin/tests/names/t_names.c +++ b/bin/tests/names/t_names.c @@ -347,14 +347,14 @@ hname_to_tname(char *src, char *target, size_t len) { * */ -static dns_result_t +static isc_result_t dname_from_tname(char *name, dns_name_t *dns_name) { int len; isc_buffer_t txtbuf; isc_buffer_t *binbuf; unsigned char *junk; - dns_result_t result; + isc_result_t result; len = strlen(name); isc_buffer_init(&txtbuf, name, len, ISC_BUFFERTYPE_TEXT); @@ -385,7 +385,7 @@ test_dns_label_countbits(char *test_name, int pos, int expected_bits) { dns_name_t dns_name; int bits; int rval; - dns_result_t result; + isc_result_t result; rval = T_UNRESOLVED; t_info("testing name %s, label %d\n", test_name, pos); @@ -466,7 +466,7 @@ test_dns_label_getbit(char *test_name, int label_pos, int bit_pos, dns_name_t dns_name; int bitval; int rval; - dns_result_t result; + isc_result_t result; rval = T_UNRESOLVED; @@ -709,7 +709,7 @@ test_dns_name_isabsolute(char *test_name, isc_boolean_t expected) { int len; int rval; isc_boolean_t isabs_p; - dns_result_t result; + isc_result_t result; rval = T_UNRESOLVED; @@ -798,7 +798,7 @@ test_dns_name_hash(char *test_name1, char *test_name2, unsigned int hash2; dns_name_t dns_name1; dns_name_t dns_name2; - dns_result_t result; + isc_result_t result; rval = T_UNRESOLVED; failures = 0; @@ -939,7 +939,7 @@ test_dns_name_fullcompare(char *name1, char *name2, dns_namereln_t exp_dns_reln, unsigned int nbits; dns_name_t dns_name1; dns_name_t dns_name2; - dns_result_t dns_result; + isc_result_t dns_result; dns_namereln_t dns_reln; nfails = 0; @@ -1073,7 +1073,7 @@ test_dns_name_compare(char *name1, char *name2, int exp_order) { int result; int order; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_name1; dns_name_t dns_name2; @@ -1171,7 +1171,7 @@ test_dns_name_rdatacompare(char *name1, char *name2, int exp_order) { int result; int order; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_name1; dns_name_t dns_name2; @@ -1270,7 +1270,7 @@ test_dns_name_issubdomain(char *name1, char *name2, isc_boolean_t exp_rval) { int result; isc_boolean_t rval; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_name1; dns_name_t dns_name2; @@ -1366,7 +1366,7 @@ test_dns_name_countlabels(char *test_name, unsigned int exp_nlabels) { int result; unsigned int nlabels; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_name; result = T_UNRESOLVED; @@ -1462,7 +1462,7 @@ test_dns_name_getlabel(char *test_name1, int label1_pos, dns_name_t dns_name2; dns_label_t dns_label1; dns_label_t dns_label2; - dns_result_t dns_result; + isc_result_t dns_result; nfails = 0; result = T_UNRESOLVED; @@ -1576,7 +1576,7 @@ test_dns_name_getlabelsequence(char *test_name1, int label1_start, dns_name_t dns_name2; dns_name_t dns_targetname1; dns_name_t dns_targetname2; - dns_result_t dns_result; + isc_result_t dns_result; isc_buffer_t buffer1; isc_buffer_t buffer2; unsigned char junk1[BUFLEN]; @@ -1694,7 +1694,7 @@ test_dns_name_fromregion(char *test_name) { int order; unsigned int nlabels; unsigned int nbits; - dns_result_t dns_result; + isc_result_t dns_result; dns_name_t dns_name1; dns_name_t dns_name2; dns_namereln_t dns_namereln; @@ -1846,7 +1846,7 @@ test_dns_name_fromtext(char *test_name1, char *test_name2, dns_name_t dns_name1; dns_name_t dns_name2; dns_name_t dns_name3; - dns_result_t dns_result; + isc_result_t dns_result; dns_namereln_t dns_namereln; result = T_UNRESOLVED; @@ -1983,7 +1983,7 @@ test_dns_name_totext(char *test_name, isc_boolean_t omit_final) { isc_buffer_t buf3; dns_name_t dns_name1; dns_name_t dns_name2; - dns_result_t dns_result; + isc_result_t dns_result; dns_namereln_t dns_namereln; result = T_UNRESOLVED; @@ -2124,7 +2124,7 @@ test_dns_name_fromwire( char *datafile_name, int downcase, int dc_method, char *exp_name, - dns_result_t exp_result, + isc_result_t exp_result, size_t buflen) { int result; @@ -2138,7 +2138,7 @@ test_dns_name_fromwire( char *datafile_name, isc_buffer_t iscbuf2; dns_name_t dns_name1; dns_name_t dns_name2; - dns_result_t dns_result; + isc_result_t dns_result; dns_namereln_t dns_namereln; dns_decompress_t dctx; @@ -2201,7 +2201,7 @@ t_dns_name_fromwire_x(char *testfile, size_t buflen) { int cnt; int result; int dc_method; - dns_result_t exp_result; + isc_result_t exp_result; char *p; char *tok; FILE *fp; @@ -2332,7 +2332,7 @@ test_dns_name_towire( char *testname, int dc_method, char *exp_data, int exp_data_len, - dns_result_t exp_result, + isc_result_t exp_result, size_t buflen) { int result; @@ -2344,7 +2344,7 @@ test_dns_name_towire( char *testname, isc_buffer_t iscbuf2; isc_buffer_t iscbuf3; dns_name_t dns_name; - dns_result_t dns_result; + isc_result_t dns_result; isc_result_t isc_result; dns_compress_t cctx; isc_mem_t *mctx; @@ -2405,7 +2405,7 @@ t_dns_name_towire_x(char *testfile, size_t buflen) { int cnt; int result; int dc_method; - dns_result_t exp_result; + isc_result_t exp_result; char *p; FILE *fp; diff --git a/bin/tests/printmsg.c b/bin/tests/printmsg.c index 5c011fda47..0787181457 100644 --- a/bin/tests/printmsg.c +++ b/bin/tests/printmsg.c @@ -79,13 +79,13 @@ static char *rcodetext[] = { "BADVERS" }; -static dns_result_t +static isc_result_t printsection(dns_message_t *msg, dns_section_t sectionid, char *section_name) { dns_name_t *name, *print_name; dns_rdataset_t *rdataset; isc_buffer_t target; - dns_result_t result; + isc_result_t result; isc_region_t r; dns_name_t empty_name; char t[4096]; @@ -145,10 +145,10 @@ printsection(dns_message_t *msg, dns_section_t sectionid, char *section_name) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t printmessage(dns_message_t *msg) { isc_boolean_t did_flag = ISC_FALSE; - dns_result_t result; + isc_result_t result; dns_rdataset_t *opt; result = DNS_R_SUCCESS; diff --git a/bin/tests/printmsg.h b/bin/tests/printmsg.h index f03a6dac20..5e980274b8 100644 --- a/bin/tests/printmsg.h +++ b/bin/tests/printmsg.h @@ -20,6 +20,6 @@ #include -dns_result_t printmessage(dns_message_t *message); +isc_result_t printmessage(dns_message_t *message); #endif /* TEST_PRINTMSG_H */ diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c index 9b340671d6..3dfa7aebef 100644 --- a/bin/tests/rbt/t_rbt.c +++ b/bin/tests/rbt/t_rbt.c @@ -46,9 +46,9 @@ static int t_dns_rbtnodechain_init(char *dbfile, char *findname, static char *fixedname_totext(dns_fixedname_t *name); static int fixedname_cmp(dns_fixedname_t *dns_name, char *txtname); static char *dnsname_totext(dns_name_t *name); -static int t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, +static int t_namechk(isc_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, dns_fixedname_t *dns_origin, char *exp_origin, - dns_result_t exp_result); + isc_result_t exp_result); /* parts adapted from the original rbt_test.c */ @@ -92,9 +92,9 @@ fixedname_totext(dns_fixedname_t *name) { #ifdef NEED_PRINT_DATA -static dns_result_t +static isc_result_t print_data(void *data) { - dns_result_t dns_result; + isc_result_t dns_result; isc_buffer_t target; char *buffer[DNSNAMELEN]; @@ -170,7 +170,7 @@ delete_name(void *data, void *arg) { /* adapted from the original rbt_test.c */ static int -t1_add(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, dns_result_t *dns_result) { +t1_add(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result) { int nprobs; dns_name_t *dns_name; @@ -197,7 +197,7 @@ t1_add(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, dns_result_t *dns_result) { } static int -t1_delete(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, dns_result_t *dns_result) { +t1_delete(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result) { int nprobs; dns_name_t *dns_name; @@ -219,7 +219,7 @@ t1_delete(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, dns_result_t *dns_result) } static int -t1_search(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, dns_result_t *dns_result) { +t1_search(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result) { int nprobs; dns_name_t *dns_searchname; @@ -253,7 +253,7 @@ static int rbt_init(char *filename, dns_rbt_t **rbt, isc_mem_t *mctx) { int rval; - dns_result_t dns_result; + isc_result_t dns_result; char *p; FILE *fp; @@ -296,12 +296,12 @@ rbt_init(char *filename, dns_rbt_t **rbt, isc_mem_t *mctx) { } static int -test_rbt_gen(char *filename, char *command, char *testname, dns_result_t exp_result) { +test_rbt_gen(char *filename, char *command, char *testname, isc_result_t exp_result) { int rval; int result; dns_rbt_t *rbt; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; isc_mem_t *mctx; dns_name_t *dns_name; @@ -584,7 +584,7 @@ t9_walkchain(dns_rbtnodechain_t *chain, dns_rbt_t *rbt) { unsigned int nlabels; unsigned int nbits; int nprobs; - dns_result_t dns_result; + isc_result_t dns_result; dns_namereln_t dns_namereln; dns_fixedname_t name; @@ -680,9 +680,9 @@ t9_walkchain(dns_rbtnodechain_t *chain, dns_rbt_t *rbt) { /* test by exercising the first|last|next|prev funcs in useful ways */ static int -t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, +t_namechk(isc_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, dns_fixedname_t *dns_origin, char *exp_origin, - dns_result_t exp_result) + isc_result_t exp_result) { int nfails; @@ -726,7 +726,7 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname, dns_rbtnodechain_t chain; isc_mem_t *mctx; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_fixedname_t dns_findname; dns_fixedname_t dns_foundname; dns_fixedname_t dns_firstname; @@ -963,10 +963,10 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname, dns_rbtnodechain_t chain; isc_mem_t *mctx; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_fixedname_t dns_name; dns_fixedname_t dns_origin; - dns_result_t expected_result; + isc_result_t expected_result; result = T_UNRESOLVED; @@ -1125,10 +1125,10 @@ t_dns_rbtnodechain_last(char *dbfile, char *expected_lastname, dns_rbtnodechain_t chain; isc_mem_t *mctx; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_fixedname_t dns_name; dns_fixedname_t dns_origin; - dns_result_t expected_result; + isc_result_t expected_result; result = T_UNRESOLVED; @@ -1286,7 +1286,7 @@ t_dns_rbtnodechain_next(char *dbfile, char *findname, dns_rbtnodechain_t chain; isc_mem_t *mctx; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_fixedname_t dns_findname; dns_fixedname_t dns_foundname; dns_fixedname_t dns_nextname; @@ -1457,7 +1457,7 @@ t_dns_rbtnodechain_prev(char *dbfile, char *findname, dns_rbtnodechain_t chain; isc_mem_t *mctx; isc_result_t isc_result; - dns_result_t dns_result; + isc_result_t dns_result; dns_fixedname_t dns_findname; dns_fixedname_t dns_foundname; dns_fixedname_t dns_prevname; diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c index cae183784d..2e6004c608 100644 --- a/bin/tests/rbt_test.c +++ b/bin/tests/rbt_test.c @@ -109,7 +109,7 @@ detail(dns_rbt_t *rbt, dns_name_t *name) { dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; dns_rbtnode_t *node1, *node2; dns_rbtnodechain_t chain; - dns_result_t result; + isc_result_t result; isc_boolean_t nodes_should_match = ISC_FALSE; dns_rbtnodechain_init(&chain, mctx); @@ -198,8 +198,8 @@ iterate(dns_rbt_t *rbt, isc_boolean_t forward) { dns_name_t foundname, *origin; dns_rbtnodechain_t chain; dns_fixedname_t fixedorigin; - dns_result_t result; - dns_result_t (*move)(dns_rbtnodechain_t *chain, dns_name_t *name, + isc_result_t result; + isc_result_t (*move)(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin); dns_rbtnodechain_init(&chain, mctx); diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 6262d334df..652222da5d 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -41,7 +41,7 @@ #include "printmsg.h" static inline void -CHECKRESULT(dns_result_t result, char *msg) +CHECKRESULT(isc_result_t result, char *msg) { if (result != DNS_R_SUCCESS) { printf("%s: %s\n", msg, dns_result_totext(result)); @@ -76,7 +76,7 @@ main(int argc, char *argv[]) { unsigned char b[1000]; char s[1000]; dns_message_t *message; - dns_result_t result; + isc_result_t result; isc_mem_t *mctx; mctx = NULL; diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c index 072b3c3842..c2e2a47642 100644 --- a/bin/tests/zone2_test.c +++ b/bin/tests/zone2_test.c @@ -51,7 +51,7 @@ static void print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) { isc_buffer_t text; char t[1000]; - dns_result_t result; + isc_result_t result; isc_region_t r; isc_buffer_init(&text, t, sizeof t, ISC_BUFFERTYPE_TEXT); @@ -70,7 +70,7 @@ query(dns_view_t *view) { dns_fixedname_t name; char *s; isc_buffer_t buffer; - dns_result_t result; + isc_result_t result; dns_rdataset_t rdataset; dns_rdataset_t sigset; fd_set rfdset; @@ -169,7 +169,7 @@ main(int argc, char **argv) { dns_view_t *view = NULL; dns_c_cbks_t cbks; int quiet = 0, stats = 0; - dns_result_t result; + isc_result_t result; int c; char *dir; dns_zone_callbackarg_t cba; diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index e03ab46d6d..d13710c7ae 100644 --- a/bin/tests/zone_test.c +++ b/bin/tests/zone_test.c @@ -63,7 +63,7 @@ usage() { static void setup(char *zonename, char *filename, char *classname) { - dns_result_t result; + isc_result_t result; dns_rdataclass_t rdclass; isc_textregion_t region; @@ -106,7 +106,7 @@ static void print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) { isc_buffer_t text; char t[1000]; - dns_result_t result; + isc_result_t result; isc_region_t r; isc_buffer_init(&text, t, sizeof t, ISC_BUFFERTYPE_TEXT); @@ -127,7 +127,7 @@ query(void) { dns_db_t *db; char *s; isc_buffer_t buffer; - dns_result_t result; + isc_result_t result; dns_rdataset_t rdataset; dns_rdataset_t sigset; fd_set rfdset; diff --git a/lib/dns/compress.c b/lib/dns/compress.c index d421691182..40a0d30749 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: compress.c,v 1.17 1999/05/26 00:34:54 marka Exp $ */ + /* $Id: compress.c,v 1.18 1999/12/23 00:08:27 explorer Exp $ */ #include #include @@ -46,10 +46,10 @@ void compress_add(dns_rbt_t *root, dns_name_t *prefix, *** Compression ***/ -dns_result_t +isc_result_t dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) { - dns_result_t result; + isc_result_t result; REQUIRE(cctx != NULL); REQUIRE(mctx != NULL); @@ -68,11 +68,11 @@ dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_compress_localinit(dns_compress_t *cctx, dns_name_t *owner, isc_buffer_t *target) { - dns_result_t result; + isc_result_t result; unsigned int labels; unsigned int ll; /* logical label length w/o root label */ unsigned int wl; /* wire labels */ @@ -294,7 +294,7 @@ dns_compress_rollback(dns_compress_t *cctx, isc_uint16_t offset) { dns_name_t *fullname; dns_name_t *origin; dns_rbtnodechain_t chain; - dns_result_t result; + isc_result_t result; REQUIRE(VALID_CCTX(cctx)); @@ -451,7 +451,7 @@ compress_add(dns_rbt_t *root, dns_name_t *prefix, dns_name_t *suffix, unsigned int start; unsigned int limit; isc_uint16_t *data; - dns_result_t result; + isc_result_t result; unsigned char buffer[255]; isc_buffer_t target; dns_offsets_t offsets; @@ -502,7 +502,7 @@ compress_find(dns_rbt_t *root, dns_name_t *name, dns_name_t *prefix, dns_name_t *foundname; dns_name_t tmpprefix; dns_name_t tmpsuffix; - dns_result_t result; + isc_result_t result; isc_uint16_t *data = NULL; dns_label_t foundlabel; dns_label_t namelabel; diff --git a/lib/dns/config/confkeys.c b/lib/dns/config/confkeys.c index 9152ca6897..43475c2ad8 100644 --- a/lib/dns/config/confkeys.c +++ b/lib/dns/config/confkeys.c @@ -1010,7 +1010,7 @@ dns_c_tkey_new(isc_mem_t *mem, const char *domain, isc_int32_t flags, { dns_c_tkey_t *newk; dns_c_pubkey_t *pk; - dns_result_t res; + isc_result_t res; REQUIRE(domain != NULL); REQUIRE(strlen(domain) > 0); diff --git a/lib/dns/config/confrrset.c b/lib/dns/config/confrrset.c index b09744e8a5..52ec694a11 100644 --- a/lib/dns/config/confrrset.c +++ b/lib/dns/config/confrrset.c @@ -213,7 +213,7 @@ dns_c_rrsolist_copy(isc_mem_t *mem, dns_c_rrsolist_t **dest, dns_c_rrsolist_t *nlist; dns_c_rrso_t *elem; dns_c_rrso_t *newe; - dns_result_t res; + isc_result_t res; REQUIRE(DNS_C_RRSOLIST_VALID(source)); REQUIRE(dest != NULL); diff --git a/lib/dns/db.c b/lib/dns/db.c index 6c9e91f8e4..c95883d5ee 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -36,7 +36,7 @@ typedef struct { char * name; - dns_result_t (*create)(isc_mem_t *mctx, dns_name_t *name, + isc_result_t (*create)(isc_mem_t *mctx, dns_name_t *name, isc_boolean_t cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], @@ -66,7 +66,7 @@ impinfo_t implementations[] = { *** Basic DB Methods ***/ -dns_result_t +isc_result_t dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin, isc_boolean_t cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp) @@ -183,7 +183,7 @@ dns_db_class(dns_db_t *db) { return (db->rdclass); } -dns_result_t +isc_result_t dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp) { /* @@ -197,7 +197,7 @@ dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, return ((db->methods->beginload)(db, addp, dbloadp)); } -dns_result_t +isc_result_t dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp) { /* * Finish loading 'db'. @@ -209,9 +209,9 @@ dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp) { return ((db->methods->endload)(db, dbloadp)); } -dns_result_t +isc_result_t dns_db_load(dns_db_t *db, const char *filename) { - dns_result_t result, eresult; + isc_result_t result, eresult; int soacount, nscount; dns_rdatacallbacks_t callbacks; isc_boolean_t age_ttl = ISC_FALSE; @@ -245,7 +245,7 @@ dns_db_load(dns_db_t *db, const char *filename) { return (result); } -dns_result_t +isc_result_t dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) { /* * Dump 'db' into master file 'filename'. @@ -274,7 +274,7 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) { (db->methods->currentversion)(db, versionp); } -dns_result_t +isc_result_t dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) { /* @@ -328,7 +328,7 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, *** Node Methods ***/ -dns_result_t +isc_result_t dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { @@ -344,7 +344,7 @@ dns_db_findnode(dns_db_t *db, dns_name_t *name, return ((db->methods->findnode)(db, name, create, nodep)); } -dns_result_t +isc_result_t dns_db_find(dns_db_t *db, 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, @@ -370,7 +370,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, nodep, foundname, rdataset, sigrdataset)); } -dns_result_t +isc_result_t dns_db_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -421,7 +421,7 @@ dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep) { ENSURE(*nodep == NULL); } -dns_result_t +isc_result_t dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { /* @@ -452,7 +452,7 @@ dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { *** DB Iterator Creation ***/ -dns_result_t +isc_result_t dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names, dns_dbiterator_t **iteratorp) { @@ -470,7 +470,7 @@ dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names, *** Rdataset Methods ***/ -dns_result_t +isc_result_t dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, dns_rdataset_t *rdataset, @@ -495,7 +495,7 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, now, rdataset, sigrdataset)); } -dns_result_t +isc_result_t dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { @@ -511,7 +511,7 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, iteratorp)); } -dns_result_t +isc_result_t dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, isc_boolean_t merge, dns_rdataset_t *addedrdataset) @@ -536,7 +536,7 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, merge, addedrdataset)); } -dns_result_t +isc_result_t dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, dns_rdataset_t *newrdataset) @@ -560,7 +560,7 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, newrdataset)); } -dns_result_t +isc_result_t dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type) { diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c index fb99445ab3..aebf41523b 100644 --- a/lib/dns/dbiterator.c +++ b/lib/dns/dbiterator.c @@ -38,7 +38,7 @@ dns_dbiterator_destroy(dns_dbiterator_t **iteratorp) { ENSURE(*iteratorp == NULL); } -dns_result_t +isc_result_t dns_dbiterator_first(dns_dbiterator_t *iterator) { /* * Move the node cursor to the first node in the database (if any). @@ -49,7 +49,7 @@ dns_dbiterator_first(dns_dbiterator_t *iterator) { return (iterator->methods->first(iterator)); } -dns_result_t +isc_result_t dns_dbiterator_last(dns_dbiterator_t *iterator) { /* * Move the node cursor to the first node in the database (if any). @@ -60,7 +60,7 @@ dns_dbiterator_last(dns_dbiterator_t *iterator) { return (iterator->methods->last(iterator)); } -dns_result_t +isc_result_t dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { /* * Move the node cursor to the node with name 'name'. @@ -71,7 +71,7 @@ dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { return (iterator->methods->seek(iterator, name)); } -dns_result_t +isc_result_t dns_dbiterator_prev(dns_dbiterator_t *iterator) { /* * Move the node cursor to the previous node in the database (if any). @@ -82,7 +82,7 @@ dns_dbiterator_prev(dns_dbiterator_t *iterator) { return (iterator->methods->prev(iterator)); } -dns_result_t +isc_result_t dns_dbiterator_next(dns_dbiterator_t *iterator) { /* * Move the node cursor to the next node in the database (if any). @@ -93,7 +93,7 @@ dns_dbiterator_next(dns_dbiterator_t *iterator) { return (iterator->methods->next(iterator)); } -dns_result_t +isc_result_t dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, dns_name_t *name) { @@ -108,7 +108,7 @@ dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, return (iterator->methods->current(iterator, nodep, name)); } -dns_result_t +isc_result_t dns_dbiterator_pause(dns_dbiterator_t *iterator) { /* * Pause iteration. @@ -119,7 +119,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator) { return (iterator->methods->pause(iterator)); } -dns_result_t +isc_result_t dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { /* diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c index 3ee531527b..1430d9bfdc 100644 --- a/lib/dns/dbtable.c +++ b/lib/dns/dbtable.c @@ -16,7 +16,7 @@ */ /* - * $Id: dbtable.c,v 1.11 1999/12/16 22:24:17 explorer Exp $ + * $Id: dbtable.c,v 1.12 1999/12/23 00:08:28 explorer Exp $ */ /* @@ -60,12 +60,12 @@ dbdetach(void *data, void *arg) { dns_db_detach(&db); } -dns_result_t +isc_result_t dns_dbtable_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_dbtable_t **dbtablep) { dns_dbtable_t *dbtable; - dns_result_t result; + isc_result_t result; isc_result_t iresult; REQUIRE(mctx != NULL); @@ -183,9 +183,9 @@ dns_dbtable_detach(dns_dbtable_t **dbtablep) { *dbtablep = NULL; } -dns_result_t +isc_result_t dns_dbtable_add(dns_dbtable_t *dbtable, dns_db_t *db) { - dns_result_t result; + isc_result_t result; dns_db_t *clone; REQUIRE(VALID_DBTABLE(dbtable)); @@ -269,10 +269,10 @@ dns_dbtable_removedefault(dns_dbtable_t *dbtable) { RWUNLOCK(&dbtable->tree_lock, isc_rwlocktype_write); } -dns_result_t +isc_result_t dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name, dns_db_t **dbp) { dns_db_t *stored_data = NULL; - dns_result_t result; + isc_result_t result; REQUIRE(dbp != NULL && *dbp == NULL); diff --git a/lib/dns/gen.c b/lib/dns/gen.c index d266a9ea97..6db198978d 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: gen.c,v 1.29 1999/10/25 17:04:55 marka Exp $ */ + /* $Id: gen.c,v 1.30 1999/12/23 00:08:28 explorer Exp $ */ #include @@ -445,16 +445,16 @@ main(int argc, char **argv) { fprintf(stdout, copyright, year); if (code) { - dodecl("dns_result_t", "fromtext", FROMTEXTDECL); - dodecl("dns_result_t", "totext", TOTEXTDECL); - dodecl("dns_result_t", "fromwire", FROMWIREDECL); - dodecl("dns_result_t", "towire", TOWIREDECL); + dodecl("isc_result_t", "fromtext", FROMTEXTDECL); + dodecl("isc_result_t", "totext", TOTEXTDECL); + dodecl("isc_result_t", "fromwire", FROMWIREDECL); + dodecl("isc_result_t", "towire", TOWIREDECL); dodecl("int", "compare", COMPAREDECL); - dodecl("dns_result_t", "fromstruct", FROMSTRUCTDECL); - dodecl("dns_result_t", "tostruct", TOSTRUCTDECL); + dodecl("isc_result_t", "fromstruct", FROMSTRUCTDECL); + dodecl("isc_result_t", "tostruct", TOSTRUCTDECL); dodecl("void", "freestruct", FREESTRUCTDECL); - dodecl("dns_result_t", "additionaldata", ADDITIONALDATADECL); - dodecl("dns_result_t", "digest", DIGESTDECL); + dodecl("isc_result_t", "additionaldata", ADDITIONALDATADECL); + dodecl("isc_result_t", "digest", DIGESTDECL); doswitch("FROMTEXTSWITCH", "fromtext", FROMTEXTARGS, FROMTEXTTYPE, FROMTEXTCLASS, FROMTEXTDEF); diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h index 228e5dc5b2..c231aa4df1 100644 --- a/lib/dns/include/dns/cert.h +++ b/lib/dns/include/dns/cert.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); +isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a certificate type. * The text may contain either a mnemonic type name or a decimal type number. @@ -40,7 +40,7 @@ dns_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); * DNS_R_RANGE numeric type is out of range */ -dns_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); +isc_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); /* * Put a textual representation of certificate type 'cert' into 'target'. * diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index bc727d65c2..f657f1c220 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -59,7 +59,7 @@ struct dns_decompress { dns_name_t owner_name; /* For local compression. */ }; -dns_result_t dns_compress_init(dns_compress_t *cctx, int edns, +isc_result_t dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx); /* * Inialise the compression context structure pointed to by 'cctx'. @@ -75,7 +75,7 @@ dns_result_t dns_compress_init(dns_compress_t *cctx, int edns, * failures from dns_rbt_create() */ -dns_result_t +isc_result_t dns_compress_localinit(dns_compress_t *cctx, dns_name_t *owner, isc_buffer_t *target); diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 19b7a4f391..c303b223b3 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -74,31 +74,31 @@ ISC_LANG_BEGINDECLS typedef struct dns_dbmethods { void (*attach)(dns_db_t *source, dns_db_t **targetp); void (*detach)(dns_db_t **dbp); - dns_result_t (*beginload)(dns_db_t *db, dns_addrdatasetfunc_t *addp, + isc_result_t (*beginload)(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp); - dns_result_t (*endload)(dns_db_t *db, dns_dbload_t **dbloadp); - dns_result_t (*dump)(dns_db_t *db, dns_dbversion_t *version, + isc_result_t (*endload)(dns_db_t *db, dns_dbload_t **dbloadp); + isc_result_t (*dump)(dns_db_t *db, dns_dbversion_t *version, const char *filename); void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp); - dns_result_t (*newversion)(dns_db_t *db, + isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp); void (*attachversion)(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp); void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit); - dns_result_t (*findnode)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findnode)(dns_db_t *db, dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); - dns_result_t (*find)(dns_db_t *db, dns_name_t *name, + isc_result_t (*find)(dns_db_t *db, 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_result_t (*findzonecut)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findzonecut)(dns_db_t *db, dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -109,35 +109,35 @@ typedef struct dns_dbmethods { dns_dbnode_t **targetp); void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp); - dns_result_t (*expirenode)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*expirenode)(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now); void (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out); - dns_result_t (*createiterator)(dns_db_t *db, + isc_result_t (*createiterator)(dns_db_t *db, isc_boolean_t relative_names, dns_dbiterator_t **iteratorp); - dns_result_t (*findrdataset)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*findrdataset)(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); - dns_result_t (*allrdatasets)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*allrdatasets)(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdatasetiter_t **iteratorp); - dns_result_t (*addrdataset)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*addrdataset)(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, isc_boolean_t merge, dns_rdataset_t *addedrdataset); - dns_result_t (*subtractrdataset)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*subtractrdataset)(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, dns_rdataset_t *newrdataset); - dns_result_t (*deleterdataset)(dns_db_t *db, dns_dbnode_t *node, + isc_result_t (*deleterdataset)(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type); isc_boolean_t (*issecure)(dns_db_t *db); @@ -189,7 +189,7 @@ struct dns_db { *** Basic DB Methods ***/ -dns_result_t +isc_result_t dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin, isc_boolean_t cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp); @@ -341,7 +341,7 @@ dns_db_class(dns_db_t *db); * The class of the database. */ -dns_result_t +isc_result_t dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp); /* @@ -372,7 +372,7 @@ dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, * implementation used, syntax errors in the master file, etc. */ -dns_result_t +isc_result_t dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp); /* * Finish loading 'db'. @@ -396,7 +396,7 @@ dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp); * implementation used, syntax errors in the master file, etc. */ -dns_result_t +isc_result_t dns_db_load(dns_db_t *db, const char *filename); /* * Load master file 'filename' into 'db'. @@ -423,7 +423,7 @@ dns_db_load(dns_db_t *db, const char *filename); * implementation used, syntax errors in the master file, etc. */ -dns_result_t +isc_result_t dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename); /* * Dump version 'version' of 'db' to master file 'filename'. @@ -464,7 +464,7 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp); * */ -dns_result_t +isc_result_t dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp); /* * Open a new version for reading and writing. @@ -542,7 +542,7 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, *** Node Methods ***/ -dns_result_t +isc_result_t dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); /* @@ -580,7 +580,7 @@ dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, * implementation used. */ -dns_result_t +isc_result_t dns_db_find(dns_db_t *db, 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, @@ -728,7 +728,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * errors. */ -dns_result_t +isc_result_t dns_db_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -810,7 +810,7 @@ dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep); * *nodep is NULL. */ -dns_result_t +isc_result_t dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now); /* * Mark as stale all records at 'node' which expire at or before 'now'. @@ -843,7 +843,7 @@ dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out); *** DB Iterator Creation ***/ -dns_result_t +isc_result_t dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names, dns_dbiterator_t **iteratorp); /* @@ -879,7 +879,7 @@ dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names, * XXXRTH Should we check for glue and pending data in dns_db_findrdataset()? */ -dns_result_t +isc_result_t dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, dns_rdataset_t *rdataset, @@ -928,7 +928,7 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * implementation used. */ -dns_result_t +isc_result_t dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdatasetiter_t **iteratorp); /* @@ -966,7 +966,7 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * implementation used. */ -dns_result_t +isc_result_t dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, isc_boolean_t merge, dns_rdataset_t *addedrdataset); @@ -1015,7 +1015,7 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * implementation used. */ -dns_result_t +isc_result_t dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, dns_rdataset_t *newrdataset); @@ -1054,7 +1054,7 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, * implementation used. */ -dns_result_t +isc_result_t dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type); /* diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index 43cb6ba392..134604d833 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -75,15 +75,15 @@ ISC_LANG_BEGINDECLS typedef struct dns_dbiteratormethods { void (*destroy)(dns_dbiterator_t **iteratorp); - dns_result_t (*first)(dns_dbiterator_t *iterator); - dns_result_t (*last)(dns_dbiterator_t *iterator); - dns_result_t (*seek)(dns_dbiterator_t *iterator, dns_name_t *name); - dns_result_t (*prev)(dns_dbiterator_t *iterator); - dns_result_t (*next)(dns_dbiterator_t *iterator); - dns_result_t (*current)(dns_dbiterator_t *iterator, + isc_result_t (*first)(dns_dbiterator_t *iterator); + isc_result_t (*last)(dns_dbiterator_t *iterator); + isc_result_t (*seek)(dns_dbiterator_t *iterator, dns_name_t *name); + isc_result_t (*prev)(dns_dbiterator_t *iterator); + isc_result_t (*next)(dns_dbiterator_t *iterator); + isc_result_t (*current)(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, dns_name_t *name); - dns_result_t (*pause)(dns_dbiterator_t *iterator); - dns_result_t (*origin)(dns_dbiterator_t *iterator, + isc_result_t (*pause)(dns_dbiterator_t *iterator); + isc_result_t (*origin)(dns_dbiterator_t *iterator, dns_name_t *name); } dns_dbiteratormethods_t; @@ -124,7 +124,7 @@ dns_dbiterator_destroy(dns_dbiterator_t **iteratorp); * *iteratorp == NULL. */ -dns_result_t +isc_result_t dns_dbiterator_first(dns_dbiterator_t *iterator); /* * Move the node cursor to the first node in the database (if any). @@ -139,7 +139,7 @@ dns_dbiterator_first(dns_dbiterator_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_last(dns_dbiterator_t *iterator); /* * Move the node cursor to the last node in the database (if any). @@ -154,7 +154,7 @@ dns_dbiterator_last(dns_dbiterator_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name); /* * Move the node cursor to the node with name 'name'. @@ -171,7 +171,7 @@ dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_prev(dns_dbiterator_t *iterator); /* * Move the node cursor to the previous node in the database (if any). @@ -187,7 +187,7 @@ dns_dbiterator_prev(dns_dbiterator_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_next(dns_dbiterator_t *iterator); /* * Move the node cursor to the next node in the database (if any). @@ -203,7 +203,7 @@ dns_dbiterator_next(dns_dbiterator_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, dns_name_t *name); /* @@ -237,7 +237,7 @@ dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_pause(dns_dbiterator_t *iterator); /* * Pause iteration. @@ -264,7 +264,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); /* * Return the origin to which returned node names are relative. diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h index 6fea908caa..99f0296527 100644 --- a/lib/dns/include/dns/dbtable.h +++ b/lib/dns/include/dns/dbtable.h @@ -46,7 +46,7 @@ #include #include -dns_result_t +isc_result_t dns_dbtable_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_dbtable_t **dbtablep); /* @@ -97,7 +97,7 @@ dns_dbtable_detach(dns_dbtable_t **dbtablep); * All resources used by the dbtable will be freed */ -dns_result_t +isc_result_t dns_dbtable_add(dns_dbtable_t *dbtable, dns_db_t *db); /* * Add 'db' to 'dbtable'. @@ -137,7 +137,7 @@ dns_dbtable_removedefault(dns_dbtable_t *dbtable); * Remove the default db from 'dbtable'. */ -dns_result_t +isc_result_t dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name, dns_db_t **dbp); /* * Find the deepest match to 'name' in the dbtable, and return it diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index 1736584db1..48923fbff1 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -123,7 +123,7 @@ typedef struct dns_journal dns_journal_t; * Maniuplation of diffs and tuples. */ -dns_result_t +isc_result_t dns_difftuple_create(isc_mem_t *mctx, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp); @@ -152,7 +152,7 @@ dns_difftuple_free(dns_difftuple_t **tp); * All memory used by the tuple is freed. */ -dns_result_t +isc_result_t dns_difftuple_copy(dns_difftuple_t *orig, dns_difftuple_t **copyp); /* * Copy a tuple. @@ -222,13 +222,13 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuple); * */ -dns_result_t +isc_result_t dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare); /* * Sort 'diff' in-place according to the comparison function 'compare'. */ -dns_result_t +isc_result_t dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver); /* * Apply 'diff' to the database 'db'. @@ -244,7 +244,7 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver); * */ -dns_result_t +isc_result_t dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, void *add_private); /* @@ -260,7 +260,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, * (XXX why is it a void pointer, then?) */ -dns_result_t +isc_result_t dns_diff_print(dns_diff_t *diff, FILE *file); /* @@ -301,7 +301,7 @@ void dns_soa_setserial(isc_uint32_t val, dns_rdata_t *rdata); * rdata refers to the rdata of a well-formed SOA record. */ -dns_result_t +isc_result_t dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp); /* * Get the current SOA serial number from a zone database. @@ -311,7 +311,7 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp); * 'ver' is a valid version. */ -dns_result_t +isc_result_t dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, dns_diffop_t op, dns_difftuple_t **tp); /* @@ -332,7 +332,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, * Journal object creation and destruction. */ -dns_result_t +isc_result_t dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write, dns_journal_t **journalp); /* @@ -356,7 +356,7 @@ dns_journal_destroy(dns_journal_t **journalp); * Writing transactions to journals. */ -dns_result_t +isc_result_t dns_journal_begin_transaction(dns_journal_t *j); /* * Prepare to write a new transaction to the open journal file 'j'. @@ -365,7 +365,7 @@ dns_journal_begin_transaction(dns_journal_t *j); * 'j' is open for writing. */ -dns_result_t +isc_result_t dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff); /* * Write 'diff' to the current transaction of journal file 'j'. @@ -378,7 +378,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff); * difference sequence. */ -dns_result_t +isc_result_t dns_journal_commit(dns_journal_t *j); /* * Commit the current transaction of journal file 'j'. @@ -392,7 +392,7 @@ dns_journal_commit(dns_journal_t *j); * sequence. */ -dns_result_t +isc_result_t dns_journal_write_transaction(dns_journal_t *j, dns_diff_t *diff); /* * Write a complete transaction at once to a journal file, @@ -419,7 +419,7 @@ isc_uint32_t dns_journal_last_serial(dns_journal_t *j); * Get the first and last addressable serial number in the journal. */ -dns_result_t +isc_result_t dns_journal_iter_init(dns_journal_t *j, isc_uint32_t begin_serial, isc_uint32_t end_serial); /* @@ -434,8 +434,8 @@ dns_journal_iter_init(dns_journal_t *j, * DNS_R_RANGE begin_serial is outside the addressable range. */ -dns_result_t dns_journal_first_rr(dns_journal_t *j); -dns_result_t dns_journal_next_rr(dns_journal_t *j); +isc_result_t dns_journal_first_rr(dns_journal_t *j); +isc_result_t dns_journal_next_rr(dns_journal_t *j); /* * Position the iterator at the first/next RR in a journal * transaction sequence established using dns_journal_iter_init(). @@ -460,7 +460,7 @@ void dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, * Database roll-forward. */ -dns_result_t +isc_result_t dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename); /* * Roll forward (play back) the journal file "filename" into the @@ -480,10 +480,10 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename); * others */ -dns_result_t dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file); +isc_result_t dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file); /* For debugging not general use */ -dns_result_t +isc_result_t dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, dns_db_t *dbb, dns_dbversion_t *dbverb, diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h index 3cb195adc4..6f89c806e5 100644 --- a/lib/dns/include/dns/keyflags.h +++ b/lib/dns/include/dns/keyflags.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, +isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC KEY flags value. diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 73235fb9e6..5f8a49e126 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.h,v 1.9 1999/12/16 23:11:06 gson Exp $ */ +/* $Id: log.h,v 1.10 1999/12/23 00:08:37 explorer Exp $ */ /* Principal Authors: DCL */ @@ -58,7 +58,7 @@ extern isc_logmodule_t dns_modules[]; #define DNS_LOGMODULE_XFER_OUT (&dns_modules[14]) #define DNS_LOGMODULE_ACL (&dns_modules[15]) -dns_result_t +isc_result_t dns_log_init(isc_log_t *lctx); /* * Make the libdns.a categories and modules available for use with the diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 2d1f31247c..4e7fb34b48 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -38,7 +38,7 @@ ISC_LANG_BEGINDECLS *** Function ***/ -dns_result_t dns_master_loadfile(const char *master_file, +isc_result_t dns_master_loadfile(const char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, @@ -48,7 +48,7 @@ dns_result_t dns_master_loadfile(const char *master_file, dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx); -dns_result_t dns_master_loadstream(FILE *stream, +isc_result_t dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, @@ -58,7 +58,7 @@ dns_result_t dns_master_loadstream(FILE *stream, dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx); -dns_result_t dns_master_loadbuffer(isc_buffer_t *buffer, +isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index f702d7b5d9..b19d5110d8 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -61,7 +61,7 @@ extern const dns_master_style_t dns_master_style_default; *** Functions ***/ -dns_result_t +isc_result_t dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename); diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 4def7035ac..5995ce92bd 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -204,7 +204,7 @@ struct dns_message { isc_region_t *saved; }; -dns_result_t +isc_result_t dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp); @@ -264,7 +264,7 @@ dns_message_destroy(dns_message_t **msgp); * '*msgp' == NULL */ -dns_result_t +isc_result_t dns_message_parse(dns_message_t *msg, isc_buffer_t *source, isc_boolean_t preserve_order); /* @@ -312,7 +312,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, * Many other errors possible XXXMLG */ -dns_result_t +isc_result_t dns_message_renderbegin(dns_message_t *msg, isc_buffer_t *buffer); /* * Begin rendering on a message. Only one call can be made to this function @@ -337,7 +337,7 @@ dns_message_renderbegin(dns_message_t *msg, isc_buffer_t *buffer); * Anything that dns_compress_init() can return. */ -dns_result_t +isc_result_t dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer); /* * Reset the buffer. This can be used after growing the old buffer @@ -360,7 +360,7 @@ dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer); * DNS_R_SUCCESS -- all is well. */ -dns_result_t +isc_result_t dns_message_renderreserve(dns_message_t *msg, unsigned int space); /* * XXXMLG should use size_t rather than unsigned int once the buffer @@ -397,7 +397,7 @@ dns_message_renderrelease(dns_message_t *msg, unsigned int space); * dns_message_renderbegin() was called. */ -dns_result_t +isc_result_t dns_message_rendersection(dns_message_t *msg, dns_section_t section, unsigned int options); /* @@ -435,7 +435,7 @@ dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target); * 'target' is a valid buffer with enough space to hold a message header */ -dns_result_t +isc_result_t dns_message_renderend(dns_message_t *msg); /* * Finish rendering to the buffer. Note that more data can be in the @@ -453,7 +453,7 @@ dns_message_renderend(dns_message_t *msg); */ -dns_result_t +isc_result_t dns_message_firstname(dns_message_t *msg, dns_section_t section); /* * Set internal per-section name pointer to the beginning of the section. @@ -472,7 +472,7 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section); * DNS_R_NOMORE -- No names on given section. */ -dns_result_t +isc_result_t dns_message_nextname(dns_message_t *msg, dns_section_t section); /* * Sets the internal per-section name pointer to point to the next name @@ -515,7 +515,7 @@ dns_message_currentname(dns_message_t *msg, dns_section_t section, * DNS_R_SUCCESS. */ -dns_result_t +isc_result_t dns_message_findname(dns_message_t *msg, dns_section_t section, dns_name_t *target, dns_rdatatype_t type, dns_rdatatype_t covers, dns_name_t **foundname, @@ -548,7 +548,7 @@ dns_message_findname(dns_message_t *msg, dns_section_t section, * type does not. */ -dns_result_t +isc_result_t dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset); /* @@ -609,7 +609,7 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name, * reset, and must NOT be used after these operations. */ -dns_result_t +isc_result_t dns_message_gettempname(dns_message_t *msg, dns_name_t **item); /* * Return a name that can be used for any temporary purpose, including @@ -629,7 +629,7 @@ dns_message_gettempname(dns_message_t *msg, dns_name_t **item); * DNS_R_NOMEMORY -- No item can be allocated. */ -dns_result_t +isc_result_t dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item); /* * Return a rdata that can be used for any temporary purpose, including @@ -646,7 +646,7 @@ dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item); * DNS_R_NOMEMORY -- No item can be allocated. */ -dns_result_t +isc_result_t dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item); /* * Return a rdataset that can be used for any temporary purpose, including @@ -663,7 +663,7 @@ dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item); * DNS_R_NOMEMORY -- No item can be allocated. */ -dns_result_t +isc_result_t dns_message_gettemprdatalist(dns_message_t *msg, dns_rdatalist_t **item); /* * Return a rdatalist that can be used for any temporary purpose, including @@ -740,7 +740,7 @@ dns_message_puttemprdatalist(dns_message_t *msg, dns_rdatalist_t **item); * *item == NULL */ -dns_result_t +isc_result_t dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, unsigned int *flagsp); /* @@ -764,7 +764,7 @@ dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, * DNS_R_UNEXPECTEDEND -- buffer doesn't contain enough for a header. */ -dns_result_t +isc_result_t dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section); /* * Start formatting a reply to the query in 'msg'. @@ -809,7 +809,7 @@ dns_message_getopt(dns_message_t *msg); * The OPT rdataset of 'msg', or NULL if there isn't one. */ -dns_result_t +isc_result_t dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt); /* * Set the OPT record for 'msg'. diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 7bedd6c592..3e30c7d436 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -616,7 +616,7 @@ void dns_name_toregion(dns_name_t *name, isc_region_t *r); * 'r' is a valid region. */ -dns_result_t dns_name_fromwire(dns_name_t *name, +isc_result_t dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, @@ -678,7 +678,7 @@ dns_result_t dns_name_fromwire(dns_name_t *name, * Resource Limit: Not enough space in buffer */ -dns_result_t dns_name_towire(dns_name_t *name, +isc_result_t dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target); /* @@ -714,7 +714,7 @@ dns_result_t dns_name_towire(dns_name_t *name, * Resource Limit: Not enough space in buffer */ -dns_result_t dns_name_fromtext(dns_name_t *name, +isc_result_t dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, dns_name_t *origin, isc_boolean_t downcase, @@ -765,7 +765,7 @@ dns_result_t dns_name_fromtext(dns_name_t *name, * DNS_R_UNEXPECTEDEND */ -dns_result_t dns_name_totext(dns_name_t *name, +isc_result_t dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot, isc_buffer_t *target); /* @@ -824,7 +824,7 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name, * Note: if source == name, then the result will always be DNS_R_SUCCESS. */ -dns_result_t dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, +isc_result_t dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name, isc_buffer_t *target); /* * Concatenate 'prefix' and 'suffix'. @@ -857,7 +857,7 @@ dns_result_t dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, * DNS_R_NOSPACE */ -dns_result_t +isc_result_t dns_name_split(dns_name_t *name, unsigned int suffixlabels, unsigned int nbits, dns_name_t *prefix, dns_name_t *suffix); @@ -923,7 +923,7 @@ dns_name_split(dns_name_t *name, * have enough room to receive the split name. */ -dns_result_t +isc_result_t dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target); /* * Make 'target' a dynamically allocated copy of 'source'. @@ -954,7 +954,7 @@ dns_name_free(dns_name_t *name, isc_mem_t *mctx); * invalidated. */ -dns_result_t +isc_result_t dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg); /* * Send 'name' in DNSSEC canonical form to 'digest'. diff --git a/lib/dns/include/dns/nxt.h b/lib/dns/include/dns/nxt.h index 78989e535b..2e7309164f 100644 --- a/lib/dns/include/dns/nxt.h +++ b/lib/dns/include/dns/nxt.h @@ -26,7 +26,7 @@ ISC_LANG_BEGINDECLS #define DNS_NXT_BUFFERSIZE (256 + 16) -dns_result_t +isc_result_t dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_name_t *target, unsigned char *buffer, dns_rdata_t *rdata); @@ -43,7 +43,7 @@ dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, * to 'buffer'. */ -dns_result_t +isc_result_t dns_buildnxt(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_name_t *target); /* diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index 1bc3e460ea..9b7d16a6de 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -73,7 +73,7 @@ typedef struct dns_rbtnode { unsigned int references:DNS_RBT_REFLENGTH; } dns_rbtnode_t; -typedef dns_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node, +typedef isc_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node, dns_name_t *name, void *callback_arg); @@ -178,7 +178,7 @@ typedef struct dns_rbtnodechain { ***** Public interfaces. *****/ -dns_result_t +isc_result_t dns_rbt_create(isc_mem_t *mctx, void (*deleter)(void *, void *), void *deleter_arg, dns_rbt_t **rbtp); /* @@ -208,7 +208,7 @@ dns_rbt_create(isc_mem_t *mctx, void (*deleter)(void *, void *), * DNS_R_NOMEMORY Resource limit: Out of Memory */ -dns_result_t +isc_result_t dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data); /* * Add 'name' to the tree of trees, associated with 'data'. @@ -249,7 +249,7 @@ dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data); * DNS_R_NOMEMORY Resource Limit: Out of Memory */ -dns_result_t +isc_result_t dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep); /* @@ -285,7 +285,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep); * DNS_R_NOMEMORY Resource Limit: Out of Memory */ -dns_result_t +isc_result_t dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, void **data); /* @@ -319,7 +319,7 @@ dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, * DNS_R_NOSPACE Concatenating nodes to form foundname failed */ -dns_result_t +isc_result_t dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, dns_rbtnode_t **node, dns_rbtnodechain_t *chain, isc_boolean_t empty_data_ok, dns_rbtfindcallback_t callback, @@ -421,7 +421,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, * DNS_R_NOSPACE Concatenating nodes to form foundname failed */ -dns_result_t +isc_result_t dns_rbt_deletename(dns_rbt_t *rbt, dns_name_t *name, isc_boolean_t recurse); /* * Delete 'name' from the tree of trees. @@ -559,7 +559,7 @@ dns_rbtnodechain_invalidate(dns_rbtnodechain_t *chain); * 'chain' is no longer suitable for use, and uses no dynamic storage. */ -dns_result_t +isc_result_t dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin, dns_rbtnode_t **node); /* @@ -599,7 +599,7 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, * Any error return from dns_name_concatenate. */ -dns_result_t +isc_result_t dns_rbtnodechain_first(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, dns_name_t *name, dns_name_t *origin); /* @@ -625,7 +625,7 @@ dns_rbtnodechain_first(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, * Any error result from dns_rbtnodechain_current. */ -dns_result_t +isc_result_t dns_rbtnodechain_last(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, dns_name_t *name, dns_name_t *origin); /* @@ -647,7 +647,7 @@ dns_rbtnodechain_last(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, * Any error result from dns_name_concatenate. */ -dns_result_t +isc_result_t dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin); /* @@ -677,7 +677,7 @@ dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, * Any error result from dns_rbtnodechain_current. */ -dns_result_t +isc_result_t dns_rbtnodechain_next(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin); /* diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h index d6b505feca..e473b35a12 100644 --- a/lib/dns/include/dns/rcode.h +++ b/lib/dns/include/dns/rcode.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source); +isc_result_t dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNS error value. * @@ -38,7 +38,7 @@ dns_result_t dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source); * DNS_R_UNKNOWN type is unknown */ -dns_result_t dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target); +isc_result_t dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target); /* * Put a textual representation of error 'rcode' into 'target'. * diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index b5002553b0..b29545fe2d 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -192,7 +192,7 @@ void dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r); * Make 'r' refer to 'rdata'. */ -dns_result_t dns_rdata_fromwire(dns_rdata_t *rdata, +isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, @@ -237,7 +237,7 @@ dns_result_t dns_rdata_fromwire(dns_rdata_t *rdata, * Resource Limit: Not enough space */ -dns_result_t dns_rdata_towire(dns_rdata_t *rdata, +isc_result_t dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target); /* @@ -266,7 +266,7 @@ dns_result_t dns_rdata_towire(dns_rdata_t *rdata, * Resource Limit: Not enough space */ -dns_result_t dns_rdata_fromtext(dns_rdata_t *rdata, +isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, @@ -312,7 +312,7 @@ dns_result_t dns_rdata_fromtext(dns_rdata_t *rdata, * Resource Limit: Not enough space */ -dns_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, +isc_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target); /* * Convert 'rdata' into text format, storing the result in 'target'. @@ -345,7 +345,7 @@ dns_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, * Resource Limit: Not enough space */ -dns_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, +isc_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags, unsigned int width, char *linebreak, isc_buffer_t *target); /* @@ -371,7 +371,7 @@ dns_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, * output is selected. */ -dns_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, +isc_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, @@ -402,7 +402,7 @@ dns_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, * Resource Limit: Not enough space */ -dns_result_t dns_rdata_tostruct(dns_rdata_t *rdata, void *target, +isc_result_t dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx); /* * Convert an rdata into its C structure representation. @@ -469,7 +469,7 @@ isc_boolean_t dns_rdatatype_iszonecutauth(dns_rdatatype_t type); * */ -dns_result_t +isc_result_t dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg); /* @@ -497,7 +497,7 @@ dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, * Many other results are possible if not successful. */ -dns_result_t +isc_result_t dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg); /* * Send 'rdata' in DNSSEC canonical form to 'digest'. @@ -542,7 +542,7 @@ dns_rdata_covers(dns_rdata_t *rdata); * The type covered. */ -dns_result_t +isc_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target); ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h index a22aaffaab..b204747878 100644 --- a/lib/dns/include/dns/rdataclass.h +++ b/lib/dns/include/dns/rdataclass.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, +isc_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNS class. @@ -40,7 +40,7 @@ dns_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, * DNS_R_NOTIMPLEMENTED class is known, but not implemented */ -dns_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass, +isc_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target); /* * Put a textual representation of class 'rdclass' into 'target'. diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h index 00c17c24dd..ae156e9c7f 100644 --- a/lib/dns/include/dns/rdatalist.h +++ b/lib/dns/include/dns/rdatalist.h @@ -72,7 +72,7 @@ dns_rdatalist_init(dns_rdatalist_t *rdatalist); * values. */ -dns_result_t +isc_result_t dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset); /* diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index 451365bd18..2e03cf3445 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -62,8 +62,8 @@ ISC_LANG_BEGINDECLS typedef struct dns_rdatasetmethods { void (*disassociate)(dns_rdataset_t *rdataset); - dns_result_t (*first)(dns_rdataset_t *rdataset); - dns_result_t (*next)(dns_rdataset_t *rdataset); + isc_result_t (*first)(dns_rdataset_t *rdataset); + isc_result_t (*next)(dns_rdataset_t *rdataset); void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata); void (*clone)(dns_rdataset_t *source, @@ -227,7 +227,7 @@ dns_rdataset_count(dns_rdataset_t *rdataset); * The number of records in 'rdataset'. */ -dns_result_t +isc_result_t dns_rdataset_first(dns_rdataset_t *rdataset); /* * Move the rdata cursor to the first rdata in the rdataset (if any). @@ -240,7 +240,7 @@ dns_rdataset_first(dns_rdataset_t *rdataset); * DNS_R_NOMORE There are no rdata in the set. */ -dns_result_t +isc_result_t dns_rdataset_next(dns_rdataset_t *rdataset); /* * Move the rdata cursor to the next rdata in the rdataset (if any). @@ -269,7 +269,7 @@ dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); * 'rdataset'. */ -dns_result_t +isc_result_t dns_rdataset_totext(dns_rdataset_t *rdataset, dns_name_t *owner_name, isc_boolean_t omit_final_dot, @@ -295,7 +295,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, * XXX Supply more Requires and Ensures XXX */ -dns_result_t +isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, dns_name_t *owner_name, dns_compress_t *cctx, @@ -333,7 +333,7 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, * dns_name_towire(). */ -dns_result_t +isc_result_t dns_rdataset_additionaldata(dns_rdataset_t *rdataset, dns_additionaldatafunc_t add, void *arg); /* diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h index 18a58154d0..383b339e06 100644 --- a/lib/dns/include/dns/rdatasetiter.h +++ b/lib/dns/include/dns/rdatasetiter.h @@ -76,8 +76,8 @@ ISC_LANG_BEGINDECLS typedef struct dns_rdatasetitermethods { void (*destroy)(dns_rdatasetiter_t **iteratorp); - dns_result_t (*first)(dns_rdatasetiter_t *iterator); - dns_result_t (*next)(dns_rdatasetiter_t *iterator); + isc_result_t (*first)(dns_rdatasetiter_t *iterator); + isc_result_t (*next)(dns_rdatasetiter_t *iterator); void (*current)(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); } dns_rdatasetitermethods_t; @@ -122,7 +122,7 @@ dns_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); * *iteratorp == NULL. */ -dns_result_t +isc_result_t dns_rdatasetiter_first(dns_rdatasetiter_t *iterator); /* * Move the rdataset cursor to the first rdataset at the node (if any). @@ -137,7 +137,7 @@ dns_rdatasetiter_first(dns_rdatasetiter_t *iterator); * Other results are possible, depending on the DB implementation. */ -dns_result_t +isc_result_t dns_rdatasetiter_next(dns_rdatasetiter_t *iterator); /* * Move the rdataset cursor to the next rdataset at the node (if any). diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index aa46995a2a..bf1a81d030 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/lib/dns/include/dns/rdataslab.h @@ -58,7 +58,7 @@ ISC_LANG_BEGINDECLS *** Functions ***/ -dns_result_t +isc_result_t dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, isc_region_t *region, unsigned int reservelen); /* @@ -91,7 +91,7 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen); * The number of bytes in the slab, including the reservelen. */ -dns_result_t +isc_result_t dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, @@ -102,7 +102,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, * XXX */ -dns_result_t +isc_result_t dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h index ff149eaa7a..d4fe80d244 100644 --- a/lib/dns/include/dns/rdatatype.h +++ b/lib/dns/include/dns/rdatatype.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep, +isc_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNS rdata type. @@ -40,7 +40,7 @@ dns_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep, * DNS_R_NOTIMPLEMENTED type is known, but not implemented */ -dns_result_t dns_rdatatype_totext(dns_rdatatype_t type, +isc_result_t dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target); /* * Put a textual representation of type 'type' into 'target'. diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 0ceea720a9..4f71dcf277 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -69,7 +69,7 @@ ISC_LANG_BEGINDECLS typedef struct dns_fetchevent { ISC_EVENT_COMMON(struct dns_fetchevent); dns_fetch_t * fetch; - dns_result_t result; + isc_result_t result; dns_rdatatype_t qtype; dns_db_t * db; dns_dbnode_t * node; @@ -91,7 +91,7 @@ typedef struct dns_fetchevent { * _dns_resolver_create()). */ -dns_result_t +isc_result_t dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr, unsigned int ntasks, isc_socketmgr_t *socketmgr, @@ -172,7 +172,7 @@ dns_resolver_attach(dns_resolver_t *source, dns_resolver_t **targetp); void dns_resolver_detach(dns_resolver_t **resp); -dns_result_t +isc_result_t dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, dns_name_t *domain, dns_rdataset_t *nameservers, diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index a01ae3c844..2e0aa36674 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -26,8 +26,6 @@ ISC_LANG_BEGINDECLS -typedef isc_result_t dns_result_t; /* XXXRTH for legacy use only */ - /* * XXXRTH Legacy result codes, to be eliminated before public release. */ diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h index e6997084d7..1af71ea2ff 100644 --- a/lib/dns/include/dns/secalg.h +++ b/lib/dns/include/dns/secalg.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, +isc_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC security algorithm value. @@ -42,7 +42,7 @@ dns_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, * DNS_R_RANGE numeric type is out of range */ -dns_result_t dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target); +isc_result_t dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target); /* * Put a textual representation of the DNSSEC security algorithm 'secalg' * into 'target'. diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h index f2d4b58607..ac0d2cc0b1 100644 --- a/lib/dns/include/dns/secproto.h +++ b/lib/dns/include/dns/secproto.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, +isc_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC security protocol value. @@ -42,7 +42,8 @@ dns_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, * DNS_R_RANGE numeric type is out of range */ -dns_result_t dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target); +isc_result_t +dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target); /* * Put a textual representation of the DNSSEC security protocol 'secproto' * into 'target'. diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h index a68335f997..707a64d408 100644 --- a/lib/dns/include/dns/tcpmsg.h +++ b/lib/dns/include/dns/tcpmsg.h @@ -35,7 +35,7 @@ typedef struct { void *arg; isc_event_t event; /* public (read-only) */ - dns_result_t result; + isc_result_t result; isc_sockaddr_t address; } dns_tcpmsg_t; @@ -70,7 +70,7 @@ dns_tcpmsg_setmaxsize(dns_tcpmsg_t *tcpmsg, unsigned int maxsize); * 512 <= "maxsize" <= 65536 */ -dns_result_t +isc_result_t dns_tcpmsg_readmessage(dns_tcpmsg_t *tcpmsg, isc_task_t *task, isc_taskaction_t action, void *arg); /* diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h index 1126c55715..30b3c9c1d6 100644 --- a/lib/dns/include/dns/time.h +++ b/lib/dns/include/dns/time.h @@ -32,27 +32,27 @@ ISC_LANG_BEGINDECLS *** Functions ***/ -dns_result_t dns_time64_fromtext(char *source, isc_int64_t *target); +isc_result_t dns_time64_fromtext(char *source, isc_int64_t *target); /* * Convert a date and time in YYYYMMDDHHMMSS text format at 'source' * into to a 64-bit count of seconds since Jan 1 1970 0:00 GMT. * Store the count at 'target'. */ -dns_result_t dns_time32_fromtext(char *source, isc_uint32_t *target); +isc_result_t dns_time32_fromtext(char *source, isc_uint32_t *target); /* * Like dns_time64_fromtext, but returns the second count modulo 2^32 * as per RFC2535. */ -dns_result_t dns_time64_totext(isc_int64_t value, isc_buffer_t *target); +isc_result_t dns_time64_totext(isc_int64_t value, isc_buffer_t *target); /* * Convert a 64-bit count of seconds since Jan 1 1970 0:00 GMT into * a YYYYMMDDHHMMSS text representation and append it to 'target'. */ -dns_result_t dns_time32_totext(isc_uint32_t value, isc_buffer_t *target); +isc_result_t dns_time32_totext(isc_uint32_t value, isc_buffer_t *target); /* * Like dns_time64_totext, but for a 32-bit cyclic time value. * Of those dates whose counts of seconds since Jan 1 1970 0:00 GMT diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h index 81646bf3e4..d38b32846b 100644 --- a/lib/dns/include/dns/ttl.h +++ b/lib/dns/include/dns/ttl.h @@ -31,7 +31,7 @@ ISC_LANG_BEGINDECLS *** Functions ***/ -dns_result_t +isc_result_t dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target); /* @@ -49,7 +49,7 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, * DNS_R_NOSPACE */ -dns_result_t +isc_result_t dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); /* * Converts a counter from either a plain number or a BIND 8 style value. @@ -59,7 +59,7 @@ dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); * DNS_R_SYNTAX */ -dns_result_t +isc_result_t dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); /* * Converts a ttl from either a plain number or a BIND 8 style value. diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 6f51dc1de1..4304f88de1 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -60,7 +60,7 @@ ISC_LANG_BEGINDECLS *** Functions ***/ -dns_result_t dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx); +isc_result_t dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx); /* * Creates a new empty zone and attach to it. @@ -110,7 +110,7 @@ void dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type); * 'type' != dns_zone_none */ -dns_result_t dns_zone_setorigin(dns_zone_t *zone, char *origin); +isc_result_t dns_zone_setorigin(dns_zone_t *zone, char *origin); /* * Sets the zones origin to 'origin'. * @@ -130,7 +130,7 @@ dns_name_t * dns_zone_getorigin(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_setdatabase(dns_zone_t *zone, const char *database); +isc_result_t dns_zone_setdatabase(dns_zone_t *zone, const char *database); /* * Sets the name of the database to be loaded. * For databases loaded from MASTER files this corresponds to the @@ -145,7 +145,7 @@ dns_result_t dns_zone_setdatabase(dns_zone_t *zone, const char *database); * DNS_R_SUCCESS */ -dns_result_t dns_zone_load(dns_zone_t *zone); +isc_result_t dns_zone_load(dns_zone_t *zone); /* * Cause the database to be loaded from its backing store. * Confirm that the mimimum requirements for the zone type are @@ -225,7 +225,7 @@ void dns_zone_setflag(dns_zone_t *zone, unsigned int flags, * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_adddbarg(dns_zone_t *zone, char *arg); +isc_result_t dns_zone_adddbarg(dns_zone_t *zone, char *arg); /* * Add 'arg' to the end of the list of database arguements. * No attempt in made to validate the arguements. @@ -247,7 +247,7 @@ void dns_zone_cleardbargs(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp); +isc_result_t dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp); /* * Attach the database to '*dbp' if it exists otherwise * return DNS_R_NOTLOADED. @@ -261,7 +261,7 @@ dns_result_t dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp); * DNS_R_NOTLOADED */ -dns_result_t dns_zone_setdbtype(dns_zone_t *zone, char *db_type); +isc_result_t dns_zone_setdbtype(dns_zone_t *zone, char *db_type); /* * Sets the database type. Current database types are: "rbt", "rbt64". * 'db_type' is not checked to see if it is a valid database type. @@ -298,7 +298,7 @@ void dns_zone_refresh(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_dump(dns_zone_t *zone, FILE *fd); +isc_result_t dns_zone_dump(dns_zone_t *zone, FILE *fd); /* * Write the zone to 'fd' in MASTER file format. * @@ -324,7 +324,7 @@ void dns_zone_clearmasters(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *master); +isc_result_t dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *master); /* * Add a master server to the end of the set of master servers for * the zone. @@ -347,7 +347,7 @@ void dns_zone_clearnotify(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_addnotify(dns_zone_t *zone, isc_sockaddr_t *notify); +isc_result_t dns_zone_addnotify(dns_zone_t *zone, isc_sockaddr_t *notify); /* * Add a server to the end of the list of additional servers to be * notified when a zone changes. @@ -372,7 +372,7 @@ void dns_zone_unload(dns_zone_t *zone); * 'zone' to be a valid initalised zone. */ -dns_result_t dns_zone_manage(dns_zone_t *zone, isc_taskmgr_t *tmgr); +isc_result_t dns_zone_manage(dns_zone_t *zone, isc_taskmgr_t *tmgr); /* * Bring the zone under control of a task manger. * @@ -426,7 +426,7 @@ void dns_zone_setrefresh(dns_zone_t *zone, isc_uint32_t refresh, * 'zone' to be a valid initalised zone. */ -dns_result_t +isc_result_t dns_zone_setxfrsource(dns_zone_t *zone, isc_sockaddr_t *xfrsource); /* * Set the source address to be used in zone transfers. @@ -578,7 +578,7 @@ isc_uint16_t dns_zone_getmasterport(dns_zone_t *zone); void dns_zone_setresolver(dns_zone_t *zone, dns_resolver_t *resolver); -dns_result_t dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, +isc_result_t dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, dns_message_t *msg); void @@ -623,7 +623,7 @@ isc_uint32_t dns_zone_getmaxxfrout(dns_zone_t *zone); * 'zone' to be valid initialised zone. */ -dns_result_t dns_zone_setjournal(dns_zone_t *zone, const char *journal); +isc_result_t dns_zone_setjournal(dns_zone_t *zone, const char *journal); /* * Sets the filename used for journaling updates / IXFR transfers. @@ -695,7 +695,7 @@ void dns_zone_notify(dns_zone_t *zone); * 'zone' to be a valid zone. */ -dns_result_t +isc_result_t dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump); /* diff --git a/lib/dns/include/dns/zoneconf.h b/lib/dns/include/dns/zoneconf.h index d0a36462cb..123f110037 100644 --- a/lib/dns/include/dns/zoneconf.h +++ b/lib/dns/include/dns/zoneconf.h @@ -30,7 +30,7 @@ * table in 'cctx'. */ -dns_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, +isc_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, dns_c_zone_t *czone, dns_zone_t *zone); /* diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index 700f420c29..3120672138 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -29,7 +29,7 @@ ISC_LANG_BEGINDECLS -dns_result_t dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, +isc_result_t dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **zt); /* * Creates a new zone table. @@ -42,7 +42,7 @@ dns_result_t dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, * DNS_R_NOMEMORY */ -dns_result_t dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone); +isc_result_t dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone); /* * Mounts the zone on the zone table. @@ -58,7 +58,7 @@ dns_result_t dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone); * DNS_R_NOMEMORY */ -dns_result_t dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone); +isc_result_t dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone); /* * Unmount the given zone from the table. @@ -73,7 +73,7 @@ dns_result_t dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone); * DNS_R_NOMEMORY */ -dns_result_t dns_zt_find(dns_zt_t *zt, dns_name_t *name, +isc_result_t dns_zt_find(dns_zt_t *zt, dns_name_t *name, dns_name_t *foundname, dns_zone_t **zone); /* @@ -132,9 +132,9 @@ void dns_zt_print(dns_zt_t *zt); * 'zt' to be valid. */ -dns_result_t +isc_result_t dns_zt_apply(dns_zt_t *zt, isc_boolean_t stop, - dns_result_t (*action)(dns_zone_t *, void *), void *uap); + isc_result_t (*action)(dns_zone_t *, void *), void *uap); /* * Apply a given 'action' to all zone zones in the table. diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 926071749f..a285a8f493 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -123,10 +123,10 @@ dns_soa_setserial(isc_uint32_t val, dns_rdata_t *rdata) encode_uint32(val, rdata->data + rdata->length - 20); } -dns_result_t +isc_result_t dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; dns_rdata_t rdata; @@ -159,11 +159,11 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp) return (result); } -dns_result_t +isc_result_t dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, dns_diffop_t op, dns_difftuple_t **tp) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node; dns_rdataset_t rdataset; dns_rdata_t rdata; @@ -205,7 +205,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, * Diffs, aka Pending Journal Entries. */ -dns_result_t +isc_result_t dns_difftuple_create(isc_mem_t *mctx, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp) @@ -264,7 +264,7 @@ dns_difftuple_free(dns_difftuple_t **tp) { *tp = NULL; } -dns_result_t +isc_result_t dns_difftuple_copy(dns_difftuple_t *orig, dns_difftuple_t **copyp) { return (dns_difftuple_create(orig->mctx, orig->op, &orig->name, @@ -347,12 +347,12 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) ENSURE(*tuplep == NULL); } -dns_result_t +isc_result_t dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) { dns_difftuple_t *t; dns_dbnode_t *node = NULL; - dns_result_t result; + isc_result_t result; REQUIRE(DNS_DIFF_VALID(diff)); REQUIRE(DNS_DB_VALID(db)); @@ -471,12 +471,12 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) /* XXX this duplicates lots of code in dns_diff_apply(). */ -dns_result_t +isc_result_t dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, void *add_private) { dns_difftuple_t *t; - dns_result_t result; + isc_result_t result; REQUIRE(DNS_DIFF_VALID(diff)); @@ -537,7 +537,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, * XXX uses qsort(); a merge sort would be more natural for lists, * and perhaps safer wrt thread stack overflow. */ -dns_result_t +isc_result_t dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { unsigned int length = 0; unsigned int i; @@ -576,7 +576,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { * an rdatalist structure for it to refer to. */ -static dns_result_t +static isc_result_t diff_tuple_tordataset(dns_difftuple_t *t, dns_rdatalist_t *rdl, dns_rdataset_t *rds) { @@ -594,9 +594,9 @@ diff_tuple_tordataset(dns_difftuple_t *t, dns_rdatalist_t *rdl, return (dns_rdatalist_tordataset(rdl, rds)); } -dns_result_t +isc_result_t dns_diff_print(dns_diff_t *diff, FILE *file) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *t; char *mem = NULL; unsigned int size = 2048; @@ -862,7 +862,7 @@ struct dns_journal { isc_uint32_t ttl; /* Current TTL */ unsigned int xsize; /* Size of transaction data */ unsigned int xpos; /* Current position in it */ - dns_result_t result; /* Result of last call */ + isc_result_t result; /* Result of last call */ } it; }; @@ -916,7 +916,7 @@ journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) * "fsync()", so isc_file_t is looking more and more probable. */ -static dns_result_t +static isc_result_t journal_seek(dns_journal_t *j, isc_uint32_t offset) { int seek_result; seek_result = fseek(j->fp, (long) offset, SEEK_SET); @@ -930,7 +930,7 @@ journal_seek(dns_journal_t *j, isc_uint32_t offset) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t journal_read(dns_journal_t *j, void *mem, size_t nbytes) { size_t nread; @@ -948,7 +948,7 @@ journal_read(dns_journal_t *j, void *mem, size_t nbytes) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t journal_write(dns_journal_t *j, void *mem, size_t nbytes) { size_t nwritten; @@ -964,7 +964,7 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t journal_fsync(dns_journal_t *j) { int r; r = fflush(j->fp); @@ -988,10 +988,10 @@ journal_fsync(dns_journal_t *j) { /* Read/write a transaction header at the current file position. */ -static dns_result_t +static isc_result_t journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) { journal_rawxhdr_t raw; - dns_result_t result; + isc_result_t result; result = journal_read(j, &raw, sizeof(raw)); if (result != DNS_R_SUCCESS) return (result); @@ -1001,7 +1001,7 @@ journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t journal_write_xhdr(dns_journal_t *j, isc_uint32_t size, isc_uint32_t serial0, isc_uint32_t serial1) { @@ -1015,10 +1015,10 @@ journal_write_xhdr(dns_journal_t *j, isc_uint32_t size, /* Read an RR header at the current file position. */ -static dns_result_t +static isc_result_t journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) { journal_rawrrhdr_t raw; - dns_result_t result; + isc_result_t result; result = journal_read(j, &raw, sizeof(raw)); if (result != DNS_R_SUCCESS) return (result); @@ -1026,7 +1026,7 @@ journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t journal_file_create(isc_mem_t *mctx, const char *filename) { FILE *fp; int r; @@ -1088,11 +1088,11 @@ journal_file_create(isc_mem_t *mctx, const char *filename) { } -dns_result_t +isc_result_t dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write, dns_journal_t **journalp) { FILE *fp; - dns_result_t result; + isc_result_t result; journal_rawheader_t rawheader; dns_journal_t *j; @@ -1263,9 +1263,9 @@ ixfr_order(const void *av, const void *bv) * DNS_R_NOMORE *pos pointed at the last transaction * Other results due to file errors are possible. */ -static dns_result_t +static isc_result_t journal_next(dns_journal_t *j, journal_pos_t *pos) { - dns_result_t result; + isc_result_t result; journal_xhdr_t xhdr; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1398,9 +1398,9 @@ index_invalidate(dns_journal_t *j, isc_uint32_t serial) * covered by the journal, return DNS_R_RANGE. * */ -static dns_result_t +static isc_result_t journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) { - dns_result_t result; + isc_result_t result; journal_pos_t current_pos; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1427,10 +1427,10 @@ journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_journal_begin_transaction(dns_journal_t *j) { isc_uint32_t offset; - dns_result_t result; + isc_result_t result; journal_rawxhdr_t hdr; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1467,13 +1467,13 @@ dns_journal_begin_transaction(dns_journal_t *j) { return (result); } -dns_result_t +isc_result_t dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { dns_difftuple_t *t; isc_buffer_t buffer; void *mem = NULL; unsigned int size; - dns_result_t result; + isc_result_t result; isc_region_t used; REQUIRE(DNS_DIFF_VALID(diff)); @@ -1546,9 +1546,9 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { } -dns_result_t +isc_result_t dns_journal_commit(dns_journal_t *j) { - dns_result_t result; + isc_result_t result; journal_rawheader_t rawheader; unsigned int i; @@ -1651,9 +1651,9 @@ dns_journal_commit(dns_journal_t *j) { return (result); } -dns_result_t +isc_result_t dns_journal_write_transaction(dns_journal_t *j, dns_diff_t *diff) { - dns_result_t result; + isc_result_t result; CHECK(dns_diff_sort(diff, ixfr_order)); CHECK(dns_journal_begin_transaction(j)); CHECK(dns_journal_writediff(j, diff)); @@ -1693,13 +1693,13 @@ dns_journal_destroy(dns_journal_t **journalp) { /* XXX Share code with incoming IXFR? */ -static dns_result_t +static isc_result_t roll_forward(dns_journal_t *j, dns_db_t *db) { isc_buffer_t source; /* Transaction data from disk */ isc_buffer_t target; /* Ditto after _fromwire check */ isc_uint32_t db_serial; /* Database SOA serial */ isc_uint32_t end_serial; /* Last journal SOA serial */ - dns_result_t result; + isc_result_t result; dns_dbversion_t *ver = NULL; journal_pos_t pos; dns_diff_t diff; @@ -1808,10 +1808,10 @@ roll_forward(dns_journal_t *j, dns_db_t *db) { return (result); } -dns_result_t +isc_result_t dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename) { dns_journal_t *j; - dns_result_t result; + isc_result_t result; REQUIRE(DNS_DB_VALID(db)); REQUIRE(filename != NULL); @@ -1832,14 +1832,14 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename) { return (result); } -dns_result_t +isc_result_t dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { dns_journal_t *j; isc_buffer_t source; /* Transaction data from disk */ isc_buffer_t target; /* Ditto after _fromwire check */ isc_uint32_t start_serial; /* Database SOA serial */ isc_uint32_t end_serial; /* Last journal SOA serial */ - dns_result_t result; + isc_result_t result; dns_diff_t diff; unsigned int n_soa = 0; unsigned int n_put = 0; @@ -1961,7 +1961,7 @@ isc_uint32_t dns_journal_last_serial(dns_journal_t *j) { * when we reach the serial number that was current when the IXFR started. */ -static dns_result_t read_one_rr(dns_journal_t *j); +static isc_result_t read_one_rr(dns_journal_t *j); /* * Make sure the buffer 'b' is has at least 'size' bytes @@ -1972,7 +1972,7 @@ static dns_result_t read_one_rr(dns_journal_t *j); * previously allocated by isc_mem_get(). */ -static dns_result_t +static isc_result_t size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) { if (b->length < size) { void *mem = isc_mem_get(mctx, size); @@ -1987,11 +1987,11 @@ size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_journal_iter_init(dns_journal_t *j, isc_uint32_t begin_serial, isc_uint32_t end_serial) { - dns_result_t result; + isc_result_t result; CHECK(journal_find(j, begin_serial, &j->it.bpos)); INSIST(j->it.bpos.serial == begin_serial); @@ -2006,10 +2006,10 @@ dns_journal_iter_init(dns_journal_t *j, } -dns_result_t +isc_result_t dns_journal_first_rr(dns_journal_t *j) { - dns_result_t result; + isc_result_t result; /* * Seek to the beginning of the first transaction we are @@ -2027,9 +2027,9 @@ dns_journal_first_rr(dns_journal_t *j) return (result); } -static dns_result_t +static isc_result_t read_one_rr(dns_journal_t *j) { - dns_result_t result; + isc_result_t result; dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; @@ -2137,7 +2137,7 @@ read_one_rr(dns_journal_t *j) { return (result); } -dns_result_t +isc_result_t dns_journal_next_rr(dns_journal_t *j) { j->it.result = read_one_rr(j); return (j->it.result); @@ -2167,12 +2167,12 @@ dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, isc_uint32_t *ttl, * Requires: 'name' must have buffer large enough to hold the name. * Typically, a dns_fixedname_t would be used. */ -static dns_result_t +static isc_result_t get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, dns_dbiterator_t *dbit, dns_name_t *name, dns_diffop_t op, dns_diff_t *diff) { - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; dns_rdatasetiter_t *rdsiter = NULL; dns_difftuple_t *tuple = NULL; @@ -2248,10 +2248,10 @@ rdata_order(const void *av, const void *bv) return (r); } -static dns_result_t +static isc_result_t dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *p[2]; int i, t; CHECK(dns_diff_sort(&diff[0], rdata_order)); @@ -2300,7 +2300,7 @@ dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) * possibly very large transaction. */ -dns_result_t +isc_result_t dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, dns_db_t *dbb, dns_dbversion_t *dbverb, @@ -2311,7 +2311,7 @@ dns_db_diff(isc_mem_t *mctx, dns_dbiterator_t *dbit[2] = { NULL, NULL }; isc_boolean_t have[2] = { ISC_FALSE, ISC_FALSE }; dns_fixedname_t fixname[2]; - dns_result_t result, itresult[2]; + isc_result_t result, itresult[2]; dns_diff_t diff[2], resultdiff; int i, t; dns_journal_t *journal = NULL; diff --git a/lib/dns/log.c b/lib/dns/log.c index f0ebca7afb..fcb813387b 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: log.c,v 1.9 1999/12/16 23:11:05 gson Exp $ */ +/* $Id: log.c,v 1.10 1999/12/23 00:08:29 explorer Exp $ */ /* Principal Authors: DCL */ @@ -68,7 +68,7 @@ isc_logmodule_t dns_modules[] = { isc_log_t *dns_lctx; -dns_result_t +isc_result_t dns_log_init(isc_log_t *lctx) { isc_result_t result; diff --git a/lib/dns/master.c b/lib/dns/master.c index 28c90fdbd4..2c45f5d31e 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: master.c,v 1.33 1999/12/16 23:29:05 explorer Exp $ */ + /* $Id: master.c,v 1.34 1999/12/23 00:08:29 explorer Exp $ */ #include @@ -80,7 +80,7 @@ typedef ISC_LIST(dns_rdatalist_t) rdatalist_head_t; -static dns_result_t commit(dns_rdatacallbacks_t *, rdatalist_head_t *, +static isc_result_t commit(dns_rdatacallbacks_t *, rdatalist_head_t *, dns_name_t *); static isc_boolean_t is_glue(rdatalist_head_t *, dns_name_t *); static dns_rdatalist_t *grow_rdatalist(int, dns_rdatalist_t *, int, @@ -94,7 +94,7 @@ static isc_boolean_t on_list(dns_rdatalist_t *this, dns_rdata_t *rdata); #define GETTOKEN(lexer, options, token, eol) \ do { \ - dns_result_t isc_r; \ + isc_result_t isc_r; \ isc_r = gettoken(lexer, options, token, eol, callbacks); \ switch (isc_r) { \ case DNS_R_SUCCESS: \ @@ -106,7 +106,7 @@ static isc_boolean_t on_list(dns_rdatalist_t *this, dns_rdata_t *rdata); } \ } while (0) \ -static inline dns_result_t +static inline isc_result_t gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, isc_boolean_t eol, dns_rdatacallbacks_t *callbacks) { @@ -142,7 +142,7 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, isc_boolean_t age_ttl, int *soacount, int *nscount, dns_rdatacallbacks_t *callbacks, @@ -169,7 +169,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, isc_boolean_t warn_1035 = ISC_TRUE; /* XXX Arguement? */ char *include_file = NULL; isc_token_t token; - dns_result_t result = DNS_R_UNEXPECTED; + isc_result_t result = DNS_R_UNEXPECTED; rdatalist_head_t glue_list; rdatalist_head_t current_list; dns_rdatalist_t *this; @@ -791,7 +791,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, return (result); } -dns_result_t +isc_result_t dns_master_loadfile(const char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, isc_boolean_t age_ttl, @@ -818,7 +818,7 @@ dns_master_loadfile(const char *master_file, dns_name_t *top, callbacks, mctx)); } -dns_result_t +isc_result_t dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, isc_boolean_t age_ttl, int *soacount, int *nscount, @@ -843,7 +843,7 @@ dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin, callbacks, mctx)); } -dns_result_t +isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, isc_boolean_t age_ttl, @@ -987,13 +987,13 @@ grow_rdata(int new_len, dns_rdata_t *old, int old_len, * Unlink each element as we go. */ -static dns_result_t +static isc_result_t commit(dns_rdatacallbacks_t *callbacks, rdatalist_head_t *head, dns_name_t *owner) { dns_rdatalist_t *this; dns_rdataset_t dataset; - dns_result_t result; + isc_result_t result; while ((this = ISC_LIST_HEAD(*head)) != NULL) { dns_rdataset_init(&dataset); diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 29fa475619..d05f3571ec 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -44,7 +44,7 @@ #include #define RETERR(x) do { \ - dns_result_t __r = (x); \ + isc_result_t __r = (x); \ if (__r != DNS_R_SUCCESS) \ return (__r); \ } while (0) @@ -167,7 +167,7 @@ char tabs[N_TABS+1] = "\t\t\t\t\t\t\t\t\t\t"; * column 'to', and update '*current' to reflect the new * current column. */ -static dns_result_t +static isc_result_t indent(unsigned int *current, unsigned int to, int tabwidth, isc_buffer_t *target) { @@ -227,10 +227,10 @@ indent(unsigned int *current, unsigned int to, int tabwidth, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) { - dns_result_t result; + isc_result_t result; ctx->style = *style; REQUIRE(style->tab_width != 0); @@ -298,14 +298,14 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) * one label. */ -static dns_result_t +static isc_result_t rdataset_totext(dns_rdataset_t *rdataset, dns_name_t *owner_name, dns_totext_ctx_t *ctx, isc_boolean_t omit_final_dot, isc_buffer_t *target) { - dns_result_t result; + isc_result_t result; unsigned int column; isc_boolean_t first = ISC_TRUE; isc_uint32_t current_ttl; @@ -437,7 +437,7 @@ rdataset_totext(dns_rdataset_t *rdataset, * such as those used to represent the question section * of a DNS message. */ -static dns_result_t +static isc_result_t question_totext(dns_rdataset_t *rdataset, dns_name_t *owner_name, dns_totext_ctx_t *ctx, @@ -445,7 +445,7 @@ question_totext(dns_rdataset_t *rdataset, isc_buffer_t *target) { unsigned int column; - dns_result_t result; + isc_result_t result; isc_region_t r; REQUIRE(DNS_RDATASET_VALID(rdataset)); @@ -499,7 +499,7 @@ question_totext(dns_rdataset_t *rdataset, * single rdataset or question section. This is now used * only by wire_test.c. */ -dns_result_t +isc_result_t dns_rdataset_totext(dns_rdataset_t *rdataset, dns_name_t *owner_name, isc_boolean_t omit_final_dot, @@ -507,7 +507,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, isc_buffer_t *target) { dns_totext_ctx_t ctx; - dns_result_t result; + isc_result_t result; result = totext_ctx_init(&dns_masterfile_style_debug, &ctx); if (result != DNS_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -539,13 +539,13 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, * the buffer will be grown automatically. */ -static dns_result_t +static isc_result_t dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { isc_region_t r; - dns_result_t result; + isc_result_t result; size_t nwritten; REQUIRE(buffer->length > 0); @@ -615,12 +615,12 @@ dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, /* * Dump all the rdatasets of a domain name to a master file. */ -static dns_result_t +static isc_result_t dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { - dns_result_t result; + isc_result_t result; dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -666,7 +666,7 @@ const int initial_buffer_length = 1200; /* * Dump an entire database into a master file. */ -static dns_result_t +static isc_result_t dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, @@ -675,7 +675,7 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_fixedname_t fixname; dns_name_t *name; dns_dbiterator_t *dbiter = NULL; - dns_result_t result; + isc_result_t result; isc_buffer_t buffer; char *bufmem; isc_stdtime_t now; @@ -773,12 +773,12 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, } -dns_result_t +isc_result_t dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename) { FILE *f; - dns_result_t result; + isc_result_t result; f = fopen(filename, "w"); if (f == NULL) { diff --git a/lib/dns/message.c b/lib/dns/message.c index b2a7426536..4c2f23c015 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -161,7 +161,7 @@ msgblock_free(isc_mem_t *mctx, dns_msgblock_t *block, * "current" buffer. (which is always the last on the list, for our * uses) */ -static inline dns_result_t +static inline isc_result_t newbuffer(dns_message_t *msg, unsigned int size) { isc_result_t result; @@ -489,7 +489,7 @@ msgreset(dns_message_t *msg, isc_boolean_t everything) msginit(msg); } -dns_result_t +isc_result_t dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp) { dns_message_t *m; @@ -622,7 +622,7 @@ dns_message_destroy(dns_message_t **msgp) isc_mem_put(msg->mctx, msg, sizeof(dns_message_t)); } -static dns_result_t +static isc_result_t findname(dns_name_t **foundname, dns_name_t *target, unsigned int attributes, dns_namelist_t *section) { @@ -642,7 +642,7 @@ findname(dns_name_t **foundname, dns_name_t *target, unsigned int attributes, return (DNS_R_NOTFOUND); } -dns_result_t +isc_result_t dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset) { @@ -668,12 +668,12 @@ dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, /* * Read a name from buffer "source". */ -static dns_result_t +static isc_result_t getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx) { isc_buffer_t *scratch; - dns_result_t result; + isc_result_t result; unsigned int tries; scratch = currentbuffer(msg); @@ -705,13 +705,13 @@ getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, return (DNS_R_UNEXPECTED); } -static dns_result_t +static isc_result_t getrdata(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, dns_rdataclass_t rdclass, dns_rdatatype_t rdtype, unsigned int rdatalen, dns_rdata_t *rdata) { isc_buffer_t *scratch; - dns_result_t result; + isc_result_t result; unsigned int tries; unsigned int trysize; @@ -773,7 +773,7 @@ getrdata(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, } } -static dns_result_t +static isc_result_t getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx) { isc_region_t r; @@ -782,7 +782,7 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx) dns_name_t *name2; dns_rdataset_t *rdataset; dns_rdatalist_t *rdatalist; - dns_result_t result; + isc_result_t result; dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; dns_namelist_t *section; @@ -926,7 +926,7 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx) return (result); } -static dns_result_t +static isc_result_t getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, dns_section_t sectionid, isc_boolean_t preserve_order) { @@ -936,7 +936,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, dns_name_t *name2; dns_rdataset_t *rdataset; dns_rdatalist_t *rdatalist; - dns_result_t result; + isc_result_t result; dns_rdatatype_t rdtype, covers; dns_rdataclass_t rdclass; dns_rdata_t *rdata; @@ -1246,13 +1246,13 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, return (result); } -dns_result_t +isc_result_t dns_message_parse(dns_message_t *msg, isc_buffer_t *source, isc_boolean_t preserve_order) { isc_region_t r; dns_decompress_t dctx; - dns_result_t ret; + isc_result_t ret; isc_uint16_t tmpflags; isc_buffer_t origsource; @@ -1346,11 +1346,11 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_renderbegin(dns_message_t *msg, isc_buffer_t *buffer) { isc_region_t r; - dns_result_t result; + isc_result_t result; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(buffer != NULL); @@ -1384,7 +1384,7 @@ dns_message_renderbegin(dns_message_t *msg, isc_buffer_t *buffer) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) { isc_region_t r, rn; @@ -1424,7 +1424,7 @@ dns_message_renderrelease(dns_message_t *msg, unsigned int space) msg->reserved -= space; } -dns_result_t +isc_result_t dns_message_renderreserve(dns_message_t *msg, unsigned int space) { isc_region_t r; @@ -1472,7 +1472,7 @@ wrong_priority(dns_rdataset_t *rds, int pass) return (ISC_TRUE); } -dns_result_t +isc_result_t dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, unsigned int options) { @@ -1480,7 +1480,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, dns_name_t *name, *next_name; dns_rdataset_t *rdataset, *next_rdataset; unsigned int count, total; - dns_result_t result; + isc_result_t result; isc_buffer_t st; /* for rollbacks */ int pass; @@ -1619,7 +1619,7 @@ dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) isc_buffer_putuint16(target, tmp); } -dns_result_t +isc_result_t dns_message_renderend(dns_message_t *msg) { isc_buffer_t tmpbuf; @@ -1691,7 +1691,7 @@ dns_message_renderend(dns_message_t *msg) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_firstname(dns_message_t *msg, dns_section_t section) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1705,7 +1705,7 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_nextname(dns_message_t *msg, dns_section_t section) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1732,14 +1732,14 @@ dns_message_currentname(dns_message_t *msg, dns_section_t section, *name = msg->cursors[section]; } -dns_result_t +isc_result_t dns_message_findname(dns_message_t *msg, dns_section_t section, dns_name_t *target, dns_rdatatype_t type, dns_rdatatype_t covers, dns_name_t **name, dns_rdataset_t **rdataset) { dns_name_t *foundname; - dns_result_t result; + isc_result_t result; unsigned int attributes; dns_rdatatype_t atype; @@ -1830,7 +1830,7 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name, ISC_LIST_APPEND(msg->sections[section], name, link); } -dns_result_t +isc_result_t dns_message_gettempname(dns_message_t *msg, dns_name_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1853,7 +1853,7 @@ dns_message_puttempname(dns_message_t *msg, dns_name_t **item) *item = NULL; } -dns_result_t +isc_result_t dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1866,7 +1866,7 @@ dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1881,7 +1881,7 @@ dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item) return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_gettemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1925,7 +1925,7 @@ dns_message_puttemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) *item = NULL; } -dns_result_t +isc_result_t dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, unsigned int *flagsp) { @@ -1954,7 +1954,7 @@ dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section) { unsigned int first_section; @@ -2014,9 +2014,9 @@ dns_message_getopt(dns_message_t *msg) { return (msg->opt); } -dns_result_t +isc_result_t dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) { - dns_result_t result; + isc_result_t result; dns_rdata_t rdata; /* diff --git a/lib/dns/name.c b/lib/dns/name.c index ad53efdeeb..2461179c63 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -979,7 +979,7 @@ dns_name_toregion(dns_name_t *name, isc_region_t *r) { } -dns_result_t +isc_result_t dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -1561,7 +1561,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot, isc_buffer_t *target) { @@ -2014,7 +2014,7 @@ compact(dns_name_t *name, unsigned char *offsets) { } } -dns_result_t +isc_result_t dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -2313,7 +2313,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target) { @@ -2432,7 +2432,7 @@ dns_name_towire(dns_name_t *name, dns_compress_t *cctx, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name, isc_buffer_t *target) { @@ -2583,7 +2583,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_name_split(dns_name_t *name, unsigned int suffixlabels, unsigned int nbits, dns_name_t *prefix, dns_name_t *suffix) @@ -2591,7 +2591,7 @@ dns_name_split(dns_name_t *name, { dns_offsets_t name_odata, split_odata; unsigned char *offsets, *splitoffsets; - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; unsigned int splitlabel, bitbytes, mod, len; unsigned char *p, *src, *dst; @@ -2852,7 +2852,7 @@ dns_name_split(dns_name_t *name, return (result); } -dns_result_t +isc_result_t dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { /* * Make 'target' a dynamically allocated copy of 'source'. @@ -2899,12 +2899,12 @@ dns_name_free(dns_name_t *name, isc_mem_t *mctx) { dns_name_invalidate(name); } -dns_result_t +isc_result_t dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg) { dns_name_t downname; unsigned char data[256]; isc_buffer_t buffer; - dns_result_t result; + isc_result_t result; isc_region_t r; /* diff --git a/lib/dns/nxt.c b/lib/dns/nxt.c index d5763829cc..32637b2c61 100644 --- a/lib/dns/nxt.c +++ b/lib/dns/nxt.c @@ -64,7 +64,7 @@ bit_isset(unsigned char *array, unsigned int index) { return ((array[index / 8] & mask) != 0); } -dns_result_t +isc_result_t dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_name_t *target, unsigned char *buffer, dns_rdata_t *rdata) @@ -130,11 +130,11 @@ dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, } -dns_result_t +isc_result_t dns_buildnxt(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_name_t *target) { - dns_result_t result; + isc_result_t result; dns_rdata_t rdata; unsigned char data[DNS_NXT_BUFFERSIZE]; dns_rdatalist_t rdatalist; diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 2a72a35c40..866cbdc1f3 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: rbt.c,v 1.68 1999/11/03 01:06:57 marka Exp $ */ +/* $Id: rbt.c,v 1.69 1999/12/23 00:08:31 explorer Exp $ */ /* Principal Authors: DCL */ @@ -159,14 +159,14 @@ static void dns_rbt_printnodename(dns_rbtnode_t *node); /* * Forward declarations. */ -static dns_result_t create_node(isc_mem_t *mctx, +static isc_result_t create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep); -static dns_result_t join_nodes(dns_rbt_t *rbt, +static isc_result_t join_nodes(dns_rbt_t *rbt, dns_rbtnode_t *node, dns_rbtnode_t *parent, dns_rbtnode_t **rootp); -static inline dns_result_t get_ancestor_mem(dns_rbtnodechain_t *chain); +static inline isc_result_t get_ancestor_mem(dns_rbtnodechain_t *chain); static inline void put_ancestor_mem(dns_rbtnodechain_t *chain); static inline void rotate_left(dns_rbtnode_t *node, dns_rbtnode_t *parent, @@ -183,7 +183,7 @@ static void dns_rbt_deletefromlevel(dns_rbt_t *rbt, dns_rbtnodechain_t *chain); static void dns_rbt_deletetree(dns_rbt_t *rbt, dns_rbtnode_t *node); -static dns_result_t zapnode_and_fixlevels(dns_rbt_t *rbt, +static isc_result_t zapnode_and_fixlevels(dns_rbt_t *rbt, dns_rbtnode_t *node, isc_boolean_t recurse, dns_rbtnodechain_t *chain); @@ -191,7 +191,7 @@ static dns_result_t zapnode_and_fixlevels(dns_rbt_t *rbt, /* * Initialize a red/black tree of trees. */ -dns_result_t +isc_result_t dns_rbt_create(isc_mem_t *mctx, void (*deleter)(void *, void *), void *deleter_arg, dns_rbt_t **rbtp) { @@ -242,7 +242,7 @@ dns_rbt_destroy(dns_rbt_t **rbtp) { * inlined by the other rbt functions that use them. */ -static inline dns_result_t +static inline isc_result_t get_ancestor_mem(dns_rbtnodechain_t *chain) { dns_rbtnode_t **ancestor_mem; int oldsize, newsize; @@ -285,12 +285,12 @@ put_ancestor_mem(dns_rbtnodechain_t *chain) { * sizeof(dns_rbtnode_t *)); } -static inline dns_result_t +static inline isc_result_t chain_name(dns_rbtnodechain_t *chain, dns_name_t *name, isc_boolean_t include_chain_end) { dns_name_t nodename; - dns_result_t result; + isc_result_t result; unsigned int i; dns_name_init(&nodename, NULL); @@ -319,7 +319,7 @@ chain_name(dns_rbtnodechain_t *chain, dns_name_t *name, return (result); } -static inline dns_result_t +static inline isc_result_t move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) { do { /* @@ -348,7 +348,7 @@ move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) { * Add 'name' to tree, initializing its data pointer with 'data'. */ -dns_result_t +isc_result_t dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) { /* * Does this thing have too many variables or what? @@ -358,7 +358,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) { dns_fixedname_t fixedcopy, fixedprefix, fixedsuffix; dns_offsets_t current_offsets; dns_namereln_t compared; - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; dns_rbtnodechain_t chain; unsigned int common_labels, common_bits, add_bits; int order; @@ -667,9 +667,9 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) { /* * Add a name to the tree of trees, associating it with some data. */ -dns_result_t +isc_result_t dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data) { - dns_result_t result; + isc_result_t result; dns_rbtnode_t *node; REQUIRE(VALID_RBT(rbt)); @@ -697,7 +697,7 @@ dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data) { /* * Find the node for "name" in the tree of trees. */ -dns_result_t +isc_result_t dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, dns_rbtnode_t **node, dns_rbtnodechain_t *chain, isc_boolean_t empty_data_ok, dns_rbtfindcallback_t callback, @@ -708,7 +708,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, dns_name_t *search_name, current_name, *callback_name; dns_fixedname_t fixedcallbackname, fixedsearchname; dns_namereln_t compared; - dns_result_t result, saved_result; + isc_result_t result, saved_result; unsigned int common_labels, common_bits; int order; @@ -954,7 +954,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, chain->end = chain->levels[--chain->level_count]; } else { - dns_result_t result2; + isc_result_t result2; /* * Reached a point within a level tree that @@ -1034,11 +1034,11 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, /* * Get the data pointer associated with 'name'. */ -dns_result_t +isc_result_t dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, void **data) { dns_rbtnode_t *node = NULL; - dns_result_t result; + isc_result_t result; REQUIRE(data != NULL && *data == NULL); @@ -1056,10 +1056,10 @@ dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, /* * Delete a name from the tree of trees. */ -dns_result_t +isc_result_t dns_rbt_deletename(dns_rbt_t *rbt, dns_name_t *name, isc_boolean_t recurse) { dns_rbtnode_t *node = NULL; - dns_result_t result; + isc_result_t result; dns_rbtnodechain_t chain; REQUIRE(VALID_RBT(rbt)); @@ -1107,11 +1107,11 @@ dns_rbt_deletename(dns_rbt_t *rbt, dns_name_t *name, isc_boolean_t recurse) { /* * */ -static dns_result_t +static isc_result_t zapnode_and_fixlevels(dns_rbt_t *rbt, dns_rbtnode_t *node, isc_boolean_t recurse, dns_rbtnodechain_t *chain) { dns_rbtnode_t *down, *parent, **rootp; - dns_result_t result; + isc_result_t result; down = DOWN(node); @@ -1215,7 +1215,7 @@ dns_rbt_namefromnode(dns_rbtnode_t *node, dns_name_t *name) { NODENAME(node, name); } -static dns_result_t +static isc_result_t create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) { dns_rbtnode_t *node; isc_region_t region; @@ -1273,12 +1273,12 @@ create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t join_nodes(dns_rbt_t *rbt, dns_rbtnode_t *node, dns_rbtnode_t *parent, dns_rbtnode_t **rootp) { dns_rbtnode_t *down, *newnode; - dns_result_t result; + isc_result_t result; dns_fixedname_t fixed_newname; dns_name_t *newname, prefix, suffix; unsigned int newlength, oldlength; @@ -1900,10 +1900,10 @@ dns_rbtnodechain_init(dns_rbtnodechain_t *chain, isc_mem_t *mctx) { chain->magic = CHAIN_MAGIC; } -dns_result_t +isc_result_t dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin, dns_rbtnode_t **node) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; REQUIRE(VALID_CHAIN(chain)); @@ -1944,12 +1944,12 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, return (result); } -dns_result_t +isc_result_t dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin) { dns_rbtnode_t *current, *previous, *predecessor; - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; isc_boolean_t new_origin = ISC_FALSE; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -2054,12 +2054,12 @@ dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, return (result); } -dns_result_t +isc_result_t dns_rbtnodechain_next(dns_rbtnodechain_t *chain, dns_name_t *name, dns_name_t *origin) { dns_rbtnode_t *current, *previous, *successor; - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; isc_boolean_t new_origin = ISC_FALSE; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -2176,12 +2176,12 @@ dns_rbtnodechain_next(dns_rbtnodechain_t *chain, dns_name_t *name, return (result); } -dns_result_t +isc_result_t dns_rbtnodechain_first(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, dns_name_t *name, dns_name_t *origin) { - dns_result_t result; + isc_result_t result; REQUIRE(VALID_RBT(rbt)); REQUIRE(VALID_CHAIN(chain)); @@ -2200,12 +2200,12 @@ dns_rbtnodechain_first(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, return (result); } -dns_result_t +isc_result_t dns_rbtnodechain_last(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, dns_name_t *name, dns_name_t *origin) { - dns_result_t result; + isc_result_t result; REQUIRE(VALID_RBT(rbt)); REQUIRE(VALID_CHAIN(chain)); diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 100705984a..54859c0599 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -191,8 +191,8 @@ typedef struct { } rbtdb_load_t; static void rdataset_disassociate(dns_rdataset_t *rdataset); -static dns_result_t rdataset_first(dns_rdataset_t *rdataset); -static dns_result_t rdataset_next(dns_rdataset_t *rdataset); +static isc_result_t rdataset_first(dns_rdataset_t *rdataset); +static isc_result_t rdataset_next(dns_rdataset_t *rdataset); static void rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); static void rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target); static unsigned int rdataset_count(dns_rdataset_t *rdataset); @@ -207,8 +207,8 @@ static dns_rdatasetmethods_t rdataset_methods = { }; static void rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); -static dns_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator); -static dns_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator); +static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator); +static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator); static void rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); @@ -225,17 +225,17 @@ typedef struct rbtdb_rdatasetiter { } rbtdb_rdatasetiter_t; static void dbiterator_destroy(dns_dbiterator_t **iteratorp); -static dns_result_t dbiterator_first(dns_dbiterator_t *iterator); -static dns_result_t dbiterator_last(dns_dbiterator_t *iterator); -static dns_result_t dbiterator_seek(dns_dbiterator_t *iterator, +static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); +static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); +static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name); -static dns_result_t dbiterator_prev(dns_dbiterator_t *iterator); -static dns_result_t dbiterator_next(dns_dbiterator_t *iterator); -static dns_result_t dbiterator_current(dns_dbiterator_t *iterator, +static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); +static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); +static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, dns_name_t *name); -static dns_result_t dbiterator_pause(dns_dbiterator_t *iterator); -static dns_result_t dbiterator_origin(dns_dbiterator_t *iterator, +static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator); +static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); static dns_dbiteratormethods_t dbiterator_methods = { @@ -255,7 +255,7 @@ typedef struct rbtdb_dbiterator { isc_boolean_t paused; isc_boolean_t new_origin; isc_boolean_t tree_locked; - dns_result_t result; + isc_result_t result; dns_fixedname_t name; dns_fixedname_t origin; dns_rbtnode_t *node; @@ -412,7 +412,7 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial, return (version); } -static dns_result_t +static isc_result_t newversion(dns_db_t *db, dns_dbversion_t **versionp) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rbtdb_version_t *version; @@ -921,7 +921,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) { *versionp = NULL; } -static dns_result_t +static isc_result_t findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { @@ -929,7 +929,7 @@ findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, dns_rbtnode_t *node = NULL; dns_name_t nodename; unsigned int locknum; - dns_result_t result; + isc_result_t result; isc_rwlocktype_t locktype = isc_rwlocktype_read; REQUIRE(VALID_RBTDB(rbtdb)); @@ -973,12 +973,12 @@ findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { rbtdb_search_t *search = arg; rdatasetheader_t *header, *header_next; rdatasetheader_t *found; - dns_result_t result; + isc_result_t result; dns_rbtnode_t *onode; /* @@ -1152,11 +1152,11 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, } } -static inline dns_result_t +static inline isc_result_t setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset) { - dns_result_t result; + isc_result_t result; dns_name_t *zcname; rbtdb_rdatatype_t type; dns_rbtnode_t *node; @@ -1264,7 +1264,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) { unsigned int i, j; dns_rbtnode_t *node, *level_node, *wnode; rdatasetheader_t *header; - dns_result_t result = DNS_R_NOTFOUND; + isc_result_t result = DNS_R_NOTFOUND; dns_name_t name; dns_name_t *wname; dns_fixedname_t fwname; @@ -1545,14 +1545,14 @@ find_closest_nxt(rbtdb_search_t *search, dns_dbnode_t **nodep, return (result); } -static dns_result_t +static isc_result_t zone_find(dns_db_t *db, 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_rbtnode_t *node = NULL; - dns_result_t result; + isc_result_t result; rbtdb_search_t search; isc_boolean_t cname_ok = ISC_TRUE; isc_boolean_t close_version = ISC_FALSE; @@ -1977,7 +1977,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t zone_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -1997,11 +1997,11 @@ zone_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, return (DNS_R_NOTIMPLEMENTED); } -static dns_result_t +static isc_result_t cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { rbtdb_search_t *search = arg; rdatasetheader_t *header, *header_prev, *header_next; - dns_result_t result; + isc_result_t result; /* XXX comment */ @@ -2069,7 +2069,7 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { return (result); } -static inline dns_result_t +static inline isc_result_t find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -2078,7 +2078,7 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, dns_rbtnode_t *level_node; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *found, *foundsig; - dns_result_t result = DNS_R_NOTFOUND; + isc_result_t result = DNS_R_NOTFOUND; dns_name_t name; dns_rbtdb_t *rbtdb; isc_boolean_t done; @@ -2204,14 +2204,14 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, return (result); } -static dns_result_t +static isc_result_t cache_find(dns_db_t *db, 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_rbtnode_t *node = NULL; - dns_result_t result; + isc_result_t result; rbtdb_search_t search; isc_boolean_t cname_ok = ISC_TRUE; isc_boolean_t empty_node; @@ -2483,14 +2483,14 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t cache_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { dns_rbtnode_t *node = NULL; - dns_result_t result; + isc_result_t result; rbtdb_search_t search; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *found, *foundsig; @@ -2657,7 +2657,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) { *targetp = NULL; } -static dns_result_t +static isc_result_t expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *rbtnode = node; @@ -2728,7 +2728,7 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock); } -static dns_result_t +static isc_result_t createiterator(dns_db_t *db, isc_boolean_t relative_names, dns_dbiterator_t **iteratorp) { @@ -2758,7 +2758,7 @@ createiterator(dns_db_t *db, isc_boolean_t relative_names, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t zone_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, dns_rdataset_t *rdataset, @@ -2842,7 +2842,7 @@ zone_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, dns_rdataset_t *rdataset, @@ -2922,7 +2922,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { @@ -2975,7 +2975,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, rdatasetheader_t *newheader, isc_boolean_t merge, isc_boolean_t loading, dns_rdataset_t *addedrdataset, isc_stdtime_t now) @@ -2983,7 +2983,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, rbtdb_changed_t *changed = NULL; rdatasetheader_t *topheader, *topheader_prev, *header; unsigned char *merged; - dns_result_t result; + isc_result_t result; isc_boolean_t force = ISC_FALSE; isc_boolean_t header_nx; isc_boolean_t newheader_nx; @@ -3266,7 +3266,7 @@ delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, return (ISC_FALSE); } -static dns_result_t +static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, isc_boolean_t merge, dns_rdataset_t *addedrdataset) @@ -3276,7 +3276,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, rbtdb_version_t *rbtversion = version; isc_region_t region; rdatasetheader_t *newheader; - dns_result_t result; + isc_result_t result; isc_boolean_t delegating; REQUIRE(VALID_RBTDB(rbtdb)); @@ -3334,7 +3334,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, dns_rdataset_t *newrdataset) { @@ -3344,7 +3344,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, rdatasetheader_t *topheader, *topheader_prev, *header, *newheader; unsigned char *subresult; isc_region_t region; - dns_result_t result; + isc_result_t result; rbtdb_changed_t *changed; REQUIRE(VALID_RBTDB(rbtdb)); @@ -3459,14 +3459,14 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; rbtdb_version_t *rbtversion = version; - dns_result_t result; + isc_result_t result; rdatasetheader_t *newheader; REQUIRE(VALID_RBTDB(rbtdb)); @@ -3496,12 +3496,12 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, return (result); } -static dns_result_t +static isc_result_t loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) { rbtdb_load_t *loadctx = arg; dns_rbtdb_t *rbtdb = loadctx->rbtdb; dns_rbtnode_t *node; - dns_result_t result; + isc_result_t result; isc_region_t region; rdatasetheader_t *newheader; dns_name_t foundname; @@ -3573,11 +3573,11 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) { return (result); } -static dns_result_t +static isc_result_t beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp) { rbtdb_load_t *loadctx; dns_rbtdb_t *rbtdb; - dns_result_t result; + isc_result_t result; rbtdb = (dns_rbtdb_t *)db; @@ -3657,7 +3657,7 @@ endload(dns_db_t *db, dns_dbload_t **dbloadp) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) { dns_rbtdb_t *rbtdb; @@ -3749,7 +3749,7 @@ static dns_dbmethods_t cache_methods = { issecure }; -dns_result_t +isc_result_t #ifdef DNS_RBTDB_VERSION64 dns_rbtdb64_create #else @@ -3925,7 +3925,7 @@ rdataset_disassociate(dns_rdataset_t *rdataset) { detachnode(db, &node); } -static dns_result_t +static isc_result_t rdataset_first(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; unsigned int count; @@ -3948,7 +3948,7 @@ rdataset_first(dns_rdataset_t *rdataset) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t rdataset_next(dns_rdataset_t *rdataset) { unsigned int count; unsigned int length; @@ -4027,7 +4027,7 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { *iteratorp = NULL; } -static dns_result_t +static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator) { rbtdb_rdatasetiter_t *rbtiterator = (rbtdb_rdatasetiter_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); @@ -4077,7 +4077,7 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator) { rbtdb_rdatasetiter_t *rbtiterator = (rbtdb_rdatasetiter_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); @@ -4206,9 +4206,9 @@ dbiterator_destroy(dns_dbiterator_t **iteratorp) { *iteratorp = NULL; } -static dns_result_t +static isc_result_t dbiterator_first(dns_dbiterator_t *iterator) { - dns_result_t result; + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; dns_name_t *name, *origin; @@ -4251,9 +4251,9 @@ dbiterator_first(dns_dbiterator_t *iterator) { return (result); } -static dns_result_t +static isc_result_t dbiterator_last(dns_dbiterator_t *iterator) { - dns_result_t result; + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; dns_name_t *name, *origin; @@ -4296,9 +4296,9 @@ dbiterator_last(dns_dbiterator_t *iterator) { return (result); } -static dns_result_t +static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { - dns_result_t result; + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; dns_name_t *iname, *origin; @@ -4337,9 +4337,9 @@ dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { return (result); } -static dns_result_t +static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator) { - dns_result_t result; + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_name_t *name, *origin; @@ -4371,9 +4371,9 @@ dbiterator_prev(dns_dbiterator_t *iterator) { return (result); } -static dns_result_t +static isc_result_t dbiterator_next(dns_dbiterator_t *iterator) { - dns_result_t result; + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_name_t *name, *origin; @@ -4412,14 +4412,14 @@ rootname(dns_name_t *name) { return (ISC_FALSE); } -static dns_result_t +static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, dns_name_t *name) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_rbtnode_t *node = rbtdbiter->node; - dns_result_t result; + isc_result_t result; dns_name_t *nodename = dns_fixedname_name(&rbtdbiter->name); dns_name_t *origin = dns_fixedname_name(&rbtdbiter->origin); @@ -4449,7 +4449,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, return (result); } -static dns_result_t +static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; @@ -4476,7 +4476,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_name_t *origin = dns_fixedname_name(&rbtdbiter->origin); diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h index 9cbaeee2a5..247ece819a 100644 --- a/lib/dns/rbtdb.h +++ b/lib/dns/rbtdb.h @@ -26,7 +26,7 @@ * DNS Red-Black Tree DB Implementation */ -dns_result_t +isc_result_t dns_rbtdb_create(isc_mem_t *mctx, dns_name_t *base, isc_boolean_t is_cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp); diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h index 491cf2eb59..2d41f142dc 100644 --- a/lib/dns/rbtdb64.h +++ b/lib/dns/rbtdb64.h @@ -28,7 +28,7 @@ #include -dns_result_t +isc_result_t dns_rbtdb64_create(isc_mem_t *mctx, dns_name_t *base, isc_boolean_t is_cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp); diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 8ae585a2a5..446a8bc643 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: rdata.c,v 1.65 1999/10/25 21:41:49 bwelling Exp $ */ + /* $Id: rdata.c,v 1.66 1999/12/23 00:08:32 explorer Exp $ */ #include @@ -45,7 +45,7 @@ #include #define RETERR(x) do { \ - dns_result_t __r = (x); \ + isc_result_t __r = (x); \ if (__r != DNS_R_SUCCESS) \ return (__r); \ } while (0) @@ -62,38 +62,38 @@ typedef struct dns_rdata_textctx { char *linebreak; /* Line break string. */ } dns_rdata_textctx_t; -static dns_result_t txt_totext(isc_region_t *source, isc_buffer_t *target); -static dns_result_t txt_fromtext(isc_textregion_t *source, +static isc_result_t txt_totext(isc_region_t *source, isc_buffer_t *target); +static isc_result_t txt_fromtext(isc_textregion_t *source, isc_buffer_t *target); -static dns_result_t txt_fromwire(isc_buffer_t *source, +static isc_result_t txt_fromwire(isc_buffer_t *source, isc_buffer_t *target); static isc_boolean_t name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target); static unsigned int name_length(dns_name_t *name); -static dns_result_t str_totext(char *source, isc_buffer_t *target); +static isc_result_t str_totext(char *source, isc_buffer_t *target); static isc_boolean_t buffer_empty(isc_buffer_t *source); static void buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region, unsigned int type); -static dns_result_t uint32_tobuffer(isc_uint32_t, +static isc_result_t uint32_tobuffer(isc_uint32_t, isc_buffer_t *target); -static dns_result_t uint16_tobuffer(isc_uint32_t, +static isc_result_t uint16_tobuffer(isc_uint32_t, isc_buffer_t *target); -static dns_result_t uint8_tobuffer(isc_uint32_t value, +static isc_result_t uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target); static isc_uint32_t uint32_fromregion(isc_region_t *region); static isc_uint16_t uint16_fromregion(isc_region_t *region); static isc_uint8_t uint8_fromregion(isc_region_t *region); -static dns_result_t gettoken(isc_lex_t *lexer, isc_token_t *token, +static isc_result_t gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect, isc_boolean_t eol); -static dns_result_t mem_tobuffer(isc_buffer_t *target, void *base, +static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length); static int compare_region(isc_region_t *r1, isc_region_t *r2); static int hexvalue(char value); static int decvalue(char value); -static dns_result_t btoa_totext(unsigned char *inbuf, int inbuflen, +static isc_result_t btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target); -static dns_result_t atob_tobuffer(isc_lex_t *lexer, isc_buffer_t *target); +static isc_result_t atob_tobuffer(isc_lex_t *lexer, isc_buffer_t *target); static void default_fromtext_callback( dns_rdatacallbacks_t *callbacks, char *, ...); @@ -103,9 +103,9 @@ static void fromtext_error(void (*callback)(dns_rdatacallbacks_t *, dns_rdatacallbacks_t *callbacks, char *name, int line, isc_token_t *token, - dns_result_t result); + isc_result_t result); -static dns_result_t rdata_totext(dns_rdata_t *rdata, +static isc_result_t rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target); @@ -321,13 +321,13 @@ dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r) { r->length = rdata->length; } -dns_result_t +isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_region_t region; isc_buffer_t ss; isc_buffer_t st; @@ -363,11 +363,11 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, return (result); } -dns_result_t +isc_result_t dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_boolean_t use_default = ISC_FALSE; isc_region_t tr; isc_buffer_t st; @@ -394,13 +394,13 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, return (result); } -dns_result_t +isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target, dns_rdatacallbacks_t *callbacks) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_region_t region; isc_buffer_t st; isc_boolean_t use_default = ISC_FALSE; @@ -488,11 +488,11 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, return (result); } -static dns_result_t +static isc_result_t rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_boolean_t use_default = ISC_FALSE; REQUIRE(rdata != NULL); @@ -512,7 +512,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (result); } -dns_result_t +isc_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) { @@ -525,7 +525,7 @@ dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, return (rdata_totext(rdata, &tctx, target)); } -dns_result_t +isc_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags, unsigned int width, char *linebreak, isc_buffer_t *target) @@ -544,12 +544,12 @@ dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, return (rdata_totext(rdata, &tctx, target)); } -dns_result_t +isc_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_buffer_t st; isc_region_t region; isc_boolean_t use_default = ISC_FALSE; @@ -574,9 +574,9 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, return (result); } -dns_result_t +isc_result_t dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_boolean_t use_default = ISC_FALSE; REQUIRE(rdata != NULL); @@ -597,11 +597,11 @@ dns_rdata_freestruct(void *source) { FREESTRUCTSWITCH } -dns_result_t +isc_result_t dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_boolean_t use_default = ISC_FALSE; /* @@ -620,9 +620,9 @@ dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (result); } -dns_result_t +isc_result_t dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { - dns_result_t result = DNS_R_NOTIMPLEMENTED; + isc_result_t result = DNS_R_NOTIMPLEMENTED; isc_boolean_t use_default = ISC_FALSE; /* @@ -642,7 +642,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { #define NUMBERSIZE sizeof("037777777777") /* 2^32-1 octal + NUL */ -static dns_result_t +static isc_result_t dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, struct tbl *table, unsigned int max) { @@ -683,7 +683,7 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, return (DNS_R_UNKNOWN); } -static dns_result_t +static isc_result_t dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, struct tbl *table) { @@ -699,7 +699,7 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, return (str_totext(buf, target)); } -dns_result_t +isc_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { int i = 0; unsigned int n; @@ -720,14 +720,14 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { /* XXXRTH This should probably be a switch() */ -dns_result_t +isc_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) { return (dns_mnemonic_totext(rdclass, target, classes)); } /* XXXRTH Should we use a hash table here? */ -dns_result_t +isc_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) { int i = 0; unsigned int n; @@ -748,14 +748,14 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) { /* XXXRTH This should probably be a switch() */ -dns_result_t +isc_result_t dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) { return (dns_mnemonic_totext(type, target, types)); } /* XXXRTH Should we use a hash table here? */ -dns_result_t +isc_result_t dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { int i = 0; unsigned int n; @@ -772,12 +772,12 @@ dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { return (DNS_R_UNKNOWN); } -dns_result_t +isc_result_t dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target) { return (dns_mnemonic_totext(rcode, target, rcodes)); } -dns_result_t +isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, certs, 0xffff)); @@ -785,12 +785,12 @@ dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { return (dns_mnemonic_totext(cert, target, certs)); } -dns_result_t +isc_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secalgs, 0xff)); @@ -798,12 +798,12 @@ dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) { return (dns_mnemonic_totext(secalg, target, secalgs)); } -dns_result_t +isc_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secprotos, 0xff)); @@ -811,12 +811,12 @@ dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target) { return (dns_mnemonic_totext(secproto, target, secprotos)); } -dns_result_t +isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) { char *text, *end; @@ -884,7 +884,7 @@ name_length(dns_name_t *name) { return (name->length); } -static dns_result_t +static isc_result_t txt_totext(isc_region_t *source, isc_buffer_t *target) { unsigned int tl; unsigned int n; @@ -934,7 +934,7 @@ txt_totext(isc_region_t *source, isc_buffer_t *target) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { isc_region_t tregion; isc_boolean_t escape; @@ -995,7 +995,7 @@ txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) { unsigned int n; isc_region_t sregion; @@ -1045,7 +1045,7 @@ return_false: return (ISC_FALSE); } -static dns_result_t +static isc_result_t str_totext(char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -1075,7 +1075,7 @@ buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region, isc_buffer_setactive(buffer, region->length); } -static dns_result_t +static isc_result_t uint32_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_region_t region; @@ -1086,7 +1086,7 @@ uint32_tobuffer(isc_uint32_t value, isc_buffer_t *target) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_region_t region; @@ -1099,7 +1099,7 @@ uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_region_t region; @@ -1140,7 +1140,7 @@ uint8_fromregion(isc_region_t *region) { return (region->base[0]); } -static dns_result_t +static isc_result_t gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect, isc_boolean_t eol) { @@ -1182,7 +1182,7 @@ gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect, return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; @@ -1263,15 +1263,15 @@ struct state { #define times85(x) ((((((x<<2)+x)<<2)+x)<<2)+x) -static dns_result_t byte_atob(int c, isc_buffer_t *target, +static isc_result_t byte_atob(int c, isc_buffer_t *target, struct state *state); -static dns_result_t putbyte(int c, isc_buffer_t *, struct state *state); -static dns_result_t byte_btoa(int c, isc_buffer_t *, struct state *state); +static isc_result_t putbyte(int c, isc_buffer_t *, struct state *state); +static isc_result_t byte_btoa(int c, isc_buffer_t *, struct state *state); /* Decode ASCII-encoded byte c into binary representation and * place into *bufp, advancing bufp */ -static dns_result_t +static isc_result_t byte_atob(int c, isc_buffer_t *target, struct state *state) { char *s; if (c == 'z') { @@ -1307,7 +1307,7 @@ byte_atob(int c, isc_buffer_t *target, struct state *state) { } /* Compute checksum info and place c into target */ -static dns_result_t +static isc_result_t putbyte(int c, isc_buffer_t *target, struct state *state) { isc_region_t tr; @@ -1340,7 +1340,7 @@ putbyte(int c, isc_buffer_t *target, struct state *state) { data, so the buffer must be of size divisible by 4). Place the number of output bytes in numbytes, and return a failure/success status */ -static dns_result_t +static isc_result_t atob_tobuffer(isc_lex_t *lexer, isc_buffer_t *target) { isc_int32_t oeor, osum, orot; struct state statebuf, *state= &statebuf; @@ -1389,7 +1389,7 @@ atob_tobuffer(isc_lex_t *lexer, isc_buffer_t *target) { /* Encode binary byte c into ASCII representation and place into *bufp, advancing bufp */ -static dns_result_t +static isc_result_t byte_btoa(int c, isc_buffer_t *target, struct state *state) { isc_region_t tr; @@ -1453,7 +1453,7 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) { * Encode the binary data from inbuf, of length inbuflen, into a * target. Return success/failure status */ -static dns_result_t +static isc_result_t btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target) { int inc; struct state statebuf, *state = &statebuf; @@ -1489,7 +1489,7 @@ default_fromtext_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) { static void fromtext_error(void (*callback)(dns_rdatacallbacks_t *, char *, ...), dns_rdatacallbacks_t *callbacks, char *name, int line, - isc_token_t *token, dns_result_t result) + isc_token_t *token, isc_result_t result) { if (name == NULL) name = "UNKNOWN"; diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index e109989b54..991d4f05a0 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: tsig_250.c,v 1.20 1999/10/08 22:48:13 tale Exp $ */ + /* $Id: tsig_250.c,v 1.21 1999/12/23 00:08:51 explorer Exp $ */ /* draft-ietf-dnsind-tsig-07.txt */ @@ -23,7 +23,7 @@ #define RDATA_ANY_255_TSIG_250_C #include -static inline dns_result_t +static inline isc_result_t fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -92,7 +92,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (isc_base64_tobuffer(lexer, target, token.value.as_ulong)); } -static inline dns_result_t +static inline isc_result_t totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -184,7 +184,7 @@ totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (isc_base64_totext(&sr, 60, " ", target)); } -static inline dns_result_t +static inline isc_result_t fromwire_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -240,7 +240,7 @@ fromwire_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, n + 2)); } -static inline dns_result_t +static inline isc_result_t towire_any_tsig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; dns_name_t name; @@ -288,7 +288,7 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -360,7 +360,7 @@ fromstruct_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t tostruct_any_tsig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_any_tsig_t *tsig; dns_name_t alg; @@ -470,7 +470,7 @@ freestruct_any_tsig(void *source) { isc_mem_put(tsig->mctx, tsig->other, tsig->otherlen); } -static inline dns_result_t +static inline isc_result_t additionaldata_any_tsig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -483,7 +483,7 @@ additionaldata_any_tsig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_any_tsig(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { REQUIRE(rdata->type == 250); diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 38addb862e..8154979ceb 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: afsdb_18.c,v 1.13 1999/09/15 23:03:27 explorer Exp $ */ + /* $Id: afsdb_18.c,v 1.14 1999/12/23 00:08:51 explorer Exp $ */ /* RFC 1183 */ #ifndef RDATA_GENERIC_AFSDB_18_C #define RDATA_GENERIC_AFSDB_18_C -static inline dns_result_t +static inline isc_result_t fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -48,7 +48,7 @@ fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_afsdb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -75,7 +75,7 @@ totext_afsdb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -107,7 +107,7 @@ fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t tr; isc_region_t sr; @@ -165,7 +165,7 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -180,7 +180,7 @@ fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 18); @@ -201,7 +201,7 @@ freestruct_afsdb(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -218,7 +218,7 @@ additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_afsdb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index d1593f1a8e..351383beef 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: cert_37.c,v 1.16 1999/10/08 21:22:27 tale Exp $ */ + /* $Id: cert_37.c,v 1.17 1999/12/23 00:08:52 explorer Exp $ */ /* draft-ietf-dnssec-certs-04.txt */ #ifndef RDATA_GENERIC_CERT_37_C #define RDATA_GENERIC_CERT_37_C -static inline dns_result_t +static inline isc_result_t fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -59,7 +59,7 @@ fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (isc_base64_tobuffer(lexer, target, -1)); } -static inline dns_result_t +static inline isc_result_t totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -100,7 +100,7 @@ totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -121,7 +121,7 @@ fromwire_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, sr.length)); } -static inline dns_result_t +static inline isc_result_t towire_cert(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; @@ -147,7 +147,7 @@ compare_cert(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -162,7 +162,7 @@ fromstruct_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_cert(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 37); @@ -180,7 +180,7 @@ freestruct_cert(void *target) { REQUIRE(ISC_FALSE); /* XXX */ } -static inline dns_result_t +static inline isc_result_t additionaldata_cert(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -192,7 +192,7 @@ additionaldata_cert(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_cert(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index c744ddde08..d25df4ccd4 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: cname_5.c,v 1.18 1999/09/15 23:03:28 explorer Exp $ */ + /* $Id: cname_5.c,v 1.19 1999/12/23 00:08:52 explorer Exp $ */ #ifndef RDATA_GENERIC_CNAME_5_C #define RDATA_GENERIC_CNAME_5_C -static inline dns_result_t +static inline isc_result_t fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_cname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_cname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, return(dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_cname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_cname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 5); @@ -159,7 +159,7 @@ freestruct_cname(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -171,7 +171,7 @@ additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_cname(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index 9508bca942..6a112ed77d 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: dname_39.c,v 1.11 1999/09/15 23:03:28 explorer Exp $ */ + /* $Id: dname_39.c,v 1.12 1999/12/23 00:08:52 explorer Exp $ */ /* draft-ietf-dnsind-dname-02.txt */ #ifndef RDATA_GENERIC_DNAME_39_C #define RDATA_GENERIC_DNAME_39_C -static inline dns_result_t +static inline isc_result_t fromtext_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -43,7 +43,7 @@ fromtext_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_dname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -65,7 +65,7 @@ totext_dname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, return(dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_dname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_dname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 39); @@ -159,7 +159,7 @@ freestruct_dname(void *source) { REQUIRE(ISC_FALSE); /* XXX */ } -static inline dns_result_t +static inline isc_result_t additionaldata_dname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -171,7 +171,7 @@ additionaldata_dname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_dname(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index 1518d99280..93a48bdb83 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: gpos_27.c,v 1.9 1999/09/15 23:03:28 explorer Exp $ */ + /* $Id: gpos_27.c,v 1.10 1999/12/23 00:08:52 explorer Exp $ */ /* RFC 1712 */ #ifndef RDATA_GENERIC_GPOS_27_C #define RDATA_GENERIC_GPOS_27_C -static inline dns_result_t +static inline isc_result_t fromtext_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -44,7 +44,7 @@ fromtext_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_gpos(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -66,7 +66,7 @@ totext_gpos(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_gpos(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 27); @@ -108,7 +108,7 @@ compare_gpos(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -123,7 +123,7 @@ fromstruct_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_gpos(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 27); @@ -140,7 +140,7 @@ freestruct_gpos(void *source) { REQUIRE(ISC_FALSE); /* XXX */ } -static inline dns_result_t +static inline isc_result_t additionaldata_gpos(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -152,7 +152,7 @@ additionaldata_gpos(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_gpos(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index 6ee1f911c1..c375bd46bc 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: hinfo_13.c,v 1.17 1999/09/15 23:03:29 explorer Exp $ */ + /* $Id: hinfo_13.c,v 1.18 1999/12/23 00:08:52 explorer Exp $ */ #ifndef RDATA_GENERIC_HINFO_13_C #define RDATA_GENERIC_HINFO_13_C -static inline dns_result_t +static inline isc_result_t fromtext_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_hinfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -58,7 +58,7 @@ totext_hinfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (txt_totext(®ion, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -74,7 +74,7 @@ fromwire_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (txt_fromwire(source, target)); } -static inline dns_result_t +static inline isc_result_t towire_hinfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 13); @@ -98,7 +98,7 @@ compare_hinfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -113,7 +113,7 @@ fromstruct_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_hinfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 13); @@ -130,7 +130,7 @@ freestruct_hinfo(void *source) { REQUIRE(ISC_FALSE); /* XXX */ } -static inline dns_result_t +static inline isc_result_t additionaldata_hinfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -142,7 +142,7 @@ additionaldata_hinfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_hinfo(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 8e7ce475c0..3db5671cae 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: isdn_20.c,v 1.10 1999/09/15 23:03:29 explorer Exp $ */ + /* $Id: isdn_20.c,v 1.11 1999/12/23 00:08:53 explorer Exp $ */ /* RFC 1183 */ #ifndef RDATA_GENERIC_ISDN_20_C #define RDATA_GENERIC_ISDN_20_C -static inline dns_result_t +static inline isc_result_t fromtext_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -49,7 +49,7 @@ fromtext_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (txt_fromtext(&token.value.as_textregion, target)); } -static inline dns_result_t +static inline isc_result_t totext_isdn(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -67,7 +67,7 @@ totext_isdn(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (txt_totext(®ion, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -85,7 +85,7 @@ fromwire_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (txt_fromwire(source, target)); } -static inline dns_result_t +static inline isc_result_t towire_isdn(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 20); @@ -109,7 +109,7 @@ compare_isdn(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -124,7 +124,7 @@ fromstruct_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_isdn(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 20); @@ -141,7 +141,7 @@ freestruct_isdn(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_isdn(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -153,7 +153,7 @@ additionaldata_isdn(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_isdn(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index f07f322a43..d4b5723fb0 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: key_25.c,v 1.14 1999/10/07 21:48:51 bwelling Exp $ */ + /* $Id: key_25.c,v 1.15 1999/12/23 00:08:53 explorer Exp $ */ /* RFC 2065 */ #ifndef RDATA_GENERIC_KEY_25_C #define RDATA_GENERIC_KEY_25_C -static inline dns_result_t +static inline isc_result_t fromtext_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -60,7 +60,7 @@ fromtext_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (isc_base64_tobuffer(lexer, target, -1)); } -static inline dns_result_t +static inline isc_result_t totext_key(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -108,7 +108,7 @@ totext_key(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return DNS_R_SUCCESS; } -static inline dns_result_t +static inline isc_result_t fromwire_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -129,7 +129,7 @@ fromwire_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, sr.length)); } -static inline dns_result_t +static inline isc_result_t towire_key(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; @@ -155,7 +155,7 @@ compare_key(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -193,7 +193,7 @@ fromstruct_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t tostruct_key(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_generic_key_t *key; isc_region_t sr; @@ -254,7 +254,7 @@ freestruct_key(void *source) { isc_mem_put(key->mctx, key->data, key->datalen); } -static inline dns_result_t +static inline isc_result_t additionaldata_key(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -266,7 +266,7 @@ additionaldata_key(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_key(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 7489f91db5..eccdd41937 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: loc_29.c,v 1.9 1999/09/15 23:03:30 explorer Exp $ */ + /* $Id: loc_29.c,v 1.10 1999/12/23 00:08:53 explorer Exp $ */ /* RFC 1876 */ #ifndef RDATA_GENERIC_LOC_29_C #define RDATA_GENERIC_LOC_29_C -static inline dns_result_t +static inline isc_result_t fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -375,7 +375,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (uint32_tobuffer(altitude, target)); } -static inline dns_result_t +static inline isc_result_t totext_loc(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -474,7 +474,7 @@ totext_loc(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (str_totext(buf, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -538,7 +538,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, 16)); } -static inline dns_result_t +static inline isc_result_t towire_loc(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 29); @@ -562,7 +562,7 @@ compare_loc(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -577,7 +577,7 @@ fromstruct_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_loc(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 29); @@ -594,7 +594,7 @@ freestruct_loc(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_loc(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -606,7 +606,7 @@ additionaldata_loc(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_loc(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index 3411b4beab..b8c2cae8bd 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: mb_7.c,v 1.18 1999/08/31 22:05:53 halley Exp $ */ + /* $Id: mb_7.c,v 1.19 1999/12/23 00:08:53 explorer Exp $ */ #ifndef RDATA_GENERIC_MB_7_C #define RDATA_GENERIC_MB_7_C -static inline dns_result_t +static inline isc_result_t fromtext_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_mb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_mb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_mb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_mb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 7); @@ -158,7 +158,7 @@ freestruct_mb(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_mb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -174,7 +174,7 @@ additionaldata_mb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_mb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index d309be38f1..445adb8a0b 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: md_3.c,v 1.19 1999/09/15 23:03:30 explorer Exp $ */ + /* $Id: md_3.c,v 1.20 1999/12/23 00:08:54 explorer Exp $ */ #ifndef RDATA_GENERIC_MD_3_C #define RDATA_GENERIC_MD_3_C -static inline dns_result_t +static inline isc_result_t fromtext_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_md(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_md(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_md(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_md(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 3); @@ -158,7 +158,7 @@ freestruct_md(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_md(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -174,7 +174,7 @@ additionaldata_md(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_md(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index 2d7e83d495..b0c9dd8853 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: mf_4.c,v 1.17 1999/08/31 22:05:53 halley Exp $ */ + /* $Id: mf_4.c,v 1.18 1999/12/23 00:08:54 explorer Exp $ */ #ifndef RDATA_GENERIC_MF_4_C #define RDATA_GENERIC_MF_4_C -static inline dns_result_t +static inline isc_result_t fromtext_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_mf(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_mf(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_mf(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_mf(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 4); @@ -158,7 +158,7 @@ freestruct_mf(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_mf(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -174,7 +174,7 @@ additionaldata_mf(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_mf(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index 0a307963ab..715b7de71a 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: mg_8.c,v 1.16 1999/08/31 22:05:54 halley Exp $ */ + /* $Id: mg_8.c,v 1.17 1999/12/23 00:08:54 explorer Exp $ */ #ifndef RDATA_GENERIC_MG_8_C #define RDATA_GENERIC_MG_8_C -static inline dns_result_t +static inline isc_result_t fromtext_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_mg(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_mg(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_mg(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_mg(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 8); @@ -158,7 +158,7 @@ freestruct_mg(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_mg(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -170,7 +170,7 @@ additionaldata_mg(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_mg(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index bedebe5278..216a7f85dd 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: minfo_14.c,v 1.17 1999/08/31 22:05:54 halley Exp $ */ + /* $Id: minfo_14.c,v 1.18 1999/12/23 00:08:54 explorer Exp $ */ #ifndef RDATA_GENERIC_MINFO_14_C #define RDATA_GENERIC_MINFO_14_C -static inline dns_result_t +static inline isc_result_t fromtext_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -47,7 +47,7 @@ fromtext_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_minfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -81,7 +81,7 @@ totext_minfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -105,7 +105,7 @@ fromwire_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&email, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_minfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; dns_name_t rmail; @@ -172,7 +172,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -187,7 +187,7 @@ fromstruct_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_minfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 14); @@ -204,7 +204,7 @@ freestruct_minfo(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_minfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -216,11 +216,11 @@ additionaldata_minfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_minfo(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 14); diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index 6ce904fa64..05ed2f5340 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: mr_9.c,v 1.16 1999/08/31 22:05:54 halley Exp $ */ + /* $Id: mr_9.c,v 1.17 1999/12/23 00:08:55 explorer Exp $ */ #ifndef RDATA_GENERIC_MR_9_C #define RDATA_GENERIC_MR_9_C -static inline dns_result_t +static inline isc_result_t fromtext_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_mr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_mr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_mr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_mr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 9); @@ -158,7 +158,7 @@ freestruct_mr(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_mr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -170,7 +170,7 @@ additionaldata_mr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_mr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index 982dae0725..57e58f9162 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: mx_15.c,v 1.20 1999/08/31 22:05:54 halley Exp $ */ + /* $Id: mx_15.c,v 1.21 1999/12/23 00:08:55 explorer Exp $ */ #ifndef RDATA_GENERIC_MX_15_C #define RDATA_GENERIC_MX_15_C -static inline dns_result_t +static inline isc_result_t fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -46,7 +46,7 @@ fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_mx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -73,7 +73,7 @@ totext_mx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -105,7 +105,7 @@ fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -163,7 +163,7 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -178,7 +178,7 @@ fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_mx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 15); @@ -195,7 +195,7 @@ freestruct_mx(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -212,7 +212,7 @@ additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_mx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index 38352c9b46..6ac35bfa41 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: ns_2.c,v 1.18 1999/09/02 06:40:14 marka Exp $ */ + /* $Id: ns_2.c,v 1.19 1999/12/23 00:08:55 explorer Exp $ */ #ifndef RDATA_GENERIC_NS_2_C #define RDATA_GENERIC_NS_2_C -static inline dns_result_t +static inline isc_result_t fromtext_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_ns(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_ns(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_ns(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_ns(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_ns_t *ns = target; @@ -175,7 +175,7 @@ freestruct_ns(void *source) { ns->mctx = NULL; } -static inline dns_result_t +static inline isc_result_t additionaldata_ns(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -191,7 +191,7 @@ additionaldata_ns(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_ns(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index ddaccdd64a..ddf4b676bd 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: null_10.c,v 1.14 1999/09/15 23:03:30 explorer Exp $ */ + /* $Id: null_10.c,v 1.15 1999/12/23 00:08:56 explorer Exp $ */ #ifndef RDATA_GENERIC_NULL_10_C #define RDATA_GENERIC_NULL_10_C -static inline dns_result_t +static inline isc_result_t fromtext_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -38,7 +38,7 @@ fromtext_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_null(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -53,7 +53,7 @@ totext_null(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -70,7 +70,7 @@ fromwire_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_null(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 10); @@ -91,7 +91,7 @@ compare_null(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (0); } -static inline dns_result_t +static inline isc_result_t fromstruct_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -106,7 +106,7 @@ fromstruct_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_null(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_null_t *null = target; @@ -128,7 +128,7 @@ freestruct_null(void *source) { /* No action required. */ } -static inline dns_result_t +static inline isc_result_t additionaldata_null(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -140,7 +140,7 @@ additionaldata_null(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_null(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { REQUIRE(rdata->type == 10); diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index 0a8443dd08..f26ad88038 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: nxt_30.c,v 1.18 1999/11/03 01:06:59 marka Exp $ */ + /* $Id: nxt_30.c,v 1.19 1999/12/23 00:08:56 explorer Exp $ */ /* RFC 2065 */ #ifndef RDATA_GENERIC_NXT_30_C #define RDATA_GENERIC_NXT_30_C -static inline dns_result_t +static inline isc_result_t fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -78,7 +78,7 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, bm, n)); } -static inline dns_result_t +static inline isc_result_t totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -87,7 +87,7 @@ totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned int i, j; dns_name_t name; dns_name_t prefix; - dns_result_t result; + isc_result_t result; isc_boolean_t sub; REQUIRE(rdata->type == 30); @@ -124,7 +124,7 @@ totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (str_totext(")", target)); } -static inline dns_result_t +static inline isc_result_t fromwire_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -153,7 +153,7 @@ fromwire_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_nxt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; dns_name_t name; @@ -199,7 +199,7 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -214,7 +214,7 @@ fromstruct_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_nxt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 30); @@ -234,7 +234,7 @@ freestruct_nxt(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_nxt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -246,11 +246,11 @@ additionaldata_nxt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_nxt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 30); diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index a12387c536..c2e0c28731 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: opt_41.c,v 1.2 1999/09/15 23:57:43 explorer Exp $ */ + /* $Id: opt_41.c,v 1.3 1999/12/23 00:08:56 explorer Exp $ */ #ifndef RDATA_GENERIC_OPT_41_C #define RDATA_GENERIC_OPT_41_C -static inline dns_result_t +static inline isc_result_t fromtext_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -40,7 +40,7 @@ fromtext_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t totext_opt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -56,7 +56,7 @@ totext_opt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t fromwire_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -98,7 +98,7 @@ fromwire_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_opt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 41); @@ -122,7 +122,7 @@ compare_opt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -135,7 +135,7 @@ fromstruct_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_opt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 41); @@ -151,7 +151,7 @@ freestruct_opt(void *source) { (void)source; } -static inline dns_result_t +static inline isc_result_t additionaldata_opt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -163,7 +163,7 @@ additionaldata_opt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_opt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { /* diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c index f141e6f05d..937974acc3 100644 --- a/lib/dns/rdata/generic/proforma.c +++ b/lib/dns/rdata/generic/proforma.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: proforma.c,v 1.15 1999/09/15 23:03:31 explorer Exp $ */ + /* $Id: proforma.c,v 1.16 1999/12/23 00:08:56 explorer Exp $ */ #ifndef RDATA_GENERIC_#_#_C #define RDATA_GENERIC_#_#_C -static inline dns_result_t +static inline isc_result_t fromtext_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) { @@ -34,7 +34,7 @@ fromtext_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t totext_#(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -45,7 +45,7 @@ totext_#(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t fromwire_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) { @@ -61,7 +61,7 @@ fromwire_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t towire_#(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == #); @@ -90,7 +90,7 @@ compare_#(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -100,7 +100,7 @@ fromstruct_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_#(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == #); @@ -119,7 +119,7 @@ freestruct_#(void *source) { } -static inline dns_result_t +static inline isc_result_t additionaldata_#(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -132,7 +132,7 @@ additionaldata_#(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_#(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 85d08b553a..5e92738d72 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: ptr_12.c,v 1.17 1999/08/31 22:05:54 halley Exp $ */ + /* $Id: ptr_12.c,v 1.18 1999/12/23 00:08:56 explorer Exp $ */ #ifndef RDATA_GENERIC_PTR_12_C #define RDATA_GENERIC_PTR_12_C -static inline dns_result_t +static inline isc_result_t fromtext_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -42,7 +42,7 @@ fromtext_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -64,7 +64,7 @@ totext_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -84,7 +84,7 @@ fromwire_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -126,7 +126,7 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -141,7 +141,7 @@ fromstruct_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 12); @@ -158,7 +158,7 @@ freestruct_ptr(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -170,7 +170,7 @@ additionaldata_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_ptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index 52a5962d88..4cad3571ab 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: rp_17.c,v 1.12 1999/09/15 23:03:31 explorer Exp $ */ + /* $Id: rp_17.c,v 1.13 1999/12/23 00:08:57 explorer Exp $ */ /* RFC 1183 */ #ifndef RDATA_GENERIC_RP_17_C #define RDATA_GENERIC_RP_17_C -static inline dns_result_t +static inline isc_result_t fromtext_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -49,7 +49,7 @@ fromtext_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_rp(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -83,7 +83,7 @@ totext_rp(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -107,7 +107,7 @@ fromwire_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&email, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_rp(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; dns_name_t rmail; @@ -174,7 +174,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -189,7 +189,7 @@ fromstruct_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_rp(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 17); @@ -206,7 +206,7 @@ freestruct_rp(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_rp(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -218,11 +218,11 @@ additionaldata_rp(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_rp(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 17); diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index e7663288ee..da3996295b 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: rt_21.c,v 1.13 1999/09/15 23:03:32 explorer Exp $ */ + /* $Id: rt_21.c,v 1.14 1999/12/23 00:08:57 explorer Exp $ */ /* RFC 1183 */ #ifndef RDATA_GENERIC_RT_21_C #define RDATA_GENERIC_RT_21_C -static inline dns_result_t +static inline isc_result_t fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -48,7 +48,7 @@ fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_rt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -75,7 +75,7 @@ totext_rt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -106,7 +106,7 @@ fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -164,7 +164,7 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -179,7 +179,7 @@ fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 21); @@ -196,7 +196,7 @@ freestruct_rt(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -220,7 +220,7 @@ additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_rt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index abd8c6dc7f..58835211fb 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: sig_24.c,v 1.25 1999/10/08 23:54:40 tale Exp $ */ + /* $Id: sig_24.c,v 1.26 1999/12/23 00:08:57 explorer Exp $ */ /* RFC 2065 */ #ifndef RDATA_GENERIC_SIG_24_C #define RDATA_GENERIC_SIG_24_C -static inline dns_result_t +static inline isc_result_t fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -33,7 +33,7 @@ fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_rdatatype_t covered; isc_textregion_t *tsr; char *e; - dns_result_t result; + isc_result_t result; dns_name_t name; isc_buffer_t buffer; isc_uint32_t time_signed, time_expire; @@ -100,7 +100,7 @@ fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (isc_base64_tobuffer(lexer, target, -1)); } -static inline dns_result_t +static inline isc_result_t totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -186,7 +186,7 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return DNS_R_SUCCESS; } -static inline dns_result_t +static inline isc_result_t fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -229,7 +229,7 @@ fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, return(mem_tobuffer(target, sr.base, sr.length)); } -static inline dns_result_t +static inline isc_result_t towire_sig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; dns_name_t name; @@ -304,7 +304,7 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -361,7 +361,7 @@ fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t tostruct_sig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t sr; dns_rdata_generic_sig_t *sig; @@ -454,7 +454,7 @@ freestruct_sig(void *source) { isc_mem_put(sig->mctx, sig->signature, sig->siglen); } -static inline dns_result_t +static inline isc_result_t additionaldata_sig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -466,7 +466,7 @@ additionaldata_sig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_sig(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { REQUIRE(rdata->type == 24); diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 97a5bcee2b..bc3d899369 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: soa_6.c,v 1.25 1999/11/02 13:07:53 marka Exp $ */ + /* $Id: soa_6.c,v 1.26 1999/12/23 00:08:59 explorer Exp $ */ #ifndef RDATA_GENERIC_SOA_6_C #define RDATA_GENERIC_SOA_6_C -static inline dns_result_t +static inline isc_result_t fromtext_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -64,7 +64,7 @@ static char *soa_fieldnames[5] = { "serial", "refresh", "retry", "expire", "minimum" } ; -static inline dns_result_t +static inline isc_result_t totext_soa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -133,7 +133,7 @@ totext_soa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -172,7 +172,7 @@ fromwire_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_soa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sregion; isc_region_t tregion; @@ -251,7 +251,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(®ion1, ®ion2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -265,12 +265,12 @@ fromstruct_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_soa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_soa_t *soa = target; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 6); REQUIRE(target != NULL); @@ -322,7 +322,7 @@ freestruct_soa(void *source) { /* No action required */ } -static inline dns_result_t +static inline isc_result_t additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -334,11 +334,11 @@ additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_soa(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 6); diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index 36852e067a..0db3543f7b 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: tkey_249.c,v 1.18 1999/10/08 21:45:01 tale Exp $ */ + /* $Id: tkey_249.c,v 1.19 1999/12/23 00:09:00 explorer Exp $ */ /* draft-ietf-dnssec-tkey-01.txt */ #ifndef RDATA_GENERIC_TKEY_249_C #define RDATA_GENERIC_TKEY_249_C -static inline dns_result_t +static inline isc_result_t fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -94,7 +94,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (isc_base64_tobuffer(lexer, target, token.value.as_ulong)); } -static inline dns_result_t +static inline isc_result_t totext_tkey(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -178,7 +178,7 @@ totext_tkey(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (isc_base64_totext(&sr, 60, " ", target)); } -static inline dns_result_t +static inline isc_result_t fromwire_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -233,7 +233,7 @@ fromwire_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, n + 2)); } -static inline dns_result_t +static inline isc_result_t towire_tkey(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; dns_name_t name; @@ -281,7 +281,7 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -344,7 +344,7 @@ fromstruct_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t tostruct_tkey(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_generic_tkey_t *tkey; dns_name_t alg; @@ -444,7 +444,7 @@ freestruct_tkey(void *source) { isc_mem_put(tkey->mctx, tkey->other, tkey->otherlen); } -static inline dns_result_t +static inline isc_result_t additionaldata_tkey(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -456,7 +456,7 @@ additionaldata_tkey(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_tkey(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { REQUIRE(rdata->type == 249); diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index ac46453d44..0a3fcf5e9e 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: txt_16.c,v 1.17 1999/11/03 01:06:59 marka Exp $ */ + /* $Id: txt_16.c,v 1.18 1999/12/23 00:09:00 explorer Exp $ */ #ifndef RDATA_GENERIC_TXT_16_C #define RDATA_GENERIC_TXT_16_C -static inline dns_result_t +static inline isc_result_t fromtext_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -46,7 +46,7 @@ fromtext_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_txt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -67,12 +67,12 @@ totext_txt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) { - dns_result_t result; + isc_result_t result; REQUIRE(type == 16); @@ -88,7 +88,7 @@ fromwire_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_txt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; @@ -119,7 +119,7 @@ compare_txt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -134,7 +134,7 @@ fromstruct_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_txt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 16); @@ -151,7 +151,7 @@ freestruct_txt(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_txt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -163,7 +163,7 @@ additionaldata_txt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_txt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c index 8d25f88c3b..49f35bd17c 100644 --- a/lib/dns/rdata/generic/unspec_103.c +++ b/lib/dns/rdata/generic/unspec_103.c @@ -15,12 +15,12 @@ * SOFTWARE. */ - /* $Id: unspec_103.c,v 1.9 1999/09/15 23:03:34 explorer Exp $ */ + /* $Id: unspec_103.c,v 1.10 1999/12/23 00:09:00 explorer Exp $ */ #ifndef RDATA_GENERIC_UNSPEC_103_C #define RDATA_GENERIC_UNSPEC_103_C -static inline dns_result_t +static inline isc_result_t fromtext_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -35,7 +35,7 @@ fromtext_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (atob_tobuffer(lexer, target)); } -static inline dns_result_t +static inline isc_result_t totext_unspec(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -48,7 +48,7 @@ totext_unspec(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (btoa_totext(rdata->data, rdata->length, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -65,7 +65,7 @@ fromwire_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, sr.base, sr.length)); } -static inline dns_result_t +static inline isc_result_t towire_unspec(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 103); @@ -89,7 +89,7 @@ compare_unspec(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -104,7 +104,7 @@ fromstruct_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_unspec(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 103); @@ -121,7 +121,7 @@ freestruct_unspec(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_unspec(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -133,7 +133,7 @@ additionaldata_unspec(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_unspec(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 2f164a8b70..a79bb27d7b 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: x25_19.c,v 1.9 1999/09/15 23:03:34 explorer Exp $ */ + /* $Id: x25_19.c,v 1.10 1999/12/23 00:09:00 explorer Exp $ */ /* RFC 1183 */ @@ -24,7 +24,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -46,7 +46,7 @@ fromtext_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (txt_fromtext(&token.value.as_textregion, target)); } -static inline dns_result_t +static inline isc_result_t totext_x25(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -60,7 +60,7 @@ totext_x25(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (txt_totext(®ion, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -75,7 +75,7 @@ fromwire_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (txt_fromwire(source, target)); } -static inline dns_result_t +static inline isc_result_t towire_x25(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 19); @@ -105,7 +105,7 @@ compare_x25(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -120,7 +120,7 @@ fromstruct_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_x25(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 19); @@ -137,7 +137,7 @@ freestruct_x25(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_x25(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -149,7 +149,7 @@ additionaldata_x25(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_x25(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index c52d9ea0c5..103d63fd87 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: a_1.c,v 1.1 1999/10/13 01:24:46 marka Exp $ */ + /* $Id: a_1.c,v 1.2 1999/12/23 00:09:01 explorer Exp $ */ #ifndef RDATA_HS_4_A_1_C #define RDATA_HS_4_A_1_C @@ -24,7 +24,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -51,7 +51,7 @@ fromtext_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_hs_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -72,7 +72,7 @@ totext_hs_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -100,7 +100,7 @@ fromwire_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_hs_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; @@ -133,7 +133,7 @@ compare_hs_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -147,7 +147,7 @@ fromstruct_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_hs_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_hs_a_t *a = target; isc_uint32_t n; @@ -176,7 +176,7 @@ freestruct_hs_a(void *source) { } -static inline dns_result_t +static inline isc_result_t additionaldata_hs_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -189,7 +189,7 @@ additionaldata_hs_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_hs_a(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index ec8e35b486..9a49dc8e60 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: a6_38.c,v 1.17 1999/10/08 23:52:39 tale Exp $ */ + /* $Id: a6_38.c,v 1.18 1999/12/23 00:09:01 explorer Exp $ */ /* draft-ietf-ipngwg-dns-lookups-03.txt */ @@ -26,7 +26,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -75,7 +75,7 @@ fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -127,7 +127,7 @@ totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -175,7 +175,7 @@ fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_a6(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; dns_name_t name; @@ -258,7 +258,7 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -272,7 +272,7 @@ fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 38); @@ -290,7 +290,7 @@ freestruct_in_a6(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -303,11 +303,11 @@ additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_a6(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; unsigned char prefixlen, octets; - dns_result_t result; + isc_result_t result; dns_name_t name; REQUIRE(rdata->type == 38); diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 2fe40fcfd9..21b843e279 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: a_1.c,v 1.21 1999/09/15 23:03:34 explorer Exp $ */ + /* $Id: a_1.c,v 1.22 1999/12/23 00:09:01 explorer Exp $ */ #ifndef RDATA_IN_1_A_1_C #define RDATA_IN_1_A_1_C @@ -24,7 +24,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -51,7 +51,7 @@ fromtext_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -72,7 +72,7 @@ totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -100,7 +100,7 @@ fromwire_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_in_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; @@ -133,7 +133,7 @@ compare_in_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -147,7 +147,7 @@ fromstruct_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_in_a_t *a = target; isc_uint32_t n; @@ -176,7 +176,7 @@ freestruct_in_a(void *source) { } -static inline dns_result_t +static inline isc_result_t additionaldata_in_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -189,7 +189,7 @@ additionaldata_in_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_a(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index f9c7ea5bb5..f3318e6c50 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: aaaa_28.c,v 1.14 1999/09/15 23:03:35 explorer Exp $ */ + /* $Id: aaaa_28.c,v 1.15 1999/12/23 00:09:02 explorer Exp $ */ /* RFC 1886 */ @@ -26,7 +26,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -53,7 +53,7 @@ fromtext_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -74,7 +74,7 @@ totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -102,7 +102,7 @@ fromwire_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; @@ -135,7 +135,7 @@ compare_in_aaaa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (result); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -149,7 +149,7 @@ fromstruct_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_aaaa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 28); @@ -167,7 +167,7 @@ freestruct_in_aaaa(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_in_aaaa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -180,7 +180,7 @@ additionaldata_in_aaaa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_aaaa(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 355019e871..edb53e339e 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: kx_36.c,v 1.13 1999/09/15 23:03:35 explorer Exp $ */ + /* $Id: kx_36.c,v 1.14 1999/12/23 00:09:02 explorer Exp $ */ /* RFC 2230 */ #ifndef RDATA_GENERIC_KX_36_C #define RDATA_GENERIC_KX_36_C -static inline dns_result_t +static inline isc_result_t fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -45,7 +45,7 @@ fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -74,7 +74,7 @@ totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -100,7 +100,7 @@ fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -155,7 +155,7 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -169,7 +169,7 @@ fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 36); @@ -188,7 +188,7 @@ freestruct_in_kx(void *source) { } -static inline dns_result_t +static inline isc_result_t additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -206,7 +206,7 @@ additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_in_kx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c index f474b024b9..ba31f2c0c6 100644 --- a/lib/dns/rdata/in_1/naptr_35.c +++ b/lib/dns/rdata/in_1/naptr_35.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: naptr_35.c,v 1.13 1999/09/15 23:03:35 explorer Exp $ */ + /* $Id: naptr_35.c,v 1.14 1999/12/23 00:09:02 explorer Exp $ */ /* RFC 2168 */ #ifndef RDATA_IN_1_NAPTR_35_C #define RDATA_IN_1_NAPTR_35_C -static inline dns_result_t +static inline isc_result_t fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -63,7 +63,7 @@ fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -113,7 +113,7 @@ totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -151,7 +151,7 @@ fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t sr; @@ -241,7 +241,7 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -255,7 +255,7 @@ fromstruct_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_naptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 35); @@ -273,7 +273,7 @@ freestruct_in_naptr(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -291,11 +291,11 @@ additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_naptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; unsigned int length, n; - dns_result_t result; + isc_result_t result; dns_name_t name; REQUIRE(rdata->type == 35); diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index 2cc24d3859..46c24c9f22 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: nsap-ptr_23.c,v 1.11 1999/09/15 23:03:36 explorer Exp $ */ + /* $Id: nsap-ptr_23.c,v 1.12 1999/12/23 00:09:02 explorer Exp $ */ /* RFC 1348 */ #ifndef RDATA_IN_1_NSAP_PTR_23_C #define RDATA_IN_1_NSAP_PTR_23_C -static inline dns_result_t +static inline isc_result_t fromtext_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -43,7 +43,7 @@ fromtext_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -66,7 +66,7 @@ totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -85,7 +85,7 @@ fromwire_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_nsap_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { @@ -131,7 +131,7 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -145,7 +145,7 @@ fromstruct_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_nsap_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 23); @@ -163,7 +163,7 @@ freestruct_in_nsap_ptr(void *source) { REQUIRE(ISC_FALSE); } -static inline dns_result_t +static inline isc_result_t additionaldata_in_nsap_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -176,7 +176,7 @@ additionaldata_in_nsap_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_nsap_ptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; dns_name_t name; diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index eec6acf46e..64ef8acb10 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: nsap_22.c,v 1.10 1999/09/15 23:03:36 explorer Exp $ */ + /* $Id: nsap_22.c,v 1.11 1999/12/23 00:09:03 explorer Exp $ */ /* RFC 1706 */ @@ -24,7 +24,7 @@ #include -static inline dns_result_t +static inline isc_result_t fromtext_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) { @@ -71,7 +71,7 @@ fromtext_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -93,7 +93,7 @@ totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -114,7 +114,7 @@ fromwire_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, region.base, region.length)); } -static inline dns_result_t +static inline isc_result_t towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 22); @@ -140,7 +140,7 @@ compare_in_nsap(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -154,7 +154,7 @@ fromstruct_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_nsap(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 22); @@ -172,7 +172,7 @@ freestruct_in_nsap(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_in_nsap(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -185,7 +185,7 @@ additionaldata_in_nsap(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_nsap(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index 73c62ae0a0..fef7aa385c 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: px_26.c,v 1.11 1999/09/15 23:03:37 explorer Exp $ */ + /* $Id: px_26.c,v 1.12 1999/12/23 00:09:03 explorer Exp $ */ /* RFC 2163 */ #ifndef RDATA_IN_1_PX_26_C #define RDATA_IN_1_PX_26_C -static inline dns_result_t +static inline isc_result_t fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -55,7 +55,7 @@ fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -93,7 +93,7 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -125,7 +125,7 @@ fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -197,7 +197,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -211,7 +211,7 @@ fromstruct_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_px(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 26); @@ -230,7 +230,7 @@ freestruct_in_px(void *source) { } -static inline dns_result_t +static inline isc_result_t additionaldata_in_px(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -243,11 +243,11 @@ additionaldata_in_px(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_px(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; dns_name_t name; - dns_result_t result; + isc_result_t result; REQUIRE(rdata->type == 26); REQUIRE(rdata->rdclass == 1); diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index 3fc6ba2883..6b5157bef8 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -15,14 +15,14 @@ * SOFTWARE. */ - /* $Id: srv_33.c,v 1.12 1999/09/15 23:03:37 explorer Exp $ */ + /* $Id: srv_33.c,v 1.13 1999/12/23 00:09:03 explorer Exp $ */ /* RFC 2052 bis */ #ifndef RDATA_IN_1_SRV_33_C #define RDATA_IN_1_SRV_33_C -static inline dns_result_t +static inline isc_result_t fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -55,7 +55,7 @@ fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromtext(&name, &buffer, origin, downcase, target)); } -static inline dns_result_t +static inline isc_result_t totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -100,7 +100,7 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return(dns_name_totext(&prefix, sub, target)); } -static inline dns_result_t +static inline isc_result_t fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -129,7 +129,7 @@ fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (dns_name_fromwire(&name, source, dctx, downcase, target)); } -static inline dns_result_t +static inline isc_result_t towire_in_srv(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t sr; @@ -186,7 +186,7 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (dns_name_rdatacompare(&name1, &name2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -200,7 +200,7 @@ fromstruct_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_srv(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 33); @@ -218,7 +218,7 @@ freestruct_in_srv(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_in_srv(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -236,7 +236,7 @@ additionaldata_in_srv(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return ((add)(arg, &name, dns_rdatatype_a)); } -static inline dns_result_t +static inline isc_result_t digest_in_srv(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 9f357b0802..c3661fac0e 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: wks_11.c,v 1.18 1999/11/03 01:07:00 marka Exp $ */ + /* $Id: wks_11.c,v 1.19 1999/12/23 00:09:03 explorer Exp $ */ #ifndef RDATA_IN_1_WKS_11_C #define RDATA_IN_1_WKS_11_C @@ -27,7 +27,7 @@ #include #include -static inline dns_result_t +static inline isc_result_t fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target) @@ -107,7 +107,7 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (mem_tobuffer(target, bm, n)); } -static inline dns_result_t +static inline isc_result_t totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target) { @@ -148,7 +148,7 @@ totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t fromwire_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target) @@ -178,7 +178,7 @@ fromwire_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; @@ -206,7 +206,7 @@ compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { return (compare_region(&r1, &r2)); } -static inline dns_result_t +static inline isc_result_t fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -221,7 +221,7 @@ fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, return (DNS_R_NOTIMPLEMENTED); } -static inline dns_result_t +static inline isc_result_t tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 11); @@ -239,7 +239,7 @@ freestruct_in_wks(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } -static inline dns_result_t +static inline isc_result_t additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { @@ -252,7 +252,7 @@ additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add, return (DNS_R_SUCCESS); } -static inline dns_result_t +static inline isc_result_t digest_in_wks(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c index f6ec11cfb1..9e5064751f 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -24,8 +24,8 @@ #include static void rdatalist_disassociate(dns_rdataset_t *rdatasetp); -static dns_result_t rdatalist_first(dns_rdataset_t *rdataset); -static dns_result_t rdatalist_next(dns_rdataset_t *rdataset); +static isc_result_t rdatalist_first(dns_rdataset_t *rdataset); +static isc_result_t rdatalist_next(dns_rdataset_t *rdataset); static void rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); static void rdatalist_clone(dns_rdataset_t *source, dns_rdataset_t *target); static unsigned int rdatalist_count(dns_rdataset_t *rdataset); @@ -54,7 +54,7 @@ dns_rdatalist_init(dns_rdatalist_t *rdatalist) { ISC_LINK_INIT(rdatalist, link); } -dns_result_t +isc_result_t dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset) { @@ -86,7 +86,7 @@ rdatalist_disassociate(dns_rdataset_t *rdataset) { (void)rdataset; /* Keep compiler quiet. */ } -static dns_result_t +static isc_result_t rdatalist_first(dns_rdataset_t *rdataset) { dns_rdatalist_t *rdatalist; @@ -99,7 +99,7 @@ rdatalist_first(dns_rdataset_t *rdataset) { return (DNS_R_SUCCESS); } -static dns_result_t +static isc_result_t rdatalist_next(dns_rdataset_t *rdataset) { dns_rdata_t *rdata; diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index 3068fb7583..d8437e92bf 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -124,7 +124,7 @@ question_disassociate(dns_rdataset_t *rdataset) { (void)rdataset; } -static dns_result_t +static isc_result_t question_cursor(dns_rdataset_t *rdataset) { (void)rdataset; return (DNS_R_NOMORE); @@ -212,7 +212,7 @@ dns_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { (source->methods->clone)(source, target); } -dns_result_t +isc_result_t dns_rdataset_first(dns_rdataset_t *rdataset) { /* @@ -225,7 +225,7 @@ dns_rdataset_first(dns_rdataset_t *rdataset) { return ((rdataset->methods->first)(rdataset)); } -dns_result_t +isc_result_t dns_rdataset_next(dns_rdataset_t *rdataset) { /* @@ -251,7 +251,7 @@ dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { (rdataset->methods->current)(rdataset, rdata); } -dns_result_t +isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, dns_name_t *owner_name, dns_compress_t *cctx, @@ -260,7 +260,7 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, { dns_rdata_t rdata; isc_region_t r; - dns_result_t result; + isc_result_t result; unsigned int count; isc_buffer_t savedbuffer, rdlen; unsigned int headlen; @@ -365,12 +365,12 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, return (result); } -dns_result_t +isc_result_t dns_rdataset_additionaldata(dns_rdataset_t *rdataset, dns_additionaldatafunc_t add, void *arg) { dns_rdata_t rdata; - dns_result_t result; + isc_result_t result; /* * For each rdata in rdataset, call 'add' for each name and type in the diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c index dff53b0cf1..178bd39937 100644 --- a/lib/dns/rdatasetiter.c +++ b/lib/dns/rdatasetiter.c @@ -38,7 +38,7 @@ dns_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { ENSURE(*iteratorp == NULL); } -dns_result_t +isc_result_t dns_rdatasetiter_first(dns_rdatasetiter_t *iterator) { /* * Move the rdataset cursor to the first rdataset at the node (if any). @@ -49,7 +49,7 @@ dns_rdatasetiter_first(dns_rdatasetiter_t *iterator) { return (iterator->methods->first(iterator)); } -dns_result_t +isc_result_t dns_rdatasetiter_next(dns_rdatasetiter_t *iterator) { /* * Move the rdataset cursor to the next rdataset at the node (if any). diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index 2f292d89ba..2eb9b97d1e 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: rdataslab.c,v 1.7 1999/07/13 17:26:07 halley Exp $ */ +/* $Id: rdataslab.c,v 1.8 1999/12/23 00:08:33 explorer Exp $ */ #include @@ -33,14 +33,14 @@ #include #include -dns_result_t +isc_result_t dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, isc_region_t *region, unsigned int reservelen) { dns_rdata_t rdata; unsigned char *rawbuf; unsigned int buflen; - dns_result_t result; + isc_result_t result; unsigned int nitems; result = dns_rdataset_first(rdataset); @@ -126,7 +126,7 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) { return ((unsigned int)(current - slab)); } -dns_result_t +isc_result_t dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, @@ -274,7 +274,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, diff --git a/lib/dns/sec/dst/dst_api.c b/lib/dns/sec/dst/dst_api.c index f307730844..5cdfedc462 100644 --- a/lib/dns/sec/dst/dst_api.c +++ b/lib/dns/sec/dst/dst_api.c @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: dst_api.c,v 1.19 1999/10/26 19:31:52 bwelling Exp $ + * $Id: dst_api.c,v 1.20 1999/12/23 00:09:04 explorer Exp $ */ #include @@ -1016,7 +1016,7 @@ write_public_key(const dst_key_t *key) { unsigned char key_array[DST_KEY_MAXSIZE]; char text_array[DST_KEY_MAXSIZE]; dst_result_t ret; - dns_result_t dnsret; + isc_result_t dnsret; dns_rdata_t rdata; REQUIRE(VALID_KEY(key)); diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c index 65c9f17a66..ef8ab58315 100644 --- a/lib/dns/tcpmsg.c +++ b/lib/dns/tcpmsg.c @@ -166,7 +166,7 @@ dns_tcpmsg_setmaxsize(dns_tcpmsg_t *tcpmsg, unsigned int maxsize) } -dns_result_t +isc_result_t dns_tcpmsg_readmessage(dns_tcpmsg_t *tcpmsg, isc_task_t *task, isc_taskaction_t action, void *arg) { diff --git a/lib/dns/time.c b/lib/dns/time.c index b82e0ad22d..7e526c6547 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: time.c,v 1.4 1999/10/08 23:58:07 tale Exp $ */ + /* $Id: time.c,v 1.5 1999/12/23 00:08:33 explorer Exp $ */ #include @@ -31,7 +31,7 @@ static int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -dns_result_t +isc_result_t dns_time64_totext(isc_int64_t t, isc_buffer_t *target) { struct tm tm; char buf[sizeof "YYYYMMDDHHMMSS"]; @@ -89,7 +89,7 @@ dns_time64_totext(isc_int64_t t, isc_buffer_t *target) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_time32_totext(isc_uint32_t value, isc_buffer_t *target) { isc_int64_t start; isc_int64_t base; @@ -106,7 +106,7 @@ dns_time32_totext(isc_uint32_t value, isc_buffer_t *target) { return (dns_time64_totext(t, target)); } -dns_result_t +isc_result_t dns_time64_fromtext(char *source, isc_int64_t *target) { int year, month, day, hour, minute, second; isc_int64_t value; @@ -148,11 +148,11 @@ dns_time64_fromtext(char *source, isc_int64_t *target) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_time32_fromtext(char *source, isc_uint32_t *target) { isc_int64_t value64; isc_int32_t value32; - dns_result_t result; + isc_result_t result; result = dns_time64_fromtext(source, &value64); if (result != DNS_R_SUCCESS) return (result); diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index b856218a2d..3ba2fa3562 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -31,17 +31,17 @@ #include #define RETERR(x) do { \ - dns_result_t __r = (x); \ + isc_result_t __r = (x); \ if (__r != DNS_R_SUCCESS) \ return (__r); \ } while (0) -static dns_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl); +static isc_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl); /* Helper for dns_ttl_totext(). */ -static dns_result_t +static isc_result_t ttlfmt(unsigned int t, char *s, isc_boolean_t verbose, isc_boolean_t space, isc_buffer_t *target) { @@ -66,7 +66,7 @@ ttlfmt(unsigned int t, char *s, isc_boolean_t verbose, /* Derived from bind8 ns_format_ttl(). */ -dns_result_t +isc_result_t dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target) { @@ -118,14 +118,14 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { return (bind_ttl(source, ttl)); } -dns_result_t +isc_result_t dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { - dns_result_t result; + isc_result_t result; result = bind_ttl(source, ttl); if (result != DNS_R_SUCCESS) @@ -133,7 +133,7 @@ dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { return (result); } -static dns_result_t +static isc_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl) { isc_uint32_t tmp = 0; unsigned long n; diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index a7efb2d6bc..f6fc4e6053 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: xfrin.c,v 1.34 1999/12/22 03:22:59 explorer Exp $ */ + /* $Id: xfrin.c,v 1.35 1999/12/23 00:08:34 explorer Exp $ */ #include @@ -165,7 +165,7 @@ struct xfrin_ctx { * Forward declarations. */ -static dns_result_t +static isc_result_t xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, @@ -180,28 +180,28 @@ xfrin_create(isc_mem_t *mctx, dns_tsigkey_t *tsigkey, xfrin_ctx_t **xfrp); -static dns_result_t axfr_init(xfrin_ctx_t *xfr); -static dns_result_t axfr_makedb(xfrin_ctx_t *xfr, dns_db_t **dbp); -static dns_result_t axfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, +static isc_result_t axfr_init(xfrin_ctx_t *xfr); +static isc_result_t axfr_makedb(xfrin_ctx_t *xfr, dns_db_t **dbp); +static isc_result_t axfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata); -static dns_result_t axfr_apply(xfrin_ctx_t *xfr); -static dns_result_t axfr_commit(xfrin_ctx_t *xfr); +static isc_result_t axfr_apply(xfrin_ctx_t *xfr); +static isc_result_t axfr_commit(xfrin_ctx_t *xfr); -static dns_result_t ixfr_init(xfrin_ctx_t *xfr); -static dns_result_t ixfr_apply(xfrin_ctx_t *xfr); -static dns_result_t ixfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, +static isc_result_t ixfr_init(xfrin_ctx_t *xfr); +static isc_result_t ixfr_apply(xfrin_ctx_t *xfr); +static isc_result_t ixfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata); -static dns_result_t ixfr_commit(xfrin_ctx_t *xfr); +static isc_result_t ixfr_commit(xfrin_ctx_t *xfr); -static dns_result_t xfr_rr(xfrin_ctx_t *xfr, dns_name_t *name, +static isc_result_t xfr_rr(xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, dns_rdata_t *rdata); void xfrin_start(xfrin_ctx_t *xfr); static void xfrin_connect_done(isc_task_t *task, isc_event_t *event); -static dns_result_t xfrin_send_request(xfrin_ctx_t *xfr); +static isc_result_t xfrin_send_request(xfrin_ctx_t *xfr); static void xfrin_send_done(isc_task_t *task, isc_event_t *event); static void xfrin_sendlen_done(isc_task_t *task, isc_event_t *event); static void xfrin_recv_done(isc_task_t *task, isc_event_t *event); @@ -210,7 +210,7 @@ static void xfrin_timeout(isc_task_t *task, isc_event_t *event); static isc_boolean_t maybe_free(xfrin_ctx_t *xfr); static void xfrin_fail(xfrin_ctx_t *xfr, isc_result_t result, char *msg); -static dns_result_t render(dns_message_t *msg, isc_buffer_t *buf); +static isc_result_t render(dns_message_t *msg, isc_buffer_t *buf); static void xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *master, @@ -227,9 +227,9 @@ xfrin_log(xfrin_ctx_t *xfr, unsigned int level, const char *fmt, ...); * AXFR handling */ -static dns_result_t +static isc_result_t axfr_init(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; xfr->is_ixfr = ISC_FALSE; if (xfr->db != NULL) @@ -243,7 +243,7 @@ axfr_init(xfrin_ctx_t *xfr) { return (result); } -static dns_result_t +static isc_result_t axfr_makedb(xfrin_ctx_t *xfr, dns_db_t **dbp) { return (dns_db_create(xfr->mctx, /* XXX */ "rbt", /* XXX guess */ @@ -254,11 +254,11 @@ axfr_makedb(xfrin_ctx_t *xfr, dns_db_t **dbp) { dbp)); } -static dns_result_t +static isc_result_t axfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *tuple = NULL; CHECK(dns_difftuple_create(xfr->diff.mctx, op, name, ttl, rdata, &tuple)); @@ -271,9 +271,9 @@ axfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, } /* Store a set of AXFR RRs in the database. */ -static dns_result_t +static isc_result_t axfr_apply(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; CHECK(dns_diff_load(&xfr->diff, xfr->axfr.add_func, xfr->axfr.add_private)); xfr->difflen = 0; @@ -283,9 +283,9 @@ axfr_apply(xfrin_ctx_t *xfr) { return (result); } -static dns_result_t +static isc_result_t axfr_commit(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; CHECK(axfr_apply(xfr)); CHECK(dns_db_endload(xfr->db, &xfr->axfr.add_private)); @@ -303,9 +303,9 @@ axfr_commit(xfrin_ctx_t *xfr) { * IXFR handling */ -static dns_result_t +static isc_result_t ixfr_init(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; xfr->is_ixfr = ISC_TRUE; INSIST(xfr->db != NULL); xfr->difflen = 0; @@ -316,11 +316,11 @@ ixfr_init(xfrin_ctx_t *xfr) { return (result); } -static dns_result_t +static isc_result_t ixfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { - dns_result_t result; + isc_result_t result; dns_difftuple_t *tuple = NULL; CHECK(dns_difftuple_create(xfr->diff.mctx, op, name, ttl, rdata, &tuple)); @@ -333,9 +333,9 @@ ixfr_putdata(xfrin_ctx_t *xfr, dns_diffop_t op, } /* Apply a set of IXFR changes to the database. */ -static dns_result_t +static isc_result_t ixfr_apply(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; if (xfr->ver == NULL) { CHECK(dns_db_newversion(xfr->db, &xfr->ver)); CHECK(dns_journal_begin_transaction(xfr->ixfr.journal)); @@ -349,9 +349,9 @@ ixfr_apply(xfrin_ctx_t *xfr) { return (result); } -static dns_result_t +static isc_result_t ixfr_commit(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; ixfr_apply(xfr); if (xfr->ver != NULL) { /* XXX enter ready-to-commit state here */ @@ -372,11 +372,11 @@ ixfr_commit(xfrin_ctx_t *xfr) { * Handle a single incoming resource record according to the current * state. */ -static dns_result_t +static isc_result_t xfr_rr(xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, dns_rdata_t *rdata) { - dns_result_t result; + isc_result_t result; redo: switch (xfr->state) { case XFRST_SOAQUERY: @@ -498,7 +498,7 @@ dns_xfrin_start(dns_zone_t *zone, isc_sockaddr_t *master, dns_name_t *zonename; isc_task_t *task; xfrin_ctx_t *xfr; - dns_result_t result; + isc_result_t result; dns_db_t *db = NULL; dns_rdatatype_t xfrtype; dns_tsigkey_t *key = NULL; @@ -576,7 +576,7 @@ xfrin_fail(xfrin_ctx_t *xfr, isc_result_t result, char *msg) { maybe_free(xfr); } -static dns_result_t +static isc_result_t xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, @@ -671,7 +671,7 @@ xfrin_create(isc_mem_t *mctx, void xfrin_start(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; CHECK(isc_socket_create(xfr->socketmgr, isc_sockaddr_pf(&xfr->master), isc_sockettype_tcp, @@ -686,9 +686,9 @@ xfrin_start(xfrin_ctx_t *xfr) { /* XXX the resolver could use this, too */ -static dns_result_t +static isc_result_t render(dns_message_t *msg, isc_buffer_t *buf) { - dns_result_t result; + isc_result_t result; CHECK(dns_message_renderbegin(msg, buf)); CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0)); @@ -708,8 +708,8 @@ static void xfrin_connect_done(isc_task_t *task, isc_event_t *event) { isc_socket_connev_t *cev = (isc_socket_connev_t *) event; xfrin_ctx_t *xfr = (xfrin_ctx_t *) event->arg; - dns_result_t evresult = cev->result; - dns_result_t result; + isc_result_t evresult = cev->result; + isc_result_t result; task = task; /* Unused */ INSIST(event->type == ISC_SOCKEVENT_CONNECT); isc_event_free(&event); @@ -737,7 +737,7 @@ xfrin_connect_done(isc_task_t *task, isc_event_t *event) { static isc_result_t tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target) { - dns_result_t result; + isc_result_t result; dns_rdata_t *rdata = NULL; dns_rdatalist_t *rdl = NULL; dns_rdataset_t *rds = NULL; @@ -774,9 +774,9 @@ tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target) /* * Build an *XFR request and send its length prefix. */ -static dns_result_t +static isc_result_t xfrin_send_request(xfrin_ctx_t *xfr) { - dns_result_t result; + isc_result_t result; isc_region_t region; isc_region_t lregion; dns_rdataset_t *qrdataset = NULL; @@ -854,8 +854,8 @@ xfrin_sendlen_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sev = (isc_socketevent_t *) event; xfrin_ctx_t *xfr = (xfrin_ctx_t *) event->arg; - dns_result_t evresult = sev->result; - dns_result_t result; + isc_result_t evresult = sev->result; + isc_result_t result; isc_region_t region; task = task; /* Unused */ @@ -884,7 +884,7 @@ xfrin_send_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sev = (isc_socketevent_t *) event; xfrin_ctx_t *xfr = (xfrin_ctx_t *) event->arg; - dns_result_t result; + isc_result_t result; task = task; /* Unused */ INSIST(event->type == ISC_SOCKEVENT_SENDDONE); @@ -906,7 +906,7 @@ xfrin_send_done(isc_task_t *task, isc_event_t *event) static void xfrin_recv_done(isc_task_t *task, isc_event_t *ev) { xfrin_ctx_t *xfr = (xfrin_ctx_t *) ev->arg; - dns_result_t result; + isc_result_t result; dns_message_t *msg = NULL; dns_name_t *name; dns_tcpmsg_t *tcpmsg; diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 40adf7ff4b..f32b1f7f12 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: zone.c,v 1.52 1999/12/22 20:52:32 gson Exp $ */ + /* $Id: zone.c,v 1.53 1999/12/23 00:08:34 explorer Exp $ */ #include @@ -194,9 +194,9 @@ struct dns_zonemgr { static void refresh_callback(isc_task_t *, isc_event_t *); static void zone_shutdown(isc_task_t *, isc_event_t *); static void soa_query(dns_zone_t *, isc_taskaction_t); -static dns_result_t zone_settimer(dns_zone_t *, isc_stdtime_t); +static isc_result_t zone_settimer(dns_zone_t *, isc_stdtime_t); static void cancel_refresh(dns_zone_t *); -static dns_result_t dns_notify(dns_name_t *, isc_sockaddr_t *, dns_rdatatype_t, +static isc_result_t dns_notify(dns_name_t *, isc_sockaddr_t *, dns_rdatatype_t, dns_rdataclass_t, isc_sockaddr_t *, isc_mem_t *); static void checkservers_callback(isc_task_t *task, isc_event_t *event); @@ -212,22 +212,22 @@ static void add_address_tocheck(dns_message_t *msg, dns_rdatatype_t type); extern void dns_zone_transfer_in(dns_zone_t *zone); static void record_serial(void); -static dns_result_t dns_zone_tostr(dns_zone_t *zone, isc_mem_t *mctx, char **s); +static isc_result_t dns_zone_tostr(dns_zone_t *zone, isc_mem_t *mctx, char **s); static void unload(dns_zone_t *zone); static void expire(dns_zone_t *zone); -static dns_result_t replacedb(dns_zone_t *zone, dns_db_t *db, +static isc_result_t replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump); -static dns_result_t default_journal(dns_zone_t *zone); +static isc_result_t default_journal(dns_zone_t *zone); static void releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone); static void xfrin_start_temporary_kludge(dns_zone_t *zone); -static void xfrdone(dns_zone_t *zone, dns_result_t result); +static void xfrdone(dns_zone_t *zone, isc_result_t result); #define PRINT_ZONE_REF(zone) \ do { \ char *s = NULL; \ - dns_result_t r; \ + isc_result_t r; \ r = dns_zone_tostr(zone, zone->mctx, &s); \ if (r == DNS_R_SUCCESS) { \ printf("%p: %s: references = %d\n", zone, s, \ @@ -243,7 +243,7 @@ static void xfrdone(dns_zone_t *zone, dns_result_t result); *** Public functions. ***/ -dns_result_t +isc_result_t dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) { isc_result_t iresult; dns_zone_t *zone; @@ -427,9 +427,9 @@ dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type) { UNLOCK(&zone->lock); } -dns_result_t +isc_result_t dns_zone_setdbtype(dns_zone_t *zone, char *db_type) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -443,11 +443,11 @@ dns_zone_setdbtype(dns_zone_t *zone, char *db_type) { return (result); } -dns_result_t +isc_result_t dns_zone_setorigin(dns_zone_t *zone, char *origin) { isc_buffer_t buffer; dns_fixedname_t fixed; - dns_result_t result; + isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(origin != NULL); @@ -470,9 +470,9 @@ dns_zone_setorigin(dns_zone_t *zone, char *origin) { return (result); } -dns_result_t +isc_result_t dns_zone_setdatabase(dns_zone_t *zone, const char *database) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(database != NULL); @@ -489,7 +489,7 @@ dns_zone_setdatabase(dns_zone_t *zone, const char *database) { return (result); } -static dns_result_t +static isc_result_t default_journal(dns_zone_t *zone) { int len; @@ -507,9 +507,9 @@ default_journal(dns_zone_t *zone) { return (DNS_R_SUCCESS); } -dns_result_t +isc_result_t dns_zone_setjournal(dns_zone_t *zone, const char *journal) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(journal != NULL); @@ -556,12 +556,12 @@ dns_zone_validate(dns_zone_t *zone) { REQUIRE(zone->db_type != NULL); } -dns_result_t +isc_result_t dns_zone_load(dns_zone_t *zone) { const char me[] = "dns_zone_load"; int soacount = 0; int nscount = 0; - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; dns_dbversion_t *version = NULL; dns_rdataset_t rdataset; @@ -769,7 +769,7 @@ dns_zone_checkservers(dns_zone_t *zone) { dns_rdata_t rdata; dns_dbnode_t *node = NULL; dns_dbversion_t *version = NULL; - dns_result_t result; + isc_result_t result; dns_rdata_ns_t ns; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1012,7 +1012,7 @@ checkservers_callback(isc_task_t *task, isc_event_t *event) { static void cmp_soa(dns_message_t *msg, dns_zone_t *zone, char *server) { dns_rdata_soa_t msgsoa, zonesoa; - dns_result_t result; + isc_result_t result; dns_rdataset_t *rdataset = NULL; dns_rdataset_t zonerdataset; dns_rdata_t rdata; @@ -1115,7 +1115,7 @@ add_address_tocheck(dns_message_t *msg, dns_zone_checkservers_t *checkservers, dns_rdatatype_t type) { dns_rdataset_t *rdataset = NULL; - dns_result_t result; + isc_result_t result; isc_sockaddr_t sockaddr; dns_rdata_in_a_t a; dns_rdata_in_a6_t a6; @@ -1235,11 +1235,11 @@ dns_zone_getmctx(dns_zone_t *zone) { return zone->mctx; } -static dns_result_t +static isc_result_t dns_zone_tostr(dns_zone_t *zone, isc_mem_t *mctx, char **s) { isc_buffer_t tbuf; char outbuf[1024]; - dns_result_t result; + isc_result_t result; REQUIRE(s != NULL && *s == NULL); REQUIRE(DNS_ZONE_VALID(zone)); @@ -1331,7 +1331,7 @@ dns_zone_getoptions(dns_zone_t *zone, unsigned int *options, UNLOCK(&zone->lock); } -dns_result_t +isc_result_t dns_zone_adddbarg(dns_zone_t *zone, char *arg) { char **new = NULL; @@ -1389,7 +1389,7 @@ dns_zone_cleardbargs(dns_zone_t *zone) { UNLOCK(&zone->lock); } -dns_result_t +isc_result_t dns_zone_setxfrsource(dns_zone_t *zone, isc_sockaddr_t *xfrsource) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -1406,7 +1406,7 @@ dns_zone_getxfrsource(dns_zone_t *zone) { return (&zone->xfrsource); } -dns_result_t +isc_result_t dns_zone_addnotify(dns_zone_t *zone, isc_sockaddr_t *notify) { isc_sockaddr_t *new; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1446,7 +1446,7 @@ dns_zone_clearnotify(dns_zone_t *zone) { UNLOCK(&zone->lock); } -dns_result_t +isc_result_t dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *master) { isc_sockaddr_t *new; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1487,9 +1487,9 @@ dns_zone_clearmasters(dns_zone_t *zone) { UNLOCK(&zone->lock); } -dns_result_t +isc_result_t dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) { - dns_result_t result = DNS_R_SUCCESS; + isc_result_t result = DNS_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1676,11 +1676,11 @@ dns_zone_refresh(dns_zone_t *zone) { #endif } -dns_result_t +isc_result_t dns_zone_dump(dns_zone_t *zone, FILE *fd) { dns_dbiterator_t *dbiterator = NULL; dns_dbversion_t *version = NULL; - dns_result_t result; + isc_result_t result; dns_fixedname_t fname; dns_name_t *name; dns_rdatasetiter_t *rdsiter = NULL; @@ -1777,7 +1777,7 @@ dns_zone_unmount(dns_zone_t *zone) { /*XXX MPA*/ } -dns_result_t +isc_result_t dns_zone_manage(dns_zone_t *zone, isc_taskmgr_t *tmgr) { #if 1 REQUIRE(DNS_ZONE_VALID(zone)); @@ -1786,7 +1786,7 @@ dns_zone_manage(dns_zone_t *zone, isc_taskmgr_t *tmgr) { return (DNS_R_SUCCESS); #else isc_result_t iresult; - dns_result_t result; + isc_result_t result; /* * XXXRTH Zones do not have resolvers!!!! @@ -1850,7 +1850,7 @@ dns_zone_notify(dns_zone_t *zone) { dns_rdataset_t nsrdset; dns_rdataset_t ardset; dns_dbversion_t *version = NULL; - dns_result_t result; + isc_result_t result; dns_dbnode_t *node = NULL; dns_rdata_ns_t ns; dns_rdata_in_a_t a; @@ -1961,7 +1961,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { dns_rdataset_t *rdataset; dns_rdata_t rdata; dns_rdata_soa_t soa; - dns_result_t result; + isc_result_t result; isc_uint32_t serial; zone = devent->arg; @@ -2115,7 +2115,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { static void soa_query(dns_zone_t *zone, isc_taskaction_t callback) { dns_name_t *zonename; - dns_result_t result; + isc_result_t result; zonename = &zone->origin; LOCK(&zone->lock); @@ -2151,7 +2151,7 @@ zone_timer(isc_task_t *task, isc_event_t *event) { task = task; /* XXX */ } -static dns_result_t +static isc_result_t zone_settimer(dns_zone_t *zone, isc_stdtime_t now) { const char me[] = "zone_settimer"; isc_stdtime_t next = 0; @@ -2236,12 +2236,12 @@ cancel_refresh(dns_zone_t *zone) { zone_settimer(zone, now); } -static dns_result_t +static isc_result_t dns_notify(dns_name_t *name, isc_sockaddr_t *addr, dns_rdatatype_t type, dns_rdataclass_t rdclass, isc_sockaddr_t *source, isc_mem_t *mctx) { dns_message_t *msg = NULL; - dns_result_t result; + isc_result_t result; isc_buffer_t target; /* dns_rdatalist_t *rdatalist = NULL; */ dns_rdatalist_t rdatalist; @@ -2300,7 +2300,7 @@ dns_notify(dns_name_t *name, isc_sockaddr_t *addr, dns_rdatatype_t type, return (result); } -dns_result_t +isc_result_t dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, dns_message_t *msg) { @@ -2309,7 +2309,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, dns_rdata_soa_t soa; dns_rdataset_t *rdataset = NULL; dns_rdata_t rdata; - dns_result_t result; + isc_result_t result; isc_stdtime_t now; REQUIRE(DNS_ZONE_VALID(zone)); @@ -2590,7 +2590,7 @@ zone_log(dns_zone_t *zone, const char *me, int level, char namebuf[1024+32]; isc_buffer_t buffer; int len; - dns_result_t result; + isc_result_t result; isc_buffer_init(&buffer, namebuf, sizeof namebuf, ISC_BUFFERTYPE_TEXT); result = dns_name_totext(&zone->origin, ISC_FALSE, &buffer); @@ -2609,7 +2609,7 @@ zone_log(dns_zone_t *zone, const char *me, int level, static int message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) { - dns_result_t result; + isc_result_t result; dns_name_t *name; dns_rdataset_t *curr; int res = 0; @@ -2835,9 +2835,9 @@ dns_zone_equal(dns_zone_t *oldzone, dns_zone_t *newzone) { } -dns_result_t +isc_result_t dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { - dns_result_t result; + isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); LOCK(&zone->lock); @@ -2846,7 +2846,7 @@ dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { return (result); } -static dns_result_t +static isc_result_t replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { dns_dbversion_t *ver; isc_result_t result; @@ -2907,7 +2907,7 @@ replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { } static void -xfrdone(dns_zone_t *zone, dns_result_t result) { +xfrdone(dns_zone_t *zone, isc_result_t result) { const char me[] = "xfrdone"; isc_stdtime_t now; diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index 9647c5e5f2..17335f9f4e 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -61,7 +61,7 @@ configure_zone_acl(dns_c_zone_t *czone, dns_c_ctx_t *cctx, } } -dns_result_t +isc_result_t dns_zone_configure(isc_log_t *lctx, dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, dns_c_zone_t *czone, dns_zone_t *zone) { diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 3f6a139593..ea8bef8ac0 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -40,7 +40,7 @@ struct dns_zt { #define VALID_ZT(zt) ISC_MAGIC_VALID(zt, ZTMAGIC) static void auto_detach(void *, void *); -static dns_result_t load(dns_zone_t *zone, void *uap); +static isc_result_t load(dns_zone_t *zone, void *uap); isc_result_t dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) { @@ -221,15 +221,15 @@ dns_zt_load(dns_zt_t *zt) { (void)dns_zt_apply(zt, ISC_FALSE, load, NULL); } -static dns_result_t +static isc_result_t load(dns_zone_t *zone, void *uap) { uap = uap; return (dns_zone_load(zone)); } -dns_result_t +isc_result_t dns_zt_apply(dns_zt_t *zt, isc_boolean_t stop, - dns_result_t (*action)(dns_zone_t *, void *), void *uap) + isc_result_t (*action)(dns_zone_t *, void *), void *uap) { dns_rbtnode_t *node; dns_rbtnodechain_t chain; diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h index 7ac1eb81f5..fccf2da07d 100644 --- a/lib/tests/include/tests/t_api.h +++ b/lib/tests/include/tests/t_api.h @@ -68,7 +68,7 @@ void t_info(const char *format, ...); void t_result(int result); char *t_getenv(const char *name); char *t_fgetbs(FILE *fp); -dns_result_t t_dns_result_fromtext(char *result); +isc_result_t t_dns_result_fromtext(char *result); int t_dc_method_fromtext(char *dc_method); int t_bustline(char *line, char **toks); int t_eval(char *filename, int (*func)(char **), int nargs); diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c index 159ae4bcaf..a997a3648a 100644 --- a/lib/tests/t_api.c +++ b/lib/tests/t_api.c @@ -539,7 +539,7 @@ t_getdate(char *buf, size_t buflen) /* some generally used utilities */ struct dns_errormap { - dns_result_t result; + isc_result_t result; char *text; } dns_errormap[] = { { DNS_R_SUCCESS, "DNS_R_SUCCESS" }, @@ -587,13 +587,13 @@ struct dns_errormap { { DNS_R_NXRDATASET, "DNS_R_NXRDATASET" }, { DNS_R_BADDB, "DNS_R_BADDB" }, { DNS_R_ZONECUT, "DNS_R_ZONECUT" }, - { (dns_result_t) 0, NULL } + { (isc_result_t) 0, NULL } }; -dns_result_t +isc_result_t t_dns_result_fromtext(char *name) { - dns_result_t result; + isc_result_t result; struct dns_errormap *pmap; result = DNS_R_UNEXPECTED;