Concentrate knowledge about the `pcre' API in one place.

[disorder] / clients / disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index a96a059..dc86a65 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -36,7 +36,6 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <pcre.h>
 #include <ctype.h>
 #if HAVE_GCRYPT_H
 # include <gcrypt.h>
@@ -880,8 +879,7 @@ int main(int argc, char **argv) {
   mem_init();
   network_init();
   /* garbage-collect PCRE's memory */
-  pcre_malloc = xmalloc;
-  pcre_free = xfree;
+  regexp_setup();
   if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
   if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
   while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {