fix variable names

diff --git a/curs_main.c b/curs_main.c
index 4ad2048748dd735311a957d927355d155c96ac01..05930b5bbd445813cb7591f0db794c82ad7785d1 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -83,7 +83,7 @@ static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 static const char *Function_not_permitted_in_attach_message_mode =
     N_("Function not permitted in attach-message mode.");
-static const char *No_visible = N_("No visible messages.");
+static const char *NoVisible = N_("No visible messages.");
 
 #define CHECK_IN_MAILBOX                                                       \
   if (!Context)                                                                \
@@ -111,7 +111,7 @@ static const char *No_visible = N_("No visible messages.");
   if (Context && menu->current >= Context->vcount)                             \
   {                                                                            \
     mutt_flushinp();                                                           \
-    mutt_error(_(No_visible));                                                 \
+    mutt_error(_(NoVisible));                                                 \
     break;                                                                     \
   }
 

diff --git a/handler.c b/handler.c
index 737e8a9ee73cd37f1ea77e564d5f0ca0f4ded08f..d11485c2473e3bd327d3abef2aaa89e4c08a92a6 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -62,7 +62,7 @@
 typedef int (*handler_t)(struct Body *b, struct State *s);
 
 // clang-format off
-const int Index_hex[128] = {
+const int IndexHex[128] = {
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

diff --git a/imap/utf7.c b/imap/utf7.c
index a3ef996a07ff7a7e35d99aa55c4b090bac59a40a..315e61f4c89ea06e167e5c045125e3b944a7ce31 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -40,14 +40,14 @@
 
 // clang-format off
 /**
- * Index_64u - Lookup table for Base64 encoding/decoding
+ * Index64u - Lookup table for Base64 encoding/decoding
  *
  * This is very similar to the table in lib/lib_base64.c
  * Encoding chars:
  *   utf7 A-Za-z0-9+,
  *   mime A-Za-z0-9+/
  */
-const int Index_64u[128] = {
+const int Index64u[128] = {
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, 63,-1,-1,-1,
@@ -110,7 +110,7 @@ static char *utf7_to_utf8(const char *u7, size_t u7len, char **u8, size_t *u8len
       k = 10;
       for (; u7len; u7++, u7len--)
       {
-        if ((*u7 & 0x80) || (b = Index_64u[(int) *u7]) == -1)
+        if ((*u7 & 0x80) || (b = Index64u[(int) *u7]) == -1)
           break;
         if (k > 0)
         {

diff --git a/init.c b/init.c
index 1a0fda6428aa7564a5f8d2d0b5bc7480f777053d..612954ebdd01fe9ed20caea929591bf54610d6f8 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3366,27 +3366,27 @@ finish:
 
 /* initial string that starts completion. No telling how much crap
  * the user has typed so far. Allocate LONG_STRING just to be sure! */
-static char User_typed[LONG_STRING] = { 0 };
+static char UserTyped[LONG_STRING] = { 0 };
 
-static int Num_matched = 0;            /* Number of matches for completion */
+static int NumMatched = 0;            /* Number of matches for completion */
 static char Completed[STRING] = { 0 }; /* completed string (command or variable) */
 static const char **Matches;
 /* this is a lie until mutt_init runs: */
-static int Matches_listsize = MAX(NUMVARS, NUMCOMMANDS) + 10;
+static int MatchesListsize = MAX(NUMVARS, NUMCOMMANDS) + 10;
 
 static void matches_ensure_morespace(int current)
 {
   int base_space, extra_space, space;
 
-  if (current > Matches_listsize - 2)
+  if (current > MatchesListsize - 2)
   {
     base_space = MAX(NUMVARS, NUMCOMMANDS) + 1;
-    extra_space = Matches_listsize - base_space;
+    extra_space = MatchesListsize - base_space;
     extra_space *= 2;
     space = base_space + extra_space;
     mutt_mem_realloc(&Matches, space * sizeof(char *));
     memset(&Matches[current + 1], 0, space - current);
-    Matches_listsize = space;
+    MatchesListsize = space;
   }
 }
 
@@ -3406,8 +3406,8 @@ static void candidate(char *dest, char *try, const char *src, int len)
 
   if (strstr(src, try) == src)
   {
-    matches_ensure_morespace(Num_matched);
-    Matches[Num_matched++] = src;
+    matches_ensure_morespace(NumMatched);
+    Matches[NumMatched++] = src;
     if (dest[0] == 0)
       mutt_str_strfcpy(dest, src, len);
     else
@@ -3455,31 +3455,31 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1)
     {
-      Num_matched = 0;
-      mutt_str_strfcpy(User_typed, pt, sizeof(User_typed));
-      memset(Matches, 0, Matches_listsize);
+      NumMatched = 0;
+      mutt_str_strfcpy(UserTyped, pt, sizeof(UserTyped));
+      memset(Matches, 0, MatchesListsize);
       memset(Completed, 0, sizeof(Completed));
       for (num = 0; Commands[num].name; num++)
-        candidate(Completed, User_typed, Commands[num].name, sizeof(Completed));
-      matches_ensure_morespace(Num_matched);
-      Matches[Num_matched++] = User_typed;
+        candidate(Completed, UserTyped, Commands[num].name, sizeof(Completed));
+      matches_ensure_morespace(NumMatched);
+      Matches[NumMatched++] = UserTyped;
 
       /* All matches are stored. Longest non-ambiguous string is ""
        * i.e. don't change 'buffer'. Fake successful return this time */
-      if (User_typed[0] == 0)
+      if (UserTyped[0] == 0)
         return 1;
     }
 
-    if (Completed[0] == 0 && User_typed[0])
+    if (Completed[0] == 0 && UserTyped[0])
       return 0;
 
-    /* Num_matched will _always_ be at least 1 since the initial
+    /* NumMatched will _always_ be at least 1 since the initial
       * user-typed string is always stored */
-    if (numtabs == 1 && Num_matched == 2)
+    if (numtabs == 1 && NumMatched == 2)
       snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-    else if (numtabs > 1 && Num_matched > 2)
+    else if (numtabs > 1 && NumMatched > 2)
       /* cycle thru all the matches */
-      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
     /* return the completed command */
     strncpy(buffer, Completed, len - spaces);
@@ -3508,33 +3508,33 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1)
     {
-      Num_matched = 0;
-      mutt_str_strfcpy(User_typed, pt, sizeof(User_typed));
-      memset(Matches, 0, Matches_listsize);
+      NumMatched = 0;
+      mutt_str_strfcpy(UserTyped, pt, sizeof(UserTyped));
+      memset(Matches, 0, MatchesListsize);
       memset(Completed, 0, sizeof(Completed));
       for (num = 0; MuttVars[num].option; num++)
-        candidate(Completed, User_typed, MuttVars[num].option, sizeof(Completed));
+        candidate(Completed, UserTyped, MuttVars[num].option, sizeof(Completed));
       for (myv = MyVars; myv; myv = myv->next)
-        candidate(Completed, User_typed, myv->name, sizeof(Completed));
-      matches_ensure_morespace(Num_matched);
-      Matches[Num_matched++] = User_typed;
+        candidate(Completed, UserTyped, myv->name, sizeof(Completed));
+      matches_ensure_morespace(NumMatched);
+      Matches[NumMatched++] = UserTyped;
 
       /* All matches are stored. Longest non-ambiguous string is ""
        * i.e. don't change 'buffer'. Fake successful return this time */
-      if (User_typed[0] == 0)
+      if (UserTyped[0] == 0)
         return 1;
     }
 
-    if (Completed[0] == 0 && User_typed[0])
+    if (Completed[0] == 0 && UserTyped[0])
       return 0;
 
-    /* Num_matched will _always_ be at least 1 since the initial
+    /* NumMatched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
-    if (numtabs == 1 && Num_matched == 2)
+    if (numtabs == 1 && NumMatched == 2)
       snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-    else if (numtabs > 1 && Num_matched > 2)
+    else if (numtabs > 1 && NumMatched > 2)
       /* cycle thru all the matches */
-      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
     strncpy(pt, Completed, buffer + len - pt - spaces);
   }
@@ -3549,38 +3549,38 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs)
     /* first TAB. Collect all the matches */
     if (numtabs == 1)
     {
-      Num_matched = 0;
-      mutt_str_strfcpy(User_typed, pt, sizeof(User_typed));
-      memset(Matches, 0, Matches_listsize);
+      NumMatched = 0;
+      mutt_str_strfcpy(UserTyped, pt, sizeof(UserTyped));
+      memset(Matches, 0, MatchesListsize);
       memset(Completed, 0, sizeof(Completed));
       for (num = 0; menu[num].name; num++)
-        candidate(Completed, User_typed, menu[num].name, sizeof(Completed));
+        candidate(Completed, UserTyped, menu[num].name, sizeof(Completed));
       /* try the generic menu */
       if (Completed[0] == 0 && CurrentMenu != MENU_PAGER)
       {
         menu = OpGeneric;
         for (num = 0; menu[num].name; num++)
-          candidate(Completed, User_typed, menu[num].name, sizeof(Completed));
+          candidate(Completed, UserTyped, menu[num].name, sizeof(Completed));
       }
-      matches_ensure_morespace(Num_matched);
-      Matches[Num_matched++] = User_typed;
+      matches_ensure_morespace(NumMatched);
+      Matches[NumMatched++] = UserTyped;
 
       /* All matches are stored. Longest non-ambiguous string is ""
        * i.e. don't change 'buffer'. Fake successful return this time */
-      if (User_typed[0] == 0)
+      if (UserTyped[0] == 0)
         return 1;
     }
 
-    if (Completed[0] == 0 && User_typed[0])
+    if (Completed[0] == 0 && UserTyped[0])
       return 0;
 
-    /* Num_matched will _always_ be at least 1 since the initial
+    /* NumMatched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
-    if (numtabs == 1 && Num_matched == 2)
+    if (numtabs == 1 && NumMatched == 2)
       snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-    else if (numtabs > 1 && Num_matched > 2)
+    else if (numtabs > 1 && NumMatched > 2)
       /* cycle thru all the matches */
-      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
     strncpy(pt, Completed, buffer + len - pt - spaces);
   }
@@ -3651,9 +3651,9 @@ static int complete_all_nm_tags(const char *pt)
   int tag_count_1 = 0;
   int tag_count_2 = 0;
 
-  Num_matched = 0;
-  mutt_str_strfcpy(User_typed, pt, sizeof(User_typed));
-  memset(Matches, 0, Matches_listsize);
+  NumMatched = 0;
+  mutt_str_strfcpy(UserTyped, pt, sizeof(UserTyped));
+  memset(Matches, 0, MatchesListsize);
   memset(Completed, 0, sizeof(Completed));
 
   nm_longrun_init(Context, false);
@@ -3685,11 +3685,11 @@ static int complete_all_nm_tags(const char *pt)
   /* Put them into the completion machinery. */
   for (int num = 0; num < tag_count_1; num++)
   {
-    candidate(Completed, User_typed, nm_tags[num], sizeof(Completed));
+    candidate(Completed, UserTyped, nm_tags[num], sizeof(Completed));
   }
 
-  matches_ensure_morespace(Num_matched);
-  Matches[Num_matched++] = User_typed;
+  matches_ensure_morespace(NumMatched);
+  Matches[NumMatched++] = UserTyped;
 
 done:
   nm_longrun_done(Context);
@@ -3721,20 +3721,20 @@ bool mutt_nm_query_complete(char *buffer, size_t len, int pos, int numtabs)
       /* All matches are stored. Longest non-ambiguous string is ""
        * i.e. don't change 'buffer'. Fake successful return this time.
        */
-      if (User_typed[0] == 0)
+      if (UserTyped[0] == 0)
         return true;
     }
 
-    if (Completed[0] == 0 && User_typed[0])
+    if (Completed[0] == 0 && UserTyped[0])
       return false;
 
-    /* Num_matched will _always_ be at least 1 since the initial
+    /* NumMatched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
-    if (numtabs == 1 && Num_matched == 2)
+    if (numtabs == 1 && NumMatched == 2)
       snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-    else if (numtabs > 1 && Num_matched > 2)
+    else if (numtabs > 1 && NumMatched > 2)
       /* cycle thru all the matches */
-      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+      snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
     /* return the completed query */
     strncpy(pt, Completed, buffer + len - pt - spaces);
@@ -3774,20 +3774,20 @@ bool mutt_nm_tag_complete(char *buffer, size_t len, int numtabs)
     /* All matches are stored. Longest non-ambiguous string is ""
       * i.e. don't change 'buffer'. Fake successful return this time.
       */
-    if (User_typed[0] == 0)
+    if (UserTyped[0] == 0)
       return true;
   }
 
-  if (Completed[0] == 0 && User_typed[0])
+  if (Completed[0] == 0 && UserTyped[0])
     return false;
 
-  /* Num_matched will _always_ be at least 1 since the initial
+  /* NumMatched will _always_ be at least 1 since the initial
     * user-typed string is always stored */
-  if (numtabs == 1 && Num_matched == 2)
+  if (numtabs == 1 && NumMatched == 2)
     snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-  else if (numtabs > 1 && Num_matched > 2)
+  else if (numtabs > 1 && NumMatched > 2)
     /* cycle thru all the matches */
-    snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+    snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
   /* return the completed query */
   strncpy(pt, Completed, buffer + len - pt);
@@ -4231,7 +4231,7 @@ void mutt_init(int skip_sys_rc, struct ListHead *commands)
   mutt_cs_set_langinfo_charset();
   mutt_set_charset(Charset);
 
-  Matches = mutt_mem_calloc(Matches_listsize, sizeof(char *));
+  Matches = mutt_mem_calloc(MatchesListsize, sizeof(char *));
 
   /* Set standard defaults */
   for (int i = 0; MuttVars[i].option; i++)
@@ -4648,33 +4648,33 @@ int mutt_label_complete(char *buffer, size_t len, int numtabs)
     struct HashElem *entry = NULL;
     struct HashWalkState state;
 
-    Num_matched = 0;
-    mutt_str_strfcpy(User_typed, buffer, sizeof(User_typed));
-    memset(Matches, 0, Matches_listsize);
+    NumMatched = 0;
+    mutt_str_strfcpy(UserTyped, buffer, sizeof(UserTyped));
+    memset(Matches, 0, MatchesListsize);
     memset(Completed, 0, sizeof(Completed));
     memset(&state, 0, sizeof(state));
     while ((entry = mutt_hash_walk(Context->label_hash, &state)))
-      candidate(Completed, User_typed, entry->key.strkey, sizeof(Completed));
-    matches_ensure_morespace(Num_matched);
-    qsort(Matches, Num_matched, sizeof(char *), (sort_t *) mutt_str_strcasecmp);
-    Matches[Num_matched++] = User_typed;
+      candidate(Completed, UserTyped, entry->key.strkey, sizeof(Completed));
+    matches_ensure_morespace(NumMatched);
+    qsort(Matches, NumMatched, sizeof(char *), (sort_t *) mutt_str_strcasecmp);
+    Matches[NumMatched++] = UserTyped;
 
     /* All matches are stored. Longest non-ambiguous string is ""
      * i.e. don't change 'buffer'. Fake successful return this time */
-    if (User_typed[0] == 0)
+    if (UserTyped[0] == 0)
       return 1;
   }
 
-  if (Completed[0] == 0 && User_typed[0])
+  if (Completed[0] == 0 && UserTyped[0])
     return 0;
 
-  /* Num_matched will _always_ be at least 1 since the initial
+  /* NumMatched will _always_ be at least 1 since the initial
     * user-typed string is always stored */
-  if (numtabs == 1 && Num_matched == 2)
+  if (numtabs == 1 && NumMatched == 2)
     snprintf(Completed, sizeof(Completed), "%s", Matches[0]);
-  else if (numtabs > 1 && Num_matched > 2)
+  else if (numtabs > 1 && NumMatched > 2)
     /* cycle thru all the matches */
-    snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % Num_matched]);
+    snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]);
 
   /* return the completed label */
   strncpy(buffer, Completed, len - spaces);

diff --git a/mime.h b/mime.h
index 257757dd22c8b65f203b363af7905265bec666d4..82bf1cfeeafbb2d135566d34a758d359146d7289 100644 (file)
--- a/mime.h
+++ b/mime.h
@@ -67,9 +67,9 @@ enum ContentDisposition
 
 /* MIME encoding/decoding global vars */
 
-extern const int Index_hex[];
+extern const int IndexHex[];
 
-#define hexval(c) Index_hex[(unsigned int) (c)]
+#define hexval(c) IndexHex[(unsigned int) (c)]
 
 #define is_multipart(x)                                                        \
   ((x)->type == TYPEMULTIPART ||                                               \

diff --git a/mutt/base64.c b/mutt/base64.c
index 6efe4edd0fb0cd2e0dc9a96b3f2a7409ed62a8d6..01bbe6f4d4264c0c9a52bc304bcc9f265c460e3e 100644 (file)
--- a/mutt/base64.c
+++ b/mutt/base64.c
@@ -32,7 +32,7 @@
  *
  * | Data               | Description
  * | :----------------- | :--------------------------------------------------
- * | #Index_64          | Lookup table for Base64 encoding characters
+ * | #Index64          | Lookup table for Base64 encoding characters
  *
  * | Function           | Description
  * | :----------------- | :-------------------------------------------------
@@ -58,7 +58,7 @@ static const char B64Chars[64] = {
 
 // clang-format off
 /**
- * Index_64 - Lookup table for Base64 encoding characters
+ * Index64 - Lookup table for Base64 encoding characters
  *
  * @note This is very similar to the table in imap/utf7.c
  *
@@ -66,7 +66,7 @@ static const char B64Chars[64] = {
  * * utf7 A-Za-z0-9+,
  * * mime A-Za-z0-9+/
  */
-const int Index_64[128] = {
+const int Index64[128] = {
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,

diff --git a/mutt/base64.h b/mutt/base64.h
index 2f085e0a38dc5f183e583dd39ef463d295a6b3f4..b688a79a0a2f574e3bfa47cd8f45ac3f7f09489e 100644 (file)
--- a/mutt/base64.h
+++ b/mutt/base64.h
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 
-extern const int Index_64[];
+extern const int Index64[];
 
-#define base64val(c) Index_64[(unsigned int) (c)]
+#define base64val(c) Index64[(unsigned int) (c)]
 
 size_t mutt_b64_encode(char *out, const char *cin, size_t len, size_t olen);
 int    mutt_b64_decode(char *out, const char *in);