projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean buffy.c and init.c
[apps/madmutt.git]
/
lib-lib
/
rx.c
diff --git
a/lib-lib/rx.c
b/lib-lib/rx.c
index
521376f
..
d0a3942
100644
(file)
--- a/
lib-lib/rx.c
+++ b/
lib-lib/rx.c
@@
-46,34
+46,32
@@
void rx_delete(rx_t **p)
p_delete(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;
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;
return 1;
+ l = l->next;
}
return 0;
}
}
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)
}
int rx_sanitize_string(char *dst, ssize_t n, const char *src)