diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-11-02 19:08:14 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-11-10 16:45:02 +0000 |
| commit | 0f7bcb5f17f18682f7f9dc41e2d0fc73c4c08318 (patch) | |
| tree | 57692ea12dfe86b9925b82ed5562e76c9aefb8a1 | |
| parent | c0fc7940df40de07320c9b2cdd5525659d16805a (diff) | |
vty: Fix bad use of vector_slot()
Commit in e9e9e427b78271941a25a63567fc2ec2bb9e4433 attempted to fix a
compilation warning but introduced a regression documented in OS#2613.
The commit was reverted in 4aa0258269296f078e685e21fb08b115567e814.
After closer lookup and testing, it seems vector_slot(vline, index) is
expected to be NULL in this case as set by vty_complete_command:
/* In case of 'help \t'. */
if (isspace((int)vty->buf[vty->length - 1]))
vector_set(vline, NULL);
As a result, the correct fix for the compilation warning is to test
against NULL instead of testing for empty string.
Change-Id: Id9e02bbf89e0a94e1766b1efd236538712415c8a
| -rw-r--r-- | src/vty/command.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vty/command.c b/src/vty/command.c index 21b26b4e..98d86d24 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1950,7 +1950,7 @@ static char **cmd_complete_command_real(vector vline, struct vty *vty, /* In case of 'command \t' pattern. Do you need '?' command at the end of the line. */ - if (vector_slot(vline, index) == '\0') + if (vector_slot(vline, index) == NULL) *status = CMD_ERR_NOTHING_TODO; else *status = CMD_ERR_NO_MATCH; |