From 28aed3c2c360b84762f76b322e9fc80bd74c036b Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 9 May 2014 17:37:40 +0200 Subject: Hardware: spring cleanup & refactor * use openlmi common library where possible * get rid of LMI_Hardware.h file * some other cosmetic changes --- src/hardware/LMI_ProcessorElementCapabilitiesProvider.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/hardware/LMI_ProcessorElementCapabilitiesProvider.c') diff --git a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c index aa8ed68..61a9fe8 100644 --- a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c @@ -22,7 +22,7 @@ #include "LMI_ProcessorElementCapabilities.h" #include "LMI_ProcessorCapabilities.h" #include "LMI_Processor.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" @@ -62,7 +62,7 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( LMI_ProcessorCapabilitiesRef lmi_cpu_cap; LMI_ProcessorRef lmi_cpu; const char *ns = KNameSpace(cop); - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN]; + char *error_msg = NULL, instance_id[BUFLEN]; unsigned i, cpus_nb = 0; DmiProcessor *dmi_cpus = NULL; unsigned dmi_cpus_nb = 0; @@ -94,7 +94,7 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( lmi_get_system_creation_class_name()); LMI_ProcessorRef_Set_SystemName(&lmi_cpu, lmi_get_system_name()); LMI_ProcessorRef_Set_CreationClassName(&lmi_cpu, - LMI_ORGID "_" CPU_CLASS_NAME); + LMI_Processor_ClassName); LMI_ProcessorCapabilitiesRef_Init(&lmi_cpu_cap, _cb, ns); @@ -102,16 +102,16 @@ static CMPIStatus LMI_ProcessorElementCapabilitiesEnumInstances( if (dmi_cpus_nb > 0) { LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, dmi_cpus[i].id); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%s", dmi_cpus[i].id); } else { char cpu_id[LONG_INT_LEN]; snprintf(cpu_id, LONG_INT_LEN, "%u", i); LMI_ProcessorRef_Set_DeviceID(&lmi_cpu, cpu_id); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%u", i); + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%u", i); } LMI_ProcessorCapabilitiesRef_Set_InstanceID(&lmi_cpu_cap, instance_id); -- cgit