This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: reformat apropos_command
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Mon, 17 Jan 2011 09:20:32 -0700
- Subject: FYI: reformat apropos_command
I am checking this in.
While working elsewhere I noticed that apropos_command is formatted
incorrectly, and also that it leaks memory.
This patch fixes the formatting and removes a bogus (AFAICT) call to
re_compile_fastmap. The next patch will fix the leak and some other
issues.
Built and regtested on x86-64 (compile farm).
Tom
2011-01-17 Tom Tromey <tromey@redhat.com>
* cli/cli-cmds.c (apropos_command): Fix formatting. Don't call
re_compile_fastmap.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index ae02031..e1d8174 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1253,28 +1253,20 @@ show_user (char *args, int from_tty)
void
apropos_command (char *searchstr, int from_tty)
{
- extern struct cmd_list_element *cmdlist; /* This is the main command
- list. */
regex_t pattern;
- char *pattern_fastmap;
char errorbuffer[512];
- pattern_fastmap = xcalloc (256, sizeof (char));
if (searchstr == NULL)
- error (_("REGEXP string is empty"));
+ error (_("REGEXP string is empty"));
- if (regcomp(&pattern,searchstr,REG_ICASE) == 0)
- {
- pattern.fastmap=pattern_fastmap;
- re_compile_fastmap(&pattern);
- apropos_cmd (gdb_stdout,cmdlist,&pattern,"");
- }
+ if (regcomp (&pattern, searchstr, REG_ICASE) == 0)
+ apropos_cmd (gdb_stdout, cmdlist, &pattern, "");
else
{
- regerror(regcomp(&pattern,searchstr,REG_ICASE),NULL,errorbuffer,512);
- error (_("Error in regular expression:%s"),errorbuffer);
+ regerror (regcomp (&pattern, searchstr, REG_ICASE), NULL,
+ errorbuffer, 512);
+ error (_("Error in regular expression: %s"), errorbuffer);
}
- xfree (pattern_fastmap);
}
/* Print a list of files and line numbers which a user may choose from