Rearranged whitespace (and comments) in all the code!

[mmh] / sbr / folder_pack.c

diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c
index b0bc67b..2e321b0 100644 (file)
--- a/sbr/folder_pack.c
+++ b/sbr/folder_pack.c
@@ -1,4 +1,3 @@
-
 /*
  * folder_pack.c -- pack (renumber) the messages in a folder
  *               -- into a contiguous range from 1 to n.
@@ -18,81 +17,81 @@
 int
 folder_pack (struct msgs **mpp, int verbose)
 {
-    int hole, msgnum, newcurrent = 0;
-    char newmsg[BUFSIZ], oldmsg[BUFSIZ];
-    struct msgs *mp;
-
-    mp = *mpp;
-
-    /*
-     * Just return if folder is empty.
-     */
-    if (mp->nummsg == 0)
-       return 0;
-
-    /*
-     * Make sure we have message status space allocated
-     * for all numbers from 1 to current high message.
-     */
-    if (mp->lowoff > 1) {
-       if ((mp = folder_realloc (mp, 1, mp->hghmsg)))
-           *mpp = mp;
-       else {
-           advise (NULL, "unable to allocate folder storage");
-           return -1;
-       }
-    }
-
-    for (msgnum = mp->lowmsg, hole = 1; msgnum <= mp->hghmsg; msgnum++) {
-       if (does_exist (mp, msgnum)) {
-           if (msgnum != hole) {
-               strncpy (newmsg, m_name (hole), sizeof(newmsg));
-               strncpy (oldmsg, m_name (msgnum), sizeof(oldmsg));
-               if (verbose)
-                   printf ("message %s becomes %s\n", oldmsg, newmsg);
-
-               /*
-                * Invoke the external refile hook for each message being renamed.
-                * This is done before the file is renamed so that the old message
-                * file is around for the hook.
-                */
-
-               (void)snprintf(oldmsg, sizeof (oldmsg), "%s/%d", mp->foldpath, msgnum);
-               (void)snprintf(newmsg, sizeof (newmsg), "%s/%d", mp->foldpath, hole);
-               ext_hook("ref-hook", oldmsg, newmsg);
-
-               /* move the message file */
-               if (rename (oldmsg, newmsg) == -1) {
-                   advise (newmsg, "unable to rename %s to", oldmsg);
-                   return -1;
+       int hole, msgnum, newcurrent = 0;
+       char newmsg[BUFSIZ], oldmsg[BUFSIZ];
+       struct msgs *mp;
+
+       mp = *mpp;
+
+       /*
+        * Just return if folder is empty.
+        */
+       if (mp->nummsg == 0)
+               return 0;
+
+       /*
+        * Make sure we have message status space allocated
+        * for all numbers from 1 to current high message.
+        */
+       if (mp->lowoff > 1) {
+               if ((mp = folder_realloc (mp, 1, mp->hghmsg)))
+                       *mpp = mp;
+               else {
+                       advise (NULL, "unable to allocate folder storage");
+                       return -1;
                }
+       }
 
-               /* check if this is the current message */
-               if (msgnum == mp->curmsg)
-                   newcurrent = hole;
-
-               /* copy the attribute flags for this message */
-               copy_msg_flags (mp, hole, msgnum);
-
-               if (msgnum == mp->lowsel)
-                   mp->lowsel = hole;
-               if (msgnum == mp->hghsel)
-                   mp->hghsel = hole;
-
-               /* mark that sequence information has been modified */
-               mp->msgflags |= SEQMOD;
-           }
-           hole++;
+       for (msgnum = mp->lowmsg, hole = 1; msgnum <= mp->hghmsg; msgnum++) {
+               if (does_exist (mp, msgnum)) {
+                       if (msgnum != hole) {
+                               strncpy (newmsg, m_name (hole), sizeof(newmsg));
+                               strncpy (oldmsg, m_name (msgnum), sizeof(oldmsg));
+                               if (verbose)
+                                       printf ("message %s becomes %s\n", oldmsg, newmsg);
+
+                               /*
+                                * Invoke the external refile hook for each message being renamed.
+                                * This is done before the file is renamed so that the old message
+                                * file is around for the hook.
+                                */
+
+                               (void)snprintf(oldmsg, sizeof (oldmsg), "%s/%d", mp->foldpath, msgnum);
+                               (void)snprintf(newmsg, sizeof (newmsg), "%s/%d", mp->foldpath, hole);
+                               ext_hook("ref-hook", oldmsg, newmsg);
+
+                               /* move the message file */
+                               if (rename (oldmsg, newmsg) == -1) {
+                                       advise (newmsg, "unable to rename %s to", oldmsg);
+                                       return -1;
+                               }
+
+                               /* check if this is the current message */
+                               if (msgnum == mp->curmsg)
+                                       newcurrent = hole;
+
+                               /* copy the attribute flags for this message */
+                               copy_msg_flags (mp, hole, msgnum);
+
+                               if (msgnum == mp->lowsel)
+                                       mp->lowsel = hole;
+                               if (msgnum == mp->hghsel)
+                                       mp->hghsel = hole;
+
+                               /* mark that sequence information has been modified */
+                               mp->msgflags |= SEQMOD;
+                       }
+                       hole++;
+               }
        }
-    }
 
-    /* record the new number for the high/low message */
-    mp->lowmsg = 1;
-    mp->hghmsg = hole - 1;
+       /* record the new number for the high/low message */
+       mp->lowmsg = 1;
+       mp->hghmsg = hole - 1;
 
-    /* update the "cur" sequence */
-    if (newcurrent != 0)
-       seq_setcur (mp, newcurrent);
+       /* update the "cur" sequence */
+       if (newcurrent != 0)
+               seq_setcur (mp, newcurrent);
 
-    return 0;
+       return 0;
 }