diff options
Diffstat (limited to 'src/hardware/LMI_ProcessorCacheMemoryProvider.c')
| -rw-r--r-- | src/hardware/LMI_ProcessorCacheMemoryProvider.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hardware/LMI_ProcessorCacheMemoryProvider.c b/src/hardware/LMI_ProcessorCacheMemoryProvider.c index 92c3a91..bbb8989 100644 --- a/src/hardware/LMI_ProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_ProcessorCacheMemoryProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_ProcessorCacheMemory.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "sysfs.h" @@ -60,7 +60,7 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( { LMI_ProcessorCacheMemory lmi_cpu_cache; const char *ns = KNameSpace(cop); - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN]; + char *error_msg = NULL, instance_id[BUFLEN]; unsigned i, caches = 0; DmiCpuCache *dmi_cpu_caches = NULL; unsigned dmi_cpu_caches_nb = 0; @@ -92,7 +92,7 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemory_Set_SystemName(&lmi_cpu_cache, lmi_get_system_name()); LMI_ProcessorCacheMemory_Set_CreationClassName(&lmi_cpu_cache, - LMI_ORGID "_" CPU_CACHE_CLASS_NAME); + LMI_ProcessorCacheMemory_ClassName); LMI_ProcessorCacheMemory_Set_BlockSize(&lmi_cpu_cache, 1); LMI_ProcessorCacheMemory_Set_Volatile(&lmi_cpu_cache, 1); @@ -116,8 +116,8 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( /* do we have dmidecode output? */ if (dmi_cpu_caches_nb > 0) { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CACHE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCacheMemory_ClassName ":%s", dmi_cpu_caches[i].id); LMI_ProcessorCacheMemory_Set_DeviceID(&lmi_cpu_cache, @@ -132,8 +132,8 @@ static CMPIStatus LMI_ProcessorCacheMemoryEnumInstances( LMI_ProcessorCacheMemory_Set_EnabledState(&lmi_cpu_cache, get_cachestatus(dmi_cpu_caches[i].status)); } else { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CACHE_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCacheMemory_ClassName ":%s", sysfs_cpu_caches[i].id); LMI_ProcessorCacheMemory_Set_DeviceID(&lmi_cpu_cache, |