From: Richard Russon <rich@flatcap.org>
Date: Sun, 3 Dec 2017 02:39:14 +0000 (+0000)
Subject: minor code fixes
X-Git-Tag: neomutt-20171208~8^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2872ff7749394d82e4b996ad1e3f2d43513d373;p=neomutt

minor code fixes
---

diff --git a/conn/sasl.c b/conn/sasl.c
index f4f1e28bd..f51b6eade 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -721,7 +721,7 @@ void mutt_sasl_setup_conn(struct Connection *conn, sasl_conn_t *saslconn)
   conn->conn_poll = mutt_sasl_conn_poll;
 }
 
-/*
+/**
  * mutt_sasl_done - Invoke when processing is complete.
  *
  * This is a cleanup function, used to free all memory used by the library.
diff --git a/mutt/debug.c b/mutt/debug.c
index ef50380ad..2d8090faa 100644
--- a/mutt/debug.c
+++ b/mutt/debug.c
@@ -50,7 +50,6 @@ int mutt_debug_real(const char *function, const char *file, int line, int level,
   va_list ap;
   va_start(ap, level);
   const char *fmt = va_arg(ap, const char *);
-  vfprintf(stderr, fmt, ap);
   int ret = vfprintf(stderr, fmt, ap);
   va_end(ap);
   return ret;
diff --git a/mutt_options.h b/mutt_options.h
index d8dfd350e..a487c50ef 100644
--- a/mutt_options.h
+++ b/mutt_options.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * Notmuch virtual mailbox type
+ * Definitions of NeoMutt Configuration
  *
  * @authors
  * Copyright (C) 2016 Bernard Pratz <z+mutt+pub@m0g.net>
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 212a56bc8..8dafb9804 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -1944,9 +1944,9 @@ int pgp_gpgme_decrypt_mime(FILE *fpin, FILE **fpout, struct Body *b, struct Body
   struct Body *first_part = b;
   int is_signed = 0;
   bool need_decode = false;
-  int saved_type;
-  LOFF_T saved_offset;
-  size_t saved_length;
+  int saved_type = 0;
+  LOFF_T saved_offset = 0;
+  size_t saved_length = 0;
   FILE *decoded_fp = NULL;
   int rc = 0;
 
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 53be76194..07ca99eae 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -955,9 +955,9 @@ int pgp_decrypt_mime(FILE *fpin, FILE **fpout, struct Body *b, struct Body **cur
   struct State s;
   struct Body *p = b;
   bool need_decode = false;
-  int saved_type;
-  LOFF_T saved_offset;
-  size_t saved_length;
+  int saved_type = 0;
+  LOFF_T saved_offset = 0;
+  size_t saved_length = 0;
   FILE *decoded_fp = NULL;
   int rc = 0;