3 files changed, 106 insertions, 90 deletions

diff --git a/src/backend/port/nextstep/dynloader.c b/src/backend/port/nextstep/dynloader.c
index af183d436de..c37508f7f19 100644
--- a/src/backend/port/nextstep/dynloader.c
+++ b/src/backend/port/nextstep/dynloader.c
@@ -2,71 +2,80 @@
 #include <streams/streams.h>
 #include <stdlib.h>
 
-static char* lastError = NULL;
+static char    *lastError = NULL;
 
-static NXStream* OpenError()
+static NXStream *
+OpenError()
 {
-    return NXOpenMemory(NULL, 0, NX_WRITEONLY);
+	return NXOpenMemory(NULL, 0, NX_WRITEONLY);
 }
 
-static void CloseError(NXStream* s)
+static void
+CloseError(NXStream * s)
 {
-    if (s)
-	NXCloseMemory (s, NX_FREEBUFFER);
+	if (s)
+		NXCloseMemory(s, NX_FREEBUFFER);
 }
 
-static void TransferError(NXStream* s)
+static void
+TransferError(NXStream * s)
 {
-    char *buffer;
-    int len, maxlen;
+	char		   *buffer;
+	int				len,
+					maxlen;
 
-    if (lastError)
-        free (lastError);
-    NXGetMemoryBuffer (s, &buffer, &len, &maxlen);
-    lastError = malloc (len + 1);
-    strcpy (lastError, buffer);
+	if (lastError)
+		free(lastError);
+	NXGetMemoryBuffer(s, &buffer, &len, &maxlen);
+	lastError = malloc(len + 1);
+	strcpy(lastError, buffer);
 }
 
-void* next_dlopen(char* name)
+void		   *
+next_dlopen(char *name)
 {
-    int rld_success;
-    NXStream* errorStream;
-    char* result = NULL;
-    char **p;
-	
-    errorStream = OpenError();
-    p = calloc (2, sizeof(void*));
-    p[0] = name;
-    rld_success = rld_load(errorStream, NULL, p, NULL);
-    free (p);
+	int				rld_success;
+	NXStream	   *errorStream;
+	char		   *result = NULL;
+	char		  **p;
 
-    if (!rld_success) {
-	TransferError (errorStream);
-	result = (char*)1;
-    }
-    CloseError (errorStream);
-    return result;
+	errorStream = OpenError();
+	p = calloc(2, sizeof(void *));
+	p[0] = name;
+	rld_success = rld_load(errorStream, NULL, p, NULL);
+	free(p);
+
+	if (!rld_success)
+	{
+		TransferError(errorStream);
+		result = (char *) 1;
+	}
+	CloseError(errorStream);
+	return result;
 }
 
-int next_dlclose(void* handle)
+int
+next_dlclose(void *handle)
 {
-    return 0;
+	return 0;
 }
 
-void* next_dlsym (void *handle, char *symbol)
+void		   *
+next_dlsym(void *handle, char *symbol)
 {
-    NXStream* errorStream = OpenError();
-    char symbuf[1024];
-    unsigned long symref = 0;
+	NXStream	   *errorStream = OpenError();
+	char			symbuf[1024];
+	unsigned long	symref = 0;
 
-    sprintf(symbuf, "_%s", symbol);
-    if (!rld_lookup (errorStream, symbuf, &symref))
-	TransferError(errorStream);
-    CloseError(errorStream);
-    return (void*) symref;
+	sprintf(symbuf, "_%s", symbol);
+	if (!rld_lookup(errorStream, symbuf, &symref))
+		TransferError(errorStream);
+	CloseError(errorStream);
+	return (void *) symref;
 }
 
-char* next_dlerror(void)
+char		   *
+next_dlerror(void)
 {
-    return lastError;
+	return lastError;
 }
diff --git a/src/backend/port/nextstep/port-protos.h b/src/backend/port/nextstep/port-protos.h
index 93fec7642f0..ce17beb69a6 100644
--- a/src/backend/port/nextstep/port-protos.h
+++ b/src/backend/port/nextstep/port-protos.h
@@ -1,27 +1,27 @@
 /*-------------------------------------------------------------------------
  *
  * port-protos.h--
- *    port-specific prototypes for NeXT
+ *	  port-specific prototypes for NeXT
  *
-  
+
 -------------------------------------------------------------------------
  */
 #ifndef PORT_PROTOS_H
 #define PORT_PROTOS_H
 
-#include "fmgr.h"			/* for func_ptr */
+#include "fmgr.h"				/* for func_ptr */
 #include "utils/dynamic_loader.h"
 
-void* next_dlopen(char* name);
-int next_dlclose(void* handle);
-void* next_dlsym (void *handle, char *symbol);
-char* next_dlerror(void);
+void		   *next_dlopen(char *name);
+int				next_dlclose(void *handle);
+void		   *next_dlsym(void *handle, char *symbol);
+char		   *next_dlerror(void);
 
-#define	pg_dlopen(f)	next_dlopen
-#define	pg_dlsym	next_dlsym
-#define	pg_dlclose	next_dlclose
-#define	pg_dlerror	next_dlerror
+#define pg_dlopen(f)	next_dlopen
+#define pg_dlsym		next_dlsym
+#define pg_dlclose		next_dlclose
+#define pg_dlerror		next_dlerror
 
 /* port.c */
 
-#endif /* PORT_PROTOS_H */
+#endif							/* PORT_PROTOS_H */
diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c
index 3da87b32eb8..baf026d5d1d 100644
--- a/src/backend/port/nextstep/port.c
+++ b/src/backend/port/nextstep/port.c
@@ -1,58 +1,65 @@
 #ifndef _POSIX_SOURCE
-# include <libc.h>
+#include <libc.h>
 #else
-# include <unistd.h>
-# include <stdlib.h>
+#include <unistd.h>
+#include <stdlib.h>
 #endif
 
 #include <string.h>
 #include <sys/signal.h>
 
 
-void putenv(char* name)
+void
+putenv(char *name)
 {
-    extern char** environ;
-    static int was_mallocated = 0;
-    int size;
-
-    /* Compute the size of environ array including the final NULL */
-    for (size = 1; environ[size++];)
-	/* nothing */;
-
-    if (!was_mallocated) {
-	char** tmp = environ;
-	int i;
-
-	was_mallocated = 1;
-	environ = malloc (size * sizeof(char*));
-	for (i = 0; i < size; i++)
-	    environ[i] = tmp[i];
-    }
-
-    environ = realloc (environ, (size + 1) * sizeof (char*));
-    environ[size - 1] = strcpy (malloc (strlen (name) + 1), name);
-    environ[size] = NULL;
+	extern char   **environ;
+	static int		was_mallocated = 0;
+	int				size;
+
+	/* Compute the size of environ array including the final NULL */
+	for (size = 1; environ[size++];)
+		 /* nothing */ ;
+
+	if (!was_mallocated)
+	{
+		char		  **tmp = environ;
+		int				i;
+
+		was_mallocated = 1;
+		environ = malloc(size * sizeof(char *));
+		for (i = 0; i < size; i++)
+			environ[i] = tmp[i];
+	}
+
+	environ = realloc(environ, (size + 1) * sizeof(char *));
+	environ[size - 1] = strcpy(malloc(strlen(name) + 1), name);
+	environ[size] = NULL;
 }
 
-char* strdup (const char* string)
+char		   *
+strdup(const char *string)
 {
-    return strcpy (malloc (strlen (string) + 1), string);
+	return strcpy(malloc(strlen(string) + 1), string);
 }
 
 #ifndef _POSIX_SOURCE
-int sigaddset(int *set, int signo)
+int
+sigaddset(int *set, int signo)
 {
-    *set |= sigmask(signo);
-    return *set;
+	*set |= sigmask(signo);
+	return *set;
 }
 
-int sigemptyset(int *set)
+int
+sigemptyset(int *set)
 {
-    return (*set = 0);
+	return (*set = 0);
 }
 
-char *getcwd(char *buf, size_t size)
+char		   *
+getcwd(char *buf, size_t size)
 {
-    return getwd (buf);
+	return getwd(buf);
 }
+
 #endif