Reformated comments and long lines

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index b49c1cc..fdd6de2 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -1,10 +1,10 @@
 /*
- * conflict.c -- check for conflicts in mail system
- *
- * 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.
- */
+** conflict.c -- check for conflicts in mail system
+**
+** 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>
 #include <fcntl.h>
@@ -15,14 +15,14 @@
 #include <pwd.h>
 
 /*
- * maximum number of directories that can
- * be specified using -search switch.
- */
+** maximum number of directories that can
+** be specified using -search switch.
+*/
 #define NDIRS  100
 
 /*
- * Add space for group names, 100 at a time
- */
+** Add space for group names, 100 at a time
+*/
 #define NGRPS  100
 
 static struct swit switches[] = {
@@ -45,8 +45,8 @@ extern struct aka  *akahead;
 extern struct home *homehead;
 
 /*
- * prototypes
- */
+** prototypes
+*/
 void alias_files (int, char **);
 void pwd_names (void);
 void grp_names (void);
@@ -150,10 +150,8 @@ alias_files (int akp, char **akv)
                if ((err = alias (akv[i])) != AK_OK) {
                        setup ();
                        fprintf (out, "aliasing error in %s - %s\n", akv[i], akerror (err));
-               }
-               else
-                       if (out && !mail)
-                               fprintf (out, "alias file %s is ok\n", akv[i]);
+               } else if (out && !mail)
+                       fprintf (out, "alias file %s is ok\n", akv[i]);
 }
 
 
@@ -316,8 +314,7 @@ mdrop(char *drop)
        while ((dp = readdir (dd)))
                if (dp->d_name[0] != '.' && !check (dp->d_name)) {
                        setup ();
-                       fprintf (out,
-                                       "there is a maildrop for the unknown user %s in %s\n",
+                       fprintf (out, "there is a maildrop for the unknown user %s in %s\n",
                                        dp->d_name, drop);
                        hit++;
                }
@@ -381,8 +378,8 @@ setup (void)
 
 #ifdef UCI
 /*
- * UCI specific stuff for conflict
- */
+** UCI specific stuff for conflict
+*/
 
 /* taken from <grpldr.h> */
 
@@ -427,8 +424,7 @@ endglent() {
 }
 
 struct grpldr  *getglent () {
-       register char  *cp,
-                                 **q;
+       register char  *cp, **q;
 
        if (glp == NULL && !setglent ())
                return NULL;
@@ -495,8 +491,7 @@ ldr_names () {
                        if (gp < NGRPS) {
                                gldrs[gp++] = getcpy (gl->gl_name);
                                gldrs[gp] = NULL;
-                       }
-                       else {
+                       } else {
                                setup ();
                                fprintf (out, "more than %d groups in group leaders file%s\n",
                                                " (time to recompile)", NGRPS - 1);