libopkg: do not clobber package flags during parsing

[oweals/opkg-lede.git] / libopkg / xregex.c

diff --git a/libopkg/xregex.c b/libopkg/xregex.c
index ba22b7d598964c0efd9c95bc0d0606851b6d1713..1c67d30802917369e0e293be174c1062ff5b5b5b 100644 (file)
--- a/libopkg/xregex.c
+++ b/libopkg/xregex.c
@@ -15,33 +15,32 @@
    GNU General Public License for more details.
 */
 
-#include "includes.h"
-
 #include "xregex.h"
 #include "libbb/libbb.h"
 
-static void print_regcomp_err(const regex_t *preg, int err);
+static void print_regcomp_err(const regex_t * preg, int err);
 
-int xregcomp(regex_t *preg, const char *regex, int cflags)
+int xregcomp(regex_t * preg, const char *regex, int cflags)
 {
-    int err;
-    err = regcomp(preg, regex, cflags);
-    if (err) {
-       print_regcomp_err(preg, err);
-    }
+       int err;
+       err = regcomp(preg, regex, cflags);
+       if (err) {
+               print_regcomp_err(preg, err);
+       }
 
-    return err;
+       return err;
 }
 
-static void print_regcomp_err(const regex_t *preg, int err)
+static void print_regcomp_err(const regex_t * preg, int err)
 {
-    int size;
-    char *error;
-    
-    fprintf(stderr, "%s: Error compiling regex:", __FUNCTION__);
-    size = regerror(err, preg, 0, 0);
-    error = xcalloc(1, size);
-    regerror(err, preg, error, size);
-    fprintf(stderr, "%s\n", error);
-    free(error);
+       unsigned int size;
+       char *error;
+
+       size = regerror(err, preg, 0, 0);
+       error = xcalloc(1, size);
+       regerror(err, preg, error, size);
+
+       opkg_msg(ERROR, "Internal error compiling regex: %s.", error);
+
+       free(error);
 }