From: Richard Russon <rich@flatcap.org>
Date: Sun, 9 Dec 2018 15:01:02 +0000 (+0000)
Subject: globals: upper case
X-Git-Tag: 2019-10-25~452^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d06bc389ed5fc143813444b8dc4e29c0d39e0f5d;p=neomutt

globals: upper case
---

diff --git a/ncrypt/crypt_mod_pgp_classic.c b/ncrypt/crypt_mod_pgp_classic.c
index 9a965f39f..ffc300666 100644
--- a/ncrypt/crypt_mod_pgp_classic.c
+++ b/ncrypt/crypt_mod_pgp_classic.c
@@ -37,7 +37,10 @@
 #endif
 
 // clang-format off
-struct CryptModuleSpecs crypt_mod_pgp_classic = {
+/**
+ * CryptModPgpClassic - CLI PGP - Implements ::CryptModuleSpecs
+ */
+struct CryptModuleSpecs CryptModPgpClassic = {
   APPLICATION_PGP,
 
   NULL, /* init */
diff --git a/ncrypt/crypt_mod_pgp_gpgme.c b/ncrypt/crypt_mod_pgp_gpgme.c
index e0c32032a..73151ede2 100644
--- a/ncrypt/crypt_mod_pgp_gpgme.c
+++ b/ncrypt/crypt_mod_pgp_gpgme.c
@@ -52,7 +52,10 @@ static int pgp_gpgme_valid_passphrase(void)
 }
 
 // clang-format off
-struct CryptModuleSpecs crypt_mod_pgp_gpgme = {
+/**
+ * CryptModPgpGpgme - GPGME PGP - Implements ::CryptModuleSpecs
+ */
+struct CryptModuleSpecs CryptModPgpGpgme = {
   APPLICATION_PGP,
 
   pgp_gpgme_init,
diff --git a/ncrypt/crypt_mod_smime_classic.c b/ncrypt/crypt_mod_smime_classic.c
index 28cae5df3..4665b3176 100644
--- a/ncrypt/crypt_mod_smime_classic.c
+++ b/ncrypt/crypt_mod_smime_classic.c
@@ -35,7 +35,10 @@
 #endif
 
 // clang-format off
-struct CryptModuleSpecs crypt_mod_smime_classic = {
+/**
+ * CryptModSmimeClassic - CLI SMIME - Implements ::CryptModuleSpecs
+ */
+struct CryptModuleSpecs CryptModSmimeClassic = {
   APPLICATION_SMIME,
 
   NULL, /* init */
diff --git a/ncrypt/crypt_mod_smime_gpgme.c b/ncrypt/crypt_mod_smime_gpgme.c
index 0050bcf47..c16cebd1d 100644
--- a/ncrypt/crypt_mod_smime_gpgme.c
+++ b/ncrypt/crypt_mod_smime_gpgme.c
@@ -52,7 +52,10 @@ static int smime_gpgme_valid_passphrase(void)
 }
 
 // clang-format off
-struct CryptModuleSpecs crypt_mod_smime_gpgme = {
+/**
+ * CryptModSmimeGpgme - GPGME SMIME - Implements ::CryptModuleSpecs
+ */
+struct CryptModuleSpecs CryptModSmimeGpgme = {
   APPLICATION_SMIME,
 
   smime_gpgme_init,
diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index 49e4dd34e..a617256ac 100644
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -53,16 +53,16 @@ struct State;
 bool CryptUseGpgme; ///< Config: Use GPGME crypto backend
 
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
-extern struct CryptModuleSpecs crypt_mod_pgp_classic;
+extern struct CryptModuleSpecs CryptModPgpClassic;
 #endif
 
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
-extern struct CryptModuleSpecs crypt_mod_smime_classic;
+extern struct CryptModuleSpecs CryptModSmimeClassic;
 #endif
 
 #ifdef CRYPT_BACKEND_GPGME
-extern struct CryptModuleSpecs crypt_mod_pgp_gpgme;
-extern struct CryptModuleSpecs crypt_mod_smime_gpgme;
+extern struct CryptModuleSpecs CryptModPgpGpgme;
+extern struct CryptModuleSpecs CryptModSmimeGpgme;
 #endif
 
 /* If the crypto module identifier by IDENTIFIER has been registered,
@@ -92,7 +92,7 @@ void crypt_init(void)
       1
 #endif
   )
-    crypto_module_register(&crypt_mod_pgp_classic);
+    crypto_module_register(&CryptModPgpClassic);
 #endif
 
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
@@ -103,14 +103,14 @@ void crypt_init(void)
       1
 #endif
   )
-    crypto_module_register(&crypt_mod_smime_classic);
+    crypto_module_register(&CryptModSmimeClassic);
 #endif
 
   if (CryptUseGpgme)
   {
 #ifdef CRYPT_BACKEND_GPGME
-    crypto_module_register(&crypt_mod_pgp_gpgme);
-    crypto_module_register(&crypt_mod_smime_gpgme);
+    crypto_module_register(&CryptModPgpGpgme);
+    crypto_module_register(&CryptModSmimeGpgme);
 #else
     mutt_message(_("\"crypt_use_gpgme\" set"
                    " but not built with GPGME support"));