Code cleanup and indentation.

.gitignore

@@ -3,6 +3,4 @@ config.h
 config.log
 config.status
 src/*.o
-src/*.c~
-src/*.h~
 src/mboxgrep

README.md

@@ -13,6 +13,3 @@ GNU/Linux distrubution, for example), please drop me a line about it.
 
 For build instructions, read the file "INSTALL", and run
 `./configure --help`.
-
-This project aims to follow the GNU coding style (https://www.gnu.org/prep/standards/html_node/Formatting.html),
-at least loosely. The code should be indented with indent -gnu -nut -ppi2.

src/info.c

@@ -36,8 +36,7 @@ print_wrap (char *str, int len, int *n)
       fprintf (stdout, "\n");
       *n = 0;
     }
-  else
-    fprintf (stdout, " ");
+  else fprintf (stdout, " ");
 }
 
 void
@@ -67,8 +66,7 @@ version (void)
 #else
 # ifdef HAVE_FTW
   print_wrap ("HAVE_FTW", 8, &n);
-#  endif
-       /* HAVE_FTW */
+# endif /* HAVE_FTW */
 #endif /* HAVE_FTS_OPEN */
 /*
   fprintf (stdout, "HAVE_LIBLOCKFILE ");

src/maildir.c

@@ -30,16 +30,13 @@
 # define NAMLEN(dirent) (dirent)->d_namlen
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#  endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#  endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#  endif
-       /* HAVE_NDIR_H */
+# endif /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <stdlib.h>
@@ -160,8 +157,7 @@ maildir_read_message (maildir_t * mdp)
 
       filename = 
         (char *) xmalloc ((sizeof (char)*((strlen (d_content->d_name))
-                                            + (strlen (config.boxname)) +
-                                            6)));
+          + (strlen (config.boxname)) + 6)));
 
 /*
       filename = 
@@ -207,8 +203,7 @@ maildir_read_message (maildir_t * mdp)
 
               message->headers =
                 (char *) xrealloc (message->headers,
-                                   ((1 + s +
-                                     message->hbytes) * sizeof (char)));
+                  ((1 + s + message->hbytes) * sizeof (char)));
 
               strcpy (message->headers + message->hbytes, buffer);
               message->hbytes += s;
@@ -217,8 +212,7 @@ maildir_read_message (maildir_t * mdp)
             {
               message->body =
                 (char *) xrealloc (message->body,
-                                   ((1 + s +
-                                     message->bbytes) * sizeof (char)));
+                  ((1 + s + message->bbytes) * sizeof (char)));
               strcpy (message->body + message->bbytes, buffer);
               message->bbytes += s;
             } /* else */
@@ -274,24 +268,18 @@ maildir_check (const char *path)
 
   sprintf (s, "%s/cur", path);
   i = stat (s, &fs);
-  if (-1 == i)
-    return -1;
-  if (!S_ISDIR (fs.st_mode))
-    return -1;
+  if (-1 == i) return -1;
+  if (! S_ISDIR (fs.st_mode)) return -1;
 
   sprintf (s, "%s/new", path);
   i = stat (s, &fs);
-  if (-1 == i)
-    return -1;
-  if (!S_ISDIR (fs.st_mode))
-    return -1;
+  if (-1 == i) return -1;
+  if (! S_ISDIR (fs.st_mode)) return -1;
 
   sprintf(s, "%s/tmp", path);
   i = stat (s, &fs);
-  if (-1 == i)
-    return -1;
-  if (!S_ISDIR (fs.st_mode))
-    return -1;
+  if (-1 == i) return -1;
+  if (! S_ISDIR (fs.st_mode)) return -1;
 
   free (s);
 

src/maildir.h

@@ -30,18 +30,14 @@
 # define NAMLEN(dirent) (dirent)->d_namlen
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#    endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#    endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#    endif
-       /* HAVE_NDIR_H */
-#  endif
-       /* HAVE_DIRENT_H */
+# endif /* HAVE_NDIR_H */
+#endif /* HAVE_DIRENT_H */
 
 #include "mboxgrep.h"
 

src/main.c

@@ -54,7 +54,8 @@ main (int argc, char **argv)
   runtime.count = 0;
   runtime.maildir_count = 0;
 
-  static struct option long_options[] = {
+  static struct option long_options[] = 
+    {
       {"count", 0, 0, 'c'},
       {"delete", 0, 0, 'd'},
       /*  {"date", 1, 0, 'D'}, */

src/mbox.c

@@ -193,8 +193,7 @@ mbox_open (const char *path, const char *mode)
                 fprintf (stderr, "%s: (standard input): Not a mbox folder\n",
                   APPNAME);
               else
-                fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME,
-                         path);
+                fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME, path);
             }
           if (config.format == MBOX)
             fclose (mp->fp);
@@ -403,14 +402,11 @@ tmpfile_mod_own (const int fd, const char *path)
       if (stat (path, &s) != -1)
         {
           if (fchown (fd, s.st_uid, s.st_gid) == -1)
-            if (config.merr)
-              perror (config.tmpfilename);
+            if (config.merr) perror (config.tmpfilename);
           if (fchmod (fd, s.st_mode) == -1)
-            if (config.merr)
-              perror (config.tmpfilename);
+            if (config.merr) perror (config.tmpfilename);
         }
-      else if (config.merr)
-        perror (path);
+      else if (config.merr) perror (path);
     }
 }
 

src/mh.c

@@ -29,16 +29,13 @@
 # define NAMLEN(dirent) (dirent)->d_namlen
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#  endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#  endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#  endif
-       /* HAVE_NDIR_H */
+# endif /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <sys/types.h>
@@ -57,8 +54,7 @@
 
 extern option_t config;
 
-DIR *
-mh_open (const char *path)
+DIR *mh_open (const char *path)
 {
   DIR *dp;
 
@@ -76,14 +72,12 @@ mh_open (const char *path)
   return dp;
 } /* mh_open */
 
-void
-mh_close (DIR * dp)
+void mh_close (DIR *dp)
 {
   closedir (dp);
 } /* mh_close */
 
-message_t *
-mh_read_message (DIR * dp)
+message_t *mh_read_message (DIR *dp)
 {
   int isheaders = 1;
   int have_from = 0, have_date = 0, have_sender = 0;
@@ -100,8 +94,7 @@ mh_read_message (DIR * dp)
   for(;;)
     {
       d_content = readdir(dp);
-      if (d_content == NULL)
-        return NULL;
+      if (d_content == NULL) return NULL;
       if (d_content->d_name[0] == '.')
 	continue;
 
@@ -168,8 +161,7 @@ mh_read_message (DIR * dp)
 
 	      message->headers =
 		(char *) realloc (message->headers,
-                                  ((1 + s +
-                                    message->hbytes) * sizeof (char)));
+				  ((1 + s + message->hbytes) * sizeof (char)));
 	      strcpy (message->headers + message->hbytes, buffer);
 	      message->hbytes += s;
 	    } /* if */
@@ -177,8 +169,7 @@ mh_read_message (DIR * dp)
 	    {
 	      message->body =
 		(char *) realloc (message->body,
-                                  ((1 + s +
-                                    message->bbytes) * sizeof (char)));
+				  ((1 + s + message->bbytes) * sizeof (char)));
 	      strcpy (message->body + message->bbytes, buffer);
 	      message->bbytes += s;
 	    } /* else */
@@ -210,14 +201,12 @@ mh_read_message (DIR * dp)
     } /* for */
 } /* mh_read_message */
 
-void
-mh_write_message (message_t * m, const char *path)
+void mh_write_message (message_t *m, const char *path)
 {
   struct dirent *dc;
   int x, y = 0;
   char s1[BUFSIZ];
-  DIR *d;
-  FILE *f;
+  DIR *d; FILE *f;
 
   d = m_opendir (path);
   rewinddir (d);

src/mh.h

@@ -27,18 +27,14 @@
 #else
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#    endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#    endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#    endif
-       /* HAVE_NDIR_H */
-#  endif
-       /* HAVE_DIRENT_H */
+# endif /* HAVE_NDIR_H */
+#endif /* HAVE_DIRENT_H */
 
 #include "mboxgrep.h"
 

src/misc.c

@@ -68,8 +68,7 @@ folder_format (const char *name)
   return f;
 }
 
-lockmethod_t
-lock_method (const char *name)
+lockmethod_t lock_method (const char *name)
 {
   lockmethod_t l;
 
@@ -123,8 +122,7 @@ time_t parse_date(char *datestr)
 }
 */
 
-char *
-parse_return_path (char *rpath)
+char * parse_return_path(char *rpath)
 {
   char *blah1, blah2[BUFSIZ];
 
@@ -134,8 +132,7 @@ parse_return_path (char *rpath)
   return blah1;
 }
 
-void *
-allocate_message (void)
+void * allocate_message (void)
 {
   message_t *message;
 
@@ -154,8 +151,7 @@ allocate_message (void)
   return message;
 }
 
-void
-postmark_print (message_t * msg)
+void postmark_print (message_t *msg)
 {
   time_t tt;
   struct tm *ct;

src/misc.h

@@ -32,7 +32,6 @@ char *parse_return_path (char *rpath);
 void * allocate_message (void);
 void postmark_print (message_t *msg);
 void set_default_options (void);
-void get_runtime_options (int *argc, char **argv,
-                          struct option *long_options);
+void get_runtime_options (int *argc, char **argv, struct option *long_options);
 
 #endif /* MISC_H */

src/re.c

@@ -42,7 +42,8 @@ pcre_init (void)
   if (config.pcre_pattern == NULL)
     {
       if (config.merr)
-        fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, error);
+        fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s,
+          error);
       exit(2);
     }
 }
@@ -56,12 +57,14 @@ pcre_match (message_t * msg)
     config.res1 =
       pcre_exec ((pcre *) config.pcre_pattern,
       (pcre_extra *) config.pcre_hints,
-                 msg->headers, (int) strlen (msg->headers), 0, 0, of, BUFSIZ);
+      msg->headers,
+      (int) strlen (msg->headers), 0, 0, of, BUFSIZ);
   if (config.body)
     config.res2 =
       pcre_exec ((pcre *) config.pcre_pattern,
       (pcre_extra *) config.pcre_hints,
-                 msg->body, (int) strlen (msg->body), 0, 0, of, BUFSIZ);
+      msg->body,
+      (int) strlen (msg->body), 0, 0, of, BUFSIZ);
 
   config.res1 = config.res1 ^ 1;
   config.res2 = config.res2 ^ 1;
@@ -87,8 +90,7 @@ regex_init (void)
     {
       if (config.merr)
         {
-          regerror (errcode, (regex_t *) config.posix_pattern, errbuf,
-                    BUFSIZ);
+          regerror (errcode, (regex_t *) config.posix_pattern, errbuf, BUFSIZ);
           fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, errbuf);
         }
       exit (2);

src/scan.c

@@ -32,16 +32,13 @@
 # define NAMLEN(dirent) (dirent)->d_namlen
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#  endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#  endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#  endif
-       /* HAVE_NDIR_H */
+# endif /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <time.h>
@@ -64,16 +61,14 @@
 #else
 # ifdef HAVE_FTW
 #  include <ftw.h>
-#  endif
-       /* HAVE_FTW */
+# endif /* HAVE_FTW */
 #endif /* HAVE_FTS_OPEN */
 
 #ifdef HAVE_LIBDMALLOC
 #include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
-void
-scan_mailbox (char path[])
+void scan_mailbox (char path[])
 {
   static FILE *outf;
   static mbox_t *mbox, *out;
@@ -104,19 +99,17 @@ scan_mailbox (char path[])
   if (config.action == DELETE)
     delete = 1;
 
-  if ((config.format == MBOX) || (config.format == ZMBOX)
-      || (config.format == BZ2MBOX))
+  if ((config.format == MBOX) || (config.format == ZMBOX) ||
+      (config.format == BZ2MBOX))
     {
       mbox = (mbox_t *) mbox_open (path, "r");
-      if (mbox == NULL)
-        return;
+      if (mbox == NULL) return;
     }
-  else if ((config.format == MH) || (config.format == NNMH)
-           || (config.format == NNML))
+  else if ((config.format == MH) || (config.format == NNMH) ||
+            (config.format == NNML))
     {
       boxd = mh_open (path);
-      if (boxd == NULL)
-        return;
+      if (boxd == NULL) return;
     }
   else if (config.format == MAILDIR)
     {
@@ -131,20 +124,18 @@ scan_mailbox (char path[])
       config.res1 = 1;
       config.res2 = 1;
 
-      if ((config.format == MBOX) || (config.format == ZMBOX)
-          || (config.format == BZ2MBOX))
+      if ((config.format == MBOX) || (config.format == ZMBOX) ||
+          (config.format == BZ2MBOX))
         msg = (message_t *) mbox_read_message (mbox);
-      else if ((config.format == MH) || (config.format == NNMH)
-               || (config.format == NNML))
+      else if ((config.format == MH) || (config.format == NNMH) ||
+              (config.format == NNML))
         msg = (message_t *) mh_read_message (boxd);
       else if (config.format == MAILDIR)
         msg = (message_t *) maildir_read_message (maildird);
 
-      if (msg == NULL)
-        break;
+      if (msg == NULL) break;
 
-      if (msg->from == NULL)
-        msg->from = (char *) xstrdup ("nobody");
+      if (msg->from == NULL) msg->from = (char *) xstrdup ("nobody");
 
 #ifdef HAVE_LIBPCRE
       if (config.perl)
@@ -173,11 +164,11 @@ scan_mailbox (char path[])
             {
               if (config.format == MAILDIR)
                 maildir_write_message (msg, config.outboxname);
-              else if (config.format == MH || config.format == NNMH
-                       || config.format == NNML)
+              else if (config.format == MH || config.format == NNMH ||
+                      config.format == NNML)
                 mh_write_message (msg, config.outboxname);
-              else if ((config.format == MBOX) || (config.format == ZMBOX)
-                       || (config.format == BZ2MBOX))
+              else if ((config.format == MBOX) || (config.format == ZMBOX) ||
+                      (config.format == BZ2MBOX))
                 {
                   out = mbox_open (config.outboxname, "w");
                   /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
@@ -203,16 +194,14 @@ scan_mailbox (char path[])
           else if (config.action == COUNT)
             runtime.count++;
           else if (config.action == DELETE &&
-                   ((config.format == MBOX) || (config.format == ZMBOX)
-                    || (config.format == BZ2MBOX)))
+                  ((config.format == MBOX) || (config.format == ZMBOX) ||
+                  (config.format == BZ2MBOX)))
             mbox_write_message (msg, runtime.tmp_mbox);
         }
 
-      else
-        if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert)
-             && delete) && ((config.format == MH) || (config.format == NNMH)
-                            || (config.format == NNML)
-                            || (config.format == MAILDIR)))
+      else if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert) && delete) &&
+                ((config.format == MH) || (config.format == NNMH) ||
+                  (config.format == NNML) || (config.format == MAILDIR)))
         m_unlink(msg->filename);
 
       free(msg->body);
@@ -220,16 +209,15 @@ scan_mailbox (char path[])
       free(msg);
     } /* for */
 
-  if ((config.format == MBOX) || (config.format == ZMBOX)
-      || (config.format == BZ2MBOX))
+  if ((config.format == MBOX) || (config.format == ZMBOX) ||
+      (config.format == BZ2MBOX))
     mbox_close (mbox);
-  else if ((config.format == MH) || (config.format == NNMH)
-           || (config.format == NNML))
+  else if ((config.format == MH) || (config.format == NNMH) ||
+            (config.format == NNML))
     mh_close(boxd);
 }
 
-void
-recursive_scan (char path[])
+void recursive_scan (char path[])
 {
 #ifdef HAVE_FTS_OPEN
   FTS *ftsfoo;
@@ -262,8 +250,7 @@ recursive_scan (char path[])
 #endif /* HAVE_FTS_OPEN */
 }
 
-int
-md5_check_message (char *body, checksum_t * chksum)
+int md5_check_message (char *body, checksum_t *chksum)
 {
   struct md5_ctx a;
   char b[16];
@@ -284,8 +271,7 @@ md5_check_message (char *body, checksum_t * chksum)
         return 1; 
     }
 
-  chksum->md5 =
-    (char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
+  chksum->md5 = (char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
 
   chksum->md5[chksum->n] = xstrdup (b);
 

src/wrap.c

@@ -31,16 +31,13 @@
 # define NAMLEN(dirent) (dirent)->d_namlen
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#  endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#  endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#  endif
-       /* HAVE_NDIR_H */
+# endif /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 #ifdef HAVE_LIBZ
 #include <zlib.h>
@@ -62,8 +59,7 @@
 
 #define BUFLEN 16384
 
-int
-m_open (const char *pathname, int flags, mode_t mode)
+int m_open (const char *pathname, int flags, mode_t mode)
 {
   int blah;
 
@@ -82,8 +78,7 @@ m_open (const char *pathname, int flags, mode_t mode)
   return blah;
 }      
 
-FILE *
-m_fopen (const char *path, const char *mode)
+FILE *m_fopen (const char *path, const char *mode)
 {
   FILE *blah;
 
@@ -101,8 +96,7 @@ m_fopen (const char *path, const char *mode)
   return blah;
 }
 
-FILE *
-m_fdopen (int fildes, const char *mode)
+FILE *m_fdopen (int fildes, const char *mode)
 {
   FILE *blah;
 
@@ -117,8 +111,7 @@ m_fdopen (int fildes, const char *mode)
 
 #ifdef HAVE_LIBZ
 
-gzFile
-m_gzdopen (int fildes, const char *mode)
+gzFile m_gzdopen (int fildes, const char *mode)
 {
   gzFile blah;
 
@@ -133,8 +126,7 @@ m_gzdopen (int fildes, const char *mode)
 
 #endif /* HAVE_LIBZ */
 
-DIR *
-m_opendir (const char *name)
+DIR *m_opendir (const char *name)
 {
   DIR *blah;
 
@@ -152,8 +144,7 @@ m_opendir (const char *name)
 
 #ifndef HAVE_LIBDMALLOC
 
-void *
-xmalloc (size_t size)
+void *xmalloc (size_t size)
 {
   void *foo;
 
@@ -167,8 +158,7 @@ xmalloc (size_t size)
   return foo;
 }
 
-void *
-xrealloc (void *ptr, size_t size)
+void *xrealloc (void *ptr, size_t size)
 {
   void *foo;
 
@@ -182,8 +172,7 @@ xrealloc (void *ptr, size_t size)
   return foo;
 }
 
-void *
-xcalloc (size_t nmemb, size_t size)
+void *xcalloc (size_t nmemb, size_t size)
 {
   void *foo;
 
@@ -197,8 +186,7 @@ xcalloc (size_t nmemb, size_t size)
   return foo;
 }
 
-char *
-xstrdup (const char *s)
+char *xstrdup (const char *s)
 {
   char *foo;
 
@@ -214,8 +202,7 @@ xstrdup (const char *s)
 
 #endif /* HAVE_LIBDMALLOC */
 
-int
-m_unlink (const char *pathname)
+int m_unlink (const char *pathname)
 {
   int baz;
 
@@ -233,8 +220,7 @@ m_unlink (const char *pathname)
 
 #ifdef HAVE_LIBZ
 
-void
-gzwrite_loop (void *fp, char *str)
+void gzwrite_loop (void *fp, char *str)
 {
   int quux, len, baz;
 
@@ -254,8 +240,7 @@ gzwrite_loop (void *fp, char *str)
 
 #ifdef HAVE_LIBBZ2
 
-void
-bzwrite_loop (void *fp, char *str)
+void bzwrite_loop (void *fp, char *str)
 {
   int quux, len, baz;
 

src/wrap.h

@@ -33,29 +33,23 @@
 #else
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
-#    endif
-       /* HAVE_SYS_NDIR_H */
+# endif /* HAVE_SYS_NDIR_H */
 # ifdef HAVE_SYS_DIR_H
 #  include <sys/dir.h>
-#    endif
-       /* HAVE_SYS_DIR_H */
+# endif /* HAVE_SYS_DIR_H */
 # ifdef HAVE_NDIR_H
 #  include <ndir.h>
-#    endif
-       /* HAVE_NDIR_H */
-#  endif
-       /* HAVE_DIRENT_H */
+# endif /* HAVE_NDIR_H */
+#endif /* HAVE_DIRENT_H */
 #ifdef HAVE_LIBZ
 #include <zlib.h>
-#  endif
-       /* HAVE_LIBZ */
+#endif /* HAVE_LIBZ */
 
 #include <stdlib.h>
 
 #ifdef HAVE_LIBDMALLOC
 # include <dmalloc.h>
-#  endif
-       /* HAVE_LIBDMALLOC */
+#endif /* HAVE_LIBDMALLOC */
 
 int m_open (const char *pathname, int flags, mode_t mode);
 
@@ -64,12 +58,10 @@ FILE *m_fdopen (int fildes, const char *mode);
 #ifdef HAVE_LIBZ
 gzFile m_gzdopen (int fildes, const char *mode);
 void gzwrite_loop (void *fp, char *str);
-#  endif
-       /* HAVE_LIBZ */
+#endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
 void bzwrite_loop (void *fp, char *str);
-#  endif
-       /* HAVE_LIBBZ2 */
+#endif /* HAVE_LIBBZ2 */
 
 DIR *m_opendir (const char *name);
 
@@ -78,8 +70,7 @@ void *xmalloc (size_t size);
 void *xrealloc (void *ptr, size_t size);
 void *xcalloc (size_t nmemb, size_t size);
 char *xstrdup (const char *s);
-#  endif
-       /* HAVE_LIBDMALLOC */
+#endif /* HAVE_LIBDMALLOC */
 
 int m_unlink (const char *pathname);