X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Frx.h;h=81352ad6b34eb159e8dd3e64b6af1be0940600de;hb=11a177822f648694f442b3038fdc60a4e50e6edb;hp=a827b82de12207f847a85e3125981e8de01d7d3f;hpb=9fde23d2b9a4ba8076eb425a1af4342de1e485b5;p=apps%2Fmadmutt.git

diff --git a/lib-lib/rx.h b/lib-lib/rx.h
index a827b82..81352ad 100644
--- a/lib-lib/rx.h
+++ b/lib-lib/rx.h
@@ -29,7 +29,7 @@
 #ifndef MUTT_LIB_LIB_RX_H
 #define MUTT_LIB_LIB_RX_H
 
-#include <lib-lib/lib-lib.h>
+#include "lib-lib.h"
 
 /* this is a non-standard option supported by Solaris 2.5.x which allows
  * patterns of the form \<...\>
@@ -45,16 +45,20 @@ typedef struct rx_t {
     int not;                      /* do not match */
 
     int nmatch;                   /* nb matches */
-    char *template;               /* out template */
+    char *tpl;                    /* out template */
 } rx_t;
 
-rx_t* rx_compile(const char*, int);
+rx_t *rx_compile(const char*, int);
+int rx_validate(const char*, char*, ssize_t);
 void rx_set_template(rx_t *, const char*);
-void rx_delete(rx_t **);
+void rx_wipe(rx_t *);
+DO_DELETE(rx_t, rx);
+
 DO_SLIST(rx_t, rx, rx_delete);
 
 /* for handling lists */
 int rx_list_match(rx_t *, const char*);      /* match all items list agains string */
+int rx_list_match2(rx_t *l, const char *s, char *dst, int dlen);
 rx_t **rx_lookup(rx_t**, const char*);       /* lookup pattern */
 int rx_sanitize_string(char *, ssize_t, const char *);