X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fmhlsbr.c;h=4c2558f742926234fd346763988aa8c545b2abb3;hb=3ef341abe440ece07f8deed59fb026ab020e805a;hp=68a265d5e605ee2da1e32fc8206a04df8866424c;hpb=2ce001e1b0b7cc5366ea2804f66726e57910282b;p=mmh diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 68a265d..4c2558f 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -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;