From 7a87830f5eb32373bc17235e9d178d383830dc64 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 23 Oct 2011 17:52:19 -0300 Subject: xregcomp: don't consider every regex compilation failure an internal error. This pushes the error handling up one step, but makes the function more flexible. Running out of memory still triggers an internal error, in the spirit of other xutils functions. --- util/xutil.c | 7 +++++-- util/xutil.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/xutil.c b/util/xutil.c index 15ff7650..ac496daf 100644 --- a/util/xutil.c +++ b/util/xutil.c @@ -99,7 +99,7 @@ xstrndup (const char *s, size_t n) return ret; } -void +int xregcomp (regex_t *preg, const char *regex, int cflags) { int rerr; @@ -110,9 +110,12 @@ xregcomp (regex_t *preg, const char *regex, int cflags) char *error = xmalloc (error_size); regerror (rerr, preg, error, error_size); - INTERNAL_ERROR ("compiling regex %s: %s\n", + fprintf (stderr, "compiling regex %s: %s\n", regex, error); + free (error); + return 1; } + return 0; } int diff --git a/util/xutil.h b/util/xutil.h index fd77f733..92992564 100644 --- a/util/xutil.h +++ b/util/xutil.h @@ -43,7 +43,8 @@ xstrdup (const char *s); char * xstrndup (const char *s, size_t n); -void +/* Returns 0 for successful compilation, 1 otherwise */ +int xregcomp (regex_t *preg, const char *regex, int cflags); int -- cgit v1.2.3