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_DiskDriveATAProtocolEndpointProvider.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_DiskDriveATAProtocolEndpointProvider.c')
| -rw-r--r-- | src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c index c7525d4..56d71e6 100644 --- a/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c +++ b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_DiskDriveATAProtocolEndpoint.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "lsblk.h" static const CMPIBroker* _cb = NULL; @@ -58,7 +58,7 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint lmi_hdd_endpoint; const char *ns = KNameSpace(cop); unsigned i; - char instance_id[INSTANCE_ID_LEN], name[ELEMENT_NAME_LEN]; + char instance_id[BUFLEN], name[BUFLEN]; LsblkHdd *lsblk_hdds = NULL; unsigned lsblk_hdds_nb = 0; @@ -79,7 +79,7 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint_Set_SystemName(&lmi_hdd_endpoint, lmi_get_system_name()); LMI_DiskDriveATAProtocolEndpoint_Set_CreationClassName(&lmi_hdd_endpoint, - LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); + LMI_DiskDriveATAProtocolEndpoint_ClassName); LMI_DiskDriveATAProtocolEndpoint_Set_Caption(&lmi_hdd_endpoint, "Disk Drive ATA Protocol Endpoint"); LMI_DiskDriveATAProtocolEndpoint_Set_Description(&lmi_hdd_endpoint, @@ -90,11 +90,11 @@ static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances( LMI_DiskDriveATAProtocolEndpoint_Set_ProtocolIFType(&lmi_hdd_endpoint, LMI_DiskDriveATAProtocolEndpoint_ProtocolIFType_Unknown); - snprintf(name, ELEMENT_NAME_LEN, - "%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME, + snprintf(name, BUFLEN, + "%s " LMI_DiskDriveATAProtocolEndpoint_ClassName, lsblk_hdds[i].name); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_DiskDriveATAProtocolEndpoint_ClassName ":%s", name); LMI_DiskDriveATAProtocolEndpoint_Set_Name(&lmi_hdd_endpoint, name); |