diff options
| author | Peter Schiffer <pschiffe@redhat.com> | 2014-05-09 17:37:40 +0200 |
|---|---|---|
| committer | Peter Schiffer <pschiffe@redhat.com> | 2014-05-12 19:20:43 +0200 |
| commit | 28aed3c2c360b84762f76b322e9fc80bd74c036b (patch) | |
| tree | 880f68596cbaf7e0e020a6f116c3e789cd4fd60a /src/hardware/LMI_DiskPhysicalPackageProvider.c | |
| parent | 87a03ac7ebff779351e9782d40e691221195f8e0 (diff) | |
| download | openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.tar.gz openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.tar.xz openlmi-providers-28aed3c2c360b84762f76b322e9fc80bd74c036b.zip | |
Hardware: spring cleanup & refactor
* use openlmi common library where possible
* get rid of LMI_Hardware.h file
* some other cosmetic changes
Diffstat (limited to 'src/hardware/LMI_DiskPhysicalPackageProvider.c')
| -rw-r--r-- | src/hardware/LMI_DiskPhysicalPackageProvider.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hardware/LMI_DiskPhysicalPackageProvider.c b/src/hardware/LMI_DiskPhysicalPackageProvider.c index f619e0b..8d7d924 100644 --- a/src/hardware/LMI_DiskPhysicalPackageProvider.c +++ b/src/hardware/LMI_DiskPhysicalPackageProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_DiskPhysicalPackage.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" @@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskPhysicalPackageEnumInstances( LMI_DiskPhysicalPackage lmi_hdd; const char *ns = KNameSpace(cop); unsigned i, j; - char instance_id[INSTANCE_ID_LEN], *serial_nb, *name, *model; + char instance_id[BUFLEN], *serial_nb, *name, *model; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; LsblkHdd *lsblk_hdds = NULL; @@ -100,15 +100,15 @@ static CMPIStatus LMI_DiskPhysicalPackageEnumInstances( LMI_DiskPhysicalPackage_Init(&lmi_hdd, _cb, ns); LMI_DiskPhysicalPackage_Set_CreationClassName(&lmi_hdd, - LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME); + LMI_DiskPhysicalPackage_ClassName); LMI_DiskPhysicalPackage_Set_PackageType(&lmi_hdd, LMI_DiskPhysicalPackage_PackageType_Storage_Media_Package_e_g___Disk_or_Tape_Drive); LMI_DiskPhysicalPackage_Set_Caption(&lmi_hdd, "Physical Disk Package"); LMI_DiskPhysicalPackage_Set_Description(&lmi_hdd, "This object represents one physical disk package in system."); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_PHYS_PKG_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskPhysicalPackage_ClassName ":%s", lsblk_hdds[i].name); LMI_DiskPhysicalPackage_Set_Tag(&lmi_hdd, lsblk_hdds[i].name); |