diff options
author | Nathan Scott <nathans@redhat.com> | 2020-09-08 17:33:50 +1000 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2020-09-08 17:33:50 +1000 |
commit | 8ec5d4a3a07fe9a3c556a4abeac6645a7bb2235e (patch) | |
tree | 1efb582b7517e2ec32c892ff2e2ab269ea7e0c47 /openbsd | |
parent | eede79b29af116bc568c7f7a1be319f0c1dfd311 (diff) |
Further, minor cleanups to headers post-MakeHeaders
Remove leftover empty ifdef/endif pairs, whitespace.
The generated htop.h file was also unused - removed.
Diffstat (limited to 'openbsd')
-rw-r--r-- | openbsd/OpenBSDCRT.h | 1 | ||||
-rw-r--r-- | openbsd/OpenBSDProcess.h | 8 | ||||
-rw-r--r-- | openbsd/OpenBSDProcessList.h | 6 | ||||
-rw-r--r-- | openbsd/Platform.h | 12 |
4 files changed, 2 insertions, 25 deletions
diff --git a/openbsd/OpenBSDCRT.h b/openbsd/OpenBSDCRT.h index 66684c53..85860a96 100644 --- a/openbsd/OpenBSDCRT.h +++ b/openbsd/OpenBSDCRT.h @@ -10,5 +10,4 @@ in the source distribution for its full text. void CRT_handleSIGSEGV(int sgn); - #endif diff --git a/openbsd/OpenBSDProcess.h b/openbsd/OpenBSDProcess.h index b4fd82db..fede6f87 100644 --- a/openbsd/OpenBSDProcess.h +++ b/openbsd/OpenBSDProcess.h @@ -8,8 +8,7 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ - -typedef enum OpenBSDProcessFields { +typedef enum OpenBSDProcessFields_ { // Add platform-specific fields here, with ids >= 100 LAST_PROCESSFIELD = 100, } OpenBSDProcessField; @@ -18,14 +17,9 @@ typedef struct OpenBSDProcess_ { Process super; } OpenBSDProcess; -#ifndef Process_isKernelThread #define Process_isKernelThread(_process) (_process->pgrp == 0) -#endif -#ifndef Process_isUserlandThread #define Process_isUserlandThread(_process) (_process->pid != _process->tgid) -#endif - extern ProcessClass OpenBSDProcess_class; diff --git a/openbsd/OpenBSDProcessList.h b/openbsd/OpenBSDProcessList.h index 4b5203c7..038a263d 100644 --- a/openbsd/OpenBSDProcessList.h +++ b/openbsd/OpenBSDProcessList.h @@ -8,7 +8,6 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ - #include <kvm.h> typedef struct CPUData_ { @@ -39,7 +38,6 @@ typedef struct OpenBSDProcessList_ { } OpenBSDProcessList; - /* * avoid relying on or conflicting with MIN() and MAX() in sys/param.h */ @@ -61,10 +59,6 @@ void ProcessList_delete(ProcessList* this); char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd); -/* - * Taken from OpenBSD's ps(1). - */ void ProcessList_goThroughEntries(ProcessList* this); - #endif diff --git a/openbsd/Platform.h b/openbsd/Platform.h index da1a1740..f51d6bc6 100644 --- a/openbsd/Platform.h +++ b/openbsd/Platform.h @@ -14,14 +14,11 @@ in the source distribution for its full text. extern ProcessFieldData Process_fields[]; - extern ProcessField Platform_defaultFields[]; extern int Platform_numberOfFields; -/* - * See /usr/include/sys/signal.h - */ +/* see /usr/include/sys/signal.h */ extern const SignalItem Platform_signals[]; extern const unsigned int Platform_numberOfSignals; @@ -30,7 +27,6 @@ void Platform_setBindings(Htop_Action* keys); extern MeterClass* Platform_meterTypes[]; -// preserved from FreeBSD port int Platform_getUptime(); void Platform_getLoadAverage(double* one, double* five, double* fifteen); @@ -41,12 +37,6 @@ double Platform_setCPUValues(Meter* this, int cpu); void Platform_setMemoryValues(Meter* this); -/* - * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com> - * All rights reserved. - * - * Taken almost directly from OpenBSD's top(1) - */ void Platform_setSwapValues(Meter* this); void Platform_setTasksValues(Meter* this); |