Changed types and added casts so that build is clean with gcc -Wsign-compare.

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index 321c5f9..c78619e 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -178,12 +178,12 @@ static int mhldebug = 0;
 #define NOTTY  0
 static int ontty = NOTTY;
 
-static int column;
+static unsigned int column;
 
 static int lm;
 static int ovoff;
 static int term;
-static int wid;
+static unsigned int wid;
 
 static char *ovtxt;
 
@@ -1082,11 +1082,11 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag)
        count = 0;
        if (cchdr) {
                if (flag == TWOCOMP)
-                       count = (c1->c_cwidth >= 0) ?
-                                       c1->c_cwidth : strlen(c2->c_name) + 2;
+                       count = (c1->c_cwidth >= 0) ? c1->c_cwidth :
+                                       (int)strlen(c2->c_name) + 2;
                else
-                       count = (c1->c_cwidth >= 0) ?
-                                       c1->c_cwidth : strlen(c1->c_text ?
+                       count = (c1->c_cwidth >= 0) ? (size_t)c1->c_cwidth :
+                                       strlen(c1->c_text ?
                                        c1->c_text : c1->c_name) + 2;
        }
        count += c1->c_offset;