Further, minor cleanups to headers post-MakeHeaders

Remove leftover empty ifdef/endif pairs, whitespace.
The generated htop.h file was also unused - removed.
This commit is contained in:
Nathan Scott
2020-09-08 17:33:50 +10:00
parent eede79b29a
commit 8ec5d4a3a0
63 changed files with 6 additions and 246 deletions

View File

@ -10,5 +10,4 @@ in the source distribution for its full text.
void CRT_handleSIGSEGV(int sgn);
#endif

View File

@ -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;

View File

@ -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

View File

@ -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);