From 4a98be19cdaffe296173f61b7b1f59f89bf4a382 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 19 Jun 2009 15:47:09 +0000 Subject: [PATCH] 2009-06-19 Samuel Bronson PR cli/9930: * cli/cli-decode.c (apropos_cmd): Fix avoidance of double printing. --- gdb/ChangeLog | 6 ++++++ gdb/cli/cli-decode.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ddaaff47b56..b92962e8484 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-06-19 Samuel Bronson + + PR cli/9930: + * cli/cli-decode.c (apropos_cmd): Fix avoidance of double + printing. + 2009-06-19 Jerome Guitton * breakpoint.c (expand_line_sal_maybe): When explicit_line, diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index e748ee6ea8d..f8f6f28b2f3 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -755,10 +755,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist, struct re_pattern_buffer *regex, char *prefix) { struct cmd_list_element *c; - int returnvalue=1; /*Needed to avoid double printing*/ + int returnvalue; /* Walk through the commands */ for (c=commandlist;c;c=c->next) { + returnvalue = -1; /*Needed to avoid double printing*/ if (c->name != NULL) { /* Try to match against the name*/ @@ -769,7 +770,7 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist, 0 /* don't recurse */, stream); } } - if (c->doc != NULL && returnvalue != 0) + if (c->doc != NULL && returnvalue < 0) { /* Try to match against documentation */ if (re_search(regex,c->doc,strlen(c->doc),0,strlen(c->doc),NULL) >=0) -- 2.30.2