FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2009-06-19 Samuel Bronson <naesten@gmail.com>

Browse source 
PR cli/9930:
	* cli/cli-decode.c (apropos_cmd): Fix avoidance of double
	printing.
This commit is contained in:
Tom Tromey 2009-06-19 15:47:09 +00:00
parent 3daf8fe56f
commit 4a98be19cd
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2009-06-19 Samuel Bronson <naesten@gmail.com>
PR cli/9930:
* cli/cli-decode.c (apropos_cmd): Fix avoidance of double
printing.
2009-06-19 Jerome Guitton <guitton@adacore.com> 2009-06-19 Jerome Guitton <guitton@adacore.com>
* breakpoint.c (expand_line_sal_maybe): When explicit_line, * breakpoint.c (expand_line_sal_maybe): When explicit_line,

5
gdb/cli/cli-decode.c
View file

@ -755,10 +755,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
struct re_pattern_buffer *regex, char *prefix) struct re_pattern_buffer *regex, char *prefix)
{ {
struct cmd_list_element *c; struct cmd_list_element *c;
int returnvalue=1; /*Needed to avoid double printing*/ int returnvalue;
/* Walk through the commands */ /* Walk through the commands */
for (c=commandlist;c;c=c->next) for (c=commandlist;c;c=c->next)
{ {
returnvalue = -1; /*Needed to avoid double printing*/
if (c->name != NULL) if (c->name != NULL)
{ {
/* Try to match against the name*/ /* 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); 0 /* don't recurse */, stream);
} }
} }
if (c->doc != NULL && returnvalue != 0) if (c->doc != NULL && returnvalue < 0)
{ {
/* Try to match against documentation */ /* Try to match against documentation */
if (re_search(regex,c->doc,strlen(c->doc),0,strlen(c->doc),NULL) >=0) if (re_search(regex,c->doc,strlen(c->doc),0,strlen(c->doc),NULL) >=0)