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. --- notmuch-restore.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'notmuch-restore.c') diff --git a/notmuch-restore.c b/notmuch-restore.c index ff1ebab1..13b4325a 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -88,9 +88,10 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) * non-space characters for the message-id, then one or more * spaces, then a list of space-separated tags as a sequence of * characters within literal '(' and ')'. */ - xregcomp (®ex, - "^([^ ]+) \\(([^)]*)\\)$", - REG_EXTENDED); + if ( xregcomp (®ex, + "^([^ ]+) \\(([^)]*)\\)$", + REG_EXTENDED) ) + INTERNAL_ERROR("compile time constant regex failed."); while ((line_len = getline (&line, &line_size, input)) != -1) { regmatch_t match[3]; -- cgit v1.2.3