From: Richard Russon <rich@flatcap.org>
Date: Tue, 26 Sep 2017 13:49:04 +0000 (+0100)
Subject: clang-format
X-Git-Tag: neomutt-20171006~35^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=183620a994c7407a21d8212004da6c7f555c186f;p=neomutt

clang-format
---

diff --git a/imap/imap.c b/imap/imap.c
index e765d27ae..28cf6b943 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1120,7 +1120,7 @@ static bool compare_flags_for_copy(struct Header *h)
  *       desirable to propagate that flag into the copy.
  */
 int imap_sync_message_for_copy(struct ImapData *idata, struct Header *hdr,
-                      struct Buffer *cmd, int *err_continue)
+                               struct Buffer *cmd, int *err_continue)
 {
   char flags[LONG_STRING];
   char uid[11];
@@ -1146,7 +1146,8 @@ int imap_sync_message_for_copy(struct ImapData *idata, struct Header *hdr,
   imap_set_flag(idata, MUTT_ACL_WRITE, hdr->old, "Old ", flags, sizeof(flags));
   imap_set_flag(idata, MUTT_ACL_WRITE, hdr->flagged, "\\Flagged ", flags, sizeof(flags));
   imap_set_flag(idata, MUTT_ACL_WRITE, hdr->replied, "\\Answered ", flags, sizeof(flags));
-  imap_set_flag (idata, MUTT_ACL_DELETE, HEADER_DATA(hdr)->deleted, "\\Deleted ", flags, sizeof (flags));
+  imap_set_flag(idata, MUTT_ACL_DELETE, HEADER_DATA(hdr)->deleted, "\\Deleted ",
+                flags, sizeof(flags));
 
   /* now make sure we don't lose custom tags */
   if (mutt_bit_isset(idata->ctx->rights, MUTT_ACL_WRITE))
@@ -1162,7 +1163,8 @@ int imap_sync_message_for_copy(struct ImapData *idata, struct Header *hdr,
     imap_set_flag(idata, MUTT_ACL_WRITE, 1, "Old ", flags, sizeof(flags));
     imap_set_flag(idata, MUTT_ACL_WRITE, 1, "\\Flagged ", flags, sizeof(flags));
     imap_set_flag(idata, MUTT_ACL_WRITE, 1, "\\Answered ", flags, sizeof(flags));
-    imap_set_flag(idata, MUTT_ACL_DELETE, !HEADER_DATA(hdr)->deleted, "\\Deleted ", flags, sizeof (flags));
+    imap_set_flag(idata, MUTT_ACL_DELETE, !HEADER_DATA(hdr)->deleted,
+                  "\\Deleted ", flags, sizeof(flags));
 
     mutt_remove_trailing_ws(flags);
 
@@ -2253,16 +2255,16 @@ int imap_fast_trash(struct Context *ctx, char *dest)
     strfcpy(mbox, "INBOX", sizeof(mbox));
   imap_munge_mbox_name(idata, mmbox, sizeof(mmbox), mbox);
 
-  sync_cmd = mutt_buffer_new ();
+  sync_cmd = mutt_buffer_new();
   for (n = 0; n < ctx->msgcount; n++)
   {
     if (ctx->hdrs[n]->active && ctx->hdrs[n]->changed &&
         ctx->hdrs[n]->deleted && !ctx->hdrs[n]->purge)
     {
-      rc = imap_sync_message_for_copy (idata, ctx->hdrs[n], sync_cmd, &err_continue);
+      rc = imap_sync_message_for_copy(idata, ctx->hdrs[n], sync_cmd, &err_continue);
       if (rc < 0)
       {
-        mutt_debug (1, "imap_fast_trash: could not sync\n");
+        mutt_debug(1, "imap_fast_trash: could not sync\n");
         goto out;
       }
     }
@@ -2320,7 +2322,7 @@ int imap_fast_trash(struct Context *ctx, char *dest)
   rc = 0;
 
 out:
-  mutt_buffer_free (&sync_cmd);
+  mutt_buffer_free(&sync_cmd);
   FREE(&mx.mbox);
 
   return rc < 0 ? -1 : rc;
diff --git a/init.c b/init.c
index bee9390be..a357184ea 100644
--- a/init.c
+++ b/init.c
@@ -2320,8 +2320,7 @@ static void start_debug(void)
   if ((debugfile = safe_fopen(debugfilename, "w")) != NULL)
   {
     setbuf(debugfile, NULL); /* don't buffer the debugging output! */
-    mutt_debug(1, "NeoMutt/%s debugging at level %d\n", PACKAGE_VERSION,
-               debuglevel);
+    mutt_debug(1, "NeoMutt/%s debugging at level %d\n", PACKAGE_VERSION, debuglevel);
   }
 }
 
@@ -2347,8 +2346,7 @@ static void restart_debug(void)
   }
 
   if (!enable_debug && !disable_debug && debuglevel != DebugLevel)
-    mutt_debug(1, "NeoMutt/%s debugging at level %d\n", PACKAGE_VERSION,
-               DebugLevel);
+    mutt_debug(1, "NeoMutt/%s debugging at level %d\n", PACKAGE_VERSION, DebugLevel);
 
   debuglevel = DebugLevel;
 
@@ -3179,7 +3177,7 @@ static int source_rc(const char *rcfile_path, struct Buffer *err)
   if (rcfilelen == 0)
     return -1;
 
-  ispipe = rcfile[rcfilelen -1] == '|';
+  ispipe = rcfile[rcfilelen - 1] == '|';
 
   if (!ispipe)
   {
diff --git a/pattern.c b/pattern.c
index d2909edd3..3b61a32d5 100644
--- a/pattern.c
+++ b/pattern.c
@@ -729,7 +729,7 @@ static void order_range(struct Pattern *pat)
 }
 
 static int eat_range_by_regex(struct Pattern *pat, struct Buffer *s, int kind,
-                               struct Buffer *err)
+                              struct Buffer *err)
 {
   int regerr;
   regmatch_t pmatch[RANGE_RX_GROUPS];
diff --git a/pop.c b/pop.c
index 1aea2bd48..6d1cc1e49 100644
--- a/pop.c
+++ b/pop.c
@@ -51,8 +51,8 @@
 #endif
 
 #ifdef USE_HCACHE
-#define HC_FNAME "neomutt"  /* filename for hcache as POP lacks paths */
-#define HC_FEXT "hcache" /* extension for hcache as POP lacks paths */
+#define HC_FNAME "neomutt" /* filename for hcache as POP lacks paths */
+#define HC_FEXT "hcache"   /* extension for hcache as POP lacks paths */
 #endif
 
 /**