bzr push into mysql-trunk branch (nirbhay.choubey:3246 to 3247) WL#5945

[Nirbhay Choubey]

 3247 Nirbhay Choubey	2011-10-05
      WL#5945 : Improve libedit library
      
      Fixes for compiler warnings.

    modified:
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/search.c
      cmd-line-utils/libedit/terminal.c
      cmd-line-utils/libedit/tty.c
      cmd-line-utils/libedit/vi.c
 3246 Nirbhay Choubey	2011-10-03
      WL#5945 : Improve libedit library
      
      * Number of bytes in a multibyte character can
        be (at most) equal to MB_CUR_MAX.
      * Fix for a compiler warning.

    modified:
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/readline.c
=== modified file 'cmd-line-utils/libedit/README'
--- a/cmd-line-utils/libedit/README	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/README	2011-10-05 06:46:08 +0000
@@ -42,7 +42,7 @@ then merge remaining bits by hand.  All 
 marked with XXXMYSQL to make them easier to identify and merge.  To generate
 a 'clean' diff against upstream you can use the above commands but use
 
-	cvs co -D "2011/10/03 14:09:38" [..]
+	cvs co -D "2011/10/04 15:27:04" [..]
 
 to fetch the baseline of most recent merge.
 

=== modified file 'cmd-line-utils/libedit/read.c'
--- a/cmd-line-utils/libedit/read.c	2011-10-03 15:44:13 +0000
+++ b/cmd-line-utils/libedit/read.c	2011-10-05 06:46:08 +0000
@@ -303,7 +303,7 @@ read_char(EditLine *el, Char *cp)
 	int tried = 0;
         char cbuf[MB_LEN_MAX];
         size_t cbp = 0;
-        size_t bytes = 0;
+        int bytes = 0;
 
 #ifdef WIDECHAR
 static mbstate_t state, temp_state;

=== modified file 'cmd-line-utils/libedit/search.c'
--- a/cmd-line-utils/libedit/search.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/search.c	2011-10-05 06:46:08 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: search.c,v 1.29 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -599,7 +599,7 @@ cv_csearch(EditLine *el, int direction, 
 	if (ch == 0)
 		return CC_ERROR;
 
-	if (ch == -1) {
+	if (ch == (Int)-1) {
 		Char c;
 		if (FUN(el,getc)(el, &c) != 1)
 			return ed_end_of_file(el, 0);
@@ -613,14 +613,14 @@ cv_csearch(EditLine *el, int direction, 
 
 	cp = el->el_line.cursor;
 	while (count--) {
-		if (*cp == ch)
+		if ((Int)*cp == ch)
 			cp += direction;
 		for (;;cp += direction) {
 			if (cp >= el->el_line.lastchar)
 				return CC_ERROR;
 			if (cp < el->el_line.buffer)
 				return CC_ERROR;
-			if (*cp == ch)
+			if ((Int)*cp == ch)
 				break;
 		}
 	}

=== modified file 'cmd-line-utils/libedit/terminal.c'
--- a/cmd-line-utils/libedit/terminal.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/terminal.c	2011-10-05 06:46:08 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: terminal.c,v 1.9 2011/10/03 14:09:38 christos Exp $	*/
+/*	$NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -1249,7 +1249,7 @@ terminal__putc(EditLine *el, Int c)
 	mbstate_t state;
 
 	memset(&state, 0, sizeof(mbstate_t));
-	if (c == MB_FILL_CHAR)
+	if (c == (Int)MB_FILL_CHAR)
 		return 0;
 	i = ct_encode_char(buf, (size_t)MB_CUR_MAX, c, &state);
 	if (i <= 0)

=== modified file 'cmd-line-utils/libedit/tty.c'
--- a/cmd-line-utils/libedit/tty.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/tty.c	2011-10-05 06:46:08 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.40 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: tty.c,v 1.41 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -153,7 +153,7 @@ private const ttymap_t tty_map[] = {
 	{C_LNEXT, VLNEXT,
 	{ED_QUOTED_INSERT, ED_QUOTED_INSERT, ED_UNASSIGNED}},
 #endif /* VLNEXT */
-	{-1, -1,
+	{(Int)-1, (Int)-1,
 	{ED_UNASSIGNED, ED_UNASSIGNED, ED_UNASSIGNED}}
 };
 
@@ -913,7 +913,7 @@ tty_bind_char(EditLine *el, int force)
 		dalt = NULL;
 	}
 
-	for (tp = tty_map; tp->nch != -1; tp++) {
+	for (tp = tty_map; tp->nch != (Int)-1; tp++) {
 		new[0] = t_n[tp->nch];
 		old[0] = t_o[tp->och];
 		if (new[0] == old[0] && !force)

=== modified file 'cmd-line-utils/libedit/vi.c'
--- a/cmd-line-utils/libedit/vi.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/vi.c	2011-10-05 06:46:08 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vi.c,v 1.40 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -62,7 +62,7 @@ cv_action(EditLine *el, Int c)
 
 	if (el->el_chared.c_vcmd.action != NOP) {
 		/* 'cc', 'dd' and (possibly) friends */
-		if (c != el->el_chared.c_vcmd.action)
+		if (c != (Int)el->el_chared.c_vcmd.action)
 			return CC_ERROR;
 
 		if (!(c & YANK))

No bundle (reason: useless for push emails).