CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Feb 26 17:36:15 UTC 2018

Modified Files:
        src/lib/libedit: common.c search.c

Log Message:
PR/53058: Nikhil Benesch: use correctly typed variables (wchar_t vs wint_t)
as parameters.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libedit/common.c src/lib/libedit/search.c

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


Modified files:

Index: src/lib/libedit/common.c
diff -u src/lib/libedit/common.c:1.47 src/lib/libedit/common.c:1.48
--- src/lib/libedit/common.c:1.47	Sun May 22 15:44:26 2016
+++ src/lib/libedit/common.c	Mon Feb 26 12:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.47 2016/05/22 19:44:26 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.48 2018/02/26 17:36:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: common.c,v 1.47 2016/05/22 19:44:26 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.48 2018/02/26 17:36:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -363,15 +363,17 @@ ed_prev_char(EditLine *el, wint_t c __at
  *	[^V] [^V]
  */
 libedit_private el_action_t
-ed_quoted_insert(EditLine *el, wint_t c)
+/*ARGSUSED*/
+ed_quoted_insert(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	int num;
+	wchar_t ch;
 
 	tty_quotemode(el);
-	num = el_wgetc(el, &c);
+	num = el_wgetc(el, &ch);
 	tty_noquotemode(el);
 	if (num == 1)
-		return ed_insert(el, c);
+		return ed_insert(el, ch);
 	else
 		return ed_end_of_file(el, 0);
 }
Index: src/lib/libedit/search.c
diff -u src/lib/libedit/search.c:1.47 src/lib/libedit/search.c:1.48
--- src/lib/libedit/search.c:1.47	Mon May  9 17:46:56 2016
+++ src/lib/libedit/search.c	Mon Feb 26 12:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: search.c,v 1.47 2016/05/09 21:46:56 christos Exp $	*/
+/*	$NetBSD: search.c,v 1.48 2018/02/26 17:36:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: search.c,v 1.47 2016/05/09 21:46:56 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.48 2018/02/26 17:36:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -603,8 +603,10 @@ cv_csearch(EditLine *el, int direction, 
 		return CC_ERROR;
 
 	if (ch == (wint_t)-1) {
-		if (el_wgetc(el, &ch) != 1)
+		wchar_t c;
+		if (el_wgetc(el, &c) != 1)
 			return ed_end_of_file(el, 0);
+		ch = c;
 	}
 
 	/* Save for ';' and ',' commands */