Reindent safe.[ch]

Author: acv

src/safe.c

@@ -31,7 +31,6 @@
 /* Enable vasprintf */
 #define _GNU_SOURCE
 
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,18 +43,19 @@
 #include <syslog.h>
 
 /* From gateway.c */
-extern httpd * webserver;
+extern httpd *webserver;
 
 void *
-safe_malloc (size_t size) {
-	void * retval = NULL;
-	retval = malloc(size);
-	if (!retval) {
-		debug(LOG_CRIT, "Failed to malloc %d bytes of memory: %s.  Bailing out", size, strerror(errno));
-		exit(1);
-	}
+safe_malloc(size_t size)
+{
+    void *retval = NULL;
+    retval = malloc(size);
+    if (!retval) {
+        debug(LOG_CRIT, "Failed to malloc %d bytes of memory: %s.  Bailing out", size, strerror(errno));
+        exit(1);
+    }
     memset(retval, 0, size);
-	return (retval);
+    return (retval);
 }
 
 void *
@@ -70,59 +70,65 @@ safe_realloc(void *ptr, size_t newsize)
     return retval;
 }
 
-char * safe_strdup(const char *s) {
-	char * retval = NULL;
-	if (!s) {
-		debug(LOG_CRIT, "safe_strdup called with NULL which would have crashed strdup. Bailing out");
-		exit(1);
-	}
-	retval = strdup(s);
-	if (!retval) {
-		debug(LOG_CRIT, "Failed to duplicate a string: %s.  Bailing out", strerror(errno));
-		exit(1);
-	}
-	return (retval);
+char *
+safe_strdup(const char *s)
+{
+    char *retval = NULL;
+    if (!s) {
+        debug(LOG_CRIT, "safe_strdup called with NULL which would have crashed strdup. Bailing out");
+        exit(1);
+    }
+    retval = strdup(s);
+    if (!retval) {
+        debug(LOG_CRIT, "Failed to duplicate a string: %s.  Bailing out", strerror(errno));
+        exit(1);
+    }
+    return (retval);
 }
 
-int safe_asprintf(char **strp, const char *fmt, ...) {
-	va_list ap;
-	int retval;
+int
+safe_asprintf(char **strp, const char *fmt, ...)
+{
+    va_list ap;
+    int retval;
 
-	va_start(ap, fmt);
-	retval = safe_vasprintf(strp, fmt, ap);
-	va_end(ap);
+    va_start(ap, fmt);
+    retval = safe_vasprintf(strp, fmt, ap);
+    va_end(ap);
 
-	return (retval);
+    return (retval);
 }
 
-int safe_vasprintf(char **strp, const char *fmt, va_list ap) {
-	int retval;
+int
+safe_vasprintf(char **strp, const char *fmt, va_list ap)
+{
+    int retval;
 
-	retval = vasprintf(strp, fmt, ap);
+    retval = vasprintf(strp, fmt, ap);
 
-	if (retval == -1) {
-		debug(LOG_CRIT, "Failed to vasprintf: %s.  Bailing out", strerror(errno));
-		exit (1);
-	}
-	return (retval);
+    if (retval == -1) {
+        debug(LOG_CRIT, "Failed to vasprintf: %s.  Bailing out", strerror(errno));
+        exit(1);
+    }
+    return (retval);
 }
 
-pid_t safe_fork(void) {
-	pid_t result;
-	result = fork();
-
-	if (result == -1) {
-		debug(LOG_CRIT, "Failed to fork: %s.  Bailing out", strerror(errno));
-		exit (1);
-	}
-	else if (result == 0) {
-		/* I'm the child - do some cleanup */
-		if (webserver) {
-			close(webserver->serverSock);
-			webserver = NULL;
-		}
-	}
-
-	return result;
-}
+pid_t
+safe_fork(void)
+{
+    pid_t result;
+    result = fork();
 
+    if (result == -1) {
+        debug(LOG_CRIT, "Failed to fork: %s.  Bailing out", strerror(errno));
+        exit(1);
+    } else if (result == 0) {
+        /* I'm the child - do some cleanup */
+        if (webserver) {
+            close(webserver->serverSock);
+            webserver = NULL;
+        }
+    }
+
+    return result;
+}

src/safe.h

@@ -28,9 +28,9 @@
 #ifndef _SAFE_H_
 #define _SAFE_H_
 
-#include <stdarg.h> /* For va_list */
-#include <sys/types.h> /* For fork */
-#include <unistd.h> /* For fork */
+#include <stdarg.h>             /* For va_list */
+#include <sys/types.h>          /* For fork */
+#include <unistd.h>             /* For fork */
 
 /** @brief Safe version of malloc
  */
@@ -41,7 +41,7 @@ void *safe_realloc(void *, size_t);
 
 /* @brief Safe version of strdup
  */
-char * safe_strdup(const char *);
+char *safe_strdup(const char *);
 
 /* @brief Safe version of asprintf
  */
@@ -56,5 +56,4 @@ int safe_vasprintf(char **, const char *, va_list);
 
 pid_t safe_fork(void);
 
-#endif /* _SAFE_H_ */
-
+#endif                          /* _SAFE_H_ */