]> xenbits.xensource.com Git - libvirt.git/commitdiff
vsh: Fix warnings in command line completer
authorJiri Denemark <jdenemar@redhat.com>
Wed, 5 Oct 2016 07:19:19 +0000 (09:19 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 5 Oct 2016 15:26:47 +0000 (17:26 +0200)
GCC complained that

vsh.c: In function 'vshReadlineOptionsGenerator':
vsh.c:2622:29: warning: unused variable 'opt' [-Wunused-variable]
         const vshCmdOptDef *opt = &cmd->opts[list_index];
                             ^
vsh.c: In function 'vshReadlineParse':
vsh.c:2830:44: warning: 'opt' may be used uninitialized in this function
[-Wmaybe-uninitialized]
             completed_list = opt->completer(autoCompleteOpaque,

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
tools/vsh.c

index cdd1cba81ed02aedef64a73ebc5ddc4dbbb5ab8f..420eb7931f8a53b9c0b83b68b3d869709296166f 100644 (file)
@@ -2619,7 +2619,6 @@ vshReadlineOptionsGenerator(const char *text, int state, const vshCmdDef *cmd_pa
         return NULL;
 
     while ((name = cmd->opts[list_index].name)) {
-        const vshCmdOptDef *opt = &cmd->opts[list_index];
         char *res;
 
         list_index++;
@@ -2648,7 +2647,7 @@ vshReadlineParse(const char *text, int state)
     static vshCommandParser parser, sanitizer;
     vshCommandToken tk;
     static const vshCmdDef *cmd;
-    const vshCmdOptDef *opt;
+    const vshCmdOptDef *opt = NULL;
     char *tkdata, *optstr, *const_tkdata, *completed_name;
     char *res = NULL;
     static char *ctext, *sanitized_text;