warning fixes

ProcessList.c

@@ -27,6 +27,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <sys/utsname.h>
 #include <stdarg.h>
+#include <math.h>
 
 #include "debug.h"
 #include <assert.h>
@@ -699,6 +700,7 @@ static bool ProcessList_processEntries(ProcessList* this, const char* dirname, P
          int percent_cpu = (process->utime + process->stime - lasttimes) / 
             period * 100.0;
          process->percent_cpu = MAX(MIN(percent_cpu, processors*100.0), 0.0);
+         if (isnan(process->percent_cpu)) process->percent_cpu = 0.0;
 
          process->percent_mem = (process->m_resident * PAGE_SIZE_KB) / 
             (float)(this->totalMem) * 

ProcessList.h

@@ -30,6 +30,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <sys/utsname.h>
 #include <stdarg.h>
+#include <math.h>
 
 #include "debug.h"
 #include <assert.h>

RichString.c

@@ -52,7 +52,7 @@ typedef struct RichString_ {
 
 #ifdef HAVE_LIBNCURSESW
 
-inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) {
+inline void RichString_appendn(RichString* this, int attrs, const char* data_c, int len) {
    wchar_t data[RICHSTRING_MAXLEN];
    len = mbstowcs(data, data_c, RICHSTRING_MAXLEN);
    if (len<0)
@@ -88,7 +88,7 @@ int RichString_findChar(RichString *this, char c, int start) {
 
 #else
 
-inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) {
+inline void RichString_appendn(RichString* this, int attrs, const char* data_c, int len) {
    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
    for (int i = this->len, j = 0; i < last; i++, j++)
       this->chstr[i] = (isprint(data_c[j]) ? data_c[j] : '?') | attrs;
@@ -108,7 +108,7 @@ void RichString_setAttrn(RichString *this, int attrs, int start, int finish) {
 int RichString_findChar(RichString *this, char c, int start) {
    chtype* ch = this->chstr + start;
    for (int i = start; i < this->len; i++) {
-      if ((*ch & 0xff) == c)
+      if ((*ch & 0xff) == (chtype) c)
          return i;
       ch++;
    }
@@ -125,16 +125,16 @@ void RichString_setAttr(RichString *this, int attrs) {
    RichString_setAttrn(this, attrs, 0, this->len - 1);
 }
 
-inline void RichString_append(RichString* this, int attrs, char* data) {
+inline void RichString_append(RichString* this, int attrs, const char* data) {
    RichString_appendn(this, attrs, data, strlen(data));
 }
 
-void RichString_write(RichString* this, int attrs, char* data) {
+void RichString_write(RichString* this, int attrs, const char* data) {
    RichString_init(this);
    RichString_append(this, attrs, data);
 }
 
-RichString RichString_quickString(int attrs, char* data) {
+RichString RichString_quickString(int attrs, const char* data) {
    RichString str;
    RichString_initVal(str);
    RichString_write(&str, attrs, data);

RichString.h

@@ -53,7 +53,7 @@ typedef struct RichString_ {
 
 #ifdef HAVE_LIBNCURSESW
 
-extern void RichString_appendn(RichString* this, int attrs, char* data_c, int len);
+extern void RichString_appendn(RichString* this, int attrs, const char* data_c, int len);
 
 extern void RichString_setAttrn(RichString *this, int attrs, int start, int finish);
 
@@ -61,7 +61,7 @@ int RichString_findChar(RichString *this, char c, int start);
 
 #else
 
-extern void RichString_appendn(RichString* this, int attrs, char* data_c, int len);
+extern void RichString_appendn(RichString* this, int attrs, const char* data_c, int len);
 
 void RichString_setAttrn(RichString *this, int attrs, int start, int finish);
 
@@ -73,10 +73,10 @@ void RichString_prune(RichString* this);
 
 void RichString_setAttr(RichString *this, int attrs);
 
-extern void RichString_append(RichString* this, int attrs, char* data);
+extern void RichString_append(RichString* this, int attrs, const char* data);
 
-void RichString_write(RichString* this, int attrs, char* data);
+void RichString_write(RichString* this, int attrs, const char* data);
 
-RichString RichString_quickString(int attrs, char* data);
+RichString RichString_quickString(int attrs, const char* data);
 
 #endif

ScreenManager.c

@@ -89,10 +89,10 @@ void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int
    this->itemCount++;
 }
 
-Panel* ScreenManager_remove(ScreenManager* this, int index) {
-   assert(this->itemCount > index);
-   Panel* panel = (Panel*) Vector_remove(this->items, index);
-   Vector_remove(this->fuBars, index);
+Panel* ScreenManager_remove(ScreenManager* this, int idx) {
+   assert(this->itemCount > idx);
+   Panel* panel = (Panel*) Vector_remove(this->items, idx);
+   Vector_remove(this->fuBars, idx);
    this->fuBar = NULL;
    this->itemCount--;
    return panel;

ScreenManager.h

@@ -47,7 +47,7 @@ extern int ScreenManager_size(ScreenManager* this);
 
 void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int size);
 
-Panel* ScreenManager_remove(ScreenManager* this, int index);
+Panel* ScreenManager_remove(ScreenManager* this, int idx);
 
 void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2);
 

SignalItem.c

@@ -19,7 +19,7 @@ in the source distribution for its full text.
 
 typedef struct Signal_ {
    Object super;
-   char* name;
+   const char* name;
    int number;
 } Signal;
 
@@ -47,7 +47,7 @@ static void Signal_display(Object* cast, RichString* out) {
    RichString_write(out, CRT_colors[DEFAULT_COLOR], buffer);
 }
 
-static Signal* Signal_new(char* name, int number) {
+static Signal* Signal_new(const char* name, int number) {
    Signal* this = malloc(sizeof(Signal));
    Object_setClass(this, SIGNAL_CLASS);
    ((Object*)this)->display = Signal_display;

SignalItem.h

@@ -21,7 +21,7 @@ in the source distribution for its full text.
 
 typedef struct Signal_ {
    Object super;
-   char* name;
+   const char* name;
    int number;
 } Signal;
 

SignalsPanel.c

@@ -26,13 +26,13 @@ static HandlerResult SignalsPanel_eventHandler(Panel* super, int ch) {
    int size = Panel_size(super);
    
    if (ch <= 255 && isdigit(ch)) {
-      int signal = ch-48 + this->state;
+      int sgn = ch-48 + this->state;
       for (int i = 0; i < size; i++)
-         if (((Signal*) Panel_get(super, i))->number == signal) {
+         if (((Signal*) Panel_get(super, i))->number == sgn) {
             Panel_setSelected(super, i);
             break;
          }
-      this->state = signal * 10;
+      this->state = sgn * 10;
       if (this->state > 100)
          this->state = 0;
       return HANDLED;

String.c

@@ -18,11 +18,11 @@ in the source distribution for its full text.
 #define String_startsWith(s, match) (strstr((s), (match)) == (s))
 }*/
 
-inline char* String_copy(char* orig) {
+inline char* String_copy(const char* orig) {
    return strdup(orig);
 }
 
-char* String_cat(char* s1, char* s2) {
+char* String_cat(const char* s1, const char* s2) {
    int l1 = strlen(s1);
    int l2 = strlen(s2);
    char* out = malloc(l1 + l2 + 1);
@@ -31,7 +31,7 @@ char* String_cat(char* s1, char* s2) {
    return out;
 }
 
-char* String_trim(char* in) {
+char* String_trim(const char* in) {
    while (in[0] == ' ' || in[0] == '\t' || in[0] == '\n') {
       in++;
    }
@@ -55,7 +55,7 @@ inline int String_eq(const char* s1, const char* s2) {
    return (strcmp(s1, s2) == 0);
 }
 
-char** String_split(char* s, char sep) {
+char** String_split(const char* s, char sep) {
    const int rate = 10;
    char** out = (char**) malloc(sizeof(char*) * rate);
    int ctr = 0;
@@ -93,7 +93,7 @@ void String_freeArray(char** s) {
    free(s);
 }
 
-int String_contains_i(char* s, char* match) {
+int String_contains_i(const char* s, const char* match) {
    int lens = strlen(s);
    int lenmatch = strlen(match);
    for (int i = 0; i < lens-lenmatch; i++) {

String.h

@@ -19,19 +19,19 @@ in the source distribution for its full text.
 
 #define String_startsWith(s, match) (strstr((s), (match)) == (s))
 
-extern char* String_copy(char* orig);
+extern char* String_copy(const char* orig);
 
-char* String_cat(char* s1, char* s2);
+char* String_cat(const char* s1, const char* s2);
 
-char* String_trim(char* in);
+char* String_trim(const char* in);
 
 extern int String_eq(const char* s1, const char* s2);
 
-char** String_split(char* s, char sep);
+char** String_split(const char* s, char sep);
 
 void String_freeArray(char** s);
 
-int String_contains_i(char* s, char* match);
+int String_contains_i(const char* s, const char* match);
 
 char* String_getToken(const char* line, const unsigned short int numMatch);
 

TraceScreen.c

@@ -32,9 +32,9 @@ typedef struct TraceScreen_ {
 
 }*/
 
-static char* tbFunctions[] = {"AutoScroll ", "Stop Tracing   ", "Done   ", NULL};
+static const char* tbFunctions[] = {"AutoScroll ", "Stop Tracing   ", "Done   ", NULL};
 
-static char* tbKeys[] = {"F4", "F5", "Esc"};
+static const char* tbKeys[] = {"F4", "F5", "Esc"};
 
 static int tbEvents[] = {KEY_F(4), KEY_F(5), 27};
 

Vector.c

@@ -127,37 +127,37 @@ static void Vector_checkArraySize(Vector* this) {
    assert(Vector_isConsistent(this));
 }
 
-void Vector_insert(Vector* this, int index, void* data_) {
-   assert(index >= 0);
+void Vector_insert(Vector* this, int idx, void* data_) {
+   assert(idx >= 0);
    assert(((Object*)data_)->class == this->vectorType);
    Object* data = data_;
    assert(Vector_isConsistent(this));
    
    Vector_checkArraySize(this);
    assert(this->array[this->items] == NULL);
-   for (int i = this->items; i >= index; i--) {
+   for (int i = this->items; i >= idx; i--) {
       this->array[i+1] = this->array[i];
    }
-   this->array[index] = data;
+   this->array[idx] = data;
    this->items++;
    assert(Vector_isConsistent(this));
 }
 
-Object* Vector_take(Vector* this, int index) {
-   assert(index >= 0 && index < this->items);
+Object* Vector_take(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
    assert(Vector_isConsistent(this));
-   Object* removed = this->array[index];
+   Object* removed = this->array[idx];
    assert (removed != NULL);
    this->items--;
-   for (int i = index; i < this->items; i++)
+   for (int i = idx; i < this->items; i++)
       this->array[i] = this->array[i+1];
    this->array[this->items] = NULL;
    assert(Vector_isConsistent(this));
    return removed;
 }
 
-Object* Vector_remove(Vector* this, int index) {
-   Object* removed = Vector_take(this, index);
+Object* Vector_remove(Vector* this, int idx) {
+   Object* removed = Vector_take(this, idx);
    if (this->owner) {
       removed->delete(removed);
       return NULL;
@@ -165,52 +165,52 @@ Object* Vector_remove(Vector* this, int index) {
       return removed;
 }
 
-void Vector_moveUp(Vector* this, int index) {
-   assert(index >= 0 && index < this->items);
+void Vector_moveUp(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
    assert(Vector_isConsistent(this));
-   if (index == 0)
+   if (idx == 0)
       return;
-   Object* temp = this->array[index];
-   this->array[index] = this->array[index - 1];
-   this->array[index - 1] = temp;
+   Object* temp = this->array[idx];
+   this->array[idx] = this->array[idx - 1];
+   this->array[idx - 1] = temp;
 }
 
-void Vector_moveDown(Vector* this, int index) {
-   assert(index >= 0 && index < this->items);
+void Vector_moveDown(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
    assert(Vector_isConsistent(this));
-   if (index == this->items - 1)
+   if (idx == this->items - 1)
       return;
-   Object* temp = this->array[index];
-   this->array[index] = this->array[index + 1];
-   this->array[index + 1] = temp;
+   Object* temp = this->array[idx];
+   this->array[idx] = this->array[idx + 1];
+   this->array[idx + 1] = temp;
 }
 
-void Vector_set(Vector* this, int index, void* data_) {
-   assert(index >= 0);
+void Vector_set(Vector* this, int idx, void* data_) {
+   assert(idx >= 0);
    assert(((Object*)data_)->class == this->vectorType);
    Object* data = data_;
    assert(Vector_isConsistent(this));
 
    Vector_checkArraySize(this);
-   if (index >= this->items) {
-      this->items = index+1;
+   if (idx >= this->items) {
+      this->items = idx+1;
    } else {
       if (this->owner) {
-         Object* removed = this->array[index];
+         Object* removed = this->array[idx];
          assert (removed != NULL);
          if (this->owner) {
             removed->delete(removed);
          }
       }
    }
-   this->array[index] = data;
+   this->array[idx] = data;
    assert(Vector_isConsistent(this));
 }
 
-inline Object* Vector_get(Vector* this, int index) {
-   assert(index < this->items);
+inline Object* Vector_get(Vector* this, int idx) {
+   assert(idx < this->items);
    assert(Vector_isConsistent(this));
-   return this->array[index];
+   return this->array[idx];
 }
 
 inline int Vector_size(Vector* this) {

Vector.h

@@ -49,19 +49,19 @@ void Vector_prune(Vector* this);
 
 void Vector_sort(Vector* this);
 
-void Vector_insert(Vector* this, int index, void* data_);
+void Vector_insert(Vector* this, int idx, void* data_);
 
-Object* Vector_take(Vector* this, int index);
+Object* Vector_take(Vector* this, int idx);
 
-Object* Vector_remove(Vector* this, int index);
+Object* Vector_remove(Vector* this, int idx);
 
-void Vector_moveUp(Vector* this, int index);
+void Vector_moveUp(Vector* this, int idx);
 
-void Vector_moveDown(Vector* this, int index);
+void Vector_moveDown(Vector* this, int idx);
 
-void Vector_set(Vector* this, int index, void* data_);
+void Vector_set(Vector* this, int idx, void* data_);
 
-extern Object* Vector_get(Vector* this, int index);
+extern Object* Vector_get(Vector* this, int idx);
 
 extern int Vector_size(Vector* this);
 

htop.c

@@ -151,7 +151,7 @@ static void showHelp(ProcessList* pl) {
    clear();
 }
 
-static char* CategoriesFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+static const char* CategoriesFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
 
 static void Setup_run(Settings* settings, int headerHeight) {
    ScreenManager* scr = ScreenManager_new(0, headerHeight, 0, -1, HORIZONTAL, true);
@@ -184,13 +184,14 @@ static bool changePriority(Panel* panel, int delta) {
 }
 
 static HandlerResult pickWithEnter(Panel* panel, int ch) {
+   (void) panel;
    if (ch == 13)
       return BREAK_LOOP;
    return IGNORED;
 }
 
-static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) {
-   char* fuKeys[] = {"Enter", "Esc", NULL};
+static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, const char** keyLabels, FunctionBar* prevBar) {
+   const char* fuKeys[] = {"Enter", "Esc", NULL};
    int fuEvents[] = {13, 27};
    if (!list->eventHandler)
       Panel_setEventHandler(list, pickWithEnter);
@@ -325,12 +326,12 @@ int main(int argc, char** argv) {
    }
    Panel_setRichHeader(panel, ProcessList_printHeader(pl));
    
-   char* searchFunctions[] = {"Next  ", "Exit  ", " Search: ", NULL};
-   char* searchKeys[] = {"F3", "Esc", "  "};
+   const char* searchFunctions[] = {"Next  ", "Exit  ", " Search: ", NULL};
+   const char* searchKeys[] = {"F3", "Esc", "  "};
    int searchEvents[] = {KEY_F(3), 27, ERR};
    FunctionBar* searchBar = FunctionBar_new(searchFunctions, searchKeys, searchEvents);
    
-   char* defaultFunctions[] = {"Help  ", "Setup ", "Search", "Invert", "Tree  ",
+   const char* defaultFunctions[] = {"Help  ", "Setup ", "Search", "Invert", "Tree  ",
        "SortBy", "Nice -", "Nice +", "Kill  ", "Quit  ", NULL};
    FunctionBar* defaultBar = FunctionBar_new(defaultFunctions, NULL, NULL);
 
@@ -358,7 +359,7 @@ int main(int argc, char** argv) {
          oldTime = newTime;
       if (doRefresh) {
          int currPos = Panel_getSelectedIndex(panel);
-         unsigned int currPid = 0;
+         pid_t currPid = 0;
          int currScrollV = panel->scrollV;
          if (follow)
             currPid = ProcessList_get(pl, currPos)->pid;
@@ -372,16 +373,16 @@ int main(int argc, char** argv) {
          }
          Panel_prune(panel);
          int size = ProcessList_size(pl);
-         int index = 0;
+         int idx = 0;
          for (int i = 0; i < size; i++) {
             Process* p = ProcessList_get(pl, i);
             if (!userOnly || (p->st_uid == userId)) {
-               Panel_set(panel, index, (Object*)p);
-               if ((!follow && index == currPos) || (follow && p->pid == currPid)) {
-                  Panel_setSelected(panel, index);
+               Panel_set(panel, idx, (Object*)p);
+               if ((!follow && idx == currPos) || (follow && p->pid == currPid)) {
+                  Panel_setSelected(panel, idx);
                   panel->scrollV = currScrollV;
                }
-               index++;
+               idx++;
             }
          }
       }
@@ -452,7 +453,7 @@ int main(int argc, char** argv) {
          continue;
       }
       if (isdigit((char)ch)) {
-         unsigned int pid = ch-48 + acc;
+         pid_t pid = ch-48 + acc;
          for (int i = 0; i < ProcessList_size(pl) && ((Process*) Panel_getSelected(panel))->pid != pid; i++)
             Panel_setSelected(panel, i);
          acc = pid * 10;
@@ -600,7 +601,7 @@ int main(int argc, char** argv) {
          Vector_sort(usersPanel->items);
          ListItem* allUsers = ListItem_new("All users", -1);
          Panel_insert(usersPanel, 0, (Object*) allUsers);
-         char* fuFunctions[] = {"Show    ", "Cancel ", NULL};
+         const char* fuFunctions[] = {"Show    ", "Cancel ", NULL};
          ListItem* picked = (ListItem*) pickFromVector(panel, usersPanel, 20, headerHeight, fuFunctions, defaultBar);
          if (picked) {
             if (picked == allUsers) {
@@ -619,10 +620,10 @@ int main(int argc, char** argv) {
             killPanel = (Panel*) SignalsPanel_new(0, 0, 0, 0);
          }
          SignalsPanel_reset((SignalsPanel*) killPanel);
-         char* fuFunctions[] = {"Send  ", "Cancel ", NULL};
-         Signal* signal = (Signal*) pickFromVector(panel, killPanel, 15, headerHeight, fuFunctions, defaultBar);
-         if (signal) {
-            if (signal->number != 0) {
+         const char* fuFunctions[] = {"Send  ", "Cancel ", NULL};
+         Signal* sgn = (Signal*) pickFromVector(panel, killPanel, 15, headerHeight, fuFunctions, defaultBar);
+         if (sgn) {
+            if (sgn->number != 0) {
                Panel_setHeader(panel, "Sending...");
                Panel_draw(panel, true);
                refresh();
@@ -630,13 +631,13 @@ int main(int argc, char** argv) {
                for (int i = 0; i < Panel_size(panel); i++) {
                   Process* p = (Process*) Panel_get(panel, i);
                   if (p->tag) {
-                     Process_sendSignal(p, signal->number);
+                     Process_sendSignal(p, sgn->number);
                      anyTagged = true;
                   }
                }
                if (!anyTagged) {
                   Process* p = (Process*) Panel_getSelected(panel);
-                  Process_sendSignal(p, signal->number);
+                  Process_sendSignal(p, sgn->number);
                }
                napms(500);
             }
@@ -651,12 +652,11 @@ int main(int argc, char** argv) {
          if (pl->processorCount == 1)
             break;
 
-         Process* p = (Process*) Panel_getSelected(panel);
-         unsigned long curr = Process_getAffinity(p);
+         unsigned long curr = Process_getAffinity((Process*) Panel_getSelected(panel));
          
          Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr);
 
-         char* fuFunctions[] = {"Set    ", "Cancel ", NULL};
+         const char* fuFunctions[] = {"Set    ", "Cancel ", NULL};
          void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar);
          if (set) {
             unsigned long new = AffinityPanel_getAffinity(affinityPanel);
@@ -695,7 +695,7 @@ int main(int argc, char** argv) {
       {
          Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare);
          Panel_setHeader(sortPanel, "Sort by");
-         char* fuFunctions[] = {"Sort  ", "Cancel ", NULL};
+         const char* fuFunctions[] = {"Sort  ", "Cancel ", NULL};
          ProcessField* fields = pl->fields;
          for (int i = 0; fields[i]; i++) {
             char* name = String_trim(Process_fieldTitles[fields[i]]);