[libvirt PATCH v2 04/10] conf: rename virDomainMomentFindLeaf() to virDomainMomentObjListFindLeaf()

Pavel Mores pmores at redhat.com
Wed May 6 11:42:20 UTC 2020


We'll need the original name for a function that finds leaf for a single
virDomainMomentObj.  The new name properly advertises that the function
actually works on a virDomainMomentObjList, as some (but not all) of
existing functions operating on lists do.

Signed-off-by: Pavel Mores <pmores at redhat.com>
---
 src/conf/virdomaincheckpointobjlist.c | 2 +-
 src/conf/virdomainmomentobjlist.c     | 2 +-
 src/conf/virdomainmomentobjlist.h     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c
index a4942ea706..2df1c426a2 100644
--- a/src/conf/virdomaincheckpointobjlist.c
+++ b/src/conf/virdomaincheckpointobjlist.c
@@ -186,7 +186,7 @@ virDomainCheckpointUpdateRelations(virDomainCheckpointObjListPtr checkpoints,
     int ret = virDomainMomentUpdateRelations(checkpoints->base);
 
     if (ret == 0)
-        *leaf = virDomainMomentFindLeaf(checkpoints->base);
+        *leaf = virDomainMomentObjListFindLeaf(checkpoints->base);
     return ret;
 }
 
diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c
index 18dbd434fb..41e887ba18 100644
--- a/src/conf/virdomainmomentobjlist.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -588,7 +588,7 @@ virDomainMomentCheckCycles(virDomainMomentObjListPtr list,
 
 /* If there is exactly one leaf node, return that node. */
 virDomainMomentObjPtr
-virDomainMomentFindLeaf(virDomainMomentObjListPtr list)
+virDomainMomentObjListFindLeaf(virDomainMomentObjListPtr list)
 {
     virDomainMomentObjPtr moment = &list->metaroot;
 
diff --git a/src/conf/virdomainmomentobjlist.h b/src/conf/virdomainmomentobjlist.h
index 75198909ba..cab51edbc4 100644
--- a/src/conf/virdomainmomentobjlist.h
+++ b/src/conf/virdomainmomentobjlist.h
@@ -121,4 +121,4 @@ int virDomainMomentUpdateRelations(virDomainMomentObjListPtr moments);
 int virDomainMomentCheckCycles(virDomainMomentObjListPtr list,
                                virDomainMomentDefPtr def,
                                const char *domname);
-virDomainMomentObjPtr virDomainMomentFindLeaf(virDomainMomentObjListPtr list);
+virDomainMomentObjPtr virDomainMomentObjListFindLeaf(virDomainMomentObjListPtr list);
-- 
2.24.1




More information about the libvir-list mailing list