X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Frx.c;h=d0a394238a59bfa9ff78e67fdf3674b68c0f706a;hb=676b896e26b7aeef16d95aba7a5ea9322d2dc6e1;hp=f2b672070143adac3b230a6b4da101b3da5f1507;hpb=230399f9632c37b66c1c117a17e8327eae6b3235;p=apps%2Fmadmutt.git

diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index f2b6720..d0a3942 100644
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -22,11 +22,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <lib-lib/lib-lib.h>
+#include "lib-lib.h"
 
 rx_t *rx_compile(const char *s, int flags)
 {
@@ -50,34 +46,32 @@ void rx_delete(rx_t **p)
     p_delete(p);
 }
 
-int rx_list_match(list2_t *l, const char *pat)
+int rx_list_match(rx_t *l, const char *pat)
 {
-    int i;
-
-    if (!pat || !*pat || list_empty(l))
+    if (!pat || !*pat)
         return 0;
 
-    for (i = 0; i < l->length; i++) {
-        if (!REGEXEC(((rx_t*)l->data[i])->rx, pat))
+    while (l) {
+        if (!REGEXEC(l->rx, pat))
             return 1;
+        l = l->next;
     }
 
     return 0;
 }
 
-int rx_lookup (list2_t *l, const char *pat)
+rx_t **rx_lookup(rx_t **l, const char *pat)
 {
-    int i;
-
-    if (!pat || !*pat || list_empty(l))
-        return -1;
+    if (!pat || !*pat)
+        return NULL;
 
-    for (i = 0; i < l->length; i++) {
-        if (!strcmp(((rx_t*)l->data[i])->pattern, pat))
-            return i;
+    while (*l) {
+        if (!strcmp((*l)->pattern, pat))
+            return l;
+        l = &(*l)->next;
     }
 
-    return -1;
+    return NULL;
 }
 
 int rx_sanitize_string(char *dst, ssize_t n, const char *src)