clang-format

userland/lib/libc/unix/err.c

@@ -47,72 +47,60 @@ extern char **__argv;
 /*
  * Routine to print error message text to stderr.
  */
-static
-void
-__senderr(void *junk, const char *data, size_t len)
-{
-	(void)junk;  /* not needed or used */
+static void __senderr(void *junk, const char *data, size_t len) {
+  (void)junk; /* not needed or used */
 
-	write(STDERR_FILENO, data, len);
+  write(STDERR_FILENO, data, len);
 }
 
 /*
  * Shortcut to call __senderr on a null-terminated string.
  * (__senderr is set up to be called by __vprintf.)
  */
-static
-void
-__senderrstr(const char *str)
-{
-	__senderr(NULL, str, strlen(str));
-}
+static void __senderrstr(const char *str) { __senderr(NULL, str, strlen(str)); }
 
 /*
  * Common routine for all the *err* and *warn* functions.
  */
-static
-void
-__printerr(int use_errno, const char *fmt, va_list ap)
-{
-	const char *errmsg;
-	const char *prog;
+static void __printerr(int use_errno, const char *fmt, va_list ap) {
+  const char *errmsg;
+  const char *prog;
 
-	/*
-	 * Get the error message for the current errno.
-	 * Do this early, before doing anything that might change the
-	 * value in errno.
-	 */
-	errmsg = strerror(errno);
+  /*
+   * Get the error message for the current errno.
+   * Do this early, before doing anything that might change the
+   * value in errno.
+   */
+  errmsg = strerror(errno);
 
-	/*
-	 * Look up the program name.
-	 * Strictly speaking we should pull off the rightmost
-	 * path component of argv[0] and use that as the program
-	 * name (this is how BSD err* prints) but it doesn't make
-	 * much difference.
-	 */
-	if (__argv!=NULL && __argv[0]!=NULL) {
-		prog = __argv[0];
-	}
-	else {
-		prog = "(program name unknown)";
-	}
+  /*
+   * Look up the program name.
+   * Strictly speaking we should pull off the rightmost
+   * path component of argv[0] and use that as the program
+   * name (this is how BSD err* prints) but it doesn't make
+   * much difference.
+   */
+  if (__argv != NULL && __argv[0] != NULL) {
+    prog = __argv[0];
+  } else {
+    prog = "(program name unknown)";
+  }
 
-	/* print the program name */
-	__senderrstr(prog);
-	__senderrstr(": ");
+  /* print the program name */
+  __senderrstr(prog);
+  __senderrstr(": ");
 
-	/* process the printf format and args */
-	__vprintf(__senderr, NULL, fmt, ap);
+  /* process the printf format and args */
+  __vprintf(__senderr, NULL, fmt, ap);
 
-	/* if we're using errno, print the error string from above. */
-	if (use_errno) {
-		__senderrstr(": ");
-		__senderrstr(errmsg);
-	}
+  /* if we're using errno, print the error string from above. */
+  if (use_errno) {
+    __senderrstr(": ");
+    __senderrstr(errmsg);
+  }
 
-	/* and always add a newline. */
-	__senderrstr("\n");
+  /* and always add a newline. */
+  __senderrstr("\n");
 }
 
 /*
@@ -120,33 +108,21 @@ __printerr(int use_errno, const char *fmt, va_list ap)
  */
 
 /* warn/vwarn: use errno, don't exit */
-void
-vwarn(const char *fmt, va_list ap)
-{
-	__printerr(1, fmt, ap);
-}
+void vwarn(const char *fmt, va_list ap) { __printerr(1, fmt, ap); }
 
 /* warnx/vwarnx: don't use errno, don't exit */
-void
-vwarnx(const char *fmt, va_list ap)
-{
-	__printerr(0, fmt, ap);
-}
+void vwarnx(const char *fmt, va_list ap) { __printerr(0, fmt, ap); }
 
 /* err/verr: use errno, then exit */
-void
-verr(int exitcode, const char *fmt, va_list ap)
-{
-	__printerr(1, fmt, ap);
-	exit(exitcode);
+void verr(int exitcode, const char *fmt, va_list ap) {
+  __printerr(1, fmt, ap);
+  exit(exitcode);
 }
 
 /* errx/verrx: don't use errno, but do then exit */
-void
-verrx(int exitcode, const char *fmt, va_list ap)
-{
-	__printerr(0, fmt, ap);
-	exit(exitcode);
+void verrx(int exitcode, const char *fmt, va_list ap) {
+  __printerr(0, fmt, ap);
+  exit(exitcode);
 }
 
 /*
@@ -154,38 +130,30 @@ verrx(int exitcode, const char *fmt, va_list ap)
  * Just hand off to the va_list versions.
  */
 
-void
-warn(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarn(fmt, ap);
-	va_end(ap);
+void warn(const char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  vwarn(fmt, ap);
+  va_end(ap);
 }
 
-void
-warnx(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
+void warnx(const char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  vwarnx(fmt, ap);
+  va_end(ap);
 }
 
-void
-err(int exitcode, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verr(exitcode, fmt, ap);
-	va_end(ap);
+void err(int exitcode, const char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  verr(exitcode, fmt, ap);
+  va_end(ap);
 }
 
-void
-errx(int exitcode, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(exitcode, fmt, ap);
-	va_end(ap);
+void errx(int exitcode, const char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  verrx(exitcode, fmt, ap);
+  va_end(ap);
 }