Clean up headers by using 'static' whenever possible.

Reduces resulting code size.

Vector.c

@@ -218,7 +218,9 @@ inline int Vector_size(Vector* this) {
    return this->items;
 }
 
-void Vector_merge(Vector* this, Vector* v2) {
+/*
+
+static void Vector_merge(Vector* this, Vector* v2) {
    int i;
    assert(Vector_isConsistent(this));
    
@@ -229,6 +231,8 @@ void Vector_merge(Vector* this, Vector* v2) {
    assert(Vector_isConsistent(this));
 }
 
+*/
+
 void Vector_add(Vector* this, void* data_) {
    assert(data_ && ((Object*)data_)->class == this->vectorType);
    Object* data = data_;
@@ -252,7 +256,9 @@ inline int Vector_indexOf(Vector* this, void* search_, Object_Compare compare) {
    return -1;
 }
 
-void Vector_foreach(Vector* this, Vector_procedure f) {
+/*
+
+static void Vector_foreach(Vector* this, Vector_procedure f) {
    int i;
    assert(Vector_isConsistent(this));
 
@@ -260,3 +266,5 @@ void Vector_foreach(Vector* this, Vector_procedure f) {
       f(this->array[i]);
    assert(Vector_isConsistent(this));
 }
+
+*/

Vector.h

@@ -65,12 +65,16 @@ extern Object* Vector_get(Vector* this, int index);
 
 extern int Vector_size(Vector* this);
 
-void Vector_merge(Vector* this, Vector* v2);
+/*
+
+*/
 
 void Vector_add(Vector* this, void* data_);
 
 extern int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
 
-void Vector_foreach(Vector* this, Vector_procedure f);
+/*
+
+*/
 
 #endif

htop.c

@@ -35,14 +35,14 @@ in the source distribution for its full text.
 
 #define INCSEARCH_MAX 40
 
-void printVersionFlag() {
+static void printVersionFlag() {
    clear();
    printf("htop " VERSION " - (C) 2004-2008 Hisham Muhammad.\n");
    printf("Released under the GNU GPL.\n\n");
    exit(0);
 }
 
-void printHelpFlag() {
+static void printHelpFlag() {
    clear();
    printf("htop " VERSION " - (C) 2004-2008 Hisham Muhammad.\n");
    printf("Released under the GNU GPL.\n\n");
@@ -54,7 +54,7 @@ void printHelpFlag() {
    exit(0);
 }
 
-void showHelp(ProcessList* pl) {
+static void showHelp(ProcessList* pl) {
    clear();
    attrset(CRT_colors[HELP_BOLD]);
 
@@ -201,13 +201,13 @@ static Object* pickFromList(Panel* panel, Panel* list, int x, int y, char** keyL
    return NULL;
 }
 
-void addUserToList(int key, void* userCast, void* panelCast) {
+static void addUserToList(int key, void* userCast, void* panelCast) {
    char* user = (char*) userCast;
    Panel* panel = (Panel*) panelCast;
    Panel_add(panel, (Object*) ListItem_new(user, key));
 }
 
-void setUserOnly(const char* userName, bool* userOnly, uid_t* userId) {
+static void setUserOnly(const char* userName, bool* userOnly, uid_t* userId) {
    struct passwd* user = getpwnam(userName);
    if (user) {
       *userOnly = true;

htop.h

@@ -39,16 +39,6 @@ in the source distribution for its full text.
 
 #define INCSEARCH_MAX 40
 
-void printVersionFlag();
-
-void printHelpFlag();
-
-void showHelp(ProcessList* pl);
-
-void addUserToList(int key, void* userCast, void* panelCast);
-
-void setUserOnly(const char* userName, bool* userOnly, uid_t* userId);
-
 int main(int argc, char** argv);
 
 #endif