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_DiskDriveSoftwareIdentityProvider.c b/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c
index 34043fa..a3c139a 100644
--- a/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c
+++ b/src/hardware/LMI_DiskDriveSoftwareIdentityProvider.c
@@ -20,7 +20,7 @@
 
 #include <konkret/konkret.h>
 #include "LMI_DiskDriveSoftwareIdentity.h"
-#include "LMI_Hardware.h"
+#include "utils.h"
 #include "smartctl.h"
 #include "lsblk.h"
 
@@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveSoftwareIdentityEnumInstances(
     LMI_DiskDriveSoftwareIdentity lmi_hdd_swi;
     const char *ns = KNameSpace(cop);
     unsigned i, j;
-    char instance_id[INSTANCE_ID_LEN], *fw_ver = NULL, name[ELEMENT_NAME_LEN];
+    char instance_id[BUFLEN], *fw_ver = NULL, name[BUFLEN];
     SmartctlHdd *smtcl_hdds = NULL;
     unsigned smtcl_hdds_nb = 0;
     LsblkHdd *lsblk_hdds = NULL;
@@ -87,10 +87,10 @@ static CMPIStatus LMI_DiskDriveSoftwareIdentityEnumInstances(
         LMI_DiskDriveSoftwareIdentity_Set_Description(&lmi_hdd_swi,
                 "This object represents firmware of disk drive in system.");
 
-        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);
-        snprintf(name, ELEMENT_NAME_LEN, "%s disk firmware",
+        snprintf(name, BUFLEN, "%s disk firmware",
                 lsblk_hdds[i].name);
 
         LMI_DiskDriveSoftwareIdentity_Set_InstanceID(&lmi_hdd_swi, instance_id);