upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

renamed cfg_map_addclone() into cfg_map_add()

Browse source 
Since there is no `cfg_map_add()` anymore, and `cfg_map_addclone()`
wasn't quite clear, let's rename to `cfg_map_addclone()` into
`cfg_map_add()`, as this is fundamentally what this function is doing.
This commit is contained in:
Colin Vidal 2026-05-21 09:53:59 +02:00
parent b13bd6cb85
commit 3594b0ff7a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/isccfg/include/isccfg/cfg.h
View file

@ -136,10 +136,10 @@ cfg_parser_currentfile(cfg_parser_t *pctx);
*/
isc_result_t
cfg_map_addclone(cfg_obj_t *map, const cfg_obj_t *obj,
const cfg_clausedef_t *clause);
cfg_map_add(cfg_obj_t *map, const cfg_obj_t *obj,
const cfg_clausedef_t *clause);
/*%<
* Add a clone of 'obj' to the specified clause in mapbody 'mapobj'.
* Clone 'obj' and add its clone to the specified clause in mapbody 'mapobj'.
* If the clause is tagged with CFG_CLAUSEFLAG_MULTI, the function expects
* that 'obj' is a list and will clone each element and sequentially add them
* (preserving the order), instead of adding a list as single element of

6
lib/isccfg/namedconf.c
View file

@ -1176,8 +1176,8 @@ map_merge(const cfg_obj_t *config ISC_ATTR_UNUSED, cfg_obj_t *effectivemap,
if (effectiveres == ISC_R_NOTFOUND &&
defaultres == ISC_R_SUCCESS)
{
INSIST(cfg_map_addclone(effectivemap, defaultobj,
clause) == ISC_R_SUCCESS);
INSIST(cfg_map_add(effectivemap, defaultobj, clause) ==
ISC_R_SUCCESS);
continue;
}
@ -1205,7 +1205,7 @@ cloneto(cfg_obj_t *options, const cfg_obj_t *obj, const char *clausename) {
const cfg_clausedef_t *clause = cfg_map_findclause(options->type,
clausename);
result = cfg_map_addclone(options, obj, clause);
result = cfg_map_add(options, obj, clause);
INSIST(result == ISC_R_SUCCESS);
}

4
lib/isccfg/parser.c
View file

@ -4047,8 +4047,8 @@ map_define(cfg_obj_t *mapobj, cfg_obj_t *obj, const cfg_clausedef_t *clause) {
}
isc_result_t
cfg_map_addclone(cfg_obj_t *map, const cfg_obj_t *obj,
const cfg_clausedef_t *clause) {
cfg_map_add(cfg_obj_t *map, const cfg_obj_t *obj,
const cfg_clausedef_t *clause) {
isc_result_t result = ISC_R_SUCCESS;
cfg_obj_t *clone = NULL;