mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-19 02:32:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

move regex helper to be with teh single remaining call site

Browse Source
This commit is contained in:
Vincent Sanders 2016-04-20 23:33:31 +01:00
parent 10ef7b3f1d
commit 7ba291037b
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desktop/save_complete.c
View File

@ -1158,6 +1158,25 @@ static bool save_complete_inventory(save_complete_ctx *ctx)
return true; 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 */ /* Documented in save_complete.h */
void save_complete_init(void) void save_complete_init(void)
{ {

16
utils/utils.c
View File

@ -28,7 +28,6 @@
#include <strings.h> #include <strings.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <regex.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <curl/curl.h> #include <curl/curl.h>
@ -217,21 +216,6 @@ nserror snstrjoin(char **str, size_t *size, char sep, size_t nelm, ...)
} }
/* exported interface documented in utils/utils.h */
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;
}
/** /**
* The size of buffers within human_friendly_bytesize. * The size of buffers within human_friendly_bytesize.
* *

8
utils/utils.h
View File

@ -31,7 +31,6 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <regex.h>
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>
@ -152,13 +151,6 @@ char *cnv_space2nbsp(const char *s);
*/ */
bool is_dir(const char *path); bool is_dir(const char *path);
/**
* Compile a regular expression, handling errors.
*
* Parameters as for regcomp(), see man regex.
*/
nserror regcomp_wrapper(regex_t *preg, const char *regex, int cflags);
/** /**
* Create a human redable representation of a size in bytes. * Create a human redable representation of a size in bytes.
* *