* cli/cli-cmds.c (apropos_command): Fix formatting. Don't call

	re_compile_fastmap.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7db03c94467c8944026bd1660dc57e2826452f67..5a814c4d8b71df9b016580cbf926958b62d5a903 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-17  Tom Tromey  <tromey@redhat.com>
+
+       * cli/cli-cmds.c (apropos_command): Fix formatting.  Don't call
+       re_compile_fastmap.
+
 2011-01-17  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * 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 ae02031e1146fa6e06e76ef24f1ed5db88c5f93d..e1d8174f6ad5075740369a35fe2d4902f377fe0f 100644 (file)
--- 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);
 }
 \f
 /* Print a list of files and line numbers which a user may choose from