diff options
| author | emaste <emaste@FreeBSD.org> | 2015-01-30 14:22:15 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-01-30 14:22:15 +0000 |
| commit | 2f8208fe7786625939fcd121b4e4289a8796786e (patch) | |
| tree | 600dd99c25f840ddaeea654b05d28ab7e4c6c840 /lib/libedit/map.c | |
| parent | 0a6db6b09eaecbd84ff23691f42dc39563edb5d7 (diff) | |
| download | FreeBSD-src-2f8208fe7786625939fcd121b4e4289a8796786e.zip FreeBSD-src-2f8208fe7786625939fcd121b4e4289a8796786e.tar.gz | |
Merge libedit fixes from NetBSD
Add trailing NULL's to the varargs functions as required.
(John Spencer)
readline.c r1.106
Bounds search for reallocated index, from OpenBSD via Andreas Fett
map.c 1.34
map.h 1.10
parse.c 1.27
read.c 1.71
This is a direct commit to stable/10 as these changes are included in a
broader sync with NetBSD committed by bapt@ in r276881.
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D1728
Diffstat (limited to 'lib/libedit/map.c')
| -rw-r--r-- | lib/libedit/map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libedit/map.c b/lib/libedit/map.c index c70904a..d4296e2 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1395,7 +1395,7 @@ protected int map_addfunc(EditLine *el, const char *name, const char *help, el_func_t func) { void *p; - int nf = el->el_map.nfunc + 1; + size_t nf = el->el_map.nfunc + 1; if (name == NULL || help == NULL || func == NULL) return (-1); |
