From: Peter Krempa <[email protected]> Replace the implementation in 'virDomainLeaseInsert' by VIR_APPEND_ELEMENT and remove the unneeded helpers.
Signed-off-by: Peter Krempa <[email protected]> --- src/conf/domain_conf.c | 22 ++++------------------ src/conf/domain_conf.h | 4 +--- src/libvirt_private.syms | 2 -- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2d3e646bcb..6375eecffb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16158,25 +16158,11 @@ int virDomainLeaseIndex(virDomainDef *def, } -void virDomainLeaseInsertPreAlloc(virDomainDef *def) -{ - VIR_EXPAND_N(def->leases, def->nleases, 1); -} - -void virDomainLeaseInsert(virDomainDef *def, virDomainLeaseDef *lease) -{ - virDomainLeaseInsertPreAlloc(def); - virDomainLeaseInsertPreAlloced(def, lease); -} - - -void virDomainLeaseInsertPreAlloced(virDomainDef *def, - virDomainLeaseDef *lease) +void +virDomainLeaseInsert(virDomainDef *def, + virDomainLeaseDef *lease) { - if (lease == NULL) - VIR_SHRINK_N(def->leases, def->nleases, 1); - else - def->leases[def->nleases-1] = lease; + VIR_APPEND_ELEMENT(def->leases, def->nleases, lease); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d17f6352bd..3fec157a26 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4200,9 +4200,7 @@ const char *virDomainControllerAliasFind(const virDomainDef *def, int virDomainLeaseIndex(virDomainDef *def, virDomainLeaseDef *lease); void virDomainLeaseInsert(virDomainDef *def, virDomainLeaseDef *lease); -void virDomainLeaseInsertPreAlloc(virDomainDef *def); -void virDomainLeaseInsertPreAlloced(virDomainDef *def, - virDomainLeaseDef *lease); + virDomainLeaseDef * virDomainLeaseRemoveAt(virDomainDef *def, size_t i); virDomainLeaseDef * diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30c4564456..be073ced43 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -515,8 +515,6 @@ virDomainLaunchSecurityTypeToString; virDomainLeaseDefFree; virDomainLeaseIndex; virDomainLeaseInsert; -virDomainLeaseInsertPreAlloc; -virDomainLeaseInsertPreAlloced; virDomainLeaseRemove; virDomainLeaseRemoveAt; virDomainLifecycleActionTypeFromString; -- 2.54.0
