global: make more vars const

Make lots more global variables const.
jamestiotio · Apr 28, 2023 · 34106a6 · 34106a6
1 parent 353df76
commit 34106a6
Show file tree

Hide file tree

Showing 29 changed files with 44 additions and 46 deletions.
diff --git a/compmbox/compress.c b/compmbox/compress.c
@@ -940,7 +940,7 @@ static int comp_path_parent(char *buf, size_t buflen)
  * Compress only uses open, close and check.
  * The message functions are delegated to mbox.
  */
-struct MxOps MxCompOps = {
+const struct MxOps MxCompOps = {
   // clang-format off
   .type            = MUTT_COMPRESSED,
   .name             = "compressed",

diff --git a/compmbox/lib.h b/compmbox/lib.h
@@ -59,6 +59,6 @@ bool mutt_comp_can_append(struct Mailbox *m);
 bool mutt_comp_can_read(const char *path);
 int  mutt_comp_valid_command(const char *cmd);
 
-extern struct MxOps MxCompOps;
+extern const struct MxOps MxCompOps;
 
 #endif /* MUTT_COMPMBOX_LIB_H */
diff --git a/imap/imap.c b/imap/imap.c
@@ -2514,7 +2514,7 @@ static int imap_path_is_empty(const char *path)
 /**
  * MxImapOps - IMAP Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxImapOps = {
+const struct MxOps MxImapOps = {
   // clang-format off
   .type            = MUTT_IMAP,
   .name             = "imap",

diff --git a/imap/lib.h b/imap/lib.h
@@ -85,7 +85,7 @@ enum MailboxType imap_path_probe(const char *path, const struct stat *st);
 int imap_path_canon(char *buf, size_t buflen);
 void imap_notify_delete_email(struct Mailbox *m, struct Email *e);
 
-extern struct MxOps MxImapOps;
+extern const struct MxOps MxImapOps;
 
 /* browse.c */
 int imap_browse(const char *path, struct BrowserState *state);

diff --git a/maildir/lib.h b/maildir/lib.h
@@ -47,8 +47,8 @@
 struct Email;
 struct HeaderCache;
 
-extern struct MxOps MxMaildirOps;
-extern struct MxOps MxMhOps;
+extern const struct MxOps MxMaildirOps;
+extern const struct MxOps MxMhOps;
 
 int           maildir_check_empty      (const char *path);
 void          maildir_gen_flags        (char *dest, size_t destlen, struct Email *e);

diff --git a/maildir/maildir.c b/maildir/maildir.c
@@ -1653,7 +1653,7 @@ static enum MailboxType maildir_path_probe(const char *path, const struct stat *
 /**
  * MxMaildirOps - Maildir Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxMaildirOps = {
+const struct MxOps MxMaildirOps = {
   // clang-format off
   .type            = MUTT_MAILDIR,
   .name             = "maildir",

diff --git a/maildir/mh.c b/maildir/mh.c
@@ -1254,7 +1254,7 @@ static enum MailboxType mh_path_probe(const char *path, const struct stat *st)
 /**
  * MxMhOps - MH Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxMhOps = {
+const struct MxOps MxMhOps = {
   // clang-format off
   .type            = MUTT_MH,
   .name             = "mh",

diff --git a/mbox/lib.h b/mbox/lib.h
@@ -55,8 +55,8 @@ struct MboxAccountData
   bool append : 1; ///< mailbox is opened in append mode
 };
 
-extern struct MxOps MxMboxOps;
-extern struct MxOps MxMmdfOps;
+extern const struct MxOps MxMboxOps;
+extern const struct MxOps MxMmdfOps;
 
 #define MMDF_SEP "\001\001\001\001\n"
 

diff --git a/mbox/mbox.c b/mbox/mbox.c
@@ -1853,7 +1853,7 @@ static enum MxStatus mbox_mbox_check_stats(struct Mailbox *m, uint8_t flags)
 /**
  * MxMboxOps - Mbox Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxMboxOps = {
+const struct MxOps MxMboxOps = {
   // clang-format off
   .type            = MUTT_MBOX,
   .name             = "mbox",
@@ -1885,7 +1885,7 @@ struct MxOps MxMboxOps = {
 /**
  * MxMmdfOps - MMDF Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxMmdfOps = {
+const struct MxOps MxMmdfOps = {
   // clang-format off
   .type            = MUTT_MMDF,
   .name             = "mmdf",

diff --git a/mutt/notify.c b/mutt/notify.c
@@ -36,7 +36,7 @@
 
 /// Lookup table for NotifyType
 /// Must be the same size and order as #NotifyType
-static char *NotifyTypeNames[] = {
+static const char *NotifyTypeNames[] = {
   "NT_ALL",     "NT_ACCOUNT",  "NT_ALIAS",   "NT_ALTERN", "NT_ATTACH",
   "NT_BINDING", "NT_COLOR",    "NT_COMMAND", "NT_CONFIG", "NT_CONTEXT",
   "NT_EMAIL",   "NT_ENVELOPE", "NT_GLOBAL",  "NT_HEADER", "NT_INDEX",

diff --git a/mutt/pool.c b/mutt/pool.c
@@ -38,9 +38,9 @@ static size_t BufferPoolCount = 0;
 /// Total size of the pool
 static size_t BufferPoolLen = 0;
 /// Amount to increase the size of the pool
-static size_t BufferPoolIncrement = 20;
+static const size_t BufferPoolIncrement = 20;
 /// Minimum size for a buffer
-static size_t BufferPoolInitialBufferSize = 1024;
+static const size_t BufferPoolInitialBufferSize = 1024;
 /// A pool of buffers
 static struct Buffer **BufferPool = NULL;
 

diff --git a/mutt_thread.c b/mutt_thread.c
@@ -72,7 +72,7 @@ static const struct Mapping UseThreadsMethods[] = {
 };
 
 /// Data for the $use_threads enumeration
-struct EnumDef UseThreadsTypeDef = {
+const struct EnumDef UseThreadsTypeDef = {
   "use_threads_type",
   4,
   (struct Mapping *) &UseThreadsMethods,

diff --git a/mutt_thread.h b/mutt_thread.h
@@ -87,7 +87,7 @@ enum UseThreads
   UT_REVERSE,   ///< Reverse threading (subthreads above root)
 };
 
-extern struct EnumDef UseThreadsTypeDef;
+extern const struct EnumDef UseThreadsTypeDef;
 
 int mutt_traverse_thread(struct Email *e, MuttThreadFlags flag);
 #define mutt_collapse_thread(e)         mutt_traverse_thread(e, MUTT_THREAD_COLLAPSE)

diff --git a/mx.c b/mx.c
@@ -96,7 +96,7 @@ static const struct Mapping MboxTypeMap[] = {
 };
 
 /// Data for the $mbox_type enumeration
-struct EnumDef MboxTypeDef = {
+const struct EnumDef MboxTypeDef = {
   "mbox_type",
   4,
   (struct Mapping *) &MboxTypeMap,

diff --git a/mx.h b/mx.h
@@ -34,9 +34,7 @@
 struct Buffer;
 struct Email;
 
-extern const struct MxOps *mx_ops[];
-
-extern struct EnumDef MboxTypeDef;
+extern const struct EnumDef MboxTypeDef;
 
 typedef uint8_t MsgOpenFlags;      ///< Flags for mx_msg_open_new(), e.g. #MUTT_ADD_FROM
 #define MUTT_MSG_NO_FLAGS       0  ///< No flags are set

diff --git a/ncrypt/crypt_mod.c b/ncrypt/crypt_mod.c
@@ -37,8 +37,8 @@
  */
 struct CryptModule
 {
-  struct CryptModuleSpecs *specs;    ///< Crypto module definition
-  STAILQ_ENTRY(CryptModule) entries; ///< Linked list
+  const struct CryptModuleSpecs *specs; ///< Crypto module definition
+  STAILQ_ENTRY(CryptModule) entries;    ///< Linked list
 };
 STAILQ_HEAD(CryptModuleList, CryptModule);
 
@@ -49,7 +49,7 @@ static struct CryptModuleList CryptModules = STAILQ_HEAD_INITIALIZER(CryptModule
  * crypto_module_register - Register a new crypto module
  * @param specs API functions
  */
-void crypto_module_register(struct CryptModuleSpecs *specs)
+void crypto_module_register(const struct CryptModuleSpecs *specs)
 {
   struct CryptModule *module = mutt_mem_calloc(1, sizeof(struct CryptModule));
   module->specs = specs;
@@ -63,9 +63,9 @@ void crypto_module_register(struct CryptModuleSpecs *specs)
  *
  * This function is usually used via the CRYPT_MOD_CALL[_CHECK] macros.
  */
-struct CryptModuleSpecs *crypto_module_lookup(int identifier)
+const struct CryptModuleSpecs *crypto_module_lookup(int identifier)
 {
-  struct CryptModule *module = NULL;
+  const struct CryptModule *module = NULL;
   STAILQ_FOREACH(module, &CryptModules, entries)
   {
     if (module->specs->identifier == identifier)

diff --git a/ncrypt/crypt_mod.h b/ncrypt/crypt_mod.h
@@ -306,7 +306,7 @@ struct CryptModuleSpecs
 };
 
 /* High Level crypto module interface */
-void crypto_module_register(struct CryptModuleSpecs *specs);
-struct CryptModuleSpecs *crypto_module_lookup(int identifier);
+void crypto_module_register(const struct CryptModuleSpecs *specs);
+const struct CryptModuleSpecs *crypto_module_lookup(int identifier);
 
 #endif /* MUTT_NCRYPT_CRYPT_MOD_H */
diff --git a/ncrypt/crypt_mod_pgp_classic.c b/ncrypt/crypt_mod_pgp_classic.c
@@ -39,7 +39,7 @@
 /**
  * CryptModPgpClassic - CLI PGP - Implements ::CryptModuleSpecs
  */
-struct CryptModuleSpecs CryptModPgpClassic = {
+const struct CryptModuleSpecs CryptModPgpClassic = {
   // clang-format off
   APPLICATION_PGP,
 

diff --git a/ncrypt/crypt_mod_pgp_gpgme.c b/ncrypt/crypt_mod_pgp_gpgme.c
@@ -55,7 +55,7 @@ static bool pgp_gpgme_valid_passphrase(void)
 /**
  * CryptModPgpGpgme - GPGME PGP - Implements ::CryptModuleSpecs
  */
-struct CryptModuleSpecs CryptModPgpGpgme = {
+const struct CryptModuleSpecs CryptModPgpGpgme = {
   // clang-format off
   APPLICATION_PGP,
 

diff --git a/ncrypt/crypt_mod_smime_classic.c b/ncrypt/crypt_mod_smime_classic.c
@@ -53,7 +53,7 @@ static void smime_class_cleanup(void)
 /**
  * CryptModSmimeClassic - CLI SMIME - Implements ::CryptModuleSpecs
  */
-struct CryptModuleSpecs CryptModSmimeClassic = {
+const struct CryptModuleSpecs CryptModSmimeClassic = {
   // clang-format off
   APPLICATION_SMIME,
 

diff --git a/ncrypt/crypt_mod_smime_gpgme.c b/ncrypt/crypt_mod_smime_gpgme.c
@@ -55,7 +55,7 @@ static bool smime_gpgme_valid_passphrase(void)
 /**
  * CryptModSmimeGpgme - GPGME SMIME - Implements ::CryptModuleSpecs
  */
-struct CryptModuleSpecs CryptModSmimeGpgme = {
+const struct CryptModuleSpecs CryptModSmimeGpgme = {
   // clang-format off
   APPLICATION_SMIME,
 

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
@@ -62,16 +62,16 @@ struct Address;
 struct AddressList;
 
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
-extern struct CryptModuleSpecs CryptModPgpClassic;
+extern const struct CryptModuleSpecs CryptModPgpClassic;
 #endif
 
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
-extern struct CryptModuleSpecs CryptModSmimeClassic;
+extern const struct CryptModuleSpecs CryptModSmimeClassic;
 #endif
 
 #ifdef CRYPT_BACKEND_GPGME
-extern struct CryptModuleSpecs CryptModPgpGpgme;
-extern struct CryptModuleSpecs CryptModSmimeGpgme;
+extern const struct CryptModuleSpecs CryptModPgpGpgme;
+extern const struct CryptModuleSpecs CryptModSmimeGpgme;
 #endif
 
 /* If the crypto module identifier by IDENTIFIER has been registered,

diff --git a/nntp/lib.h b/nntp/lib.h
@@ -54,7 +54,7 @@ struct NntpAccountData;
 struct stat;
 
 extern struct NntpAccountData *CurrentNewsSrv; ///< Current NNTP news server
-extern struct MxOps MxNntpOps;
+extern const struct MxOps MxNntpOps;
 
 /* article number type and format */
 #define anum_t long

diff --git a/nntp/nntp.c b/nntp/nntp.c
@@ -2772,7 +2772,7 @@ static int nntp_path_parent(char *buf, size_t buflen)
 /**
  * MxNntpOps - NNTP Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxNntpOps = {
+const struct MxOps MxNntpOps = {
   // clang-format off
   .type            = MUTT_NNTP,
   .name             = "nntp",

diff --git a/notmuch/lib.h b/notmuch/lib.h
@@ -47,7 +47,7 @@
 struct Email;
 struct stat;
 
-extern struct MxOps MxNotmuchOps;
+extern const struct MxOps MxNotmuchOps;
 
 void  nm_init                    (void);
 void  nm_db_debug_check          (struct Mailbox *m);

diff --git a/notmuch/notmuch.c b/notmuch/notmuch.c
@@ -2477,7 +2477,7 @@ static int nm_path_parent(char *buf, size_t buflen)
 /**
  * MxNotmuchOps - Notmuch Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxNotmuchOps = {
+const struct MxOps MxNotmuchOps = {
   // clang-format off
   .type            = MUTT_NOTMUCH,
   .name             = "notmuch",

diff --git a/pop/lib.h b/pop/lib.h
@@ -42,7 +42,7 @@
 
 struct stat;
 
-extern struct MxOps MxPopOps;
+extern const struct MxOps MxPopOps;
 
 void pop_fetch_mail(void);
 enum MailboxType pop_path_probe(const char *path, const struct stat *st);

diff --git a/pop/pop.c b/pop/pop.c
@@ -1195,7 +1195,7 @@ static int pop_path_parent(char *buf, size_t buflen)
 /**
  * MxPopOps - POP Mailbox - Implements ::MxOps - @ingroup mx_api
  */
-struct MxOps MxPopOps = {
+const struct MxOps MxPopOps = {
   // clang-format off
   .type            = MUTT_POP,
   .name             = "pop",

diff --git a/version.c b/version.c
@@ -130,7 +130,7 @@ struct CompileOptions
 /* These are sorted by the display string */
 
 /// Default options strings for `neomutt -v` output
-static struct CompileOptions CompOptsDefault[] = {
+static const struct CompileOptions CompOptsDefault[] = {
   { "attach_headers_color", 1 },
   { "compose_to_sender", 1 },
   { "compress", 1 },
@@ -165,7 +165,7 @@ static struct CompileOptions CompOptsDefault[] = {
 };
 
 /// Compile options strings for `neomutt -v` output
-static struct CompileOptions CompOpts[] = {
+static const struct CompileOptions CompOpts[] = {
 #ifdef USE_AUTOCRYPT
   { "autocrypt", 1 },
 #else
@@ -301,7 +301,7 @@ static struct CompileOptions CompOpts[] = {
 };
 
 /// Debug options strings for `neomutt -v` output
-static struct CompileOptions DebugOpts[] = {
+static const struct CompileOptions DebugOpts[] = {
 #ifdef USE_ASAN
   { "asan", 2 },
 #endif
@@ -345,7 +345,7 @@ static struct CompileOptions DebugOpts[] = {
  * The output is of the form: "+enabled_feature -disabled_feature" and is
  * wrapped to SCREEN_WIDTH characters.
  */
-static void print_compile_options(struct CompileOptions *co, FILE *fp)
+static void print_compile_options(const struct CompileOptions *co, FILE *fp)
 {
   if (!co || !fp)
     return;