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_MemorySlotProvider.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_MemorySlotProvider.c')
-rw-r--r-- | src/hardware/LMI_MemorySlotProvider.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hardware/LMI_MemorySlotProvider.c b/src/hardware/LMI_MemorySlotProvider.c index 2c8116f..f299e4c 100644 --- a/src/hardware/LMI_MemorySlotProvider.c +++ b/src/hardware/LMI_MemorySlotProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_MemorySlot.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -57,7 +57,7 @@ static CMPIStatus LMI_MemorySlotEnumInstances( { LMI_MemorySlot lmi_mem_slot; const char *ns = KNameSpace(cop); - char tag[LONG_INT_LEN], instance_id[INSTANCE_ID_LEN]; + char tag[LONG_INT_LEN], instance_id[BUFLEN]; unsigned i; DmiMemory dmi_memory; @@ -69,8 +69,8 @@ static CMPIStatus LMI_MemorySlotEnumInstances( LMI_MemorySlot_Init(&lmi_mem_slot, _cb, ns); snprintf(tag, LONG_INT_LEN, "%d", dmi_memory.slots[i].slot_number); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME ":%d", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_MemorySlot_ClassName ":%d", dmi_memory.slots[i].slot_number); LMI_MemorySlot_Set_ConnectorLayout(&lmi_mem_slot, @@ -82,7 +82,7 @@ static CMPIStatus LMI_MemorySlotEnumInstances( LMI_MemorySlot_ConnectorGender_Female); LMI_MemorySlot_Set_CreationClassName(&lmi_mem_slot, - LMI_ORGID "_" MEMORY_SLOT_CLASS_NAME); + LMI_MemorySlot_ClassName); LMI_MemorySlot_Set_Tag(&lmi_mem_slot, tag); LMI_MemorySlot_Set_Number(&lmi_mem_slot, dmi_memory.slots[i].slot_number); |