rename: tidy global variable naming

Rename the global variables to match the MixedCase coding style, e.g.
    Spoolfile -> SpoolFile

diff --git a/browser.c b/browser.c
index 33f7b382140370d6e28a376d60dfcb473fe69a65..d4b36d0c4d763216f67811bd66c636c19336a610 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -1221,8 +1221,8 @@ void _mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numf
             case MUTT_IMAP:
               if (Maildir)
                 strfcpy(LastDir, NONULL(Maildir), sizeof(LastDir));
-              else if (Spoolfile)
-                mutt_browser_select_dir(Spoolfile);
+              else if (SpoolFile)
+                mutt_browser_select_dir(SpoolFile);
               break;
             default:
               mutt_browser_select_dir(CurrentFolder);
@@ -1429,7 +1429,7 @@ void _mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numf
               strfcpy(LastDir, OldLastDir, sizeof(LastDir));
               if (examine_directory(menu, &state, LastDir, prefix) == -1)
               {
-                strfcpy(LastDir, NONULL(Homedir), sizeof(LastDir));
+                strfcpy(LastDir, NONULL(HomeDir), sizeof(LastDir));
                 goto bail;
               }
             }

diff --git a/complete.c b/complete.c
index a8d162825a2128276984f85b0f3c74c6728e2a69..efad4ebe3ff6dc056ff199e99af16262a734c81a 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -127,7 +127,7 @@ int mutt_complete(char *s, size_t slen)
   if (*s == '=' || *s == '+' || *s == '!')
   {
     if (*s == '!')
-      p = NONULL(Spoolfile);
+      p = NONULL(SpoolFile);
     else
       p = NONULL(Maildir);
 
@@ -145,7 +145,7 @@ int mutt_complete(char *s, size_t slen)
     dirpart[0] = *s;
     dirpart[1] = 0;
     if (*s == '!')
-      strfcpy(exp_dirpart, NONULL(Spoolfile), sizeof(exp_dirpart));
+      strfcpy(exp_dirpart, NONULL(SpoolFile), sizeof(exp_dirpart));
     else
       strfcpy(exp_dirpart, NONULL(Maildir), sizeof(exp_dirpart));
     if ((p = strrchr(s, '/')))

diff --git a/curs_lib.c b/curs_lib.c
index 10c118477812ab8f7e6da78c5191ab076a7ec139..31d20f7bc8b6beeab853b6d4e8327dcde745e423 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -218,7 +218,7 @@ int mutt_get_field_unbuffered(char *msg, char *buf, size_t buflen, int flags)
 
 void mutt_clear_error(void)
 {
-  Errorbuf[0] = 0;
+  ErrorBuf[0] = 0;
   if (!option(OPT_NO_CURSES))
     mutt_window_clearline(MuttMessageWindow, 0);
 }
@@ -406,7 +406,7 @@ static void curses_message(int error, const char *fmt, va_list ap)
   vsnprintf(scratch, sizeof(scratch), fmt, ap);
 
   mutt_debug(1, "%s\n", scratch);
-  mutt_simple_format(Errorbuf, sizeof(Errorbuf), 0, MuttMessageWindow->cols,
+  mutt_simple_format(ErrorBuf, sizeof(ErrorBuf), 0, MuttMessageWindow->cols,
                      FMT_LEFT, 0, scratch, sizeof(scratch), 0);
 
   if (!option(OPT_KEEP_QUIET))
@@ -414,7 +414,7 @@ static void curses_message(int error, const char *fmt, va_list ap)
     if (error)
       BEEP();
     SETCOLOR(error ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
-    mutt_window_mvaddstr(MuttMessageWindow, 0, 0, Errorbuf);
+    mutt_window_mvaddstr(MuttMessageWindow, 0, 0, ErrorBuf);
     NORMAL_COLOR;
     mutt_window_clrtoeol(MuttMessageWindow);
     mutt_refresh();
@@ -801,7 +801,7 @@ void mutt_show_error(void)
     return;
 
   SETCOLOR(option(OPT_MSG_ERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
-  mutt_window_mvaddstr(MuttMessageWindow, 0, 0, Errorbuf);
+  mutt_window_mvaddstr(MuttMessageWindow, 0, 0, ErrorBuf);
   NORMAL_COLOR;
   mutt_window_clrtoeol(MuttMessageWindow);
 }

diff --git a/globals.h b/globals.h
index 4f530cd4cba571bfd4f0afbda119d13cb5e74d52..de87a435a742a9ab524f5f37accd6e0be250c431 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -38,7 +38,7 @@
 
 WHERE struct Context *Context;
 
-WHERE char Errorbuf[STRING];
+WHERE char ErrorBuf[STRING];
 WHERE char AttachmentMarker[STRING];
 
 WHERE struct Address *EnvFrom;
@@ -70,10 +70,10 @@ WHERE char *ForwardAttrIntro;
 WHERE char *ForwardAttrTrailer;
 WHERE char *ForwFmt;
 WHERE char *Fqdn;
-WHERE struct MbCharTable *Fromchars;
+WHERE struct MbCharTable *FromChars;
 WHERE char *HdrFmt;
 WHERE char *HistFile;
-WHERE char *Homedir;
+WHERE char *HomeDir;
 WHERE char *Hostname;
 #ifdef USE_IMAP
 WHERE char *ImapAuthenticators;
@@ -145,7 +145,7 @@ WHERE char *PrintCmd;
 WHERE char *NewMailCmd;
 WHERE char *QueryCmd;
 WHERE char *QueryFormat;
-WHERE char *Realname;
+WHERE char *RealName;
 WHERE short SearchContext;
 WHERE char *SendCharset;
 WHERE char *Sendmail;
@@ -164,7 +164,7 @@ WHERE char *SmtpAuthenticators;
 WHERE char *SmtpPass;
 WHERE char *SmtpUrl;
 #endif /* USE_SMTP */
-WHERE char *Spoolfile;
+WHERE char *SpoolFile;
 WHERE char *SpamSep;
 #ifdef USE_SSL
 WHERE char *SslCertFile;
@@ -178,9 +178,9 @@ WHERE char *SslCACertFile;
 #endif
 WHERE struct MbCharTable *StChars;
 WHERE char *Status;
-WHERE char *Tempdir;
-WHERE struct MbCharTable *Tochars;
-WHERE struct MbCharTable *Flagchars;
+WHERE char *TempDir;
+WHERE struct MbCharTable *ToChars;
+WHERE struct MbCharTable *FlagChars;
 WHERE char *TrashPath;
 WHERE char *TSStatusFormat;
 WHERE char *TSIconFormat;
@@ -209,7 +209,7 @@ WHERE struct List *InlineAllow;
 WHERE struct List *InlineExclude;
 WHERE struct List *HeaderOrderList;
 WHERE struct List *Ignore;
-WHERE struct List *MailtoAllow;
+WHERE struct List *MailToAllow;
 WHERE struct List *MimeLookupList;
 WHERE struct List *UnIgnore;
 

diff --git a/hdrline.c b/hdrline.c
index d2d94a18e621d69c9b4e71c9444faf8648a2984a..90e054aca6d1883d858557bf82562d7272362d41 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -232,10 +232,10 @@ static const char *make_from_prefix(enum FieldType disp)
         [DISP_TO] = "To ", [DISP_CC] = "Cc ", [DISP_BCC] = "Bcc ", [DISP_FROM] = "",
   };
 
-  if (!Fromchars || !Fromchars->chars || (Fromchars->len == 0))
+  if (!FromChars || !FromChars->chars || (FromChars->len == 0))
     return long_prefixes[disp];
 
-  char *pchar = get_nth_wchar(Fromchars, disp);
+  char *pchar = get_nth_wchar(FromChars, disp);
   if (mutt_strlen(pchar) == 0)
     return "";
 
@@ -1062,21 +1062,21 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
 
     case 'S':
       if (hdr->deleted)
-        wch = get_nth_wchar(Flagchars, FlagCharDeleted);
+        wch = get_nth_wchar(FlagChars, FlagCharDeleted);
       else if (hdr->attach_del)
-        wch = get_nth_wchar(Flagchars, FlagCharDeletedAttach);
+        wch = get_nth_wchar(FlagChars, FlagCharDeletedAttach);
       else if (hdr->tagged)
-        wch = get_nth_wchar(Flagchars, FlagCharTagged);
+        wch = get_nth_wchar(FlagChars, FlagCharTagged);
       else if (hdr->flagged)
-        wch = get_nth_wchar(Flagchars, FlagCharImportant);
+        wch = get_nth_wchar(FlagChars, FlagCharImportant);
       else if (hdr->replied)
-        wch = get_nth_wchar(Flagchars, FlagCharReplied);
+        wch = get_nth_wchar(FlagChars, FlagCharReplied);
       else if (hdr->read && (ctx && ctx->msgnotreadyet != hdr->msgno))
-        wch = get_nth_wchar(Flagchars, FlagCharSEmpty);
+        wch = get_nth_wchar(FlagChars, FlagCharSEmpty);
       else if (hdr->old)
-        wch = get_nth_wchar(Flagchars, FlagCharOld);
+        wch = get_nth_wchar(FlagChars, FlagCharOld);
       else
-        wch = get_nth_wchar(Flagchars, FlagCharNew);
+        wch = get_nth_wchar(FlagChars, FlagCharNew);
 
       snprintf(buf2, sizeof(buf2), "%s", wch);
       colorlen = add_index_color(dest, destlen, flags, MT_COLOR_INDEX_FLAGS);
@@ -1100,8 +1100,8 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
     case 'T':
       snprintf(fmt, sizeof(fmt), "%%%ss", prefix);
       snprintf(dest, destlen, fmt,
-               (Tochars && ((i = user_is_recipient(hdr))) < Tochars->len) ?
-                   Tochars->chars[i] :
+               (ToChars && ((i = user_is_recipient(hdr))) < ToChars->len) ?
+                   ToChars->chars[i] :
                    " ");
       break;
 
@@ -1209,26 +1209,26 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
       {
         char *ch = NULL;
         if (hdr->deleted)
-          ch = get_nth_wchar(Flagchars, FlagCharDeleted);
+          ch = get_nth_wchar(FlagChars, FlagCharDeleted);
         else if (hdr->attach_del)
-          ch = get_nth_wchar(Flagchars, FlagCharDeletedAttach);
+          ch = get_nth_wchar(FlagChars, FlagCharDeletedAttach);
         else if (THREAD_NEW)
-          ch = get_nth_wchar(Flagchars, FlagCharNewThread);
+          ch = get_nth_wchar(FlagChars, FlagCharNewThread);
         else if (THREAD_OLD)
-          ch = get_nth_wchar(Flagchars, FlagCharOldThread);
+          ch = get_nth_wchar(FlagChars, FlagCharOldThread);
         else if (hdr->read && (ctx && (ctx->msgnotreadyet != hdr->msgno)))
         {
           if (hdr->replied)
-            ch = get_nth_wchar(Flagchars, FlagCharReplied);
+            ch = get_nth_wchar(FlagChars, FlagCharReplied);
           else
-            ch = get_nth_wchar(Flagchars, FlagCharZEmpty);
+            ch = get_nth_wchar(FlagChars, FlagCharZEmpty);
         }
         else
         {
           if (hdr->old)
-            ch = get_nth_wchar(Flagchars, FlagCharOld);
+            ch = get_nth_wchar(FlagChars, FlagCharOld);
           else
-            ch = get_nth_wchar(Flagchars, FlagCharNew);
+            ch = get_nth_wchar(FlagChars, FlagCharNew);
         }
 
         snprintf(buf2, sizeof(buf2), "%s", ch);
@@ -1255,11 +1255,11 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
       {
         char *ch = NULL;
         if (hdr->tagged)
-          ch = get_nth_wchar(Flagchars, FlagCharTagged);
+          ch = get_nth_wchar(FlagChars, FlagCharTagged);
         else if (hdr->flagged)
-          ch = get_nth_wchar(Flagchars, FlagCharImportant);
+          ch = get_nth_wchar(FlagChars, FlagCharImportant);
         else
-          ch = get_nth_wchar(Tochars, user_is_recipient(hdr));
+          ch = get_nth_wchar(ToChars, user_is_recipient(hdr));
 
         snprintf(buf2, sizeof(buf2), "%s", ch);
         src++;
@@ -1277,30 +1277,30 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
       /* New/Old for threads; replied; New/Old for messages */
       char *first = NULL;
       if (THREAD_NEW)
-        first = get_nth_wchar(Flagchars, FlagCharNewThread);
+        first = get_nth_wchar(FlagChars, FlagCharNewThread);
       else if (THREAD_OLD)
-        first = get_nth_wchar(Flagchars, FlagCharOldThread);
+        first = get_nth_wchar(FlagChars, FlagCharOldThread);
       else if (hdr->read && (ctx && (ctx->msgnotreadyet != hdr->msgno)))
       {
         if (hdr->replied)
-          first = get_nth_wchar(Flagchars, FlagCharReplied);
+          first = get_nth_wchar(FlagChars, FlagCharReplied);
         else
-          first = get_nth_wchar(Flagchars, FlagCharZEmpty);
+          first = get_nth_wchar(FlagChars, FlagCharZEmpty);
       }
       else
       {
         if (hdr->old)
-          first = get_nth_wchar(Flagchars, FlagCharOld);
+          first = get_nth_wchar(FlagChars, FlagCharOld);
         else
-          first = get_nth_wchar(Flagchars, FlagCharNew);
+          first = get_nth_wchar(FlagChars, FlagCharNew);
       }
 
       /* Marked for deletion; deleted attachments; crypto */
       char *second = NULL;
       if (hdr->deleted)
-        second = get_nth_wchar(Flagchars, FlagCharDeleted);
+        second = get_nth_wchar(FlagChars, FlagCharDeleted);
       else if (hdr->attach_del)
-        second = get_nth_wchar(Flagchars, FlagCharDeletedAttach);
+        second = get_nth_wchar(FlagChars, FlagCharDeletedAttach);
       else if (WithCrypto && (hdr->security & GOODSIGN))
         second = "S";
       else if (WithCrypto && (hdr->security & ENCRYPT))
@@ -1315,11 +1315,11 @@ static const char *hdr_format_str(char *dest, size_t destlen, size_t col, int co
       /* Tagged, flagged and recipient flag */
       char *third = NULL;
       if (hdr->tagged)
-        third = get_nth_wchar(Flagchars, FlagCharTagged);
+        third = get_nth_wchar(FlagChars, FlagCharTagged);
       else if (hdr->flagged)
-        third = get_nth_wchar(Flagchars, FlagCharImportant);
+        third = get_nth_wchar(FlagChars, FlagCharImportant);
       else
-        third = get_nth_wchar(Tochars, user_is_recipient(hdr));
+        third = get_nth_wchar(ToChars, user_is_recipient(hdr));
 
       snprintf(buf2, sizeof(buf2), "%s%s%s", first, second, third);
     }

diff --git a/init.c b/init.c
index 8ab89d1b736c9596e50c3cb782042c858be1ed75..cad0b6f5c8457ca37553b01f58597210b54b8089 100644 (file)
--- a/init.c
+++ b/init.c
@@ -4191,7 +4191,7 @@ void mutt_init(int skip_sys_rc, struct List *commands)
   /* on one of the systems I use, getcwd() does not return the same prefix
      as is listed in the passwd file */
   if ((p = getenv("HOME")))
-    Homedir = safe_strdup(p);
+    HomeDir = safe_strdup(p);
 
   /* Get some information about the user */
   if ((pw = getpwuid(getuid())))
@@ -4199,16 +4199,16 @@ void mutt_init(int skip_sys_rc, struct List *commands)
     char rnbuf[STRING];
 
     Username = safe_strdup(pw->pw_name);
-    if (!Homedir)
-      Homedir = safe_strdup(pw->pw_dir);
+    if (!HomeDir)
+      HomeDir = safe_strdup(pw->pw_dir);
 
-    Realname = safe_strdup(mutt_gecos_name(rnbuf, sizeof(rnbuf), pw));
+    RealName = safe_strdup(mutt_gecos_name(rnbuf, sizeof(rnbuf), pw));
     Shell = safe_strdup(pw->pw_shell);
     endpwent();
   }
   else
   {
-    if (!Homedir)
+    if (!HomeDir)
     {
       mutt_endwin(NULL);
       fputs(_("unable to determine home directory"), stderr);
@@ -4315,17 +4315,17 @@ void mutt_init(int skip_sys_rc, struct List *commands)
 #endif
 
   if ((p = getenv("MAIL")))
-    Spoolfile = safe_strdup(p);
+    SpoolFile = safe_strdup(p);
   else if ((p = getenv("MAILDIR")))
-    Spoolfile = safe_strdup(p);
+    SpoolFile = safe_strdup(p);
   else
   {
 #ifdef HOMESPOOL
-    mutt_concat_path(buffer, NONULL(Homedir), MAILPATH, sizeof(buffer));
+    mutt_concat_path(buffer, NONULL(HomeDir), MAILPATH, sizeof(buffer));
 #else
     mutt_concat_path(buffer, MAILPATH, NONULL(Username), sizeof(buffer));
 #endif
-    Spoolfile = safe_strdup(buffer);
+    SpoolFile = safe_strdup(buffer);
   }
 
   if ((p = getenv("MAILCAPS")))
@@ -4338,7 +4338,7 @@ void mutt_init(int skip_sys_rc, struct List *commands)
         "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
   }
 
-  Tempdir = safe_strdup((p = getenv("TMPDIR")) ? p : "/tmp");
+  TempDir = safe_strdup((p = getenv("TMPDIR")) ? p : "/tmp");
 
   p = getenv("VISUAL");
   if (!p)
@@ -4404,25 +4404,25 @@ void mutt_init(int skip_sys_rc, struct List *commands)
    * create RFC822-compliant mail messages using the "subject" and "body"
    * headers.
    */
-  add_to_list(&MailtoAllow, "body");
-  add_to_list(&MailtoAllow, "subject");
+  add_to_list(&MailToAllow, "body");
+  add_to_list(&MailToAllow, "subject");
   /* Cc, In-Reply-To, and References help with not breaking threading on
    * mailing lists, see https://github.com/neomutt/neomutt/issues/115 */
-  add_to_list(&MailtoAllow, "cc");
-  add_to_list(&MailtoAllow, "in-reply-to");
-  add_to_list(&MailtoAllow, "references");
+  add_to_list(&MailToAllow, "cc");
+  add_to_list(&MailToAllow, "in-reply-to");
+  add_to_list(&MailToAllow, "references");
 
   if (!Muttrc)
   {
     char *xdg_cfg_home = getenv("XDG_CONFIG_HOME");
 
-    if (!xdg_cfg_home && Homedir)
+    if (!xdg_cfg_home && HomeDir)
     {
-      snprintf(buffer, sizeof(buffer), "%s/.config", Homedir);
+      snprintf(buffer, sizeof(buffer), "%s/.config", HomeDir);
       xdg_cfg_home = buffer;
     }
 
-    char *config = find_cfg(Homedir, xdg_cfg_home);
+    char *config = find_cfg(HomeDir, xdg_cfg_home);
     if (config)
     {
       Muttrc = mutt_add_list(Muttrc, config);
@@ -4527,7 +4527,7 @@ void mutt_init(int skip_sys_rc, struct List *commands)
       mutt_exit(1);
   }
 
-  mutt_mkdir(Tempdir, S_IRWXU);
+  mutt_mkdir(TempDir, S_IRWXU);
 
   mutt_read_histfile();
 
@@ -4539,7 +4539,7 @@ void mutt_init(int skip_sys_rc, struct List *commands)
     {
       if (b->magic == MUTT_NOTMUCH)
       {
-        mutt_str_replace(&Spoolfile, b->path);
+        mutt_str_replace(&SpoolFile, b->path);
         mutt_sb_toggle_virtual();
         break;
       }

diff --git a/init.h b/init.h
index 6f1c82b48a645b7a9260dd1125eb15c6fb68538d..d650aea0a6a654aabfaaa7b4b99a5701d48057f4 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1038,7 +1038,7 @@ struct Option MuttVars[] = {
   ** .pp
   ** This setting defaults to the contents of the environment variable \fC$$$EMAIL\fP.
   */
-  { "from_chars",               DT_MBCHARTBL,    R_BOTH, UL &Fromchars, 0 },
+  { "from_chars",               DT_MBCHARTBL,    R_BOTH, UL &FromChars, 0 },
   /*
   ** .pp
   ** Controls the character used to prefix the %F and %L fields in the
@@ -2870,7 +2870,7 @@ struct Option MuttVars[] = {
   ** .pp
   ** If \fIset\fP, all folders are opened in read-only mode.
   */
-  { "realname",         DT_STR,  R_BOTH, UL &Realname, 0 },
+  { "realname",         DT_STR,  R_BOTH, UL &RealName, 0 },
   /*
   ** .pp
   ** This variable specifies what ``real'' or ``personal'' name should be used
@@ -3784,7 +3784,7 @@ struct Option MuttVars[] = {
   ** match will append to the previous, using this variable's value as a
   ** separator.
   */
-  { "spoolfile",        DT_PATH, R_NONE, UL &Spoolfile, 0 },
+  { "spoolfile",        DT_PATH, R_NONE, UL &SpoolFile, 0 },
   /*
   ** .pp
   ** If your spool mailbox is in a non-default place where Mutt cannot find
@@ -4106,7 +4106,7 @@ struct Option MuttVars[] = {
   ** .pp
   ** A value of zero or less will cause Mutt to never time out.
   */
-  { "tmpdir",           DT_PATH, R_NONE, UL &Tempdir, 0 },
+  { "tmpdir",           DT_PATH, R_NONE, UL &TempDir, 0 },
   /*
   ** .pp
   ** This variable allows you to specify where Mutt will place its
@@ -4114,7 +4114,7 @@ struct Option MuttVars[] = {
   ** this variable is not set, the environment variable \fC$$$TMPDIR\fP is
   ** used.  If \fC$$$TMPDIR\fP is not set then ``\fC/tmp\fP'' is used.
   */
-  { "to_chars",         DT_MBCHARTBL, R_BOTH, UL &Tochars, UL " +TCFL" },
+  { "to_chars",         DT_MBCHARTBL, R_BOTH, UL &ToChars, UL " +TCFL" },
   /*
   ** .pp
   ** Controls the character used to indicate mail addressed to you.
@@ -4128,7 +4128,7 @@ struct Option MuttVars[] = {
   ** .dt 6 .dd L .dd Indicates the mail was sent to a mailing-list you subscribe to.
   ** .de
   */
-  { "flag_chars",       DT_MBCHARTBL,    R_BOTH, UL &Flagchars, UL "*!DdrONon- " },
+  { "flag_chars",       DT_MBCHARTBL,    R_BOTH, UL &FlagChars, UL "*!DdrONon- " },
   /*
    ** .pp
    ** Controls the characters used in several flags.
@@ -4607,8 +4607,8 @@ const struct Command Commands[] = {
   { "tag-transforms",   parse_tag_transforms,   0 },
   { "tag-formats",      parse_tag_formats,      0 },
 #endif
-  { "mailto_allow",     parse_list,             UL &MailtoAllow },
-  { "unmailto_allow",   parse_unlist,           UL &MailtoAllow },
+  { "mailto_allow",     parse_list,             UL &MailToAllow },
+  { "unmailto_allow",   parse_unlist,           UL &MailToAllow },
   { "message-hook",     mutt_parse_hook,        MUTT_MESSAGEHOOK },
   { "mbox-hook",        mutt_parse_hook,        MUTT_MBOXHOOK },
   { "mime_lookup",      parse_list,     UL &MimeLookupList },

diff --git a/main.c b/main.c
index fd784dac1929fe1912b8cdf58b909cc969e59043..83f25470647e3b4de7e0408d51b862fc951bcfa4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -864,7 +864,7 @@ int main(int argc, char **argv, char **env)
         set_option(OPT_NEWS);
         if (!(CurrentNewsSrv = nntp_select_server(NewsServer, 0)))
         {
-          mutt_endwin(Errorbuf);
+          mutt_endwin(ErrorBuf);
           exit(1);
         }
       }
@@ -886,8 +886,8 @@ int main(int argc, char **argv, char **env)
 
     if (!folder[0])
     {
-      if (Spoolfile)
-        strfcpy(folder, NONULL(Spoolfile), sizeof(folder));
+      if (SpoolFile)
+        strfcpy(folder, NONULL(SpoolFile), sizeof(folder));
       else if (Maildir)
         strfcpy(folder, NONULL(Maildir), sizeof(folder));
       /* else no folder */
@@ -942,7 +942,7 @@ int main(int argc, char **argv, char **env)
 #endif
     mutt_free_opts();
     mutt_free_windows();
-    mutt_endwin(Errorbuf);
+    mutt_endwin(ErrorBuf);
   }
 
   exit(0);

diff --git a/mbox.c b/mbox.c
index 4c062517a707534aaabaf6e5872d2f90141d8645..095a5270c76a2bc276e838f8fed7dcac6f8f9fec 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -1288,7 +1288,7 @@ static int mbox_sync_mailbox(struct Context *ctx, int *index_hint)
 
     char savefile[_POSIX_PATH_MAX];
 
-    snprintf(savefile, sizeof(savefile), "%s/mutt.%s-%s-%u", NONULL(Tempdir),
+    snprintf(savefile, sizeof(savefile), "%s/mutt.%s-%s-%u", NONULL(TempDir),
              NONULL(Username), NONULL(Hostname), (unsigned int) getpid());
     rename(tempfile, savefile);
     mutt_unblock_signals();

diff --git a/menu.c b/menu.c
index 8885cd5ecaec06e31c760fbce0b6efb8ce32c090..8bd36b93a102a8d61221448457b9e7c9bc22b6bf 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -471,7 +471,7 @@ static void menu_redraw_prompt(struct Menu *menu)
       unset_option(OPT_MSG_ERR);
     }
 
-    if (*Errorbuf)
+    if (*ErrorBuf)
       mutt_clear_error();
 
     mutt_window_mvaddstr(menu->messagewin, 0, 0, menu->prompt);

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 584d8da606a6df5536d16bd6fbc89c111a8cd99a..9781dadddf2aef39a51d6a68db3c3dc9aa924613 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -91,7 +91,7 @@ static int getnameinfo_err(int ret)
 
 #define IP_PORT_BUFLEN 1024
 
-static sasl_callback_t mutt_sasl_callbacks[5];
+static sasl_callback_t MuttSaslCallbacks[5];
 
 static sasl_secret_t *secret_ptr = NULL;
 
@@ -240,7 +240,7 @@ static sasl_callback_t *mutt_sasl_get_callbacks(struct Account *account)
 {
   sasl_callback_t *callback = NULL;
 
-  callback = mutt_sasl_callbacks;
+  callback = MuttSaslCallbacks;
 
   callback->id = SASL_CB_USER;
   callback->proc = (int (*)(void)) mutt_sasl_cb_authname;
@@ -266,7 +266,7 @@ static sasl_callback_t *mutt_sasl_get_callbacks(struct Account *account)
   callback->proc = NULL;
   callback->context = NULL;
 
-  return mutt_sasl_callbacks;
+  return MuttSaslCallbacks;
 }
 
 /**

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 9338d551a9126d87881b8881ac20c6a0c9886c53..ebc1fa09ab55afcab4d411b64497979821d26429 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -511,7 +511,7 @@ static int ssl_init(void)
 /* load entropy from egd sockets */
 #ifdef HAVE_RAND_EGD
     add_entropy(getenv("EGDSOCKET"));
-    snprintf(path, sizeof(path), "%s/.entropy", NONULL(Homedir));
+    snprintf(path, sizeof(path), "%s/.entropy", NONULL(HomeDir));
     add_entropy(path);
     add_entropy("/tmp/entropy");
 #endif

diff --git a/muttlib.c b/muttlib.c
index 72ebadc7d0ead365a31f7cdcb2ef42ff1c8f855b..43b8fd8ac5ec8752367346aa087b0b24af6a8ae8 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -112,7 +112,7 @@ void mutt_adv_mktemp(char *s, size_t l)
   {
     strfcpy(prefix, s, sizeof(prefix));
     mutt_sanitize_filename(prefix, 1);
-    snprintf(s, l, "%s/%s", NONULL(Tempdir), prefix);
+    snprintf(s, l, "%s/%s", NONULL(TempDir), prefix);
     if (lstat(s, &sb) == -1 && errno == ENOENT)
       return;
 
@@ -455,7 +455,7 @@ char *_mutt_expand_path(char *s, size_t slen, int rx)
       {
         if (*(s + 1) == '/' || *(s + 1) == 0)
         {
-          strfcpy(p, NONULL(Homedir), sizeof(p));
+          strfcpy(p, NONULL(HomeDir), sizeof(p));
           tail = s + 1;
         }
         else
@@ -558,7 +558,7 @@ char *_mutt_expand_path(char *s, size_t slen, int rx)
         }
         else
         {
-          strfcpy(p, NONULL(Spoolfile), sizeof(p));
+          strfcpy(p, NONULL(SpoolFile), sizeof(p));
           tail = s + 1;
         }
       }
@@ -872,7 +872,7 @@ uint64_t mutt_rand64(void)
 void _mutt_mktemp(char *s, size_t slen, const char *prefix, const char *suffix,
                   const char *src, int line)
 {
-  size_t n = snprintf(s, slen, "%s/%s-%s-%d-%d-%" PRIu64 "%s%s", NONULL(Tempdir),
+  size_t n = snprintf(s, slen, "%s/%s-%s-%d-%d-%" PRIu64 "%s%s", NONULL(TempDir),
                       NONULL(prefix), NONULL(Hostname), (int) getuid(), (int) getpid(),
                       mutt_rand64(), suffix ? "." : "", NONULL(suffix));
   if (n >= slen)
@@ -969,7 +969,7 @@ void mutt_pretty_mailbox(char *s, size_t buflen)
     *s++ = '=';
     memmove(s, s + len, mutt_strlen(s + len) + 1);
   }
-  else if ((mutt_strncmp(s, Homedir, (len = mutt_strlen(Homedir))) == 0) && s[len] == '/')
+  else if ((mutt_strncmp(s, HomeDir, (len = mutt_strlen(HomeDir))) == 0) && s[len] == '/')
   {
     *s++ = '~';
     memmove(s, s + len - 1, mutt_strlen(s + len - 1) + 1);

diff --git a/mx.c b/mx.c
index 29bc0f9a26766ed29804eed0974343cd2e9a3dc3..a31fbd159558cbc68c5b17ed33377144489677d4 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -109,7 +109,7 @@ struct MxOps *mx_get_ops(int magic)
   }
 }
 
-#define mutt_is_spool(s) (mutt_strcmp(Spoolfile, s) == 0)
+#define mutt_is_spool(s) (mutt_strcmp(SpoolFile, s) == 0)
 
 /**
  * mx_lock_file - (try to) lock a file

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 8601630cb76ff47ea52bc5e62aa9bb279b33a548..d6d7c4e98f753a48da3dda8c4f170383b21d0e11 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -2153,7 +2153,7 @@ static int pgp_gpgme_extract_keys(gpgme_data_t keydata, FILE **fp, int dryrun)
 
   if (dryrun)
   {
-    snprintf(tmpdir, sizeof(tmpdir), "%s/mutt-gpgme-XXXXXX", Tempdir);
+    snprintf(tmpdir, sizeof(tmpdir), "%s/mutt-gpgme-XXXXXX", TempDir);
     if (!mkdtemp(tmpdir))
     {
       mutt_debug(1, "Error creating temporary GPGME home\n");

diff --git a/pop.c b/pop.c
index 060baadb722f4b8890f9fe18a12a7161bd74aea6..1c4014faae1568d77492ca416b6e1a3eb7284ca4 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -889,7 +889,7 @@ void pop_fetch_mail(void)
     goto finish;
   }
 
-  if (mx_open_mailbox(NONULL(Spoolfile), MUTT_APPEND, &ctx) == NULL)
+  if (mx_open_mailbox(NONULL(SpoolFile), MUTT_APPEND, &ctx) == NULL)
     goto finish;
 
   delanswer =

diff --git a/send.c b/send.c
index 734b56cf304a03033ce2ed612853c574f97adea1..fc41997f8f6274a05427f48229dcc879e3100ea0 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1648,7 +1648,7 @@ int ci_send_message(int flags, struct Header *msg, char *tempfile,
   /* wait until now to set the real name portion of our return address so
      that $realname can be set in a send-hook */
   if (msg->env->from && !msg->env->from->personal && !(flags & (SENDRESEND | SENDPOSTPONED)))
-    msg->env->from->personal = safe_strdup(Realname);
+    msg->env->from->personal = safe_strdup(RealName);
 
   if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
     safe_fclose(&tempfp);

diff --git a/sendlib.c b/sendlib.c
index c50b5a6d9fbbcdd48682b61ce52f79f02d76f66a..72f5ac8cfed178e057cadb2954271d81187e64aa 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1014,7 +1014,7 @@ int mutt_lookup_mime_type(struct Body *att, const char *path)
         strfcpy(buf, PKGDATADIR "/mime.types", sizeof(buf));
         break;
       case 3:
-        snprintf(buf, sizeof(buf), "%s/.mime.types", NONULL(Homedir));
+        snprintf(buf, sizeof(buf), "%s/.mime.types", NONULL(HomeDir));
         break;
       default:
         mutt_debug(1, "mutt_lookup_mime_type: Internal error, count = %d.\n", count);
@@ -2770,7 +2770,7 @@ int mutt_bounce_message(FILE *fp, struct Header *h, struct Address *to)
    * upon message criteria.
    */
   if (!from->personal)
-    from->personal = safe_strdup(Realname);
+    from->personal = safe_strdup(RealName);
 
   if (fqdn)
     rfc822_qualify(from, fqdn);

diff --git a/sidebar.c b/sidebar.c
index 868c400cbb55061c3f19fc56b4dedf0b2c62c8f4..438a137ca8ef317a1ea84cc0809190ca9500bef6 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -828,7 +828,7 @@ static void draw_sidebar(int num_rows, int num_cols, int div_width)
     else if (b->msg_flagged > 0)
       SETCOLOR(MT_COLOR_FLAGGED);
     else if ((ColorDefs[MT_COLOR_SB_SPOOLFILE] != 0) &&
-             (mutt_strcmp(b->path, Spoolfile) == 0))
+             (mutt_strcmp(b->path, SpoolFile) == 0))
       SETCOLOR(MT_COLOR_SB_SPOOLFILE);
     else
     {

diff --git a/url.c b/url.c
index 238dec5b1b497626c3a0eaf94c170c71b5ca5dc2..eb610054429010c90e74d0b91d9743caf28ec6d2 100644 (file)
--- a/url.c
+++ b/url.c
@@ -315,7 +315,7 @@ int url_parse_mailto(struct Envelope *e, char **body, const char *src)
      * choose to create a message with only a subset of the headers given in
      * the URL.
      */
-    if (mutt_matches_list(tag, MailtoAllow))
+    if (mutt_matches_list(tag, MailToAllow))
     {
       if (ascii_strcasecmp(tag, "body") == 0)
       {