From bb9b0a15cb4c4de8ed59b0da13b6503b3a2508f4 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Tue, 24 Jun 2014 15:07:39 +0200 Subject: software-dbus: use common software init and cleanup Each software provider shall use the same sw-common initialization and cleanup function. --- src/software-dbus/LMI_HostedSoftwareCollectionProvider.c | 4 ++-- src/software-dbus/LMI_HostedSoftwareIdentityResourceProvider.c | 4 ++-- src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c | 4 ++-- src/software-dbus/LMI_MemberOfSoftwareCollectionProvider.c | 4 ++-- src/software-dbus/LMI_ResourceForSoftwareIdentityProvider.c | 4 ++-- src/software-dbus/LMI_SoftwareIdentityChecksProvider.c | 4 ++-- src/software-dbus/LMI_SoftwareIdentityFileCheckProvider.c | 4 ++-- src/software-dbus/LMI_SoftwareIdentityProvider.c | 4 ++-- src/software-dbus/LMI_SoftwareIdentityResourceProvider.c | 4 ++-- src/software-dbus/LMI_SystemSoftwareCollectionProvider.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/software-dbus/LMI_HostedSoftwareCollectionProvider.c b/src/software-dbus/LMI_HostedSoftwareCollectionProvider.c index 6541949..fad7db6 100644 --- a/src/software-dbus/LMI_HostedSoftwareCollectionProvider.c +++ b/src/software-dbus/LMI_HostedSoftwareCollectionProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; static void LMI_HostedSoftwareCollectionInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_HostedSoftwareCollectionCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_HostedSoftwareCollectionCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_HostedSoftwareCollectionEnumInstanceNames( diff --git a/src/software-dbus/LMI_HostedSoftwareIdentityResourceProvider.c b/src/software-dbus/LMI_HostedSoftwareIdentityResourceProvider.c index 4b26213..50b8030 100644 --- a/src/software-dbus/LMI_HostedSoftwareIdentityResourceProvider.c +++ b/src/software-dbus/LMI_HostedSoftwareIdentityResourceProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; static void LMI_HostedSoftwareIdentityResourceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_HostedSoftwareIdentityResourceCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_HostedSoftwareIdentityResourceCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_HostedSoftwareIdentityResourceEnumInstanceNames( diff --git a/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c b/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c index 79a9660..428515e 100644 --- a/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c +++ b/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; static void LMI_InstalledSoftwareIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_InstalledSoftwareIdentityCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_InstalledSoftwareIdentityCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus enum_instances(const CMPIContext *ctx, const CMPIResult *cr, diff --git a/src/software-dbus/LMI_MemberOfSoftwareCollectionProvider.c b/src/software-dbus/LMI_MemberOfSoftwareCollectionProvider.c index 704b36c..05d03c7 100644 --- a/src/software-dbus/LMI_MemberOfSoftwareCollectionProvider.c +++ b/src/software-dbus/LMI_MemberOfSoftwareCollectionProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; static void LMI_MemberOfSoftwareCollectionInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_MemberOfSoftwareCollectionCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_MemberOfSoftwareCollectionCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus enum_instances(const CMPIResult *cr, const char *ns, diff --git a/src/software-dbus/LMI_ResourceForSoftwareIdentityProvider.c b/src/software-dbus/LMI_ResourceForSoftwareIdentityProvider.c index dc119ca..1944f0b 100644 --- a/src/software-dbus/LMI_ResourceForSoftwareIdentityProvider.c +++ b/src/software-dbus/LMI_ResourceForSoftwareIdentityProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb; static void LMI_ResourceForSoftwareIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_ResourceForSoftwareIdentityCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_ResourceForSoftwareIdentityCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus k_return_rfsi(const gchar *pkg_id, diff --git a/src/software-dbus/LMI_SoftwareIdentityChecksProvider.c b/src/software-dbus/LMI_SoftwareIdentityChecksProvider.c index e000305..a90fbb8 100644 --- a/src/software-dbus/LMI_SoftwareIdentityChecksProvider.c +++ b/src/software-dbus/LMI_SoftwareIdentityChecksProvider.c @@ -27,7 +27,7 @@ static const CMPIBroker* _cb; static void LMI_SoftwareIdentityChecksInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SoftwareIdentityChecksCleanup( @@ -35,7 +35,7 @@ static CMPIStatus LMI_SoftwareIdentityChecksCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_SoftwareIdentityChecksEnumInstanceNames( diff --git a/src/software-dbus/LMI_SoftwareIdentityFileCheckProvider.c b/src/software-dbus/LMI_SoftwareIdentityFileCheckProvider.c index a1c33a4..ca6af59 100644 --- a/src/software-dbus/LMI_SoftwareIdentityFileCheckProvider.c +++ b/src/software-dbus/LMI_SoftwareIdentityFileCheckProvider.c @@ -52,7 +52,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SoftwareIdentityFileCheckInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); #ifdef RPM_FOUND pthread_mutex_lock(&ts_mutex); @@ -89,7 +89,7 @@ static CMPIStatus LMI_SoftwareIdentityFileCheckCleanup( } #endif - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_SoftwareIdentityFileCheckEnumInstanceNames( diff --git a/src/software-dbus/LMI_SoftwareIdentityProvider.c b/src/software-dbus/LMI_SoftwareIdentityProvider.c index d88715a..7074be6 100644 --- a/src/software-dbus/LMI_SoftwareIdentityProvider.c +++ b/src/software-dbus/LMI_SoftwareIdentityProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SoftwareIdentityInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SoftwareIdentityCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_SoftwareIdentityCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_SoftwareIdentityEnumInstanceNames( diff --git a/src/software-dbus/LMI_SoftwareIdentityResourceProvider.c b/src/software-dbus/LMI_SoftwareIdentityResourceProvider.c index 74ea75f..01a3990 100644 --- a/src/software-dbus/LMI_SoftwareIdentityResourceProvider.c +++ b/src/software-dbus/LMI_SoftwareIdentityResourceProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SoftwareIdentityResourceInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SoftwareIdentityResourceCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_SoftwareIdentityResourceCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_SoftwareIdentityResourceEnumInstanceNames( diff --git a/src/software-dbus/LMI_SystemSoftwareCollectionProvider.c b/src/software-dbus/LMI_SystemSoftwareCollectionProvider.c index 7a840b9..888ac99 100644 --- a/src/software-dbus/LMI_SystemSoftwareCollectionProvider.c +++ b/src/software-dbus/LMI_SystemSoftwareCollectionProvider.c @@ -26,7 +26,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SystemSoftwareCollectionInitialize(const CMPIContext *ctx) { - lmi_init(provider_name, _cb, ctx, provider_config_defaults); + software_init(provider_name, _cb, ctx, provider_config_defaults); } static CMPIStatus LMI_SystemSoftwareCollectionCleanup( @@ -34,7 +34,7 @@ static CMPIStatus LMI_SystemSoftwareCollectionCleanup( const CMPIContext* cc, CMPIBoolean term) { - CMReturn(CMPI_RC_OK); + return software_cleanup(); } static CMPIStatus LMI_SystemSoftwareCollectionEnumInstanceNames( -- cgit