X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=c78619ee6ca8615d058c87677dc5283e1d12a289;hb=6cdade9983a7ebd5a5bb8296daa49d5475f07af8;hp=69797adb23e1b8cf647efe61f7f48498a6a267b1;hpb=ac0b9fcce4167e2959ebc5b8d6efb8511acec66d;p=mmh

diff --git a/uip/mhl.c b/uip/mhl.c
index 69797ad..c78619e 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -105,11 +105,11 @@ static struct mcomp *fmthd = NULL;
 static struct mcomp *fmttl = NULL;
 
 static struct mcomp global = {
-	NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 0, 0
+	NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 0, NULL
 };
 
 static struct mcomp holder = {
-	NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, 0
+	NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, NULL
 };
 
 struct pair {
@@ -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;