return r

diff --git a/color.c b/color.c
index ae69be6168e38598e8961fe947163e3d40fc845a..e8b1dce73dc7fa0561cc569e4013c62d3f5c6727 100644 (file)
--- a/color.c
+++ b/color.c
@@ -1024,7 +1024,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
                                       bool dry_run, bool color)
 {
   int object = 0, attr = 0, fg = 0, bg = 0, q_level = 0, match = 0;
-  enum CommandResult r = MUTT_CMD_SUCCESS;
+  enum CommandResult rc = MUTT_CMD_SUCCESS;
 
   if (parse_object(buf, s, &object, &q_level, err) == -1)
     return MUTT_CMD_ERROR;
@@ -1082,11 +1082,11 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
 #endif
 
   if (object == MT_COLOR_HEADER)
-    r = add_pattern(&ColorHdrList, buf->data, false, fg, bg, attr, err, false, match);
+    rc = add_pattern(&ColorHdrList, buf->data, false, fg, bg, attr, err, false, match);
   else if (object == MT_COLOR_BODY)
-    r = add_pattern(&ColorBodyList, buf->data, true, fg, bg, attr, err, false, match);
+    rc = add_pattern(&ColorBodyList, buf->data, true, fg, bg, attr, err, false, match);
   else if (object == MT_COLOR_ATTACH_HEADERS)
-    r = add_pattern(&ColorAttachList, buf->data, true, fg, bg, attr, err, false, match);
+    rc = add_pattern(&ColorAttachList, buf->data, true, fg, bg, attr, err, false, match);
   else if ((object == MT_COLOR_STATUS) && MoreArgs(s))
   {
     /* 'color status fg bg' can have up to 2 arguments:
@@ -1110,31 +1110,31 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
       return MUTT_CMD_WARNING;
     }
 
-    r = add_pattern(&ColorStatusList, buf->data, true, fg, bg, attr, err, false, match);
+    rc = add_pattern(&ColorStatusList, buf->data, true, fg, bg, attr, err, false, match);
   }
   else if (object == MT_COLOR_INDEX)
   {
-    r = add_pattern(&ColorIndexList, buf->data, true, fg, bg, attr, err, true, match);
+    rc = add_pattern(&ColorIndexList, buf->data, true, fg, bg, attr, err, true, match);
     mutt_menu_set_redraw_full(MENU_MAIN);
   }
   else if (object == MT_COLOR_INDEX_AUTHOR)
   {
-    r = add_pattern(&ColorIndexAuthorList, buf->data, true, fg, bg, attr, err, true, match);
+    rc = add_pattern(&ColorIndexAuthorList, buf->data, true, fg, bg, attr, err, true, match);
     mutt_menu_set_redraw_full(MENU_MAIN);
   }
   else if (object == MT_COLOR_INDEX_FLAGS)
   {
-    r = add_pattern(&ColorIndexFlagsList, buf->data, true, fg, bg, attr, err, true, match);
+    rc = add_pattern(&ColorIndexFlagsList, buf->data, true, fg, bg, attr, err, true, match);
     mutt_menu_set_redraw_full(MENU_MAIN);
   }
   else if (object == MT_COLOR_INDEX_SUBJECT)
   {
-    r = add_pattern(&ColorIndexSubjectList, buf->data, true, fg, bg, attr, err, true, match);
+    rc = add_pattern(&ColorIndexSubjectList, buf->data, true, fg, bg, attr, err, true, match);
     mutt_menu_set_redraw_full(MENU_MAIN);
   }
   else if (object == MT_COLOR_INDEX_TAG)
   {
-    r = add_pattern(&ColorIndexTagList, buf->data, true, fg, bg, attr, err, true, match);
+    rc = add_pattern(&ColorIndexTagList, buf->data, true, fg, bg, attr, err, true, match);
     mutt_menu_set_redraw_full(MENU_MAIN);
   }
   else if (object == MT_COLOR_QUOTED)
@@ -1168,7 +1168,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
       mutt_menu_set_redraw_full(MENU_MAIN);
   }
 
-  return r;
+  return rc;
 }
 
 #ifdef HAVE_COLOR

diff --git a/copy.c b/copy.c
index 5be1bf594380f2dbfc6e12727a3334d537d8ef47..aa11cdefdda4c0a96524ad128d115b7536345170 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -807,14 +807,14 @@ int mutt_copy_message_ctx(FILE *fp_out, struct Mailbox *src, struct Email *e,
     return -1;
   if (!e->content)
     return -1;
-  int r = mutt_copy_message_fp(fp_out, msg->fp, e, cmflags, chflags);
-  if ((r == 0) && (ferror(fp_out) || feof(fp_out)))
+  int rc = mutt_copy_message_fp(fp_out, msg->fp, e, cmflags, chflags);
+  if ((rc == 0) && (ferror(fp_out) || feof(fp_out)))
   {
     mutt_debug(LL_DEBUG1, "failed to detect EOF!\n");
-    r = -1;
+    rc = -1;
   }
   mx_msg_close(src, &msg);
-  return r;
+  return rc;
 }
 
 /**
@@ -833,7 +833,7 @@ static int append_message(struct Mailbox *dest, FILE *fp_in, struct Mailbox *src
 {
   char buf[256];
   struct Message *msg = NULL;
-  int r;
+  int rc;
 
   if (fseeko(fp_in, e->offset, SEEK_SET) < 0)
     return -1;
@@ -846,9 +846,9 @@ static int append_message(struct Mailbox *dest, FILE *fp_in, struct Mailbox *src
   if (dest->magic == MUTT_MBOX || dest->magic == MUTT_MMDF)
     chflags |= CH_FROM | CH_FORCE_FROM;
   chflags |= (dest->magic == MUTT_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
-  r = mutt_copy_message_fp(msg->fp, fp_in, e, cmflags, chflags);
+  rc = mutt_copy_message_fp(msg->fp, fp_in, e, cmflags, chflags);
   if (mx_msg_commit(dest, msg) != 0)
-    r = -1;
+    rc = -1;
 
 #ifdef USE_NOTMUCH
   if (msg->committed_path && dest->magic == MUTT_MAILDIR && src->magic == MUTT_NOTMUCH)
@@ -856,7 +856,7 @@ static int append_message(struct Mailbox *dest, FILE *fp_in, struct Mailbox *src
 #endif
 
   mx_msg_close(dest, &msg);
-  return r;
+  return rc;
 }
 
 /**
@@ -875,9 +875,9 @@ int mutt_append_message(struct Mailbox *dest, struct Mailbox *src, struct Email
   struct Message *msg = mx_msg_open(src, e->msgno);
   if (!msg)
     return -1;
-  int r = append_message(dest, msg->fp, src, e, cmflags, chflags);
+  int rc = append_message(dest, msg->fp, src, e, cmflags, chflags);
   mx_msg_close(src, &msg);
-  return r;
+  return rc;
 }
 
 /**

diff --git a/imap/auth.c b/imap/auth.c
index 803410fd9b98aba932a8103143beb86280cc0230..04d30d18d9929befedc06bc9aef68f2b844fafaa 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -66,7 +66,7 @@ static const struct ImapAuth imap_authenticators[] = {
  */
 int imap_authenticate(struct ImapAccountData *adata)
 {
-  int r = IMAP_AUTH_FAILURE;
+  int rc = IMAP_AUTH_FAILURE;
 
   if (C_ImapAuthenticators && *C_ImapAuthenticators)
   {
@@ -91,11 +91,11 @@ int imap_authenticate(struct ImapAccountData *adata)
         const struct ImapAuth *auth = &imap_authenticators[i];
         if (!auth->method || (mutt_str_strcasecmp(auth->method, method) == 0))
         {
-          r = auth->authenticate(adata, method);
-          if (r == IMAP_AUTH_SUCCESS)
+          rc = auth->authenticate(adata, method);
+          if (rc == IMAP_AUTH_SUCCESS)
           {
             FREE(&methods);
-            return r;
+            return rc;
           }
         }
       }
@@ -110,12 +110,12 @@ int imap_authenticate(struct ImapAccountData *adata)
 
     for (size_t i = 0; i < mutt_array_size(imap_authenticators); ++i)
     {
-      r = imap_authenticators[i].authenticate(adata, NULL);
-      if (r == IMAP_AUTH_SUCCESS)
-        return r;
+      rc = imap_authenticators[i].authenticate(adata, NULL);
+      if (rc == IMAP_AUTH_SUCCESS)
+        return rc;
     }
   }
 
   mutt_error(_("No authenticators available or wrong credentials"));
-  return r;
+  return rc;
 }

diff --git a/imap/message.c b/imap/message.c
index cb917c11b8c2bd0c4d93ca7b800c21fea2a653a6..5bab2fec9e01f9f63490a694944be0ae2032f2a7 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -2027,9 +2027,9 @@ bail:
  */
 int imap_msg_commit(struct Mailbox *m, struct Message *msg)
 {
-  int r = mutt_file_fclose(&msg->fp);
-  if (r != 0)
-    return r;
+  int rc = mutt_file_fclose(&msg->fp);
+  if (rc != 0)
+    return rc;
 
   return imap_append_message(m, msg);
 }

diff --git a/init.c b/init.c
index aea5087a90e7786ed3f45ae74594c43abeacfdd0..7c07bb282c200e65c36b2c6017134b928eeef694 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3282,7 +3282,7 @@ enum CommandResult mutt_parse_rc_line(/* const */ char *line,
                                       struct Buffer *token, struct Buffer *err)
 {
   int i;
-  enum CommandResult r = MUTT_CMD_SUCCESS;
+  enum CommandResult rc = MUTT_CMD_SUCCESS;
   struct Buffer expn;
 
   if (!line || !*line)
@@ -3310,8 +3310,8 @@ enum CommandResult mutt_parse_rc_line(/* const */ char *line,
     {
       if (mutt_str_strcmp(token->data, Commands[i].name) == 0)
       {
-        r = Commands[i].func(token, &expn, Commands[i].data, err);
-        if (r != MUTT_CMD_SUCCESS)
+        rc = Commands[i].func(token, &expn, Commands[i].data, err);
+        if (rc != MUTT_CMD_SUCCESS)
         {              /* -1 Error, +1 Finish */
           goto finish; /* Propagate return code */
         }
@@ -3321,14 +3321,14 @@ enum CommandResult mutt_parse_rc_line(/* const */ char *line,
     if (!Commands[i].name)
     {
       mutt_buffer_printf(err, _("%s: unknown command"), NONULL(token->data));
-      r = MUTT_CMD_ERROR;
+      rc = MUTT_CMD_ERROR;
       break; /* Ignore the rest of the line */
     }
   }
 finish:
   if (expn.destroy)
     FREE(&expn.data);
-  return r;
+  return rc;
 }
 
 /**

diff --git a/keymap.c b/keymap.c
index ee3499ba3ddaff1f47b0a27bdedd6172c9bd93f3..ee3428e72e49c6b4ef2b54b61930924e0d05462c 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -1251,7 +1251,7 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s,
 {
   const struct Binding *bindings = NULL;
   int menu[sizeof(Menus) / sizeof(struct Mapping) - 1], nummenus;
-  enum CommandResult r = MUTT_CMD_SUCCESS;
+  enum CommandResult rc = MUTT_CMD_SUCCESS;
 
   char *key = parse_keymap(menu, s, mutt_array_size(menu), &nummenus, err, true);
   if (!key)
@@ -1262,7 +1262,7 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s,
   if (MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), "bind");
-    r = MUTT_CMD_ERROR;
+    rc = MUTT_CMD_ERROR;
   }
   else if (mutt_str_strcasecmp("noop", buf->data) == 0)
   {
@@ -1279,10 +1279,10 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s,
        * however for other menus try generic first. */
       if ((menu[i] != MENU_PAGER) && (menu[i] != MENU_EDITOR) && (menu[i] != MENU_GENERIC))
       {
-        r = try_bind(key, menu[i], buf->data, OpGeneric, err);
-        if (r == 0)
+        rc = try_bind(key, menu[i], buf->data, OpGeneric, err);
+        if (rc == 0)
           continue;
-        if (r == -2)
+        if (rc == -2)
           break;
       }
 
@@ -1291,12 +1291,12 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s,
       bindings = km_get_table(menu[i]);
       if (bindings)
       {
-        r = try_bind(key, menu[i], buf->data, bindings, err);
+        rc = try_bind(key, menu[i], buf->data, bindings, err);
       }
     }
   }
   FREE(&key);
-  return r;
+  return rc;
 }
 
 /**
@@ -1308,7 +1308,7 @@ enum CommandResult mutt_parse_macro(struct Buffer *buf, struct Buffer *s,
                                     unsigned long data, struct Buffer *err)
 {
   int menu[sizeof(Menus) / sizeof(struct Mapping) - 1], nummenus;
-  enum CommandResult r = MUTT_CMD_ERROR;
+  enum CommandResult rc = MUTT_CMD_ERROR;
   char *seq = NULL;
 
   char *key = parse_keymap(menu, s, mutt_array_size(menu), &nummenus, err, false);
@@ -1336,7 +1336,7 @@ enum CommandResult mutt_parse_macro(struct Buffer *buf, struct Buffer *s,
       {
         for (int i = 0; i < nummenus; ++i)
         {
-          r = km_bind(key, menu[i], OP_MACRO, seq, buf->data);
+          rc = km_bind(key, menu[i], OP_MACRO, seq, buf->data);
         }
       }
 
@@ -1346,12 +1346,12 @@ enum CommandResult mutt_parse_macro(struct Buffer *buf, struct Buffer *s,
     {
       for (int i = 0; i < nummenus; ++i)
       {
-        r = km_bind(key, menu[i], OP_MACRO, buf->data, NULL);
+        rc = km_bind(key, menu[i], OP_MACRO, buf->data, NULL);
       }
     }
   }
   FREE(&key);
-  return r;
+  return rc;
 }
 
 /**

diff --git a/maildir/shared.c b/maildir/shared.c
index e1d9b333b39a3d7e8d165057514553f655419592..0ceb09dab1d13a0ff870fe0feebcee7ec2f1488f 100644 (file)
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -475,9 +475,9 @@ static int maildir_add_to_context(struct Mailbox *m, struct Maildir *md)
  */
 int maildir_move_to_context(struct Mailbox *m, struct Maildir **md)
 {
-  int r = maildir_add_to_context(m, *md);
+  int num = maildir_add_to_context(m, *md);
   maildir_free_maildir(md);
-  return r;
+  return num;
 }
 
 #ifdef USE_HCACHE
@@ -1627,7 +1627,7 @@ int maildir_check_empty(const char *path)
 {
   DIR *dp = NULL;
   struct dirent *de = NULL;
-  int r = 1; /* assume empty until we find a message */
+  int rc = 1; /* assume empty until we find a message */
   char realpath[PATH_MAX];
   int iter = 0;
 
@@ -1646,15 +1646,15 @@ int maildir_check_empty(const char *path)
     {
       if (*de->d_name != '.')
       {
-        r = 0;
+        rc = 0;
         break;
       }
     }
     closedir(dp);
     iter++;
-  } while (r && iter < 2);
+  } while (rc && iter < 2);
 
-  return r;
+  return rc;
 }
 
 /**
@@ -1667,7 +1667,7 @@ int maildir_check_empty(const char *path)
 int mh_check_empty(const char *path)
 {
   struct dirent *de = NULL;
-  int r = 1; /* assume empty until we find a message */
+  int rc = 1; /* assume empty until we find a message */
 
   DIR *dp = opendir(path);
   if (!dp)
@@ -1676,13 +1676,13 @@ int mh_check_empty(const char *path)
   {
     if (mh_valid_message(de->d_name))
     {
-      r = 0;
+      rc = 0;
       break;
     }
   }
   closedir(dp);
 
-  return r;
+  return rc;
 }
 
 /**

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 8d63370a83a6cee6a89c784bed9ec9912c52c3fb..ad768a2cebd6c0dc28f3bbf9122f8ffd0036ac33 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -141,8 +141,8 @@ static int mbox_lock_mailbox(struct Mailbox *m, bool excl, bool retry)
   if (!adata)
     return -1;
 
-  int r = mutt_file_lock(fileno(adata->fp), excl, retry);
-  if (r == 0)
+  int rc = mutt_file_lock(fileno(adata->fp), excl, retry);
+  if (rc == 0)
     adata->locked = true;
   else if (retry && !excl)
   {
@@ -150,7 +150,7 @@ static int mbox_lock_mailbox(struct Mailbox *m, bool excl, bool retry)
     return 0;
   }
 
-  return r;
+  return rc;
 }
 
 /**

diff --git a/mutt/file.c b/mutt/file.c
index d1412872110a028d95d2ac8ce4d68eac95c0ea90..c9e68bb8c8b3a3ba9b01140abe5a4f64cf5e695d 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -151,9 +151,9 @@ int mutt_file_fclose(FILE **fp)
   if (!fp || !*fp)
     return 0;
 
-  int r = fclose(*fp);
+  int rc = fclose(*fp);
   *fp = NULL;
-  return r;
+  return rc;
 }
 
 /**
@@ -167,19 +167,19 @@ int mutt_file_fsync_close(FILE **fp)
   if (!fp || !*fp)
     return 0;
 
-  int r = 0;
+  int rc = 0;
 
   if (fflush(*fp) || fsync(fileno(*fp)))
   {
     int save_errno = errno;
-    r = -1;
+    rc = -1;
     mutt_file_fclose(fp);
     errno = save_errno;
   }
   else
-    r = mutt_file_fclose(fp);
+    rc = mutt_file_fclose(fp);
 
-  return r;
+  return rc;
 }
 
 /**

diff --git a/mutt/regex.c b/mutt/regex.c
index a06b99244dc3a9a1e31bab6e860a9d75192be812..8ee9079a3a438140dc8feaac392414c96e3b69ea 100644 (file)
--- a/mutt/regex.c
+++ b/mutt/regex.c
@@ -50,13 +50,13 @@
  */
 struct Regex *mutt_regex_compile(const char *str, int flags)
 {
-  struct Regex *r = mutt_mem_calloc(1, sizeof(struct Regex));
-  r->pattern = mutt_str_strdup(str);
-  r->regex = mutt_mem_calloc(1, sizeof(regex_t));
-  if (REGCOMP(r->regex, NONULL(str), flags) != 0)
-    mutt_regex_free(&r);
+  struct Regex *rx = mutt_mem_calloc(1, sizeof(struct Regex));
+  rx->pattern = mutt_str_strdup(str);
+  rx->regex = mutt_mem_calloc(1, sizeof(regex_t));
+  if (REGCOMP(rx->regex, NONULL(str), flags) != 0)
+    mutt_regex_free(&rx);
 
-  return r;
+  return rx;
 }
 
 /**

diff --git a/mutt_attach.c b/mutt_attach.c
index 25062aec0fc5faa47481dc91d4b9443505346b51..0553bf4cb2ca0b324a40540bdbf612a015889759 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -801,7 +801,7 @@ int mutt_save_attachment(FILE *fp, struct Body *m, char *path, int flags, struct
       char buf[8192];
       struct Message *msg = NULL;
       CopyHeaderFlags chflags = CH_NO_FLAGS;
-      int r = -1;
+      int rc = -1;
 
       struct Email *en = m->email;
       en->msgno = e->msgno; /* required for MH/maildir */
@@ -830,16 +830,16 @@ int mutt_save_attachment(FILE *fp, struct Body *m, char *path, int flags, struct
       if ((mutt_copy_message_fp(msg->fp, fp, en, 0, chflags) == 0) &&
           (mx_msg_commit(ctx->mailbox, msg) == 0))
       {
-        r = 0;
+        rc = 0;
       }
       else
       {
-        r = -1;
+        rc = -1;
       }
 
       mx_msg_close(ctx->mailbox, &msg);
       mx_mbox_close(&ctx);
-      return r;
+      return rc;
     }
     else
     {

diff --git a/mx.c b/mx.c
index 1bf57a393bea19009dea6eb7a0633cf0ebb85a53..5a4b3393a2eb4285a932c0bc693a8b6366fef1f0 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1062,10 +1062,10 @@ int mx_msg_close(struct Mailbox *m, struct Message **msg)
   if (!m || !msg || !*msg)
     return 0;
 
-  int r = 0;
+  int rc = 0;
 
   if (m->mx_ops && m->mx_ops->msg_close)
-    r = m->mx_ops->msg_close(m, *msg);
+    rc = m->mx_ops->msg_close(m, *msg);
 
   if ((*msg)->path)
   {
@@ -1076,7 +1076,7 @@ int mx_msg_close(struct Mailbox *m, struct Message **msg)
 
   FREE(&(*msg)->committed_path);
   FREE(msg);
-  return r;
+  return rc;
 }
 
 /**

diff --git a/smtp.c b/smtp.c
index 9e62f921916cea46980f1df2974aa30380e1a97b..1cf6c11db1ba07e2360648b9ca88100e67a667a4 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -170,7 +170,7 @@ static int smtp_get_resp(struct Connection *conn)
 static int smtp_rcpt_to(struct Connection *conn, const struct Address *a)
 {
   char buf[1024];
-  int r;
+  int rc;
 
   while (a)
   {
@@ -186,9 +186,9 @@ static int smtp_rcpt_to(struct Connection *conn, const struct Address *a)
       snprintf(buf, sizeof(buf), "RCPT TO:<%s>\r\n", a->mailbox);
     if (mutt_socket_send(conn, buf) == -1)
       return SMTP_ERR_WRITE;
-    r = smtp_get_resp(conn);
-    if (r != 0)
-      return r;
+    rc = smtp_get_resp(conn);
+    if (rc != 0)
+      return rc;
     a = a->next;
   }
 
@@ -207,7 +207,7 @@ static int smtp_data(struct Connection *conn, const char *msgfile)
   char buf[1024];
   struct Progress progress;
   struct stat st;
-  int r, term = 0;
+  int rc, term = 0;
   size_t buflen = 0;
 
   FILE *fp = fopen(msgfile, "r");
@@ -227,11 +227,11 @@ static int smtp_data(struct Connection *conn, const char *msgfile)
     mutt_file_fclose(&fp);
     return SMTP_ERR_WRITE;
   }
-  r = smtp_get_resp(conn);
-  if (r != 0)
+  rc = smtp_get_resp(conn);
+  if (rc != 0)
   {
     mutt_file_fclose(&fp);
-    return r;
+    return rc;
   }
 
   while (fgets(buf, sizeof(buf) - 1, fp))
@@ -266,9 +266,9 @@ static int smtp_data(struct Connection *conn, const char *msgfile)
   if (mutt_socket_send(conn, ".\r\n") == -1)
     return SMTP_ERR_WRITE;
 
-  r = smtp_get_resp(conn);
-  if (r != 0)
-    return r;
+  rc = smtp_get_resp(conn);
+  if (rc != 0)
+    return rc;
 
   return 0;
 }