Changeset 1651 for zzuf/trunkTweet

Timestamp:

Jan 11, 2007, 11:11:56 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Remove two useless malloc() calls.

File:

• zzuf/trunk/src/fd.c (modified) (3 diffs)

zzuf/trunk/src/fd.c

@@ -32 +32 @@
 
 /* Regex stuff */
-static regex_t * re_include = NULL;
-static regex_t * re_exclude = NULL;
+static regex_t re_include, re_exclude;
+static int has_include = 0, has_exclude = 0;
 
 /* File descriptor stuff */
@@ -50 +50 @@
 void _zz_include(char const *regex)
 {
-    re_include = malloc(sizeof(*re_include));
-
-    if(regcomp(re_include, regex, REG_EXTENDED) != 0)
-    {
-        free(re_include);
-        re_include = NULL;
-    }
+    if(regcomp(&re_include, regex, REG_EXTENDED) == 0)
+        has_include = 1;
 }
 
 void _zz_exclude(char const *regex)
 {
-    re_exclude = malloc(sizeof(*re_exclude));
-
-    if(regcomp(re_exclude, regex, REG_EXTENDED) != 0)
-    {
-        free(re_exclude);
-        re_exclude = NULL;
-    }
+    if(regcomp(&re_exclude, regex, REG_EXTENDED) == 0)
+        has_exclude = 1;
 }
 
@@ -100 +90 @@
 int _zz_mustwatch(char const *file)
 {
-    if(re_include && regexec(re_include, file, 0, NULL, 0) == REG_NOMATCH)
+    if(has_include && regexec(&re_include, file, 0, NULL, 0) == REG_NOMATCH)
         return 0; /* not included: ignore */
 
-    if(re_exclude && regexec(re_exclude, file, 0, NULL, 0) != REG_NOMATCH)
+    if(has_exclude && regexec(&re_exclude, file, 0, NULL, 0) != REG_NOMATCH)
         return 0; /* excluded: ignore */