]> jfr.im git - irc/atheme/atheme.git/commitdiff
modules/nickserv/verify: redefine messages as macros
authorAaron Jones <redacted>
Tue, 1 Feb 2022 23:38:08 +0000 (23:38 +0000)
committerAaron Jones <redacted>
Tue, 1 Feb 2022 23:38:18 +0000 (23:38 +0000)
This was (correctly) triggering -Wformat-security diagnostics because
they were not string literals.

Fixes: b40775a303c7bbcb027e
modules/nickserv/verify.c

index 6580e31e043aac379e51b8e738d529da01e0b115..8bd9c0e0383b573538b0f847cdbec8b0f44ac088 100644 (file)
@@ -9,26 +9,27 @@
 
 #include <atheme.h>
 
+#define VERIFY_STR_THANKS   _("Thank you for verifying your e-mail address! You have taken steps in ensuring that your registrations are not exploited.")
+#define VERIFY_STR_CONFIRM  _("\2%s\2 has now been verified.")
+
 static void
 ns_verify_activate_account(struct sourceinfo *si, struct myuser *mu, bool force)
 {
        mowgli_node_t *n;
        struct hook_user_req req;
-       const char *thanks = _("Thank you for verifying your e-mail address! You have taken steps in ensuring that your registrations are not exploited.");
-       const char *confirm = _("\2%s\2 has now been verified.");
 
        mu->flags &= ~MU_WAITAUTH;
 
        metadata_delete(mu, "private:verify:register:key");
        metadata_delete(mu, "private:verify:register:timestamp");
 
-       myuser_notice(nicksvs.nick, mu, confirm, entity(mu)->name);
+       myuser_notice(nicksvs.nick, mu, VERIFY_STR_CONFIRM, entity(mu)->name);
        if (!force)
-               myuser_notice(nicksvs.nick, mu, thanks);
+               myuser_notice(nicksvs.nick, mu, VERIFY_STR_THANKS);
        if (si->smu != mu) {
-               command_success_nodata(si, confirm, entity(mu)->name);
+               command_success_nodata(si, VERIFY_STR_CONFIRM, entity(mu)->name);
                if (!force)
-                       command_success_nodata(si, thanks);
+                       command_success_nodata(si, VERIFY_STR_THANKS);
        }
 
        MOWGLI_ITER_FOREACH(n, mu->logins.head)