From fbb4c49edd666dbbba9fa41906604c386b95b5ed Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Mon, 5 Oct 2015 11:27:44 -0300
Subject: [PATCH] gcc warning cleanups.

---
 CRT.c  | 2 +-
 htop.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRT.c b/CRT.c
index 48182200..2ab20c2d 100644
--- a/CRT.c
+++ b/CRT.c
@@ -552,7 +552,7 @@ void CRT_init(int delay, int colorScheme) {
    CRT_colorScheme = colorScheme;
    
    for (int i = 0; i < LAST_COLORELEMENT; i++) {
-      int color = CRT_colorSchemes[COLORSCHEME_DEFAULT][i];
+      unsigned int color = CRT_colorSchemes[COLORSCHEME_DEFAULT][i];
       CRT_colorSchemes[COLORSCHEME_BROKENGRAY][i] = color == (A_BOLD | ColorPair(Black,Black)) ? ColorPair(White,Black) : color;
    }
    
diff --git a/htop.c b/htop.c
index a5e75660..f5fe6db2 100644
--- a/htop.c
+++ b/htop.c
@@ -108,7 +108,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
             }
             flags.sortKey = ColumnsPanel_fieldNameToIndex(optarg);
             if (flags.sortKey == -1) {
-               errx(1, stderr, "Error: invalid column \"%s\".\n", optarg);
+               fprintf(stderr, "Error: invalid column \"%s\".\n", optarg);
             }
             break;
          case 'd':
@@ -116,12 +116,12 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
                if (flags.delay < 1) flags.delay = 1;
                if (flags.delay > 100) flags.delay = 100;
             } else {
-               errx(1, stderr, "Error: invalid delay value \"%s\".\n", optarg);
+               fprintf(stderr, "Error: invalid delay value \"%s\".\n", optarg);
             }
             break;
          case 'u':
             if (!Action_setUserOnly(optarg, &(flags.userId))) {
-               errx(1, stderr, "Error: invalid user \"%s\".\n", optarg);
+               fprintf(stderr, "Error: invalid user \"%s\".\n", optarg);
             }
             break;
          case 'C':
@@ -176,7 +176,7 @@ int main(int argc, char** argv) {
 
 #ifdef HAVE_PROC
    if (access(PROCDIR, R_OK) != 0) {
-      errx(1, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
+      fprintf("Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
    }
 #endif