diff options
| author | Nathan Scott <nathans@redhat.com> | 2020-09-09 16:56:04 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@redhat.com> | 2020-09-09 16:56:04 +1000 |
| commit | c5808c56db166528ae7e74cedb51cc466f973b9f (patch) | |
| tree | b0364c031595aacc8db222885bebb8390983429e /dragonflybsd | |
| parent | 8ec5d4a3a07fe9a3c556a4abeac6645a7bb2235e (diff) | |
Consolidate repeated macro definitions into one header
The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear
throughout the codebase with many re-definitions. Make
a single copy of each in a common header file, and use
the BSD variants of MINIMUM/MAXIMUM due to conflicts in
the system <sys/param.h> headers.
Diffstat (limited to 'dragonflybsd')
| -rw-r--r-- | dragonflybsd/DragonFlyBSDProcessList.c | 2 | ||||
| -rw-r--r-- | dragonflybsd/Platform.c | 4 | ||||
| -rw-r--r-- | dragonflybsd/Platform.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c index d77f12eb..08303ba6 100644 --- a/dragonflybsd/DragonFlyBSDProcessList.c +++ b/dragonflybsd/DragonFlyBSDProcessList.c @@ -97,7 +97,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui sysctl(MIB_kern_cp_times, 2, dfpl->cp_times_o, &len, NULL, 0); } - pl->cpuCount = MAX(cpus, 1); + pl->cpuCount = MAXIMUM(cpus, 1); if (cpus == 1 ) { dfpl->cpus = xRealloc(dfpl->cpus, sizeof(CPUData)); diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c index 84f13707..3b8e1a0d 100644 --- a/dragonflybsd/Platform.c +++ b/dragonflybsd/Platform.c @@ -28,10 +28,6 @@ in the source distribution for its full text. #include <math.h> -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; int Platform_numberOfFields = LAST_PROCESSFIELD; diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h index c6792a28..83c14f51 100644 --- a/dragonflybsd/Platform.h +++ b/dragonflybsd/Platform.h @@ -14,10 +14,6 @@ in the source distribution for its full text. extern ProcessFieldData Process_fields[]; -#ifndef CLAMP -#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) -#endif - extern ProcessField Platform_defaultFields[]; extern int Platform_numberOfFields; |