CVS commit: src/dist/nvi/vi

[Takehiko NOZAKI]

Module Name:    src
Committed By:   tnozaki
Date:           Wed Nov 16 14:24:43 UTC 2011

Modified Files:
        src/dist/nvi/vi: vs_line.c

Log Message:
use ARG_CHAR_T instead of CHAR_T for integer promotion.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/vi/vs_line.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/dist/nvi/vi/vs_line.c
diff -u src/dist/nvi/vi/vs_line.c:1.5 src/dist/nvi/vi/vs_line.c:1.6
--- src/dist/nvi/vi/vs_line.c:1.5	Sun Apr 19 02:28:19 2009
+++ src/dist/nvi/vi/vs_line.c	Wed Nov 16 14:24:43 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vs_line.c,v 1.5 2009/04/19 02:28:19 tnozaki Exp $ */
+/*	$NetBSD: vs_line.c,v 1.6 2011/11/16 14:24:43 tnozaki Exp $ */
 
 /*-
  * Copyright (c) 1993, 1994
@@ -52,7 +52,7 @@ vs_line(SCR *sp, SMAP *smp, size_t *yp, 
 	int list_tab, list_dollar;
 	CHAR_T *p;
 	CHAR_T *cbp, *ecbp, cbuf[128];
-	CHAR_T ch = '\0';
+	ARG_CHAR_T ch = L('\0');
 
 #if defined(DEBUG) && 0
 	vtrace(sp, "vs_line: row %u: line: %u off: %u\n",
@@ -268,7 +268,7 @@ empty:					(void)gp->scr_addstr(sp,
 	/* Do it the hard way, for leftright scrolling screens. */
 	if (O_ISSET(sp, O_LEFTRIGHT)) {
 		for (; offset_in_line < len; ++offset_in_line) {
-			chlen = (ch = *p++) == L('\t') && !list_tab ?
+			chlen = (ch = (UCHAR_T)*p++) == L('\t') && !list_tab ?
 			    TAB_OFF(scno) : KEY_COL(sp, ch);
 			if ((scno += chlen) >= skip_cols)
 				break;
@@ -295,7 +295,7 @@ empty:					(void)gp->scr_addstr(sp,
 	/* Do it the hard way, for historic line-folding screens. */
 	else {
 		for (; offset_in_line < len; ++offset_in_line) {
-			chlen = (ch = *p++) == L('\t') && !list_tab ?
+			chlen = (ch = (UCHAR_T)*p++) == L('\t') && !list_tab ?
 			    TAB_OFF(scno) : KEY_COL(sp, ch);
 			if ((scno += chlen) < cols_per_screen)
 				continue;
@@ -345,7 +345,7 @@ display:
 	ecbp = (cbp = cbuf) + sizeof(cbuf)/sizeof(CHAR_T) - 1;
 	for (is_partial = 0, scno = 0;
 	    offset_in_line < len; ++offset_in_line, offset_in_char = 0) {
-		if ((ch = *p++) == L('\t') && !list_tab) {
+		if ((ch = (UCHAR_T)*p++) == L('\t') && !list_tab) {
 			scno += chlen = TAB_OFF(scno) - offset_in_char;
 			is_tab = 1;
 		} else {
@@ -465,10 +465,10 @@ display:
 		if (list_dollar) {
 			++scno;
 
-			chlen = KEY_LEN(sp, '$');
+			chlen = KEY_LEN(sp, L('$'));
 			if (cbp + chlen >= ecbp)
 				FLUSH;
-			for (kp = KEY_NAME(sp, '$'); chlen--;)
+			for (kp = KEY_NAME(sp, L('$')); chlen--;)
 				*cbp++ = *kp++;
 		}