From f55af66d6ed6e6ad47757c5fff7ab5df1284ce33 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 17 Jan 2011 16:20:56 +0000 Subject: [PATCH] * cli/cli-cmds.c (apropos_command): Fix formatting. Don't call re_compile_fastmap. --- gdb/ChangeLog | 5 +++++ gdb/cli/cli-cmds.c | 20 ++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7db03c94467..5a814c4d8b7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-01-17 Tom Tromey + + * cli/cli-cmds.c (apropos_command): Fix formatting. Don't call + re_compile_fastmap. + 2011-01-17 Pierre Muller * p-exp.y (intvar): New static variable, used to set CURRENT_TYPE diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index ae02031e114..e1d8174f6ad 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 -- 2.30.2