Hardware: spring cleanup & refactor

* use openlmi common library where possible
* get rid of LMI_Hardware.h file
* some other cosmetic changes

1 files changed, 5 insertions, 5 deletions

diff --git a/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c b/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c
index cf599be..aff9540 100644
--- a/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c
+++ b/src/hardware/LMI_DiskDriveElementSoftwareIdentityProvider.c
@@ -20,7 +20,7 @@
 
 #include <konkret/konkret.h>
 #include "LMI_DiskDriveElementSoftwareIdentity.h"
-#include "LMI_Hardware.h"
+#include "utils.h"
 #include "lsblk.h"
 
 static const CMPIBroker* _cb;
@@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveElementSoftwareIdentityEnumInstances(
     LMI_DiskDriveSoftwareIdentityRef lmi_hdd_swi;
     LMI_DiskDriveRef lmi_hdd;
     const char *ns = KNameSpace(cop);
-    char instance_id[INSTANCE_ID_LEN];
+    char instance_id[BUFLEN];
     unsigned i;
     LsblkHdd *lsblk_hdds = NULL;
     unsigned lsblk_hdds_nb = 0;
@@ -81,11 +81,11 @@ static CMPIStatus LMI_DiskDriveElementSoftwareIdentityEnumInstances(
                 lmi_get_system_creation_class_name());
         LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name());
         LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd,
-                LMI_ORGID "_" DISK_DRIVE_CLASS_NAME);
+                LMI_DiskDrive_ClassName);
         LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name);
 
-        snprintf(instance_id, INSTANCE_ID_LEN,
-                LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_SW_IDENTITY_CLASS_NAME ":%s",
+        snprintf(instance_id, BUFLEN,
+                LMI_ORGID ":" LMI_DiskDriveSoftwareIdentity_ClassName ":%s",
                 lsblk_hdds[i].name);
 
         LMI_DiskDriveSoftwareIdentityRef_Init(&lmi_hdd_swi, _cb, ns);