From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> For consistency all the APIs in the lxc_domain.c file should have a virLXCDomain prefix in their name Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- src/lxc/lxc_domain.c | 14 +++++++------- src/lxc/lxc_domain.h | 2 +- src/lxc/lxc_driver.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 75fd74f..0376f0b 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -25,9 +25,9 @@ #include "memory.h" -static void *lxcDomainObjPrivateAlloc(void) +static void *virLXCDomainObjPrivateAlloc(void) { - lxcDomainObjPrivatePtr priv; + virLXCDomainObjPrivatePtr priv; if (VIR_ALLOC(priv) < 0) return NULL; @@ -38,16 +38,16 @@ static void *lxcDomainObjPrivateAlloc(void) return priv; } -static void lxcDomainObjPrivateFree(void *data) +static void virLXCDomainObjPrivateFree(void *data) { - lxcDomainObjPrivatePtr priv = data; + virLXCDomainObjPrivatePtr priv = data; VIR_FREE(priv); } -void lxcDomainSetPrivateDataHooks(virCapsPtr caps) +void virLXCDomainSetPrivateDataHooks(virCapsPtr caps) { - caps->privateDataAllocFunc = lxcDomainObjPrivateAlloc; - caps->privateDataFreeFunc = lxcDomainObjPrivateFree; + caps->privateDataAllocFunc = virLXCDomainObjPrivateAlloc; + caps->privateDataFreeFunc = virLXCDomainObjPrivateFree; } diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index e97b2b4..08d09c1 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -32,6 +32,6 @@ struct _lxcDomainObjPrivate { int monitorWatch; }; -void lxcDomainSetPrivateDataHooks(virCapsPtr caps); +void virLXCDomainSetPrivateDataHooks(virCapsPtr caps); #endif /* __LXC_DOMAIN_H__ */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index dcb9737..3807cee 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1434,7 +1434,7 @@ static int lxcStartup(int privileged) if ((lxc_driver->caps = lxcCapsInit(lxc_driver)) == NULL) goto cleanup; - lxcDomainSetPrivateDataHooks(lxc_driver->caps); + virLXCDomainSetPrivateDataHooks(lxc_driver->caps); if (virLXCProcessAutoDestroyInit(lxc_driver) < 0) goto cleanup; -- 1.7.10.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list