diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-01-31 15:34:54 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-01-31 15:34:54 +0000 |
| commit | d142056ed9ba44eee97080c79405ab70c6ef5220 (patch) | |
| tree | 4c4e12a3cd3cce4949e1ac5a5331caed681a101a /lib/libedit | |
| parent | 1f54fc9f3e8b5328af37c16eecf5aee89af390c0 (diff) | |
trivial partial sync to NetBSD, no functional change:
* remove unused ifdef'ed header junk
* remove pointless cast of NULL
* wrap two excessively long lines
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/filecomplete.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c index a83699d5e03..f5da3357fe7 100644 --- a/lib/libedit/filecomplete.c +++ b/lib/libedit/filecomplete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: filecomplete.c,v 1.6 2016/01/30 12:22:20 schwarze Exp $ */ +/* $OpenBSD: filecomplete.c,v 1.7 2016/01/31 15:34:53 schwarze Exp $ */ /* $NetBSD: filecomplete.c,v 1.22 2010/12/02 04:42:46 dholland Exp $ */ /*- @@ -44,14 +44,7 @@ #include <limits.h> #include <errno.h> #include <fcntl.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else -#include "np/vis.h" -#endif -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif + #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "histedit.h" @@ -320,7 +313,7 @@ completion_matches(const char *text, char *(*genfunc)(const char *, int)) match_list[0] = retstr; /* add NULL as last pointer to the array */ - match_list[matches + 1] = (char *) NULL; + match_list[matches + 1] = NULL; return match_list; } @@ -446,13 +439,15 @@ fn_complete(EditLine *el, if (attempted_completion_function) { int cur_off = (int)(li->cursor - li->buffer); - matches = (*attempted_completion_function) (ct_encode_string(temp, &el->el_scratch), + matches = (*attempted_completion_function) ( + ct_encode_string(temp, &el->el_scratch), (int)(cur_off - len), cur_off); } else matches = 0; if (!attempted_completion_function || (over != NULL && !*over && !matches)) - matches = completion_matches(ct_encode_string(temp, &el->el_scratch), complet_func); + matches = completion_matches( + ct_encode_string(temp, &el->el_scratch), complet_func); if (over != NULL) *over = 0; |