From 55f63d29f5d2b4e82979d71386df58394e87ef5a Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 29 Apr 2014 08:33:13 +0200 Subject: libopenlmi: reorganize and gather Make naming consistent. Gather common functionality into one library and try to use it across all providers. Introduce libtool-style versioning for libraries. --- src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c') diff --git a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c index ee964b1..51b5f44 100644 --- a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c +++ b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c @@ -21,7 +21,6 @@ #include #include "LMI_DiskDriveSAPAvailableForElement.h" #include "LMI_Hardware.h" -#include "globals.h" #include "lsblk.h" static const CMPIBroker* _cb; @@ -82,7 +81,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances( get_system_creation_class_name()); LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, get_system_name()); LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd, - ORGID "_" DISK_DRIVE_CLASS_NAME); + LMI_ORGID "_" DISK_DRIVE_CLASS_NAME); LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name); snprintf(name, ELEMENT_NAME_LEN, @@ -95,7 +94,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances( LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp, get_system_name()); LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp, - ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); + LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME); LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name); LMI_DiskDriveSAPAvailableForElement_Set_ManagedElement(&lmi_hdd_sap, -- cgit