From: Richard Russon <rich@flatcap.org>
Date: Sat, 24 Feb 2018 15:28:27 +0000 (+0000)
Subject: minor code tidy
X-Git-Tag: neomutt-20180323~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=354294aab7793c7e70464870864d98ed943a642d;p=neomutt

minor code tidy
---

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 9381a3ce7..7473698a8 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -265,7 +265,6 @@ struct ImapData
   header_cache_t *hcache;
 #endif
 };
-/* I wish that were called IMAP_CONTEXT :( */
 
 /* -- private IMAP functions -- */
 /* imap.c */
diff --git a/main.c b/main.c
index 5f38b7f31..762321caf 100644
--- a/main.c
+++ b/main.c
@@ -252,9 +252,9 @@ int main(int argc, char **argv, char **env)
      */
     for (; optind < argc; optind++)
     {
-      if (argv[optind][0] == '-' && argv[optind][1] != '\0')
+      if ((argv[optind][0] == '-') && (argv[optind][1] != '\0'))
       {
-        if (argv[optind][1] == '-' && argv[optind][2] == '\0')
+        if ((argv[optind][1] == '-') && (argv[optind][2] == '\0'))
           double_dash = optind; /* quit outer loop after getopt */
         break;                  /* drop through to getopt */
       }
@@ -411,7 +411,7 @@ int main(int argc, char **argv, char **env)
   mutt_init_windows();
 
   /* This must come before mutt_init() because curses needs to be started
-     before calling the init_pair() function to set the color scheme.  */
+   * before calling the init_pair() function to set the color scheme.  */
   if (!OPT_NO_CURSES)
   {
     start_curses();
@@ -436,6 +436,7 @@ int main(int argc, char **argv, char **env)
       mutt_list_insert_tail(&queries, mutt_str_strdup(argv[optind]));
     return mutt_query_variables(&queries);
   }
+
   if (dump_variables)
     return mutt_dump_variables(hide_sensitive);
 
@@ -489,13 +490,13 @@ int main(int argc, char **argv, char **env)
 #ifdef USE_NNTP
     skip |= mx_is_nntp(fpath);
 #endif
-    if (!skip && stat(fpath, &sb) == -1 && errno == ENOENT)
+    if (!skip && (stat(fpath, &sb) == -1) && (errno == ENOENT))
     {
       char msg2[STRING];
       snprintf(msg2, sizeof(msg2), _("%s does not exist. Create it?"), Folder);
       if (mutt_yesorno(msg2, MUTT_YES) == MUTT_YES)
       {
-        if (mkdir(fpath, 0700) == -1 && errno != EEXIST)
+        if ((mkdir(fpath, 0700) == -1) && (errno != EEXIST))
           mutt_error(_("Can't create %s: %s."), Folder, strerror(errno));
       }
     }
@@ -660,7 +661,7 @@ int main(int argc, char **argv, char **env)
         context_hdr = mutt_new_header();
         context_hdr->offset = 0;
         context_hdr->content = mutt_new_body();
-        if (fstat(fileno(fin), &st))
+        if (fstat(fileno(fin), &st) != 0)
         {
           perror(draft_file);
           exit(1);
@@ -802,7 +803,7 @@ int main(int argc, char **argv, char **env)
     if (!OPT_NO_CURSES)
       mutt_endwin(NULL);
 
-    if (rv)
+    if (rv != 0)
       exit(1);
   }
   else
@@ -814,7 +815,7 @@ int main(int argc, char **argv, char **env)
         mutt_endwin(_("No mailbox with new mail."));
         exit(1);
       }
-      folder[0] = 0;
+      folder[0] = '\0';
       mutt_buffy(folder, sizeof(folder));
     }
     else if (flags & MUTT_SELECT)
@@ -837,9 +838,9 @@ int main(int argc, char **argv, char **env)
         mutt_endwin(_("No incoming mailboxes defined."));
         exit(1);
       }
-      folder[0] = 0;
+      folder[0] = '\0';
       mutt_select_file(folder, sizeof(folder), MUTT_SEL_FOLDER | MUTT_SEL_BUFFY, NULL, NULL);
-      if (!folder[0])
+      if (folder[0] == '\0')
       {
         mutt_endwin(NULL);
         exit(0);
diff --git a/mutt/address.h b/mutt/address.h
index fda20b6c1..6798d50f1 100644
--- a/mutt/address.h
+++ b/mutt/address.h
@@ -69,6 +69,8 @@ void            mutt_addr_free(struct Address **p);
 int             mutt_addr_has_recips(struct Address *a);
 bool            mutt_addr_is_intl(struct Address *a);
 bool            mutt_addr_is_local(struct Address *a);
+int             mutt_addrlist_to_intl(struct Address *a, char **err);
+int             mutt_addrlist_to_local(struct Address *a);
 int             mutt_addr_mbox_to_udomain(const char *mbox, char **user, char **domain);
 struct Address *mutt_addr_new(void);
 struct Address *mutt_addr_parse_list2(struct Address *p, const char *s);
diff --git a/mutt/string.c b/mutt/string.c
index 3494f0b56..e6dd4ca9d 100644
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -272,6 +272,7 @@ int mutt_str_atoul(const char *str, unsigned long *dst)
     return 1;
   return 0;
 }
+
 /**
  * mutt_str_strdup - Copy a string, safely
  * @param s String to copy
diff --git a/pager.c b/pager.c
index 56375c43c..baf7c5c6b 100644
--- a/pager.c
+++ b/pager.c
@@ -1676,6 +1676,7 @@ static const struct Mapping PagerHelp[] = {
   { N_("NextPg"), OP_NEXT_PAGE },
   { NULL, 0 },
 };
+
 static const struct Mapping PagerHelpExtra[] = {
   { N_("View Attachm."), OP_VIEW_ATTACHMENTS },
   { N_("Del"), OP_DELETE },
diff --git a/protos.h b/protos.h
index 4fe7ddf68..52b6a3093 100644
--- a/protos.h
+++ b/protos.h
@@ -363,7 +363,4 @@ int wcscasecmp(const wchar_t *a, const wchar_t *b);
 bool message_is_tagged(struct Context *ctx, int index);
 bool message_is_visible(struct Context *ctx, int index);
 
-int mutt_addrlist_to_intl(struct Address *a, char **err);
-int mutt_addrlist_to_local(struct Address *a);
-
 #endif /* _MUTT_PROTOS_H */