From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 13 Apr 2018 12:56:40 +0000 (+0200)
Subject: src: Unify dispose function names
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9ce3c20bb1fa96cdca3dfed2b1246bb30a2c32e1;p=libvirt.git

src: Unify dispose function names

If a function is disposing virSomething it should be called
virSomethingDispose(). There are two offenders:
virCapabilitiesDispose(virCapsPtr) and
virDomainXMLOptionClassDispose(virDomainXMLOptionPtr).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index edf9f54f77..33b9194041 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -58,14 +58,14 @@ VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST,
               "suspend_mem", "suspend_disk", "suspend_hybrid");
 
 static virClassPtr virCapsClass;
-static void virCapabilitiesDispose(void *obj);
+static void virCapsDispose(void *obj);
 
 static int virCapabilitiesOnceInit(void)
 {
     if (!(virCapsClass = virClassNew(virClassForObject(),
                                      "virCaps",
                                      sizeof(virCaps),
-                                     virCapabilitiesDispose)))
+                                     virCapsDispose)))
         return -1;
 
     return 0;
@@ -215,7 +215,7 @@ virCapabilitiesClearSecModel(virCapsHostSecModelPtr secmodel)
 }
 
 static void
-virCapabilitiesDispose(void *object)
+virCapsDispose(void *object)
 {
     virCapsPtr caps = object;
     size_t i;
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d23182f18a..4dad8e3b20 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -934,7 +934,7 @@ VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST,
 static virClassPtr virDomainObjClass;
 static virClassPtr virDomainXMLOptionClass;
 static void virDomainObjDispose(void *obj);
-static void virDomainXMLOptionClassDispose(void *obj);
+static void virDomainXMLOptionDispose(void *obj);
 
 static int virDomainObjOnceInit(void)
 {
@@ -947,7 +947,7 @@ static int virDomainObjOnceInit(void)
     if (!(virDomainXMLOptionClass = virClassNew(virClassForObject(),
                                                 "virDomainXMLOption",
                                                 sizeof(virDomainXMLOption),
-                                                virDomainXMLOptionClassDispose)))
+                                                virDomainXMLOptionDispose)))
         return -1;
 
     return 0;
@@ -957,7 +957,7 @@ VIR_ONCE_GLOBAL_INIT(virDomainObj)
 
 
 static void
-virDomainXMLOptionClassDispose(void *obj)
+virDomainXMLOptionDispose(void *obj)
 {
     virDomainXMLOptionPtr xmlopt = obj;