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_DiskDriveATAPortProvider.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_DiskDriveATAPortProvider.c')
| -rw-r--r-- | src/hardware/LMI_DiskDriveATAPortProvider.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hardware/LMI_DiskDriveATAPortProvider.c b/src/hardware/LMI_DiskDriveATAPortProvider.c index 626d5f2..b4de4a0 100644 --- a/src/hardware/LMI_DiskDriveATAPortProvider.c +++ b/src/hardware/LMI_DiskDriveATAPortProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_DiskDriveATAPort.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "smartctl.h" #include "lsblk.h" @@ -61,7 +61,7 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( LMI_DiskDriveATAPort lmi_hdd_ata_port; const char *ns = KNameSpace(cop); unsigned i, j; - char instance_id[INSTANCE_ID_LEN], name[ELEMENT_NAME_LEN]; + char instance_id[BUFLEN], name[BUFLEN]; SmartctlHdd *smtcl_hdds = NULL; unsigned smtcl_hdds_nb = 0; LsblkHdd *lsblk_hdds = NULL; @@ -86,7 +86,7 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( lmi_get_system_creation_class_name()); LMI_DiskDriveATAPort_Set_SystemName(&lmi_hdd_ata_port, lmi_get_system_name()); LMI_DiskDriveATAPort_Set_CreationClassName(&lmi_hdd_ata_port, - LMI_ORGID "_" DISK_DRIVE_ATA_PORT_CLASS_NAME); + LMI_DiskDriveATAPort_ClassName); LMI_DiskDriveATAPort_Set_Caption(&lmi_hdd_ata_port, "Disk Drive ATA Port"); LMI_DiskDriveATAPort_Set_Description(&lmi_hdd_ata_port, @@ -94,11 +94,11 @@ static CMPIStatus LMI_DiskDriveATAPortEnumInstances( LMI_DiskDriveATAPort_Set_UsageRestriction(&lmi_hdd_ata_port, LMI_DiskDriveATAPort_UsageRestriction_Front_end_only); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PORT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAPort_ClassName, lsblk_hdds[i].name); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_ATA_PORT_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveATAPort_ClassName ":%s", name); LMI_DiskDriveATAPort_Set_DeviceID(&lmi_hdd_ata_port, name); |