Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/xregcomp.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/xregcomp.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/libbb/xregcomp.c

@@ -9 +9 @@
  */
 
-#include <stdio.h>
 #include "libbb.h"
 #include "xregex.h"
 
-
+char* regcomp_or_errmsg(regex_t *preg, const char *regex, int cflags)
+{
+    int ret = regcomp(preg, regex, cflags);
+    if (ret) {
+        int errmsgsz = regerror(ret, preg, NULL, 0);
+        char *errmsg = xmalloc(errmsgsz);
+        regerror(ret, preg, errmsg, errmsgsz);
+        return errmsg;
+    }
+    return NULL;
+}
 
 void xregcomp(regex_t *preg, const char *regex, int cflags)
 {
-    int ret;
-    if ((ret = regcomp(preg, regex, cflags)) != 0) {
-        int errmsgsz = regerror(ret, preg, NULL, 0);
-        char *errmsg = xmalloc(errmsgsz);
-        regerror(ret, preg, errmsg, errmsgsz);
+    char *errmsg = regcomp_or_errmsg(preg, regex, cflags);
+    if (errmsg) {
         bb_error_msg_and_die("xregcomp: %s", errmsg);
     }