projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit str_cmp enters m_strcmp
[apps/madmutt.git]
/
lib
/
rx.c
diff --git
a/lib/rx.c
b/lib/rx.c
index
616d824
..
230bf3d
100644
(file)
--- a/
lib/rx.c
+++ b/
lib/rx.c
@@
-9,16
+9,15
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include "rx.h"
#include "rx.h"
-#include "mem.h"
-#include "str.h"
rx_t *rx_compile (const char *s, int flags) {
rx_t *pp = p_new(rx_t, 1);
rx_t *rx_compile (const char *s, int flags) {
rx_t *pp = p_new(rx_t, 1);
- pp->pattern =
str_dup
(s);
+ pp->pattern =
m_strdup
(s);
pp->rx = p_new(regex_t, 1);
if (REGCOMP(pp->rx, NONULL (s), flags) != 0)
rx_free (&pp);
pp->rx = p_new(regex_t, 1);
if (REGCOMP(pp->rx, NONULL (s), flags) != 0)
rx_free (&pp);
@@
-34,7
+33,7
@@
void rx_free (rx_t** p) {
}
int rx_compare (const rx_t* r1, const rx_t* r2) {
}
int rx_compare (const rx_t* r1, const rx_t* r2) {
- return (
str_cmp
(r1->pattern, r2->pattern));
+ return (
m_strcmp
(r1->pattern, r2->pattern));
}
int rx_list_match (list2_t* l, const char* pat) {
}
int rx_list_match (list2_t* l, const char* pat) {
@@
-52,7
+51,7
@@
int rx_lookup (list2_t* l, const char* pat) {
if (!pat || !*pat || list_empty(l))
return (-1);
for (i = 0; i < l->length; i++)
if (!pat || !*pat || list_empty(l))
return (-1);
for (i = 0; i < l->length; i++)
- if (
str_cmp
(((rx_t*) l->data[i])->pattern, pat) == 0)
+ if (
m_strcmp
(((rx_t*) l->data[i])->pattern, pat) == 0)
return (i);
return (-1);
}
return (i);
return (-1);
}