mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
checkpoint
This commit is contained in:
parent
0180ccf72c
commit
d176cbca5b
2 changed files with 8 additions and 13 deletions
|
|
@ -87,15 +87,15 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator) {
|
|||
}
|
||||
|
||||
dns_result_t
|
||||
dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name,
|
||||
isc_buffer_t *target)
|
||||
{
|
||||
dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
|
||||
|
||||
/*
|
||||
* Return the origin to which returned node names are relative.
|
||||
*/
|
||||
|
||||
REQUIRE(DNS_DBITERATOR_VALID(iterator));
|
||||
REQUIRE(iterator->relative_names);
|
||||
REQUIRE(dns_name_hasbuffer(name));
|
||||
|
||||
return (iterator->methods->origin(iterator, name, target));
|
||||
return (iterator->methods->origin(iterator, name));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ typedef struct dns_dbiteratormethods {
|
|||
dns_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, dns_name_t *name,
|
||||
isc_buffer_t *target);
|
||||
dns_result_t (*origin)(dns_dbiterator_t *iterator,
|
||||
dns_name_t *name);
|
||||
} dns_dbiteratormethods_t;
|
||||
|
||||
#define DNS_DBITERATOR_MAGIC 0x444E5349U /* DNSI. */
|
||||
|
|
@ -103,7 +103,6 @@ struct dns_dbiterator {
|
|||
dns_dbiteratormethods_t * methods;
|
||||
dns_db_t * db;
|
||||
dns_dbversion_t * version;
|
||||
isc_boolean_t paused;
|
||||
isc_boolean_t relative_names;
|
||||
};
|
||||
|
||||
|
|
@ -214,8 +213,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator);
|
|||
*/
|
||||
|
||||
dns_result_t
|
||||
dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name,
|
||||
isc_buffer_t *target);
|
||||
dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name);
|
||||
/*
|
||||
* Return the origin to which returned node names are relative.
|
||||
*
|
||||
|
|
@ -223,10 +221,7 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name,
|
|||
*
|
||||
* 'iterator' is a relative_names iterator.
|
||||
*
|
||||
* 'name' is a valid name.
|
||||
*
|
||||
* 'target' is a valid buffer of type ISC_BUFFERTYPE_BINARY, or
|
||||
* 'target' is NULL and 'name' has a dedicated buffer.
|
||||
* 'name' is a valid name with a dedicated buffer.
|
||||
*
|
||||
* Ensures:
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in a new issue