misc: syslog: Fix indentation and style

And also clenaup the headers, no semantic changes.

misc/syslog.c

@@ -31,32 +31,16 @@
 static char sccsid[] = "@(#)syslog.c	8.4 (Berkeley) 3/18/94";
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
+#include <libio/libioP.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <paths.h>
+#include <stdarg.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <stdio_ext.h>
-#include <string.h>
+#include <sys/socket.h>
-#include <time.h>
+#include <sys/uio.h>
-#include <unistd.h>
+#include <sys/un.h>
-#include <stdlib.h>
+#include <syslog.h>
-#include <libc-lock.h>
-#include <signal.h>
-#include <locale.h>
-
-#include <stdarg.h>
-
-#include <libio/libioP.h>
-#include <math_ldbl_opt.h>
-
-#include <kernel-features.h>
 
 #define ftell(s) _IO_ftell (s)
 
@@ -71,7 +55,6 @@ extern char	*__progname;		/* Program name, from crt0. */
 
 /* Define the lock.  */
 __libc_lock_define_initialized (static, syslog_lock)
-
 static void openlog_internal (const char *, int, int);
 static void closelog_internal (void);
 
@@ -151,14 +134,14 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
 
 #define	INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
   /* Check for invalid bits. */
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
+  if (pri & ~(LOG_PRIMASK | LOG_FACMASK))
-		syslog(INTERNALLOG,
+    {
-		    "syslog: unknown facility/priority: %x", pri);
+      syslog (INTERNALLOG, "syslog: unknown facility/priority: %x", pri);
       pri &= LOG_PRIMASK | LOG_FACMASK;
     }
 
-	/* Prepare for multiple users.  We have to take care: most
+  /* Prepare for multiple users.  We have to take care: most syscalls we are
-	   syscalls we are using are cancellation points.  */
+     using are cancellation points.  */
   struct cleanup_arg clarg;
   clarg.buf = NULL;
   clarg.oldaction = NULL;
@@ -177,8 +160,8 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
   f = __open_memstream (&buf, &bufsize);
   if (f == NULL)
     {
-	    /* We cannot get a stream.  There is not much we can do but
+      /* We cannot get a stream.  There is not much we can do but emitting an
-	       emitting an error messages.  */
+         error messages.  */
       char numbuf[3 * sizeof (pid_t)];
       char *nump;
       char *endp = __stpcpy (failbuf, "out of memory [");
@@ -203,8 +186,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
       fprintf (f, "<%d>", pri);
       now = time_now ();
       f->_IO_write_ptr += __strftime_l (f->_IO_write_ptr,
-					      f->_IO_write_end
+					f->_IO_write_end - f->_IO_write_ptr,
-					      - f->_IO_write_ptr,
 					"%h %e %T ",
 					__localtime_r (&now, &now_tm),
 					_nl_C_locobj_ptr);
@@ -224,12 +206,11 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
       /* Restore errno for %m format.  */
       __set_errno (saved_errno);
 
-	    /* We have the header.  Print the user's format into the
+      /* We have the header.  Print the user's format into the buffer.  */
-	       buffer.  */
       __vfprintf_internal (f, fmt, ap, mode_flags);
 
-	    /* Close the memory stream; this will finalize the data
+      /* Close the memory stream; this will finalize the data into a malloc'd
-	       into a malloc'd buffer in BUF.  */
+         buffer in BUF.  */
       fclose (f);
 
       /* Tell the cancellation handler to free this buffer.  */
@@ -237,7 +218,8 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
     }
 
   /* Output to stderr if requested. */
-	if (LogStat & LOG_PERROR) {
+  if (LogStat & LOG_PERROR)
+    {
       struct iovec iov[2];
       struct iovec *v = iov;
 
@@ -252,15 +234,15 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
 	}
 
       /* writev is a cancellation point.  */
-		(void)__writev(STDERR_FILENO, iov, v - iov + 1);
+      __writev (STDERR_FILENO, iov, v - iov + 1);
     }
 
   /* Get connected, output the message to the local logger.  */
   if (!connected)
     openlog_internal (NULL, LogStat | LOG_NDELAY, LogFacility);
 
-	/* If we have a SOCK_STREAM connection, also send ASCII NUL as
+  /* If we have a SOCK_STREAM connection, also send ASCII NUL as a record
-	   a record terminator.  */
+     terminator.  */
   if (LogType == SOCK_STREAM)
     ++bufsize;
 
@@ -268,8 +250,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
     {
       if (connected)
 	{
-		/* Try to reopen the syslog connection.  Maybe it went
+	  /* Try to reopen the syslog connection.  Maybe it went down.  */
-		   down.  */
 	  closelog_internal ();
 	  openlog_internal (NULL, LogStat | LOG_NDELAY, LogFacility);
 	}
@@ -284,11 +265,11 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
 	   * syslogd failure.
 	   */
 	  if (LogStat & LOG_CONS &&
-		    (fd = __open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_CLOEXEC,
+	      (fd = __open (_PATH_CONSOLE, O_WRONLY | O_NOCTTY
-				 0)) >= 0)
+			    | O_CLOEXEC, 0)) >= 0)
 	    {
 	      __dprintf (fd, "%s\r\n", buf + msgoff);
-		    (void)__close(fd);
+	      __close (fd);
 	    }
 	}
     }
@@ -319,9 +300,12 @@ openlog_internal(const char *ident, int logstat, int logfac)
     LogFacility = logfac;
 
   int retry = 0;
-	while (retry < 2) {
+  while (retry < 2)
-		if (LogFile == -1) {
+    {
-			if (LogStat & LOG_NDELAY) {
+      if (LogFile == -1)
+	{
+	  if (LogStat & LOG_NDELAY)
+	    {
 	      LogFile = __socket (AF_UNIX, LogType | SOCK_CLOEXEC, 0);
 	      if (LogFile == -1)
 		return;
@@ -330,23 +314,22 @@ openlog_internal(const char *ident, int logstat, int logfac)
       if (LogFile != -1 && !connected)
 	{
 	  int old_errno = errno;
-			if (__connect(LogFile, &SyslogAddr, sizeof(SyslogAddr))
+	  if (__connect (LogFile, &SyslogAddr, sizeof (SyslogAddr)) == -1)
-			    == -1)
 	    {
 	      int saved_errno = errno;
 	      int fd = LogFile;
 	      LogFile = -1;
-				(void)__close(fd);
+	      __close (fd);
 	      __set_errno (old_errno);
 	      if (saved_errno == EPROTOTYPE)
 		{
 		  /* retry with the other type: */
-					LogType = (LogType == SOCK_DGRAM
+		  LogType = LogType == SOCK_DGRAM ? SOCK_STREAM : SOCK_DGRAM;
-						   ? SOCK_STREAM : SOCK_DGRAM);
 		  ++retry;
 		  continue;
 		}
-			} else
+	    }
+	  else
 	    connected = true;
 	}
       break;