s/DNS_R_/ISC_R_/ change for some codes. Mostly documentation in these files.

lib/dns/include/dns/acl.h

@@ -150,7 +150,7 @@ dns_acl_match(isc_netaddr_t *reqaddr,
  * If there is no match, *match will be set to zero.
  *
  * Returns:
- *	DNS_R_SUCCESS		Always succeeds.
+ *	ISC_R_SUCCESS		Always succeeds.
  */
 
 ISC_LANG_ENDDECLS

lib/dns/include/dns/cache.h

@@ -87,8 +87,8 @@ dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  */
 
 void
@@ -161,8 +161,8 @@ dns_cache_setfilename(dns_cache_t *cahce, char *filename);
  * Files that are no longer used are not unlinked automatically.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *	Various file-related failures
  */
 
@@ -183,7 +183,7 @@ dns_cache_load(dns_cache_t *cache);
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *      Various failures depending on the database implementation type
  */
 
@@ -203,7 +203,7 @@ dns_cache_dump(dns_cache_t *cache);
  * 
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *      Various failures depending on the database implementation type
  */
 

lib/dns/include/dns/cert.h

@@ -35,7 +35,7 @@ isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source);
  *	'source' is a valid text region.
  *
  * Returns:
- *	DNS_R_SUCCESS			on success
+ *	ISC_R_SUCCESS			on success
  *	DNS_R_UNKNOWN			mnemonic type is unknown
  *	DNS_R_RANGE			numeric type is out of range
  */
@@ -54,8 +54,8 @@ isc_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target);
  *		The used space in 'target' is updated.
  *
  * Returns:
- *	DNS_R_SUCCESS			on success
- *	DNS_R_NOSPACE			target buffer is too small
+ *	ISC_R_SUCCESS			on success
+ *	ISC_R_NOSPACE			target buffer is too small
  */
 
 ISC_LANG_ENDDECLS

lib/dns/include/dns/compress.h

@@ -76,7 +76,7 @@ isc_result_t dns_compress_init(dns_compress_t *cctx, int edns,
  *		cctx->global is initalised.
  *
  *	Returns:
- *		DNS_R_SUCCESS
+ *		ISC_R_SUCCESS
  *		failures from dns_rbt_create()
  */
 

lib/dns/include/dns/db.h

@@ -227,9 +227,9 @@ dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
- *	DNS_R_NOTFOUND				db_type not found
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
+ *	ISC_R_NOTFOUND				db_type not found
  *
  *	Many other errors are possible, depending on what db_type was
  *	specified.
@@ -380,8 +380,8 @@ dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *
  *	Other results are possible, depending upon the database
  *	implementation used, syntax errors in the master file, etc.
@@ -404,8 +404,8 @@ dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp);
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *
  *	Other results are possible, depending upon the database
  *	implementation used, syntax errors in the master file, etc.
@@ -431,8 +431,8 @@ dns_db_load(dns_db_t *db, const char *filename);
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *
  *	Other results are possible, depending upon the database
  *	implementation used, syntax errors in the master file, etc.
@@ -451,8 +451,8 @@ dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename);
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *
  *	Other results are possible, depending upon the database
  *	implementation used, OS file errors, etc.
@@ -496,8 +496,8 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp);
  * 
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  *
  *	Other results are possible, depending upon the database
  *	implementation used.
@@ -587,9 +587,9 @@ dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOTFOUND			If !create and name not found.
- *	DNS_R_NOMEMORY		        Can only happen if create is ISC_TRUE.
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOTFOUND			If !create and name not found.
+ *	ISC_R_NOMEMORY		        Can only happen if create is ISC_TRUE.
  *
  *	Other results are possible, depending upon the database
  *	implementation used.
@@ -659,7 +659,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *
  *	Non-error results are:
  *
- *		DNS_R_SUCCESS			The desired node and type were
+ *		ISC_R_SUCCESS			The desired node and type were
  *						found.
  *
  *		DNS_R_GLUE			The desired node and type were
@@ -710,7 +710,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *		DNS_R_NXRRSET			The desired name exists, but
  *						the desired type does not.
  *
- *		DNS_R_NOTFOUND			The desired name does not
+ *		ISC_R_NOTFOUND			The desired name does not
  *						exist, and no delegation could
  *						be found.  This result can only
  *						occur if 'db' is a cache
@@ -732,7 +732,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *
  *	Error results:
  *
- *		DNS_R_NOMEMORY
+ *		ISC_R_NOMEMORY
  *
  *		DNS_R_BADDB			Data that is required to be
  *						present in the DB, e.g. an NXT
@@ -783,9 +783,9 @@ dns_db_findzonecut(dns_db_t *db, dns_name_t *name,
  *
  *	Non-error results are:
  *
- *		DNS_R_SUCCESS
+ *		ISC_R_SUCCESS
  *
- *		DNS_R_NOTFOUND
+ *		ISC_R_NOTFOUND
  *
  *		Other results are possible, and should all be treated as
  *		errors.
@@ -882,8 +882,8 @@ dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
  */
 
 /***
@@ -936,8 +936,8 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOTFOUND
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOTFOUND
  *	
  *	Other results are possible, depending upon the database
  *	implementation used.
@@ -974,8 +974,8 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOTFOUND
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOTFOUND
  *	
  *	Other results are possible, depending upon the database
  *	implementation used.
@@ -1028,9 +1028,9 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *	DNS_R_UNCHANGED			The operation did not change anything.
- *	DNS_R_NOMEMORY
+ *	ISC_R_NOMEMORY
  *	
  *	Other results are possible, depending upon the database
  *	implementation used.
@@ -1066,9 +1066,9 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *	DNS_R_UNCHANGED			The operation did not change anything.
- *	DNS_R_NXRDATASET		All rdata of the same type as those
+ *	DNS_R_NXRRSET			All rdata of the same type as those
  *					in 'rdataset' have been deleted.
  *	
  *	Other results are possible, depending upon the database
@@ -1110,7 +1110,7 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *	DNS_R_UNCHANGED			No rdatasets of 'type' existed before
  *					the operation was attempted.
  *	

lib/dns/include/dns/dbiterator.h

@@ -133,8 +133,8 @@ dns_dbiterator_first(dns_dbiterator_t *iterator);
  *	'iterator' is a valid iterator.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMORE			There are no nodes in the database.
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMORE			There are no nodes in the database.
  *
  *	Other results are possible, depending on the DB implementation.
  */
@@ -148,8 +148,8 @@ dns_dbiterator_last(dns_dbiterator_t *iterator);
  *	'iterator' is a valid iterator.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMORE			There are no nodes in the database.
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMORE			There are no nodes in the database.
  *
  *	Other results are possible, depending on the DB implementation.
  */
@@ -165,8 +165,8 @@ dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name);
  *	'name' is a valid name.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOTFOUND
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOTFOUND
  *
  *	Other results are possible, depending on the DB implementation.
  */
@@ -180,8 +180,8 @@ dns_dbiterator_prev(dns_dbiterator_t *iterator);
  *	'iterator' is a valid iterator.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMORE			There are no more nodes in the
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMORE			There are no more nodes in the
  *					database.
  *
  *	Other results are possible, depending on the DB implementation.
@@ -196,8 +196,8 @@ dns_dbiterator_next(dns_dbiterator_t *iterator);
  *	'iterator' is a valid iterator.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMORE			There are no more nodes in the
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMORE			There are no more nodes in the
  *					database.
  *
  *	Other results are possible, depending on the DB implementation.
@@ -218,13 +218,13 @@ dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
  *	nodep != NULL && *nodep == NULL
  *
  *	The node cursor of 'iterator' is at a valid location (i.e. the
- *	result of last call to a cursor movement command was DNS_R_SUCCESS).
+ *	result of last call to a cursor movement command was ISC_R_SUCCESS).
  *
  *	'name' is NULL, or is a valid name with a dedicated buffer.
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *	DNS_R_NEWORIGIN			If this iterator was created with
  *					'relative_names' set to ISC_TRUE,
  *					then DNS_R_NEWORIGIN will be returned
@@ -259,7 +259,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator);
  *	released.
  *
  * Returns:
- *	DNS_R_SUCCESS
+ *	ISC_R_SUCCESS
  *
  *	Other results are possible, depending on the DB implementation.
  */
@@ -277,8 +277,8 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name);
  *
  * Returns:
  *
- *	DNS_R_SUCCESS
- *	DNS_R_NOSPACE
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOSPACE
  *
  *	Other results are possible, depending on the DB implementation.
  */

lib/dns/include/dns/dbtable.h

@@ -58,9 +58,9 @@ dns_dbtable_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
  *	'rdclass' is a valid class
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
- *	DNS_R_UNEXPECTED
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
+ *	ISC_R_UNEXPECTED
  */
 
 void
@@ -142,6 +142,6 @@ 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
  *
- * Returns:  DNS_R_SUCCESS		on success
+ * Returns:  ISC_R_SUCCESS		on success
  *	     <something else>		no default and match
  */

lib/dns/include/dns/dispatch.h

@@ -214,9 +214,9 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
  *
  * Returns:
  *
- *	DNS_R_SUCCESS		-- all is well.
- *	DNS_R_NOMEMORY		-- memory could not be allocated.
- *	DNS_R_NOMORE		-- no more message ids can be allocated
+ *	ISC_R_SUCCESS		-- all is well.
+ *	ISC_R_NOMEMORY		-- memory could not be allocated.
+ *	ISC_R_NOMORE		-- no more message ids can be allocated
  *				   for this destination.
  */
 

lib/dns/include/dns/dnssec.h

@@ -95,7 +95,7 @@ dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
  *		'sigrdata' is a valid rdata containing a SIG record
  *
  *	Returns:
- *		DNS_R_SUCCESS
+ *		ISC_R_SUCCESS
  *		ISC_R_NOMEMORY
  *		DNS_R_SIGINVALID - the signature fails to verify
  *		DNS_R_SIGEXPIRED - the signature has expired

lib/dns/include/dns/journal.h

@@ -272,9 +272,9 @@ dns_diff_print(dns_diff_t *diff, FILE *file);
  *	'file' to refer to a open file or NULL.
  *
  * Returns:
- *	DNS_R_SUCCESS
- *	DNS_R_NOMEMORY
- *	DNS_R_UNEXPECTED
+ *	ISC_R_SUCCESS
+ *	ISC_R_NOMEMORY
+ *	ISC_R_UNEXPECTED
  *	any error from dns_rdataset_totext()
  */
 	
@@ -427,8 +427,8 @@ dns_journal_iter_init(dns_journal_t *j,
  * from SOA serial number 'begin_serial' to 'end_serial'.
  *
  * Returns:
- *	DNS_R_SUCCESS	
- *	DNS_R_NOTFOUND	begin_serial is within the range of adressable
+ *	ISC_R_SUCCESS	
+ *	ISC_R_NOTFOUND	begin_serial is within the range of adressable
  *			serial numbers covered by the journal, but
  *			this particular serial number does not exist.
  *	DNS_R_RANGE	begin_serial is outside the addressable range.
@@ -452,7 +452,7 @@ void dns_journal_current_rr(dns_journal_t *j, dns_name_t **name,
  *
  * Requires:
  *      The last call to dns_journal_first_rr() or dns_journal_next_rr()
- *      returned DNS_R_SUCCESS.
+ *      returned ISC_R_SUCCESS.
  */
 
 /**************************************************************************/
@@ -475,8 +475,8 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename);
  *
  * Returns:
  *	DNS_R_NOJOURNAL when journal does not exist.
- *	DNS_R_NOTFOUND when current serial in not in journal.
- *	DNS_R_SUCCESS journal has been applied successfully to database.
+ *	ISC_R_NOTFOUND when current serial in not in journal.
+ *	ISC_R_SUCCESS journal has been applied successfully to database.
  *	others
  */
 

lib/dns/include/dns/keyflags.h

@@ -40,7 +40,7 @@ isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp,
  *	'source' is a valid text region.
  *
  * Returns:
- *	DNS_R_SUCCESS			on success
+ *	ISC_R_SUCCESS			on success
  *	DNS_R_UNKNOWN			mnemonic flag is unknown
  *	DNS_R_RANGE			numeric flag value is out of range
  */

lib/dns/include/dns/master.h

@@ -73,7 +73,7 @@ isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer,
  * and then calls 'callbacks->commit' to commit the rdatasets.  Rdata memory belongs
  * to dns_master_load and will be reused / released when the callback
  * completes.  dns_load_master will abort if callbacks->commit returns
- * any value other than DNS_R_SUCCESS.
+ * any value other than ISC_R_SUCCESS.
  *
  * If 'age_ttl' is ISC_TRUE and the master file contains one or more
  * $DATE directives, the TTLs of the data will be aged accordingly.
@@ -93,11 +93,11 @@ isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer,
  *	'mctx' to point to a memory context.
  *
  * Returns:
- *	DNS_R_SUCCESS upon successfully loading the master file.
- *	DNS_R_NOMEMORY out of memory.
- *	DNS_R_UNEXPECTEDEND expected to be able to read a input token and
+ *	ISC_R_SUCCESS upon successfully loading the master file.
+ *	ISC_R_NOMEMORY out of memory.
+ *	ISC_R_UNEXPECTEDEND expected to be able to read a input token and
  *		there was not one.
- *	DNS_R_UNEXPECTED
+ *	ISC_R_UNEXPECTED
  *	DNS_R_NOOWNER failed to specify a ownername.
  *	DNS_R_NOTTL failed to specify a ttl.
  *	DNS_R_BADCLASS record class did not match zone class.

lib/dns/include/dns/masterdump.h

@@ -73,8 +73,8 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db,
  * Temporary dynamic memory may be allocated from 'mctx'.
  *
  * Returns:
- *	DNS_R_SUCCESS 
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS 
+ *	ISC_R_NOMEMORY
  * 	Any database or rrset iterator error.
  *	Any dns_rdata_totext() error code.
  */
@@ -91,8 +91,8 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db,
  * Temporary dynamic memory may be allocated from 'mctx'.
  *
  * Returns:
- *	DNS_R_SUCCESS 
- *	DNS_R_NOMEMORY
+ *	ISC_R_SUCCESS 
+ *	ISC_R_NOMEMORY
  * 	Any database or rrset iterator error.
  *	Any dns_rdata_totext() error code.
  */

lib/dns/include/dns/message.h

@@ -229,8 +229,8 @@ dns_message_create(isc_mem_t *mctx, unsigned int intent,
  *	structure.
  *
  * Returns:
- *	DNS_R_NOMEMORY		-- out of memory
- *	DNS_R_SUCCESS		-- success
+ *	ISC_R_NOMEMORY		-- out of memory
+ *	ISC_R_SUCCESS		-- success
  */
 
 void
@@ -290,7 +290,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
  *
  * If this is a multi-packet message (edns) and more data is required to
  * build the full message state, DNS_R_MOREDATA is returned.  In this case,
- * this function should be repeated with all input buffers until DNS_R_SUCCESS
+ * this function should be repeated with all input buffers until ISC_R_SUCCESS
  * (or an error) is returned.
  *
  * Requires:
@@ -305,8 +305,8 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
  * 	and rdata sizes, etc.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well
- *	DNS_R_NOMEMORY		-- no memory
+ *	ISC_R_SUCCESS		-- all is well
+ *	ISC_R_NOMEMORY		-- no memory
  *	DNS_R_MOREDATA		-- more packets needed for complete message
  *	DNS_R_???		-- bad signature (XXXMLG need more of these)
  *	Many other errors possible XXXMLG
@@ -332,8 +332,8 @@ dns_message_renderbegin(dns_message_t *msg, isc_buffer_t *buffer);
  *	The buffer is cleared before it is used.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well
- *	DNS_R_NOSPACE		-- output buffer is too small
+ *	ISC_R_SUCCESS		-- all is well
+ *	ISC_R_NOSPACE		-- output buffer is too small
  *	Anything that dns_compress_init() can return.
  */
 
@@ -341,7 +341,7 @@ 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
- * on a DNS_R_NOSPACE return from most of the render functions.
+ * on a ISC_R_NOSPACE return from most of the render functions.
  *
  * On successful completion, the old buffer is no longer used by the
  * library.  The new buffer is owned by the library until
@@ -356,8 +356,8 @@ dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer);
  *	buffer != NULL.
  *
  * Returns:
- *	DNS_R_NOSPACE		-- new buffer is too small
- *	DNS_R_SUCCESS		-- all is well.
+ *	ISC_R_NOSPACE		-- new buffer is too small
+ *	ISC_R_SUCCESS		-- all is well.
  */
 
 isc_result_t
@@ -375,8 +375,8 @@ dns_message_renderreserve(dns_message_t *msg, unsigned int space);
  *	dns_message_renderbegin() was called.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well.
- *	DNS_R_NOSPACE		-- not enough free space in the buffer.
+ *	ISC_R_SUCCESS		-- all is well.
+ *	ISC_R_NOSPACE		-- not enough free space in the buffer.
  */
 
 void
@@ -412,9 +412,9 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t section,
  *	dns_message_renderbegin() was called.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all records were written, and there are
+ *	ISC_R_SUCCESS		-- all records were written, and there are
  *				   no more records for this section.
- *	DNS_R_NOSPACE		-- Not enough room in the buffer to write
+ *	ISC_R_NOSPACE		-- Not enough room in the buffer to write
  *				   all records requested.
  *	DNS_R_MOREDATA		-- All requested records written, and there
  *				   are records remaining for this section.
@@ -449,7 +449,7 @@ dns_message_renderend(dns_message_t *msg);
  *	dns_message_renderbegin() was called.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well.
+ *	ISC_R_SUCCESS		-- all is well.
  */
 		      
 void
@@ -482,8 +482,8 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section);
  *	'section' be a valid section.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- All is well.
- *	DNS_R_NOMORE		-- No names on given section.
+ *	ISC_R_SUCCESS		-- All is well.
+ *	ISC_R_NOMORE		-- No names on given section.
  */
 
 isc_result_t
@@ -499,11 +499,11 @@ dns_message_nextname(dns_message_t *msg, dns_section_t section);
  *	'section' be a valid section.
  *
  *	dns_message_firstname() must have been called on this section,
- *	and the result was DNS_R_SUCCESS.
+ *	and the result was ISC_R_SUCCESS.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- All is well.
- *	DNS_R_NOMORE		-- No names in given section.
+ *	ISC_R_SUCCESS		-- All is well.
+ *	ISC_R_NOMORE		-- No names in given section.
  */
 
 void
@@ -526,7 +526,7 @@ dns_message_currentname(dns_message_t *msg, dns_section_t section,
  *
  *	dns_message_firstname() must have been called on this section,
  *	and the result of it and any dns_message_nextname() calls was
- *	DNS_R_SUCCESS.
+ *	ISC_R_SUCCESS.
  */
 
 isc_result_t
@@ -556,9 +556,9 @@ dns_message_findname(dns_message_t *msg, dns_section_t section,
  *	'type' be a valid type.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well.
+ *	ISC_R_SUCCESS		-- all is well.
  *	DNS_R_NXDOMAIN		-- name does not exist in that section.
- *	DNS_R_NXRDATASET	-- The name does exist, but the desired
+ *	DNS_R_NXRRSET		-- The name does exist, but the desired
  *				   type does not.
  */
 
@@ -575,8 +575,8 @@ dns_message_findtype(dns_name_t *name, dns_rdatatype_t type,
  *	'type' be a valid type, and NOT dns_rdatatype_any.
  *
  * Returns:
- *	DNS_R_SUCCESS		-- all is well.
- *	DNS_R_NOTFOUND		-- the desired type does not exist.
+ *	ISC_R_SUCCESS		-- all is well.
+ *	ISC_R_NOTFOUND		-- the desired type does not exist.
  */
 
 void
@@ -639,8 +639,8 @@ dns_message_gettempname(dns_message_t *msg, dns_name_t **item);
  *	item != NULL && *item == NULL
  *
  * Returns:
- *	DNS_R_SUCCESS		-- All is well.
- *	DNS_R_NOMEMORY		-- No item can be allocated.
+ *	ISC_R_SUCCESS		-- All is well.
+ *	ISC_R_NOMEMORY		-- No item can be allocated.
  */
 
 isc_result_t
@@ -656,8 +656,8 @@ dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item);
  *	item != NULL && *item == NULL
  *