diff options
Diffstat (limited to 'src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c')
| -rw-r--r-- | src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c b/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c index 849e8f6..144c805 100644 --- a/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c +++ b/src/software-dbus/LMI_InstalledSoftwareIdentityProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_InstalledSoftwareIdentity.h" -#include "LMI_Software.h" +#include "sw-utils.h" static const CMPIBroker* _cb; @@ -130,9 +130,7 @@ static CMPIStatus LMI_InstalledSoftwareIdentityGetInstance( LMI_InstalledSoftwareIdentity w; LMI_InstalledSoftwareIdentity_InitFromObjectPath(&w, _cb, cop); - if (create_sw_package_from_elem_name(get_str_property_from_op(w.InstalledSoftware.value, - "InstanceID") + strlen(ORGID ":" ORGID "_" SW_IDENTITY_CLASS_NAME ":"), - &sw_pkg) != 0) { + if (get_sw_pkg_from_sw_identity_op(w.InstalledSoftware.value, &sw_pkg) != 0) { CMReturn(CMPI_RC_ERR_NOT_FOUND); } @@ -261,13 +259,11 @@ static CMPIStatus associators( } /* Is this SwIdentity installed? */ - if (create_sw_package_from_elem_name(get_str_property_from_op(cop, - "InstanceID") + strlen(ORGID ":" ORGID "_" SW_IDENTITY_CLASS_NAME ":"), - &sw_pkg) != 0) { + if (get_sw_pkg_from_sw_identity_op(cop, &sw_pkg) != 0) { goto done; } - get_pk_pkg_from_sw_pkg(&sw_pkg, pk_bitfield_value(PK_FILTER_ENUM_INSTALLED), - &pk_pkg); + get_pk_pkg_from_sw_pkg(&sw_pkg, + pk_bitfield_value(PK_FILTER_ENUM_INSTALLED), &pk_pkg); free_sw_package(&sw_pkg); if (!pk_pkg) { goto done; @@ -357,13 +353,11 @@ static CMPIStatus references( } /* Is this SwIdentity installed? */ - if (create_sw_package_from_elem_name(get_str_property_from_op(cop, - "InstanceID") + strlen(ORGID ":" ORGID "_" SW_IDENTITY_CLASS_NAME ":"), - &sw_pkg) != 0) { + if (get_sw_pkg_from_sw_identity_op(cop, &sw_pkg) != 0) { goto done; } - get_pk_pkg_from_sw_pkg(&sw_pkg, pk_bitfield_value(PK_FILTER_ENUM_INSTALLED), - &pk_pkg); + get_pk_pkg_from_sw_pkg(&sw_pkg, + pk_bitfield_value(PK_FILTER_ENUM_INSTALLED), &pk_pkg); free_sw_package(&sw_pkg); if (!pk_pkg) { goto done; |