X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib%2Frx.c;h=c0f6982281dd505bf30751a60b06647a27711194;hb=ba5e3af4ea19e1d20c80941c077039871ec84258;hp=e7c4f3cc43aed8cab7a155e72baca9320959c33c;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git diff --git a/lib/rx.c b/lib/rx.c index e7c4f3c..c0f6982 100644 --- a/lib/rx.c +++ b/lib/rx.c @@ -14,10 +14,10 @@ #include "str.h" rx_t *rx_compile (const char *s, int flags) { - rx_t *pp = safe_calloc (1, sizeof (rx_t)); + rx_t *pp = mem_calloc (1, sizeof (rx_t)); pp->pattern = str_dup (s); - pp->rx = safe_calloc (1, sizeof (regex_t)); + pp->rx = mem_calloc (1, sizeof (regex_t)); if (REGCOMP(pp->rx, NONULL (s), flags) != 0) rx_free (&pp); @@ -25,10 +25,10 @@ rx_t *rx_compile (const char *s, int flags) { } void rx_free (rx_t** p) { - FREE(&(*p)->pattern); + mem_free(&(*p)->pattern); regfree ((*p)->rx); - FREE(&(*p)->rx); - FREE(p); + mem_free(&(*p)->rx); + mem_free(p); } int rx_compare (const rx_t* r1, const rx_t* r2) {