From 1efa544e1ba1e45a1a4f53e6dc6908682e60e519 Mon Sep 17 00:00:00 2001 From: Lance Chen Date: Sun, 7 Jun 2015 17:17:46 +0800 Subject: [PATCH 1/2] Re-run MakeHeader.py on freebsd/FreeBSDProcess.c Several functions and struct had changed in b291fba02b8d9bb52cd8a23ef5fffbba4f89ff0a --- freebsd/FreeBSDProcess.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h index d0a1882c..bf0acae8 100644 --- a/freebsd/FreeBSDProcess.h +++ b/freebsd/FreeBSDProcess.h @@ -28,6 +28,8 @@ typedef struct FreeBSDProcess_ { #endif +extern ProcessClass FreeBSDProcess_class; + extern ProcessFieldData Process_fields[]; extern char* Process_pidFormat; @@ -39,9 +41,9 @@ FreeBSDProcess* FreeBSDProcess_new(Settings* settings); void Process_delete(Object* cast); -void Process_writeField(Process* this, RichString* str, ProcessField field); +void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField field); -long Process_compare(const void* v1, const void* v2); +long FreeBSDProcess_compare(const void* v1, const void* v2); bool Process_isThread(Process* this); From 5a5dc7177080054649f46c1a73af5d885a978aa3 Mon Sep 17 00:00:00 2001 From: Lance Chen Date: Sun, 7 Jun 2015 17:20:36 +0800 Subject: [PATCH 2/2] Cast FreeBSDProcess_new to Process_New `Process_new_fn` had been renamed to `Process_New` in d880def0e9b5dcce07917aa7cc71e49bddf21c16 --- freebsd/FreeBSDProcessList.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index aaebc928..cc51a7cd 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -146,7 +146,7 @@ void ProcessList_goThroughEntries(ProcessList* this) { struct kinfo_proc* kproc = &kprocs[i]; bool preExisting = false; - Process* proc = ProcessList_getProcess(this, kproc->ki_pid, &preExisting, (Process_new_fn) FreeBSDProcess_new); + Process* proc = ProcessList_getProcess(this, kproc->ki_pid, &preExisting, (Process_New) FreeBSDProcess_new); FreeBSDProcess* fp = (FreeBSDProcess*) proc; proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));