X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fmhlsbr.c;h=4c2558f742926234fd346763988aa8c545b2abb3;hb=3ef341abe440ece07f8deed59fb026ab020e805a;hp=a0d1306845606b3a047183755d540a1c1d867610;hpb=3a84d814004fd4557bf4f44952648e9e69bd22a8;p=mmh

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index a0d1306..4c2558f 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -134,11 +134,11 @@ static struct mcomp *fmthd = NULL;
 static struct mcomp *fmttl = NULL;
 
 static struct mcomp global = {
-    NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 40, BELL, 0
+    NULL, NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 40, BELL, NULL
 };
 
 static struct mcomp holder = {
-    NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, 0
+    NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, NULL
 };
 
 struct pair {
@@ -218,13 +218,13 @@ static int mhldebug = 0;
 static int ontty = NOTTY;
 
 static int row;
-static int column;
+static unsigned int column;
 
 static int lm;
 static int llim;
 static int ovoff;
 static int term;
-static int wid;
+static unsigned int wid;
 
 static char *ovtxt;
 
@@ -790,7 +790,7 @@ parse (void)
 
 
 static void
-process (char *folder, char *fname, int ofilen, int ofilec)
+process (char *folder, char *volatile fname, int ofilen, int ofilec)
 {
     char *cp = NULL;
     FILE *fp = NULL;
@@ -1275,9 +1275,9 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     if (cchdr) {
 	if (flag == TWOCOMP)
 	    count = (c1->c_cwidth >= 0) ? c1->c_cwidth
-			: strlen (c2->c_name) + 2;
+			: (int) strlen (c2->c_name) + 2;
 	else
-	    count = (c1->c_cwidth >= 0) ? c1->c_cwidth
+	    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;