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_ProcessorCapabilitiesProvider.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_ProcessorCapabilitiesProvider.c')
| -rw-r--r-- | src/hardware/LMI_ProcessorCapabilitiesProvider.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c index c125541..6287422 100644 --- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c @@ -20,7 +20,7 @@ #include <konkret/konkret.h> #include "LMI_ProcessorCapabilities.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" #include "lscpu.h" @@ -60,8 +60,8 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances( CMPIUint16 cores = 1, threads = 1; const char *ns = KNameSpace(cop), *element_name_string = "Capabilities of processor "; - char *error_msg = NULL, instance_id[INSTANCE_ID_LEN], - element_name[ELEMENT_NAME_LEN]; + char *error_msg = NULL, instance_id[BUFLEN], + element_name[BUFLEN]; unsigned i, cpus_nb = 0; DmiProcessor *dmi_cpus = NULL; unsigned dmi_cpus_nb = 0; @@ -89,17 +89,17 @@ static CMPIStatus LMI_ProcessorCapabilitiesEnumInstances( /* do we have output from dmidecode program? */ if (dmi_cpus_nb > 0) { - 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); - snprintf(element_name, ELEMENT_NAME_LEN, "%s%s", + snprintf(element_name, BUFLEN, "%s%s", element_name_string, dmi_cpus[i].id); cores = dmi_cpus[i].cores; threads = dmi_cpus[i].threads; } else { - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" CPU_CAP_CLASS_NAME ":%u", i); - snprintf(element_name, ELEMENT_NAME_LEN, "%s%u", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_ProcessorCapabilities_ClassName ":%u", i); + snprintf(element_name, BUFLEN, "%s%u", element_name_string, i); } if (cores < lscpu.cores) { |