tidy

diff --git a/imap/imap.c b/imap/imap.c
index dba151264e29e194930e2bc42569e49614b48f79..f898d86fb598513aacbd81e2082d553760d66adb 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -777,8 +777,8 @@ void imap_logout_all(void)
  * @note Strips `\r` from `\r\n`.
  *       Apparently even literals use `\r\n`-terminated strings ?!
  */
-int imap_read_literal(FILE *fp, struct ImapAccountData *adata, unsigned long bytes,
-                      struct Progress *pbar)
+int imap_read_literal(FILE *fp, struct ImapAccountData *adata,
+                      unsigned long bytes, struct Progress *pbar)
 {
   char c;
   bool r = false;
@@ -1606,7 +1606,8 @@ int imap_status(const char *path, bool queue)
  *
  * return cached mailbox stats or NULL if create is 0
  */
-struct ImapStatus *imap_mboxcache_get(struct ImapAccountData *adata, const char *mbox, bool create)
+struct ImapStatus *imap_mboxcache_get(struct ImapAccountData *adata,
+                                      const char *mbox, bool create)
 {
   struct ImapStatus *status = NULL;
   struct ListNode *np = NULL;

diff --git a/imap/util.c b/imap/util.c
index 660d9821938741b28cf12d3303c040277979706c..87690dde0c133743283b787d4f552303f9f27a7f 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -997,7 +997,8 @@ void imap_unquote_string(char *s)
  * @param dlen  Length of buffer
  * @param src   Mailbox name
  */
-void imap_munge_mbox_name(struct ImapAccountData *adata, char *dest, size_t dlen, const char *src)
+void imap_munge_mbox_name(struct ImapAccountData *adata, char *dest,
+                          size_t dlen, const char *src)
 {
   char *buf = mutt_str_strdup(src);
   imap_utf_encode(adata, &buf);

diff --git a/mailbox.c b/mailbox.c
index 09f9000e74ca12e50d02e5e2fbcdf60c2564a2e8..e89e56005f257ec63cd1ada24446eca014c0a2aa 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -122,16 +122,14 @@ void mailbox_free(struct Mailbox **mailbox)
 static int mailbox_maildir_check_dir(struct Mailbox *mailbox, const char *dir_name,
                                      bool check_new, bool check_stats)
 {
-  struct Buffer *path = NULL;
-  struct Buffer *msgpath = NULL;
   DIR *dirp = NULL;
   struct dirent *de = NULL;
   char *p = NULL;
   int rc = 0;
   struct stat sb;
 
-  path = mutt_buffer_pool_get();
-  msgpath = mutt_buffer_pool_get();
+  struct Buffer *path = mutt_buffer_pool_get();
+  struct Buffer *msgpath = mutt_buffer_pool_get();
   mutt_buffer_printf(path, "%s/%s", mailbox->path, dir_name);
 
   /* when $mail_check_recent is set, if the new/ directory hasn't been modified since

diff --git a/maildir/mh.c b/maildir/mh.c
index d29ed456bd83e39208df4df929d27f69b8016ea7..be1462b475f73fe7127f54af3042842b9202a387 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -740,12 +740,11 @@ static int maildir_parse_dir(struct Mailbox *mailbox, struct Maildir ***last,
                              const char *subdir, int *count, struct Progress *progress)
 {
   struct dirent *de = NULL;
-  struct Buffer *buf = NULL;
   int rc = 0, is_old = 0;
   struct Maildir *entry = NULL;
   struct Email *e = NULL;
 
-  buf = mutt_buffer_pool_get();
+  struct Buffer *buf = mutt_buffer_pool_get();
 
   if (subdir)
   {
@@ -1453,7 +1452,6 @@ static int md_commit_message(struct Mailbox *mailbox, struct Message *msg, struc
   char subdir[4];
   char suffix[16];
   int rc = 0;
-  struct Buffer *path = NULL, *full = NULL;
 
   if (mutt_file_fsync_close(&msg->fp))
   {
@@ -1473,8 +1471,8 @@ static int md_commit_message(struct Mailbox *mailbox, struct Message *msg, struc
     suffix[0] = '\0';
 
   /* construct a new file name. */
-  path = mutt_buffer_pool_get();
-  full = mutt_buffer_pool_get();
+  struct Buffer *path = mutt_buffer_pool_get();
+  struct Buffer *full = mutt_buffer_pool_get();
   while (true)
   {
     mutt_buffer_printf(path, "%s/%lld.R%" PRIu64 ".%s%s", subdir, (long long) time(NULL),
@@ -1641,7 +1639,10 @@ static int mh_sync_message(struct Context *ctx, int msgno)
 static int maildir_sync_message(struct Context *ctx, int msgno)
 {
   struct Email *e = ctx->mailbox->hdrs[msgno];
-  struct Buffer *newpath = NULL, *partpath = NULL, *fullpath = NULL, *oldpath = NULL;
+  struct Buffer *newpath = NULL;
+  struct Buffer *partpath = NULL;
+  struct Buffer *fullpath = NULL;
+  struct Buffer *oldpath = NULL;
   char suffix[16];
   int rc = 0;
 
@@ -1670,8 +1671,9 @@ static int maildir_sync_message(struct Context *ctx, int msgno)
 
     mutt_buffer_strcpy(newpath, p);
 
-    /* kill the previous flags. */
-    if ((p = strchr(newpath->data, ':')) != NULL)
+    /* kill the previous flags */
+    p = strchr(newpath->data, ':');
+    if (p)
     {
       *p = '\0';
       newpath->dptr = p; /* fix buffer up, just to be safe */
@@ -1797,7 +1799,7 @@ static FILE *md_open_find_message(const char *folder, const char *unique,
   {
     maildir_canon_filename(tunique, de->d_name);
 
-    if (!mutt_str_strcmp(mutt_b2s(tunique), unique))
+    if (mutt_str_strcmp(mutt_b2s(tunique), unique) == 0)
     {
       mutt_buffer_printf(fname, "%s/%s/%s", folder, subfolder, de->d_name);
       fp = fopen(mutt_b2s(fname), "r");
@@ -2204,11 +2206,9 @@ bool maildir_update_flags(struct Context *ctx, struct Email *o, struct Email *n)
  */
 FILE *maildir_open_find_message(const char *folder, const char *msg, char **newname)
 {
-  struct Buffer *unique = NULL;
-
   static unsigned int new_hits = 0, cur_hits = 0; /* simple dynamic optimization */
 
-  unique = mutt_buffer_pool_get();
+  struct Buffer *unique = mutt_buffer_pool_get();
   maildir_canon_filename(unique, msg);
 
   FILE *fp = md_open_find_message(folder, mutt_b2s(unique),
@@ -2385,7 +2385,6 @@ static int maildir_mbox_check(struct Context *ctx, int *index_hint)
 {
   struct stat st_new; /* status of the "new" subdirectory */
   struct stat st_cur; /* status of the "cur" subdirectory */
-  struct Buffer *buf = NULL;
   int changed = 0;            /* bitmask representing which subdirectories
                                  have changed.  0x1 = new, 0x2 = cur */
   bool occult = false;        /* messages were removed from the mailbox */
@@ -2402,7 +2401,7 @@ static int maildir_mbox_check(struct Context *ctx, int *index_hint)
   if (!CheckNew)
     return 0;
 
-  buf = mutt_buffer_pool_get();
+  struct Buffer *buf = mutt_buffer_pool_get();
   mutt_buffer_printf(buf, "%s/new", ctx->mailbox->path);
   if (stat(mutt_b2s(buf), &st_new) == -1)
   {

diff --git a/mutt/buffer.c b/mutt/buffer.c
index 4a2ff41d255f53247404ca9f73fec388c1b45e2a..20cb0a94344adafb9b05c6ebea4c2abb59b6c267 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -122,7 +122,7 @@ size_t mutt_buffer_add(struct Buffer *buf, const char *s, size_t len)
     return 0;
 
   if ((buf->dptr + len + 1) > (buf->data + buf->dsize))
-    mutt_buffer_increase_size(buf, buf->dsize + (len < 128 ? 128 : len + 1));
+    mutt_buffer_increase_size(buf, buf->dsize + ((len < 128) ? 128 : len + 1));
   if (!buf->dptr)
     return 0;
   memcpy(buf->dptr, s, len);