From 7ba291037b1dbd0cd205ba07e6444293596a3761 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 20 Apr 2016 23:33:31 +0100 Subject: move regex helper to be with teh single remaining call site --- desktop/save_complete.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'desktop') diff --git a/desktop/save_complete.c b/desktop/save_complete.c index 58c1d210a..635161dfb 100644 --- a/desktop/save_complete.c +++ b/desktop/save_complete.c @@ -1158,6 +1158,25 @@ static bool save_complete_inventory(save_complete_ctx *ctx) return true; } +/** + * Compile a regular expression, handling errors. + * + * Parameters as for regcomp(), see man regex. + */ +static nserror regcomp_wrapper(regex_t *preg, const char *regex, int cflags) +{ + int r; + r = regcomp(preg, regex, cflags); + if (r) { + char errbuf[200]; + regerror(r, preg, errbuf, sizeof errbuf); + LOG("Failed to compile regexp '%s': %s\n", regex, errbuf); + return NSERROR_INIT_FAILED; + } + return NSERROR_OK; +} + + /* Documented in save_complete.h */ void save_complete_init(void) { -- cgit v1.2.3