X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Fdump_entry.c;h=0f4e7c56cf066d9e2f14a886aeb21892ae6c4960;hp=f62d5c172bd57f78823af2a02b8f58c12c839205;hb=0573f2d712e4b5cb2a02a3fe52d513843d536b34;hpb=8b06e371ed1bce3dd6f37138e6becb5e1a562fe0

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index f62d5c17..0f4e7c56 100644
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -39,7 +39,7 @@
 #include "termsort.c"		/* this C file is generated */
 #include <parametrized.h>	/* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.97 2012/02/23 00:00:08 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.100 2012/06/09 21:44:40 tom Exp $")
 
 #define INDENT			8
 #define DISCARD(string) string = ABSENT_STRING
@@ -631,7 +631,7 @@ fmt_entry(TERMTYPE *tterm,
 
 	predval = pred(BOOLEAN, i);
 	if (predval != FAIL) {
-	    _nc_STRCAT(buffer, name, sizeof(buffer));
+	    _nc_STRCPY(buffer, name, sizeof(buffer));
 	    if (predval <= 0)
 		_nc_STRCAT(buffer, "@", sizeof(buffer));
 	    else if (i + 1 > num_bools)
@@ -721,14 +721,14 @@ fmt_entry(TERMTYPE *tterm,
 	    if (PRESENT(insert_character) || PRESENT(parm_ich)) {
 		if (SAME_CAP(i, enter_insert_mode)
 		    && enter_insert_mode == ABSENT_STRING) {
-		    _nc_STRCAT(buffer, "im=", sizeof(buffer));
+		    _nc_STRCPY(buffer, "im=", sizeof(buffer));
 		    WRAP_CONCAT;
 		    continue;
 		}
 
 		if (SAME_CAP(i, exit_insert_mode)
 		    && exit_insert_mode == ABSENT_STRING) {
-		    _nc_STRCAT(buffer, "ei=", sizeof(buffer));
+		    _nc_STRCPY(buffer, "ei=", sizeof(buffer));
 		    WRAP_CONCAT;
 		    continue;
 		}
@@ -860,7 +860,7 @@ fmt_entry(TERMTYPE *tterm,
 	    tp[0] = '\0';
 
 	    if (box_ok) {
-		_nc_STRCAT(buffer, "box1=", sizeof(buffer));
+		_nc_STRCPY(buffer, "box1=", sizeof(buffer));
 		_nc_STRCAT(buffer,
 			   _nc_tic_expand(boxchars,
 					  outform == F_TERMINFO, numbers),
@@ -1187,7 +1187,7 @@ show_entry(void)
      */
     if (outbuf.used != 0) {
 	bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR);
-	char delim = infodump ? ',' : ':';
+	char delim = (char) (infodump ? ',' : ':');
 	int j;
 
 	for (j = (int) outbuf.used - 1; j > 0; --j) {
@@ -1195,11 +1195,11 @@ show_entry(void)
 	    if (ch == '\n') {
 		;
 	    } else if (isspace(UChar(ch))) {
-		outbuf.used = j;
+		outbuf.used = (size_t) j;
 	    } else if (!infodump && ch == '\\') {
-		outbuf.used = j;
+		outbuf.used = (size_t) j;
 	    } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) {
-		outbuf.used = (j + 1);
+		outbuf.used = (size_t) (j + 1);
 	    } else {
 		break;
 	    }