JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of left over NULL elements in x_ftab as NELEM() is used instead.

Browse Source 
From Martin Natano. Also get rid of related checks.
This commit is contained in:
tg
2014-11-14 20:00:40 +00:00
parent 5ff0646bc6
commit 0432fc1a87
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
edit.c
View File

@ -28,7 +28,7 @@
#ifndef MKSH_NO_CMDLINE_EDITING #ifndef MKSH_NO_CMDLINE_EDITING
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.276 2014/07/13 11:34:28 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.277 2014/11/14 20:00:40 tg Exp $");
/* /*
* in later versions we might use libtermcap for this, but since external * in later versions we might use libtermcap for this, but since external
@ -1009,7 +1009,6 @@ enum emacs_funcs {
static const struct x_ftab x_ftab[] = { static const struct x_ftab x_ftab[] = {
#define EMACSFN_ITEMS #define EMACSFN_ITEMS
#include "emacsfn.h" #include "emacsfn.h"
{ 0, NULL, 0 }
}; };
static struct x_defbindings const x_defbindings[] = { static struct x_defbindings const x_defbindings[] = {
@ -2455,8 +2454,7 @@ x_bind(const char *a1, const char *a2,
/* List function names */ /* List function names */
if (list) { if (list) {
for (f = 0; f < NELEM(x_ftab); f++) for (f = 0; f < NELEM(x_ftab); f++)
if (x_ftab[f].xf_name && if (!(x_ftab[f].xf_flags & XF_NOBIND))
!(x_ftab[f].xf_flags & XF_NOBIND))
shprintf("%s\n", x_ftab[f].xf_name); shprintf("%s\n", x_ftab[f].xf_name);
return (0); return (0);
} }
@ -2517,8 +2515,7 @@ x_bind(const char *a1, const char *a2,
#endif #endif
} else { } else {
for (f = 0; f < NELEM(x_ftab); f++) for (f = 0; f < NELEM(x_ftab); f++)
if (x_ftab[f].xf_name && if (!strcmp(x_ftab[f].xf_name, a2))
strcmp(x_ftab[f].xf_name, a2) == 0)
break; break;
if (f == NELEM(x_ftab) || x_ftab[f].xf_flags & XF_NOBIND) { if (f == NELEM(x_ftab) || x_ftab[f].xf_flags & XF_NOBIND) {
bi_errorf("%s: %s %s", a2, "no such", Tfunction); bi_errorf("%s: %s %s", a2, "no such", Tfunction);