From: Richard Russon <rich@flatcap.org>
Date: Sun, 25 Mar 2018 02:28:49 +0000 (+0100)
Subject: remove unused variables
X-Git-Tag: neomutt-20180512~77^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9142c339a1912e460403353e4b27e798138edb42;p=neomutt

remove unused variables

Remove variables that are set, but not used again.
---

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index be1df16d2..b39f8c7dc 100644
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -981,7 +981,6 @@ static void tls_get_client_cert(struct Connection *conn)
     mutt_debug(1, "no CN found in DN\n");
     goto err_dn;
   }
-  cn += 3;
 
   cnend = strstr(dn, ",EMAIL=");
   if (cnend)
diff --git a/main.c b/main.c
index 58e8fc514..7f6d3b29d 100644
--- a/main.c
+++ b/main.c
@@ -654,6 +654,7 @@ int main(int argc, char **argv, char **env)
     // TEST24: neomutt -p (no postponed message)
     log_queue_empty();
     repeat_error = true;
+    goto main_curses;
   }
   else if (subject || msg || sendflags || draft_file || include_file ||
            !STAILQ_EMPTY(&attach) || optind < argc)
diff --git a/mutt/logging.c b/mutt/logging.c
index 611eda11f..d68035992 100644
--- a/mutt/logging.c
+++ b/mutt/logging.c
@@ -253,7 +253,7 @@ int log_disp_file(time_t stamp, const char *file, int line,
   va_list ap;
   va_start(ap, level);
   const char *fmt = va_arg(ap, const char *);
-  ret = vfprintf(LogFileFP, fmt, ap);
+  ret += vfprintf(LogFileFP, fmt, ap);
   va_end(ap);
 
   if (level == LL_PERROR)
diff --git a/muttlib.c b/muttlib.c
index 05a7b7f61..57a3d1c5b 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -820,7 +820,6 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c
 
       col -= wlen; /* reset to passed in value */
       wptr = buf;  /* reset write ptr */
-      wlen = ((flags & MUTT_FORMAT_ARROWCURSOR) && ArrowCursor) ? 3 : 0;
       pid = mutt_create_filter(command->data, NULL, &filter, NULL);
       if (pid != -1)
       {
diff --git a/pager.c b/pager.c
index 693c5b1c2..6f9e3b9e2 100644
--- a/pager.c
+++ b/pager.c
@@ -2204,7 +2204,6 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
           /* fatal error occurred */
           FREE(&Context);
           pager_menu->redraw = REDRAW_FULL;
-          ch = -1;
           break;
         }
       }
@@ -2244,7 +2243,6 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
             if (extra->hdr != Context->hdrs[Context->v2r[rd.index->current]])
             {
               extra->hdr = Context->hdrs[Context->v2r[rd.index->current]];
-              ch = -1;
               break;
             }
           }