From dc92e16124ca764e536f2457635749e5431c4765 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 17 Jan 2011 16:50:42 +0000 Subject: * cli/cli-cmds.c (apropos_command): Free the compiled regex. Use get_regcomp_error. * utils.c: Include gdb_regex.h. (do_regfree_cleanup): New function. (make_regfree_cleanup): Likewise. (get_regcomp_error): Likewise. * gdb_regex.h (make_regfree_cleanup, get_regcomp_error): Declare. --- gdb/cli/cli-cmds.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gdb/cli/cli-cmds.c') diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index e1d8174..c11b257 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1254,18 +1254,26 @@ void apropos_command (char *searchstr, int from_tty) { regex_t pattern; - char errorbuffer[512]; + int code; if (searchstr == NULL) error (_("REGEXP string is empty")); - if (regcomp (&pattern, searchstr, REG_ICASE) == 0) - apropos_cmd (gdb_stdout, cmdlist, &pattern, ""); + code = regcomp (&pattern, searchstr, REG_ICASE); + if (code == 0) + { + struct cleanup *cleanups; + + cleanups = make_regfree_cleanup (&pattern); + apropos_cmd (gdb_stdout, cmdlist, &pattern, ""); + do_cleanups (cleanups); + } else { - regerror (regcomp (&pattern, searchstr, REG_ICASE), NULL, - errorbuffer, 512); - error (_("Error in regular expression: %s"), errorbuffer); + char *err = get_regcomp_error (code, &pattern); + + make_cleanup (xfree, err); + error (_("Error in regular expression: %s"), err); } } -- cgit v1.1