Cosmetic refactoring

[mmh] / sbr / getfolder.c

diff --git a/sbr/getfolder.c b/sbr/getfolder.c
index 11e2b21..fc87e1e 100644 (file)
--- a/sbr/getfolder.c
+++ b/sbr/getfolder.c
@@ -1,33 +1,34 @@
 /*
- * getfolder.c -- get the current or default folder
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** getfolder.c -- get the current or default folder
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 
 
+/*
+** Return the default (=inbox) or current folder.
+** E.g. `getfolder(FDEF)' usually returns ``inbox''.
+*/
 char *
 getfolder(int wantcurrent)
 {
-       register char *folder;
+       char *folder;
 
-       /*
-        * If wantcurrent == 1, then try the current folder first
-        */
-       if (wantcurrent && (folder = context_find (pfolder)) && *folder != '\0')
+       if (wantcurrent &&
+                       (folder = context_find(pfolder)) && *folder != '\0') {
+               /* If wantcurrent, then try the current folder first */
                return folder;
 
-       /*
-        * Else try the Inbox profile entry
-        */
-       if ((folder = context_find (inbox)) && *folder != '\0')
+       } else if ((folder = context_find(inbox)) && *folder != '\0') {
+               /* try the Inbox profile entry */
                return folder;
 
-       /*
-        * Else return compile time default.
-        */
-       return defaultfolder;
+       } else {
+               /* return the compile time default  */
+               return defaultfolder;
+       }
 }