Module Name: src
Committed By: christos
Date: Fri Oct 12 23:35:03 UTC 2012
Modified Files:
src/lib/libedit: readline.c
Log Message:
Add trailing NULL's to the varargs functions as required. (John Spencer)
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/lib/libedit/readline.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/readline.c
diff -u src/lib/libedit/readline.c:1.105 src/lib/libedit/readline.c:1.106
--- src/lib/libedit/readline.c:1.105 Thu Jul 12 14:46:20 2012
+++ src/lib/libedit/readline.c Fri Oct 12 19:35:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.105 2012/07/12 18:46:20 christos Exp $ */
+/* $NetBSD: readline.c,v 1.106 2012/10/12 23:35:02 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.105 2012/07/12 18:46:20 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.106 2012/10/12 23:35:02 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -1927,7 +1927,7 @@ rl_add_defun(const char *name, Function
map[(unsigned char)c] = fun;
el_set(e, EL_ADDFN, name, name, rl_bind_wrapper);
vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0);
- el_set(e, EL_BIND, dest, name);
+ el_set(e, EL_BIND, dest, name, NULL);
return 0;
}
@@ -2035,7 +2035,7 @@ rl_variable_bind(const char *var, const
* The proper return value is undocument, but this is what the
* readline source seems to do.
*/
- return el_set(e, EL_BIND, "", var, value) == -1 ? 1 : 0;
+ return el_set(e, EL_BIND, "", var, value, NULL) == -1 ? 1 : 0;
}
void
@@ -2104,9 +2104,9 @@ void
rl_get_screen_size(int *rows, int *cols)
{
if (rows)
- el_get(e, EL_GETTC, "li", rows);
+ el_get(e, EL_GETTC, "li", rows, NULL);
if (cols)
- el_get(e, EL_GETTC, "co", cols);
+ el_get(e, EL_GETTC, "co", cols, NULL);
}
void
@@ -2114,9 +2114,9 @@ rl_set_screen_size(int rows, int cols)
{
char buf[64];
(void)snprintf(buf, sizeof(buf), "%d", rows);
- el_set(e, EL_SETTC, "li", buf);
+ el_set(e, EL_SETTC, "li", buf, NULL);
(void)snprintf(buf, sizeof(buf), "%d", cols);
- el_set(e, EL_SETTC, "co", buf);
+ el_set(e, EL_SETTC, "co", buf, NULL);
}
char **
