atheme-compat.h: add MODFLAG_FAIL definition

diff --git a/atheme-compat.h b/atheme-compat.h
index 05d2229fffe02311ac994eed62627a048ee5ea06..eb46311a335b6241891ee43b9e743ede9c76b9d7 100644 (file)
--- a/atheme-compat.h
+++ b/atheme-compat.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 William Pitcock <nenolod@dereferenced.org>
- * Copyright (C) 2018 Atheme Development Group <https://atheme.github.io/>
+ * Copyright (C) 2018 Atheme Development Group (https://atheme.github.io/)
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -84,6 +84,9 @@ typedef char *stringref;
 #    define ATHEME_VATTR_UNUSED                 /* No variable attribute support */
 #  endif
 
+// This new name was introduced in the Atheme 7.3 development series.
+#define MODFLAG_FAIL MODTYPE_FAIL
+
 /* These 2 macros were introduced in the Atheme 7.3 development series and
  * they're much nicer to use.
  */

diff --git a/backtrace.c b/backtrace.c
index 1478d5b189b499533411b8491be5a1790f597ef2..1e713d11f292aa519f6648948e62b9e142ed5d4e 100644 (file)
--- a/backtrace.c
+++ b/backtrace.c
@@ -353,7 +353,7 @@ mod_init(module_t *const restrict m)
        {
                (void) slog(LG_ERROR, "%s: sigfillset(3) failed: %s", m->name, strerror(errno));
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 
@@ -367,7 +367,7 @@ mod_init(module_t *const restrict m)
        {
                (void) slog(LG_ERROR, "%s: sigaction(2) for SIGBUS failed: %s", m->name, strerror(errno));
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
        if (sigaction(SIGFPE, &newsigaction, &oldfpeaction) != 0)
@@ -376,7 +376,7 @@ mod_init(module_t *const restrict m)
 
                (void) sigaction(SIGBUS, &oldbusaction, NULL);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
        if (sigaction(SIGILL, &newsigaction, &oldillaction) != 0)
@@ -386,7 +386,7 @@ mod_init(module_t *const restrict m)
                (void) sigaction(SIGBUS, &oldbusaction, NULL);
                (void) sigaction(SIGFPE, &oldfpeaction, NULL);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
        if (sigaction(SIGSEGV, &newsigaction, &oldsegvaction) != 0)
@@ -397,7 +397,7 @@ mod_init(module_t *const restrict m)
                (void) sigaction(SIGFPE, &oldfpeaction, NULL);
                (void) sigaction(SIGILL, &oldillaction, NULL);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 
@@ -411,7 +411,7 @@ mod_init(module_t *const restrict m)
                (void) sigaction(SIGILL, &oldillaction, NULL);
                (void) sigaction(SIGSEGV, &oldsegvaction, NULL);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 
@@ -442,7 +442,7 @@ mod_init(module_t *const restrict m)
        (void) slog(LG_ERROR, "%s: this module only supports Linux systems with GNU libc >= 2.1", m->name);
        (void) slog(LG_ERROR, "%s: please check your configuration and build environment", m->name);
 
-       m->mflags |= MODTYPE_FAIL;
+       m->mflags |= MODFLAG_FAIL;
 }
 
 static void

diff --git a/cs_badwords.c b/cs_badwords.c
index eae50bc9b1a73b1f33a493479a9e9debfe04d437..bc10ef8fc877d37dd22be0db48315c480dbc37cb 100644 (file)
--- a/cs_badwords.c
+++ b/cs_badwords.c
@@ -502,7 +502,7 @@ mod_init(module_t *const restrict m)
        if (!module_find_published("backend/opensex"))
        {
                slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/dnsbl.c b/dnsbl.c
index 0bb18852ed961d6363b79e049cf1f8f562b12835..238fc73e7aaf60eb32cf9ad306a3397d5da9a960 100644 (file)
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -601,14 +601,14 @@ mod_init(module_t *m)
        if (!module_find_published("backend/opensex"))
        {
                (void) slog(LG_ERROR, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 
        if (! (dns_base = mowgli_dns_create(base_eventloop, MOWGLI_DNS_TYPE_ASYNC)))
        {
                (void) slog(LG_ERROR, "%s: failed to create Mowgli DNS resolver object", m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/ns_goodmail.c b/ns_goodmail.c
index d675cc8bc02f41f626b5f92cdb2c117ac3ccd738..4a8d82631ac535753ca7de3d044c9d18557c2595 100644 (file)
--- a/ns_goodmail.c
+++ b/ns_goodmail.c
@@ -205,7 +205,7 @@ mod_init(module_t *const restrict m)
        if (!module_find_published("backend/opensex"))
        {
                slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/os_joinmon.c b/os_joinmon.c
index e431cf1ae8b8e36da9c2014016c7ffc4cace5197..76e126de20a6e8eac436a4007d2f0af4330fb621 100644 (file)
--- a/os_joinmon.c
+++ b/os_joinmon.c
@@ -222,7 +222,7 @@ mod_init(module_t *const restrict m)
        if (!module_find_published("backend/opensex"))
        {
                slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/os_procwatch.c b/os_procwatch.c
index d46402549f33f7d0eea4d0fde99ef3e924054d85..9073f8b7128611d6200eeace15c5bdb35a45fe87 100644 (file)
--- a/os_procwatch.c
+++ b/os_procwatch.c
@@ -83,7 +83,7 @@ mod_init(module_t *const restrict m)
 
        if (kq == -1)
        {
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/os_resolve.c b/os_resolve.c
index 6606d034f4fcc97b39adb36d0ddb6305ccd34147..10e1756a00227ddcc6b28248719821d7c7efdd7d 100644 (file)
--- a/os_resolve.c
+++ b/os_resolve.c
@@ -110,14 +110,14 @@ mod_init(module_t *const restrict m)
        if (! (request_heap = mowgli_heap_create(sizeof(struct resolve_request), 32, BH_NOW)))
        {
                (void) slog(LG_ERROR, _("%s: failed to create Mowgli heap object"), m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 
        if (! (dns_base = mowgli_dns_create(base_eventloop, MOWGLI_DNS_TYPE_ASYNC)))
        {
                (void) slog(LG_ERROR, _("%s: failed to create Mowgli DNS resolver object"), m->name);
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
 

diff --git a/os_trace.c b/os_trace.c
index d834c1b400e3fd0619585848c347b8b13a9838b4..85eed24990791bdbd7a6ff9dcd72be5155c855d3 100644 (file)
--- a/os_trace.c
+++ b/os_trace.c
@@ -989,7 +989,7 @@ mod_init(module_t *const restrict m)
        {
                (void) slog(LG_ERROR, "%s: mowgli_patricia_create() failed", m->name);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }
        if (! (trace_acttree = mowgli_patricia_create(&strcasecanon)))
@@ -998,7 +998,7 @@ mod_init(module_t *const restrict m)
 
                (void) mowgli_patricia_destroy(trace_cmdtree, NULL, NULL);
 
-               m->mflags |= MODTYPE_FAIL;
+               m->mflags |= MODFLAG_FAIL;
                return;
        }