Merge branch 'master' of https://github.com/hishamhm/htop

freebsd/FreeBSDProcess.c

@@ -115,7 +115,7 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
    char buffer[256]; buffer[255] = '\0';
    int attr = CRT_colors[DEFAULT_COLOR];
    int n = sizeof(buffer) - 1;
-   switch (field) {
+   switch ((int) field) {
    // add FreeBSD-specific fields here
    case JID: snprintf(buffer, n, Process_pidFormat, fp->jid); break;
    case JAIL:{
@@ -143,7 +143,7 @@ long FreeBSDProcess_compare(const void* v1, const void* v2) {
       p2 = (FreeBSDProcess*)v1;
       p1 = (FreeBSDProcess*)v2;
    }
-   switch (settings->sortKey) {
+   switch ((int) settings->sortKey) {
    // add FreeBSD-specific fields here
    case JID:
       return (p1->jid - p2->jid);

freebsd/FreeBSDProcessList.c

@@ -477,8 +477,8 @@ void ProcessList_goThroughEntries(ProcessList* this) {
       }
 
       // from FreeBSD source /src/usr.bin/top/machine.c
-      proc->m_size = kproc->ki_size / 1024;
-      proc->m_resident = kproc->ki_rssize * pageSizeKb;
+      proc->m_size = kproc->ki_size / 1024 / pageSizeKb;
+      proc->m_resident = kproc->ki_rssize;
       proc->nlwp = kproc->ki_numthreads;
       proc->time = (kproc->ki_runtime + 5000) / 10000;
 

freebsd/Platform.c

@@ -24,6 +24,7 @@ in the source distribution for its full text.
 #include <sys/resource.h>
 #include <vm/vm_param.h>
 #include <time.h>
+#include <math.h>
 
 /*{
 #include "Action.h"