remove constmap header (is in fehqlibs)

3 files changed, 13 insertions, 35 deletions

diff --git a/src/include/constmap.h b/src/include/constmap.h
deleted file mode 100644
index 4e33dd1..0000000
--- a/src/include/constmap.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CONSTMAP_H
-#define CONSTMAP_H
-
-typedef unsigned long constmap_hash;
-
-struct constmap {
-  int num;
-  constmap_hash mask;
-  constmap_hash *hash;
-  int *first;
-  int *next;
-  char **input;
-  int *inputlen;
-};
-
-extern int constmap_init(struct constmap *, char *, int, int);
-extern int constmap_init_char(struct constmap *, char *, int, int, char);
-extern void constmap_free(struct constmap *cm);
-extern char *constmap(struct constmap *cm, char *s, int len);
-
-#endif
diff --git a/src/include/meson.build b/src/include/meson.build
index ca8c752..4f4bbe5 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -56,7 +56,6 @@ add_project_arguments('-DUSE_CONFIG', language : 'c')
 sqmail_hdrs = [
   'base64.h',
   'commands.h',
-  'constmap.h',
   'control.h',
   'date822fmt.h',
   'datetime.h',
diff --git a/src/meson.build b/src/meson.build
index 6244403..5a2bc76 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,13 +23,13 @@ datetime_slib = static_library('datetime', 'datetime.c', 'datetime_un.c',
 if get_option('build-srs')
 
   executable('srsforward',
-    'srsforward.c', 'qmail.c', 'control.c', 'constmap.c', 'srs2.c', 'sha1.c',
+    'srsforward.c', 'qmail.c', 'control.c', 'srs2.c', 'sha1.c',
     include_directories : inc,
     install : true,
     dependencies : qlibs_dep)
 
   executable('srsreverse',
-    'srsreverse.c', 'qmail.c', 'control.c', 'constmap.c', 'srs2.c', 'sha1.c',
+    'srsreverse.c', 'qmail.c', 'control.c', 'srs2.c', 'sha1.c',
     auto_break_c,
     include_directories : inc,
     install : true,
@@ -50,7 +50,7 @@ if get_option('build-user')
     dependencies : qlibs_dep,
     install : true)
 
-  executable('qmail-pw2u', 'qmail-pw2u.c', 'constmap.c', 'control.c', auto_break_c,
+  executable('qmail-pw2u', 'qmail-pw2u.c', 'control.c', auto_break_c,
     include_directories : inc,
     install : true,
     dependencies : qlibs_dep)
@@ -66,7 +66,7 @@ endif
 if get_option('build-server')
 
   executable('qmail-qmtpd',
-    'qmail-qmtpd.c', 'rcpthosts.c', 'control.c', 'constmap.c', 'received.c',
+    'qmail-qmtpd.c', 'rcpthosts.c', 'control.c', 'received.c',
     'date822fmt.c', 'now.c', 'qmail.c', auto_break_c,
     include_directories : inc,
     install : true,
@@ -82,7 +82,7 @@ if get_option('build-server')
 
   executable('qmail-smtpd',
     'qmail-smtpd.c', 'rcpthosts.c', 'commands.c', 'ipme.c',
-    'constmap.c', 'control.c', 'received.c', 'recipients.c', 'mfrules.c',
+    'control.c', 'received.c', 'recipients.c', 'mfrules.c',
     'tls_start.c', 'smtpdlog.c', 'dns.c', 'date822fmt.c', 'now.c', 'qmail.c',
     'wildmat.c', 'spf.c', 'spfdnsip.c', 'base64.c', auto_break_c,
     include_directories : inc,
@@ -120,20 +120,20 @@ if get_option('build-pam')
 
   executable('qmail-authuser',
     'qmail-authuser.c', 'control.c', 'hmac_md5.c', 'md5c.c',
-    'constmap.c', 'sha1.c', 'sha256.c',
+    'sha1.c', 'sha256.c',
     include_directories : inc,
     install : true,
     dependencies : [qlibs_dep, crypt_dep])
 
   executable('qmail-smtpam',
-    'qmail-smtpam.c', 'control.c', 'now.c', 'dns.c', 'constmap.c',
+    'qmail-smtpam.c', 'control.c', 'now.c', 'dns.c',
     'ipme.c', 'quote.c', 'tcpto.c', 'tls_timeoutio.c', 'tls_errors.c',
     'tls_remote.c', 'dns_tlsa.c',
     include_directories : inc,
     install : true,
     dependencies : [qlibs_dep, dnsresolv_dep, ucspissl_dep, ssl_dep, crypto_dep])
 
-  executable('qmail-vmailuser', 'qmail-vmailuser.c', 'control.c', 'constmap.c',
+  executable('qmail-vmailuser', 'qmail-vmailuser.c', 'control.c',
     include_directories : inc,
     install : true,
     dependencies : qlibs_dep)
@@ -316,7 +316,7 @@ if get_option('build-dkim')
     dependencies : [qlibs_dep, dnsresolv_dep, ssl_dep, crypto_dep])
 
   executable('qmail-dksign',
-    'qmail-dksign.c', 'control.c', 'constmap.c', 'fmtqfn.c', 'rcpthosts.c',
+    'qmail-dksign.c', 'control.c', 'fmtqfn.c', 'rcpthosts.c',
     include_directories : inc,
     install : true,
     dependencies : qlibs_dep)
@@ -335,7 +335,7 @@ if get_option('build-clients')
   executable('qmail-remote',
     'qmail-remote.c', 'control.c', 'tcpto.c', 'now.c', 'dns.c',
     'ipme.c', 'quote.c', 'tls_timeoutio.c', 'tls_errors.c', 'tls_remote.c',
-    'dns_tlsa.c', 'base64.c', 'constmap.c', 'md5c.c', 'hmac_md5.c',
+    'dns_tlsa.c', 'base64.c', 'md5c.c', 'hmac_md5.c',
     include_directories : inc,
     install : true,
     dependencies : [qlibs_dep, dnsresolv_dep, idn2_dep, ssl_dep, crypto_dep, ucspissl_dep])
@@ -423,7 +423,7 @@ if get_option('build-base')
     dependencies : qlibs_dep)
 
   executable('qmail-send',
-    'qmail-send.c', 'qsutil.c', 'control.c', 'constmap.c', 'newfield.c',
+    'qmail-send.c', 'qsutil.c', 'control.c', 'newfield.c',
     'prioq.c', 'trigger.c', 'fmtqfn.c', 'quote.c', 'now.c', 'readsubdir.c',
     'qmail.c', 'date822fmt.c',
     include_directories : inc,
@@ -457,14 +457,14 @@ if get_option('build-base')
 
   executable('qmail-inject',
     'qmail-inject.c', 'headerbody.c', 'hfield.c', 'newfield.c', 'quote.c', 'now.c',
-    'control.c', 'date822fmt.c', 'qmail.c', 'token822.c', 'constmap.c',
+    'control.c', 'date822fmt.c', 'qmail.c', 'token822.c',
     include_directories : inc,
     install : true,
     link_with : datetime_slib,
     dependencies : qlibs_dep)
 
   executable('qmail-todo',
-    'qmail-todo.c', 'control.c', 'constmap.c', 'trigger.c', 'fmtqfn.c', 'now.c',
+    'qmail-todo.c', 'control.c', 'trigger.c', 'fmtqfn.c', 'now.c',
     'qsutil.c', 'readsubdir.c',
     include_directories : inc,
     install : true,