diff --git a/src/arm/midr.c b/src/arm/midr.c index f59f2b1..f7b2117 100644 --- a/src/arm/midr.c +++ b/src/arm/midr.c @@ -13,8 +13,6 @@ #include "uarch.h" #include "soc.h" -#define STRING_UNKNOWN "Unknown" - void init_cache_struct(struct cache* cach) { cach->L1i = emalloc(sizeof(struct cach)); cach->L1d = emalloc(sizeof(struct cach)); diff --git a/src/arm/soc.c b/src/arm/soc.c index b28b934..7097563 100644 --- a/src/arm/soc.c +++ b/src/arm/soc.c @@ -9,7 +9,6 @@ #include "../common/global.h" #define min(a,b) (((a)<(b))?(a):(b)) -#define STRING_UNKNOWN "Unknown" #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) static char* soc_trademark_string[] = { diff --git a/src/arm/uarch.c b/src/arm/uarch.c index 9da5461..c006c93 100644 --- a/src/arm/uarch.c +++ b/src/arm/uarch.c @@ -7,8 +7,6 @@ #include "uarch.h" #include "../common/global.h" -#define STRING_UNKNOWN "Unknown" - // Data not available #define NA -1 diff --git a/src/common/cpu.c b/src/common/cpu.c index d3dc049..3f37c11 100644 --- a/src/common/cpu.c +++ b/src/common/cpu.c @@ -15,7 +15,6 @@ #include "../arm/uarch.h" #endif -#define STRING_UNKNOWN "Unknown" #define STRING_YES "Yes" #define STRING_NO "No" #define STRING_NONE "None" diff --git a/src/common/global.h b/src/common/global.h index 92afce2..f0e9118 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -4,6 +4,8 @@ #include #include +#define STRING_UNKNOWN "Unknown" + void set_log_level(bool verbose); void printWarn(const char *fmt, ...); void printErr(const char *fmt, ...); diff --git a/src/ppc/ppc.c b/src/ppc/ppc.c index 1a69b5b..00720fa 100644 --- a/src/ppc/ppc.c +++ b/src/ppc/ppc.c @@ -11,8 +11,6 @@ #include "../common/udev.h" #include "../common/global.h" -#define STRING_UNKNOWN "Unknown" - void init_topology_struct(struct topology* topo, struct cache* cach) { topo->total_cores = 0; topo->physical_cores = 0; diff --git a/src/ppc/uarch.c b/src/ppc/uarch.c index 61eda1d..ec0aa70 100644 --- a/src/ppc/uarch.c +++ b/src/ppc/uarch.c @@ -11,8 +11,6 @@ typedef uint32_t MICROARCH; -#define STRING_UNKNOWN "Unknown" - // Data not available #define NA -1 @@ -69,7 +67,7 @@ void fill_uarch(struct uarch* arch, MICROARCH u) { bool fill = false; FILL_START - FILL_UARCH(arch->uarch, UARCH_UNKNOWN, "Unknown", UNK) + FILL_UARCH(arch->uarch, UARCH_UNKNOWN, STRING_UNKNOWN, UNK) FILL_UARCH(arch->uarch, UARCH_PPC604, "PowerPC 604", 500) FILL_UARCH(arch->uarch, UARCH_PPCG3, "PowerPC G3", UNK) // varies FILL_UARCH(arch->uarch, UARCH_PPCG4, "PowerPC G4", UNK) // varies diff --git a/src/x86/cpuid.c b/src/x86/cpuid.c index 6c307d8..c7d5422 100644 --- a/src/x86/cpuid.c +++ b/src/x86/cpuid.c @@ -37,11 +37,9 @@ static char *hv_vendors_name[] = { [HV_VENDOR_VMWARE] = "VMware", [HV_VENDOR_XEN] = "Xen", [HV_VENDOR_PARALLELS] = "Parallels", - [HV_VENDOR_INVALID] = "Unknown" + [HV_VENDOR_INVALID] = STRING_UNKNOWN }; -#define STRING_UNKNOWN "Unknown" - #define HYPERVISOR_NAME_MAX_LENGTH 17 #define MASK 0xFF @@ -305,8 +303,8 @@ struct cpuInfo* get_cpu_info() { cpu->cpu_name = get_str_cpu_name_internal(); } else { - cpu->cpu_name = emalloc(sizeof(char)*8); - sprintf(cpu->cpu_name,"Unknown"); + cpu->cpu_name = emalloc(sizeof(char) * (strlen(STRING_UNKNOWN) + 1)); + strcpy(cpu->cpu_name, STRING_UNKNOWN); printWarn("Can't read cpu name from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000004, cpu->maxExtendedLevels); } diff --git a/src/x86/uarch.c b/src/x86/uarch.c index 57ba7f2..b5ceff4 100644 --- a/src/x86/uarch.c +++ b/src/x86/uarch.c @@ -38,8 +38,6 @@ typedef uint32_t MICROARCH; -#define STRING_UNKNOWN "Unknown" - // Data not available #define NA -1 @@ -121,7 +119,7 @@ struct uarch { #define UARCH_START if (false) {} #define CHECK_UARCH(arch, ef_, f_, em_, m_, s_, str, uarch, process) \ else if (ef_ == ef && f_ == f && (em_ == NA || em_ == em) && (m_ == NA || m_ == m) && (s_ == NA || s_ == s)) fill_uarch(arch, str, uarch, process); -#define UARCH_END else { printBug("Unknown microarchitecture detected: M=0x%.8X EM=0x%.8X F=0x%.8X EF=0x%.8X S=0x%.8X", m, em, f, ef, s); fill_uarch(arch, "Unknown", UARCH_UNKNOWN, 0); } +#define UARCH_END else { printBug("Unknown microarchitecture detected: M=0x%.8X EM=0x%.8X F=0x%.8X EF=0x%.8X S=0x%.8X", m, em, f, ef, s); fill_uarch(arch, STRING_UNKNOWN, UARCH_UNKNOWN, 0); } void fill_uarch(struct uarch* arch, char* str, MICROARCH u, uint32_t process) { arch->uarch_str = emalloc(sizeof(char) * (strlen(str)+1));