zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DarwinProcess: mark local function static and sort includes

This commit is contained in:
Christian Göttsche 2020-11-17 19:41:22 +01:00 committed by cgzones
parent b3b890f546
commit ba2d59020d
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
darwin/DarwinProcess.c
View File

@ -5,17 +5,16 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "Process.h"
#include "DarwinProcess.h" #include "DarwinProcess.h"
#include <stdlib.h>
#include <libproc.h> #include <libproc.h>
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <mach/mach.h> #include <mach/mach.h>
#include "CRT.h" #include "CRT.h"
#include "Process.h"
const ProcessClass DarwinProcess_class = { const ProcessClass DarwinProcess_class = {
@ -52,7 +51,7 @@ bool Process_isThread(const Process* this) {
return false; return false;
} }
char* DarwinProcess_getCmdLine(struct kinfo_proc* k, int* basenameOffset) { static char* DarwinProcess_getCmdLine(const struct kinfo_proc* k, int* basenameOffset) {
/* This function is from the old Mac version of htop. Originally from ps? */ /* This function is from the old Mac version of htop. Originally from ps? */
int mib[3], argmax, nargs, c = 0; int mib[3], argmax, nargs, c = 0;
size_t size; size_t size;
@ -195,8 +194,8 @@ ERROR_A:
return retval; return retval;
} }
void DarwinProcess_setFromKInfoProc(Process* proc, struct kinfo_proc* ps, bool exists) { void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, bool exists) {
struct extern_proc* ep = &ps->kp_proc; const struct extern_proc* ep = &ps->kp_proc;
/* UNSET HERE : /* UNSET HERE :
* *

11
darwin/DarwinProcess.h
View File

@ -7,11 +7,12 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "Settings.h"
#include "DarwinProcessList.h"
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include "DarwinProcessList.h"
#include "Settings.h"
typedef struct DarwinProcess_ { typedef struct DarwinProcess_ {
Process super; Process super;
@ -28,9 +29,7 @@ void Process_delete(Object* cast);
bool Process_isThread(const Process* this); bool Process_isThread(const Process* this);
char* DarwinProcess_getCmdLine(struct kinfo_proc* k, int* basenameOffset); void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, bool exists);
void DarwinProcess_setFromKInfoProc(Process* proc, struct kinfo_proc* ps, bool exists);
void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessList* dpl); void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessList* dpl);