From 125d72976ab6b8fa6629a5ace276a86e9fef91ac Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Fri, 2 Jul 1999 17:51:27 +0000 Subject: [PATCH] Merged redundant DNS_R_ and ISC_R_ result codes --- lib/dns/include/dns/result.h | 105 ++++++++++++++++++----------------- lib/dns/result.c | 91 +++++++++++++----------------- 2 files changed, 93 insertions(+), 103 deletions(-) diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index 305b0615d8..d17b68555a 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -26,59 +26,60 @@ ISC_LANG_BEGINDECLS typedef isc_result_t dns_result_t; /* XXXRTH for legacy use only */ -#define DNS_R_SUCCESS (ISC_RESULTCLASS_DNS + 0) -#define DNS_R_NOMEMORY (ISC_RESULTCLASS_DNS + 1) -#define DNS_R_NOSPACE (ISC_RESULTCLASS_DNS + 2) -#define DNS_R_LABELTOOLONG (ISC_RESULTCLASS_DNS + 3) -#define DNS_R_BADESCAPE (ISC_RESULTCLASS_DNS + 4) -#define DNS_R_BADBITSTRING (ISC_RESULTCLASS_DNS + 5) -#define DNS_R_BITSTRINGTOOLONG (ISC_RESULTCLASS_DNS + 6) -#define DNS_R_EMPTYLABEL (ISC_RESULTCLASS_DNS + 7) -#define DNS_R_BADDOTTEDQUAD (ISC_RESULTCLASS_DNS + 8) -#define DNS_R_UNEXPECTEDEND (ISC_RESULTCLASS_DNS + 9) -#define DNS_R_NOTIMPLEMENTED (ISC_RESULTCLASS_DNS + 10) -#define DNS_R_UNKNOWN (ISC_RESULTCLASS_DNS + 11) -#define DNS_R_BADLABELTYPE (ISC_RESULTCLASS_DNS + 12) -#define DNS_R_BADPOINTER (ISC_RESULTCLASS_DNS + 13) -#define DNS_R_TOOMANYHOPS (ISC_RESULTCLASS_DNS + 14) -#define DNS_R_DISALLOWED (ISC_RESULTCLASS_DNS + 15) -#define DNS_R_NOMORE (ISC_RESULTCLASS_DNS + 16) -#define DNS_R_EXTRATOKEN (ISC_RESULTCLASS_DNS + 17) -#define DNS_R_EXTRADATA (ISC_RESULTCLASS_DNS + 18) -#define DNS_R_TEXTTOLONG (ISC_RESULTCLASS_DNS + 19) -#define DNS_R_RANGE (ISC_RESULTCLASS_DNS + 20) -#define DNS_R_EXISTS (ISC_RESULTCLASS_DNS + 21) -#define DNS_R_NOTFOUND (ISC_RESULTCLASS_DNS + 22) -#define DNS_R_SYNTAX (ISC_RESULTCLASS_DNS + 23) -#define DNS_R_BADCKSUM (ISC_RESULTCLASS_DNS + 24) -#define DNS_R_BADAAAA (ISC_RESULTCLASS_DNS + 25) -#define DNS_R_NOOWNER (ISC_RESULTCLASS_DNS + 26) -#define DNS_R_NOTTL (ISC_RESULTCLASS_DNS + 27) -#define DNS_R_BADCLASS (ISC_RESULTCLASS_DNS + 28) -#define DNS_R_UNEXPECTEDTOKEN (ISC_RESULTCLASS_DNS + 29) -#define DNS_R_BADBASE64 (ISC_RESULTCLASS_DNS + 30) -#define DNS_R_PARTIALMATCH (ISC_RESULTCLASS_DNS + 31) -#define DNS_R_NEWORIGIN (ISC_RESULTCLASS_DNS + 32) -#define DNS_R_UNCHANGED (ISC_RESULTCLASS_DNS + 33) -#define DNS_R_BADTTL (ISC_RESULTCLASS_DNS + 34) -#define DNS_R_NOREDATA (ISC_RESULTCLASS_DNS + 35) -#define DNS_R_CONTINUE (ISC_RESULTCLASS_DNS + 36) -#define DNS_R_DELEGATION (ISC_RESULTCLASS_DNS + 37) -#define DNS_R_GLUE (ISC_RESULTCLASS_DNS + 38) -#define DNS_R_DNAME (ISC_RESULTCLASS_DNS + 39) -#define DNS_R_CNAME (ISC_RESULTCLASS_DNS + 40) -#define DNS_R_NXDOMAIN (ISC_RESULTCLASS_DNS + 41) -#define DNS_R_NXRDATASET (ISC_RESULTCLASS_DNS + 42) -#define DNS_R_BADDB (ISC_RESULTCLASS_DNS + 43) -#define DNS_R_ZONECUT (ISC_RESULTCLASS_DNS + 44) -#define DNS_R_FORMERR (ISC_RESULTCLASS_DNS + 45) -#define DNS_R_BADZONE (ISC_RESULTCLASS_DNS + 46) /* XXX MPA*/ -#define DNS_R_TIMEDOUT (ISC_RESULTCLASS_DNS + 47) -#define DNS_R_CANCELED (ISC_RESULTCLASS_DNS + 48) -#define DNS_R_UNEXPECTED (ISC_RESULTCLASS_DNS + 49) -#define DNS_R_MOREDATA (ISC_RESULTCLASS_DNS + 50) +#define DNS_R_SUCCESS ISC_R_SUCCESS +#define DNS_R_NOMEMORY ISC_R_NOMEMORY +#define DNS_R_NOSPACE ISC_R_NOSPACE +#define DNS_R_NOTIMPLEMENTED ISC_R_NOTIMPLEMENTED +#define DNS_R_NOMORE ISC_R_NOMORE +#define DNS_R_EXISTS ISC_R_EXISTS +#define DNS_R_NOTFOUND ISC_R_NOTFOUND +#define DNS_R_BADBASE64 ISC_R_BADBASE64 +#define DNS_R_TIMEDOUT ISC_R_TIMEDOUT +#define DNS_R_CANCELED ISC_R_CANCELED +#define DNS_R_UNEXPECTED ISC_R_UNEXPECTED -#define DNS_R_NRESULTS 51 /* Number of results */ +#define DNS_R_LABELTOOLONG (ISC_RESULTCLASS_DNS + 0) +#define DNS_R_BADESCAPE (ISC_RESULTCLASS_DNS + 1) +#define DNS_R_BADBITSTRING (ISC_RESULTCLASS_DNS + 2) +#define DNS_R_BITSTRINGTOOLONG (ISC_RESULTCLASS_DNS + 3) +#define DNS_R_EMPTYLABEL (ISC_RESULTCLASS_DNS + 4) +#define DNS_R_BADDOTTEDQUAD (ISC_RESULTCLASS_DNS + 5) +#define DNS_R_UNEXPECTEDEND (ISC_RESULTCLASS_DNS + 6) +#define DNS_R_UNKNOWN (ISC_RESULTCLASS_DNS + 7) +#define DNS_R_BADLABELTYPE (ISC_RESULTCLASS_DNS + 8) +#define DNS_R_BADPOINTER (ISC_RESULTCLASS_DNS + 9) +#define DNS_R_TOOMANYHOPS (ISC_RESULTCLASS_DNS + 10) +#define DNS_R_DISALLOWED (ISC_RESULTCLASS_DNS + 11) +#define DNS_R_EXTRATOKEN (ISC_RESULTCLASS_DNS + 12) +#define DNS_R_EXTRADATA (ISC_RESULTCLASS_DNS + 13) +#define DNS_R_TEXTTOLONG (ISC_RESULTCLASS_DNS + 14) +#define DNS_R_RANGE (ISC_RESULTCLASS_DNS + 15) +#define DNS_R_SYNTAX (ISC_RESULTCLASS_DNS + 16) +#define DNS_R_BADCKSUM (ISC_RESULTCLASS_DNS + 17) +#define DNS_R_BADAAAA (ISC_RESULTCLASS_DNS + 18) +#define DNS_R_NOOWNER (ISC_RESULTCLASS_DNS + 19) +#define DNS_R_NOTTL (ISC_RESULTCLASS_DNS + 20) +#define DNS_R_BADCLASS (ISC_RESULTCLASS_DNS + 21) +#define DNS_R_UNEXPECTEDTOKEN (ISC_RESULTCLASS_DNS + 22) +#define DNS_R_PARTIALMATCH (ISC_RESULTCLASS_DNS + 23) +#define DNS_R_NEWORIGIN (ISC_RESULTCLASS_DNS + 24) +#define DNS_R_UNCHANGED (ISC_RESULTCLASS_DNS + 25) +#define DNS_R_BADTTL (ISC_RESULTCLASS_DNS + 26) +#define DNS_R_NOREDATA (ISC_RESULTCLASS_DNS + 27) +#define DNS_R_CONTINUE (ISC_RESULTCLASS_DNS + 28) +#define DNS_R_DELEGATION (ISC_RESULTCLASS_DNS + 29) +#define DNS_R_GLUE (ISC_RESULTCLASS_DNS + 30) +#define DNS_R_DNAME (ISC_RESULTCLASS_DNS + 31) +#define DNS_R_CNAME (ISC_RESULTCLASS_DNS + 32) +#define DNS_R_NXDOMAIN (ISC_RESULTCLASS_DNS + 33) +#define DNS_R_NXRDATASET (ISC_RESULTCLASS_DNS + 34) +#define DNS_R_BADDB (ISC_RESULTCLASS_DNS + 35) +#define DNS_R_ZONECUT (ISC_RESULTCLASS_DNS + 36) +#define DNS_R_FORMERR (ISC_RESULTCLASS_DNS + 37) +#define DNS_R_BADZONE (ISC_RESULTCLASS_DNS + 38) /* XXX MPA*/ +#define DNS_R_MOREDATA (ISC_RESULTCLASS_DNS + 39) + +#define DNS_R_NRESULTS 40 /* Number of results */ char * dns_result_totext(dns_result_t); void dns_result_register(void); diff --git a/lib/dns/result.c b/lib/dns/result.c index 18238cfdab..ded18cf5ca 100644 --- a/lib/dns/result.c +++ b/lib/dns/result.c @@ -27,57 +27,46 @@ #include static char *text[DNS_R_NRESULTS] = { - "success", /* 0 */ - "out of memory", /* 1 */ - "ran out of space", /* 2 */ - "label too long", /* 3 */ - "bad escape", /* 4 */ - "bad bitstring", /* 5 */ - "bitstring too long", /* 6 */ - "empty label", /* 7 */ - "bad dotted quad", /* 8 */ - "unexpected end of input", /* 9 */ - "not implemented", /* 10 */ - "unknown class/type", /* 11 */ - "bad label type", /* 12 */ - "bad compression pointer", /* 13 */ - "too many hops", /* 14 */ - "disallowed (by application policy)", /* 15 */ - "no more list elements", /* 16 */ - "extra input text", /* 17 */ - "extra input data", /* 18 */ - "text too long", /* 19 */ - "out of range", /* 20 */ - "already exists", /* 21 */ - "not found", /* 22 */ - "syntax error", /* 23 */ - "bad checksum", /* 24 */ - "bad IPv6 address", /* 25 */ - "no owner", /* 26 */ - "no ttl", /* 27 */ - "bad class", /* 28 */ - "unexpected token", /* 29 */ - "bad base64 encoding", /* 30 */ - "partial match", /* 31 */ - "new origin", /* 32 */ - "unchanged", /* 33 */ - "bad ttl", /* 34 */ - "more data needed/to be rendered", /* 35 */ - "continue", /* 36 */ - "delegation", /* 37 */ - "glue", /* 38 */ - "dname", /* 39 */ - "cname", /* 40 */ - "nxdomain", /* 41 */ - "nxrdataset", /* 42 */ - "bad database", /* 43 */ - "zonecut", /* 44 */ - "format error in packet", /* 45 */ - "bad zone", /* 46 */ - "timed out", /* 47 */ - "canceled", /* 48 */ - "unexpected error", /* 49 */ - "more data", /* 50 */ + "label too long", /* 0 */ + "bad escape", /* 1 */ + "bad bitstring", /* 2 */ + "bitstring too long", /* 3 */ + "empty label", /* 4 */ + "bad dotted quad", /* 5 */ + "unexpected end of input", /* 6 */ + "unknown class/type", /* 7 */ + "bad label type", /* 8 */ + "bad compression pointer", /* 9 */ + "too many hops", /* 10 */ + "disallowed (by application policy)", /* 11 */ + "extra input text", /* 12 */ + "extra input data", /* 13 */ + "text too long", /* 14 */ + "out of range", /* 15 */ + "syntax error", /* 16 */ + "bad checksum", /* 17 */ + "bad IPv6 address", /* 18 */ + "no owner", /* 19 */ + "no ttl", /* 20 */ + "bad class", /* 21 */ + "unexpected token", /* 22 */ + "partial match", /* 23 */ + "new origin", /* 24 */ + "unchanged", /* 25 */ + "bad ttl", /* 26 */ + "more data needed/to be rendered", /* 27 */ + "continue", /* 28 */ + "delegation", /* 29 */ + "glue", /* 30 */ + "dname", /* 31 */ + "cname", /* 32 */ + "nxdomain", /* 33 */ + "nxrdataset", /* 34 */ + "bad database", /* 35 */ + "zonecut", /* 36 */ + "format error in packet", /* 37 */ + "bad zone", /* 38 */ + "more data", /* 39 */ }; #define DNS_RESULT_RESULTSET 2