Cleanup of code layout only

[mmh] / sbr / pidstatus.c

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index ff8cf48..edd6749 100644 (file)
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -11,11 +11,8 @@
 /*
 ** auto-generated header
 */
-#include <sigmsg.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include "sigmsg.h"
+#include <sys/wait.h>
 
 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))
@@ -26,7 +23,7 @@
 #endif
 
 int
-pidstatus (int status, FILE *fp, char *cp)
+pidstatus(int status, FILE *fp, char *cp)
 {
        int signum;
 
@@ -42,21 +39,24 @@ pidstatus (int status, FILE *fp, char *cp)
        if (WIFEXITED(status)) {
                if ((signum = WEXITSTATUS(status))) {
                        if (cp)
-                               fprintf (fp, "%s: ", cp);
-                       fprintf (fp, "exit %d\n", signum);
+                               fprintf(fp, "%s: ", cp);
+                       fprintf(fp, "exit %d\n", signum);
                }
        } else if (WIFSIGNALED(status)) {
                /* If child process terminated due to receipt of a signal */
                signum = WTERMSIG(status);
                if (signum != SIGINT) {
                        if (cp)
-                               fprintf (fp, "%s: ", cp);
-                       fprintf (fp, "signal %d", signum);
-                       if (signum >= 0 && signum < sizeof(sigmsg) && sigmsg[signum] != NULL)
-                               fprintf (fp, " (%s%s)\n", sigmsg[signum],
-                                        WCOREDUMP(status) ? ", core dumped" : "");
+                               fprintf(fp, "%s: ", cp);
+                       fprintf(fp, "signal %d", signum);
+                       if (signum >= 0 && signum < (int)sizeof(sigmsg) &&
+                                       sigmsg[signum] != NULL)
+                               fprintf(fp, " (%s%s)\n", sigmsg[signum],
+                                               WCOREDUMP(status) ?
+                                               ", core dumped" : "");
                        else
-                               fprintf (fp, "%s\n", WCOREDUMP(status) ? " (core dumped)" : "");
+                               fprintf(fp, "%s\n", WCOREDUMP(status) ?
+                                               " (core dumped)" : "");
                }
        }