return ret

diff --git a/conn/ssl.c b/conn/ssl.c
index 489633dca2fcfab46f0929b776f4b642bc7e4abe..e79cd6802df50c77fd530cd60111a21230f863a2 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -1346,11 +1346,11 @@ static int ssl_socket_open(struct Connection *conn)
   if (raw_socket_open(conn) < 0)
     return -1;
 
-  int ret = ssl_setup(conn);
-  if (ret)
+  int rc = ssl_setup(conn);
+  if (rc)
     raw_socket_close(conn);
 
-  return ret;
+  return rc;
 }
 
 /**
@@ -1429,14 +1429,14 @@ int mutt_ssl_starttls(struct Connection *conn)
   if (ssl_init())
     return -1;
 
-  int ret = ssl_setup(conn);
+  int rc = ssl_setup(conn);
 
   /* hmm. watch out if we're starting TLS over any method other than raw. */
   conn->conn_read = ssl_socket_read;
   conn->conn_write = ssl_socket_write;
   conn->conn_close = ssl_socket_close_and_restore;
 
-  return ret;
+  return rc;
 }
 
 /**

diff --git a/hcache/hcache.c b/hcache/hcache.c
index 6a6f644e1640320370a127c3c4af6b66db340d08..c76456de5a6c68a9cb0ee65a746e01a14ae599b8 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -399,19 +399,17 @@ void mutt_hcache_free(header_cache_t *hc, void **data)
 int mutt_hcache_store(header_cache_t *hc, const char *key, size_t keylen,
                       struct Email *e, unsigned int uidvalidity)
 {
-  char *data = NULL;
-  int dlen;
-  int ret;
-
   if (!hc)
     return -1;
 
-  data = mutt_hcache_dump(hc, e, &dlen, uidvalidity);
-  ret = mutt_hcache_store_raw(hc, key, keylen, data, dlen);
+  int dlen = 0;
+
+  char *data = mutt_hcache_dump(hc, e, &dlen, uidvalidity);
+  int rc = mutt_hcache_store_raw(hc, key, keylen, data, dlen);
 
   FREE(&data);
 
-  return ret;
+  return rc;
 }
 
 /**

diff --git a/muttlib.c b/muttlib.c
index a13631e69f1521ca37cfc0f321e577dcfae535e6..49b5112a50b3bbc0d4880bc8e28fc3dadd81aada 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -520,11 +520,11 @@ void mutt_rand_base32(void *buf, size_t buflen)
  */
 uint32_t mutt_rand32(void)
 {
-  uint32_t ret = 0;
+  uint32_t num = 0;
 
-  if (mutt_randbuf(&ret, sizeof(ret)) < 0)
+  if (mutt_randbuf(&num, sizeof(num)) < 0)
     mutt_exit(1);
-  return ret;
+  return num;
 }
 
 /**
@@ -533,11 +533,11 @@ uint32_t mutt_rand32(void)
  */
 uint64_t mutt_rand64(void)
 {
-  uint64_t ret = 0;
+  uint64_t num = 0;
 
-  if (mutt_randbuf(&ret, sizeof(ret)) < 0)
+  if (mutt_randbuf(&num, sizeof(num)) < 0)
     mutt_exit(1);
-  return ret;
+  return num;
 }
 
 /**

diff --git a/nntp/nntp.c b/nntp/nntp.c
index d59d317e682a713eb928724d1d494cd7350a46d3..925875b716caaca0d9859443abc8c78284d80ad0 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -1552,7 +1552,7 @@ static int check_mailbox(struct Mailbox *m)
   struct NntpMboxData *mdata = m->mdata;
   struct NntpAccountData *adata = mdata->adata;
   time_t now = time(NULL);
-  int rc, ret = 0;
+  int rc = 0;
   void *hc = NULL;
 
   if (adata->check_time + C_NntpPoll > now)
@@ -1563,13 +1563,13 @@ static int check_mailbox(struct Mailbox *m)
     return -1;
 
   adata->check_time = now;
-  rc = nntp_group_poll(mdata, false);
-  if (rc < 0)
+  int rc2 = nntp_group_poll(mdata, false);
+  if (rc2 < 0)
   {
     nntp_newsrc_close(adata);
     return -1;
   }
-  if (rc)
+  if (rc2 != 0)
     nntp_active_save_cache(adata);
 
   /* articles have been renumbered, remove all headers */
@@ -1586,7 +1586,7 @@ static int check_mailbox(struct Mailbox *m)
       if (C_NntpContext && mdata->last_message - mdata->last_loaded > C_NntpContext)
         mdata->last_loaded = mdata->last_message - C_NntpContext;
     }
-    ret = MUTT_REOPENED;
+    rc = MUTT_REOPENED;
   }
 
   /* .newsrc has been externally modified */
@@ -1705,11 +1705,11 @@ static int check_mailbox(struct Mailbox *m)
 #endif
 
     adata->newsrc_modified = false;
-    ret = MUTT_REOPENED;
+    rc = MUTT_REOPENED;
   }
 
   /* some headers were removed, context must be updated */
-  if (ret == MUTT_REOPENED)
+  if (rc == MUTT_REOPENED)
     mutt_mailbox_changed(m, MBN_INVALID);
 
   /* fetch headers of new articles */
@@ -1726,25 +1726,25 @@ static int check_mailbox(struct Mailbox *m)
     }
 #endif
     int old_msg_count = m->msg_count;
-    rc = nntp_fetch_headers(m, hc, mdata->last_loaded + 1, mdata->last_message, false);
+    rc2 = nntp_fetch_headers(m, hc, mdata->last_loaded + 1, mdata->last_message, false);
     m->quiet = quiet;
-    if (rc == 0)
+    if (rc2 == 0)
     {
       if (m->msg_count > old_msg_count)
         mutt_mailbox_changed(m, MBN_INVALID);
       mdata->last_loaded = mdata->last_message;
     }
-    if (ret == 0 && m->msg_count > oldmsgcount)
-      ret = MUTT_NEW_MAIL;
+    if (rc == 0 && m->msg_count > oldmsgcount)
+      rc = MUTT_NEW_MAIL;
   }
 
 #ifdef USE_HCACHE
   mutt_hcache_close(hc);
 #endif
-  if (ret)
+  if (rc)
     nntp_newsrc_close(adata);
   mutt_clear_error();
-  return ret;
+  return rc;
 }
 
 /**
@@ -2603,14 +2603,14 @@ static int nntp_mbox_check(struct Mailbox *m, int *index_hint)
   if (!m)
     return -1;
 
-  int ret = check_mailbox(m);
-  if (ret == 0)
+  int rc = check_mailbox(m);
+  if (rc == 0)
   {
     struct NntpMboxData *mdata = m->mdata;
     struct NntpAccountData *adata = mdata->adata;
     nntp_newsrc_close(adata);
   }
-  return ret;
+  return rc;
 }
 
 /**

diff --git a/pattern.c b/pattern.c
index baf86150ca7b27593b8159905df6c012dbf42a3d..8b4c001829a550abb58616490ad51482bfc4f271 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -2145,9 +2145,9 @@ int mutt_pattern_exec(struct Pattern *pat, enum PatternExecFlag flags,
     case MUTT_DRIVER_TAGS:
     {
       char *tags = driver_tags_get(&e->tags);
-      bool ret = (pat->not^(tags &&patmatch(pat, tags) == 0));
+      bool rc = (pat->not^(tags &&patmatch(pat, tags) == 0));
       FREE(&tags);
-      return ret;
+      return rc;
     }
     case MUTT_HORMEL:
       if (!e->env)

diff --git a/pop/pop.c b/pop/pop.c
index 8593e9a1775bcc7d0fc4ecf402ae3897cbe448f7..d2bf36d2e554189e6f64009ffe63904599324ddc 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -406,20 +406,20 @@ static int pop_fetch_headers(struct Mailbox *m)
     m->emails[i]->refno = -1;
 
   const int old_count = m->msg_count;
-  int ret = pop_fetch_data(adata, "UIDL\r\n", NULL, fetch_uidl, m);
+  int rc = pop_fetch_data(adata, "UIDL\r\n", NULL, fetch_uidl, m);
   const int new_count = m->msg_count;
   m->msg_count = old_count;
 
   if (adata->cmd_uidl == 2)
   {
-    if (ret == 0)
+    if (rc == 0)
     {
       adata->cmd_uidl = 1;
 
       mutt_debug(LL_DEBUG1, "set UIDL capability\n");
     }
 
-    if (ret == -2 && adata->cmd_uidl == 2)
+    if (rc == -2 && adata->cmd_uidl == 2)
     {
       adata->cmd_uidl = 0;
 
@@ -435,7 +435,7 @@ static int pop_fetch_headers(struct Mailbox *m)
                        MUTT_PROGRESS_MSG, C_ReadInc, new_count - old_count);
   }
 
-  if (ret == 0)
+  if (rc == 0)
   {
     int i, deleted;
     for (i = 0, deleted = 0; i < old_count; i++)
@@ -487,12 +487,12 @@ static int pop_fetch_headers(struct Mailbox *m)
         /* Reattach the private data */
         m->emails[i]->edata = edata;
         m->emails[i]->free_edata = pop_edata_free;
-        ret = 0;
+        rc = 0;
         hcached = true;
       }
       else
 #endif
-          if ((ret = pop_read_header(adata, m->emails[i])) < 0)
+          if ((rc = pop_read_header(adata, m->emails[i])) < 0)
         break;
 #ifdef USE_HCACHE
       else
@@ -537,11 +537,11 @@ static int pop_fetch_headers(struct Mailbox *m)
   mutt_hcache_close(hc);
 #endif
 
-  if (ret < 0)
+  if (rc < 0)
   {
     for (int i = m->msg_count; i < new_count; i++)
       mutt_email_free(&m->emails[i]);
-    return ret;
+    return rc;
   }
 
   /* after putting the result into our structures,
@@ -879,12 +879,12 @@ static int pop_mbox_open(struct Mailbox *m)
 
     mutt_message(_("Fetching list of messages..."));
 
-    const int ret = pop_fetch_headers(m);
+    const int rc = pop_fetch_headers(m);
 
-    if (ret >= 0)
+    if (rc >= 0)
       return 0;
 
-    if (ret < -1)
+    if (rc < -1)
       return -1;
   }
 }
@@ -914,15 +914,15 @@ static int pop_mbox_check(struct Mailbox *m, int *index_hint)
   mutt_message(_("Checking for new messages..."));
 
   int old_msg_count = m->msg_count;
-  int ret = pop_fetch_headers(m);
+  int rc = pop_fetch_headers(m);
   pop_clear_cache(adata);
   if (m->msg_count > old_msg_count)
     mutt_mailbox_changed(m, MBN_INVALID);
 
-  if (ret < 0)
+  if (rc < 0)
     return -1;
 
-  if (ret > 0)
+  if (rc > 0)
     return MUTT_NEW_MAIL;
 
   return 0;
@@ -938,7 +938,7 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
   if (!m)
     return -1;
 
-  int i, j, ret = 0;
+  int i, j, rc = 0;
   char buf[1024];
   struct PopAccountData *adata = pop_adata_get(m);
   struct Progress progress;
@@ -967,7 +967,7 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
     hc = pop_hcache_open(adata, m->path);
 #endif
 
-    for (i = 0, j = 0, ret = 0; (ret == 0) && (i < m->msg_count); i++)
+    for (i = 0, j = 0, rc = 0; (rc == 0) && (i < m->msg_count); i++)
     {
       struct PopEmailData *edata = m->emails[i]->edata;
       if (m->emails[i]->deleted && m->emails[i]->refno != -1)
@@ -976,8 +976,8 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
         if (!m->quiet)
           mutt_progress_update(&progress, j, -1);
         snprintf(buf, sizeof(buf), "DELE %d\r\n", m->emails[i]->refno);
-        ret = pop_query(adata, buf, sizeof(buf));
-        if (ret == 0)
+        rc = pop_query(adata, buf, sizeof(buf));
+        if (rc == 0)
         {
           mutt_bcache_del(adata->bcache, cache_id(edata->uid));
 #ifdef USE_HCACHE
@@ -998,13 +998,13 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
     mutt_hcache_close(hc);
 #endif
 
-    if (ret == 0)
+    if (rc == 0)
     {
       mutt_str_strfcpy(buf, "QUIT\r\n", sizeof(buf));
-      ret = pop_query(adata, buf, sizeof(buf));
+      rc = pop_query(adata, buf, sizeof(buf));
     }
 
-    if (ret == 0)
+    if (rc == 0)
     {
       adata->clear_cache = true;
       pop_clear_cache(adata);
@@ -1012,7 +1012,7 @@ static int pop_mbox_sync(struct Mailbox *m, int *index_hint)
       return 0;
     }
 
-    if (ret == -2)
+    if (rc == -2)
     {
       mutt_error("%s", adata->err_msg);
       return -1;

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 14576fa7be182e52f8baa2a382c0227846636567..7ba9b25130ae080f0e194257e56d46fcad987573 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -498,9 +498,9 @@ int pop_fetch_data(struct PopAccountData *adata, const char *query,
   size_t lenbuf = 0;
 
   mutt_str_strfcpy(buf, query, sizeof(buf));
-  int ret = pop_query(adata, buf, sizeof(buf));
-  if (ret < 0)
-    return ret;
+  int rc = pop_query(adata, buf, sizeof(buf));
+  if (rc < 0)
+    return rc;
 
   char *inbuf = mutt_mem_malloc(sizeof(buf));
 
@@ -511,7 +511,7 @@ int pop_fetch_data(struct PopAccountData *adata, const char *query,
     if (chunk < 0)
     {
       adata->status = POP_DISCONNECTED;
-      ret = -1;
+      rc = -1;
       break;
     }
 
@@ -535,8 +535,8 @@ int pop_fetch_data(struct PopAccountData *adata, const char *query,
     {
       if (progress)
         mutt_progress_update(progress, pos, -1);
-      if ((ret == 0) && (func(inbuf, data) < 0))
-        ret = -3;
+      if ((rc == 0) && (func(inbuf, data) < 0))
+        rc = -3;
       lenbuf = 0;
     }
 
@@ -544,7 +544,7 @@ int pop_fetch_data(struct PopAccountData *adata, const char *query,
   }
 
   FREE(&inbuf);
-  return ret;
+  return rc;
 }
 
 /**