From 3594b0ff7a3256ae05c0edeaa182f8cd380723b4 Mon Sep 17 00:00:00 2001 From: Colin Vidal Date: Thu, 21 May 2026 09:53:59 +0200 Subject: [PATCH] renamed `cfg_map_addclone()` into `cfg_map_add()` 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. --- lib/isccfg/include/isccfg/cfg.h | 6 +++--- lib/isccfg/namedconf.c | 6 +++--- lib/isccfg/parser.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index 592f538cd0..73c7a926eb 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -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 diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index fbccca2643..ea3b18aae6 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -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); } diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 80ceeadb81..854f0b9f95 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -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;