[libvirt] [dbus PATCH 2/9] util: move and rename virDomainsFreep
Move it to the same place as virDomainFreep().
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/manager.c | 18 ++----------------
src/util.h | 14 ++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/manager.c b/src/manager.c
index 6459ec9..0cf0f8e 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -12,20 +12,6 @@ struct VirtManager {
int callback_ids[VIR_DOMAIN_EVENT_ID_LAST];
};
-static void
-virDomainsFreep(virDomainPtr **domainsp)
-{
- virDomainPtr *domains = *domainsp;
-
- if (!domains)
- return;
-
- for (int i = 0; domains[i] != NULL; i += 1)
- virDomainFree(domains[i]);
-
- free(domains);
-}
-
static int
domain_get_name(sd_bus *bus,
const char *path,
@@ -504,7 +490,7 @@ enumerate_domains(sd_bus *bus,
sd_bus_error *error)
{
VirtManager *manager = userdata;
- _cleanup_(virDomainsFreep) virDomainPtr *domains = NULL;
+ _cleanup_(virDomainListFreep) virDomainPtr *domains = NULL;
_cleanup_(strv_freep) char **paths = NULL;
int n_domains;
@@ -530,7 +516,7 @@ virt_manager_list_domains(sd_bus_message *message,
{
VirtManager *manager = userdata;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
- _cleanup_(virDomainsFreep) virDomainPtr *domains = NULL;
+ _cleanup_(virDomainListFreep) virDomainPtr *domains = NULL;
uint32_t flags;
int r;
diff --git a/src/util.h b/src/util.h
index 91e35d6..bc39f44 100644
--- a/src/util.h
+++ b/src/util.h
@@ -53,3 +53,17 @@ virDomainFreep(virDomainPtr *domainp)
if (*domainp)
virDomainFree(*domainp);
}
+
+static inline void
+virDomainListFreep(virDomainPtr **domainsp)
+{
+ virDomainPtr *domains = *domainsp;
+
+ if (!domains)
+ return;
+
+ for (int i = 0; domains[i] != NULL; i += 1)
+ virDomainFree(domains[i]);
+
+ free(domains);
+}
--
2.13.3