diff options
author | Bruce Momjian <bruce@momjian.us> | 2010-02-26 02:01:40 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2010-02-26 02:01:40 +0000 |
commit | 65e806cba1f0f154d51caa7478e7192ce58d1056 (patch) | |
tree | 99a656d7b4ec6d038d4c24e07fadf75db4c37e79 /src/backend/port/win32 | |
parent | 16040575a04486d8e0823b4e304f4933144baf90 (diff) | |
download | postgresql-65e806cba1f0f154d51caa7478e7192ce58d1056.tar.gz postgresql-65e806cba1f0f154d51caa7478e7192ce58d1056.zip |
pgindent run for 9.0
Diffstat (limited to 'src/backend/port/win32')
-rw-r--r-- | src/backend/port/win32/mingwcompat.c | 4 | ||||
-rw-r--r-- | src/backend/port/win32/signal.c | 40 | ||||
-rw-r--r-- | src/backend/port/win32/socket.c | 8 |
3 files changed, 28 insertions, 24 deletions
diff --git a/src/backend/port/win32/mingwcompat.c b/src/backend/port/win32/mingwcompat.c index 5520ec1864c..4088b204923 100644 --- a/src/backend/port/win32/mingwcompat.c +++ b/src/backend/port/win32/mingwcompat.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/mingwcompat.c,v 1.10 2010/02/09 20:22:20 mha Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/mingwcompat.c,v 1.11 2010/02/26 02:00:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ * in any library. It's trivial enough that we can safely define it * ourselves. */ -const struct in6_addr in6addr_any = {{{0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}}}; +const struct in6_addr in6addr_any = {{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}}; /* diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index 1ffc55a5c4d..35959ae0155 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.24 2010/01/31 17:16:23 mha Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.25 2010/02/26 02:00:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -275,31 +275,34 @@ pg_signal_thread(LPVOID param) fConnected = ConnectNamedPipe(pipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED); if (fConnected) { - HANDLE newpipe; + HANDLE newpipe; /* - * We have a connected pipe. Pass this off to a separate thread that will do the actual - * processing of the pipe. + * We have a connected pipe. Pass this off to a separate thread + * that will do the actual processing of the pipe. * - * We must also create a new instance of the pipe *before* we start running the new - * thread. If we don't, there is a race condition whereby the dispatch thread might - * run CloseHandle() before we have created a new instance, thereby causing a small + * We must also create a new instance of the pipe *before* we + * start running the new thread. If we don't, there is a race + * condition whereby the dispatch thread might run CloseHandle() + * before we have created a new instance, thereby causing a small * window of time where we will miss incoming requests. */ newpipe = CreateNamedPipe(pipename, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, - PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL); + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL); if (newpipe == INVALID_HANDLE_VALUE) { /* - * This really should never fail. Just retry in case it does, even though we have - * a small race window in that case. There is nothing else we can do other than - * abort the whole process which will be even worse. + * This really should never fail. Just retry in case it does, + * even though we have a small race window in that case. There + * is nothing else we can do other than abort the whole + * process which will be even worse. */ write_stderr("could not create signal listener pipe: error code %d; retrying\n", (int) GetLastError()); + /* - * Keep going so we at least dispatch this signal. Hopefully, the call will succeed - * when retried in the loop soon after. + * Keep going so we at least dispatch this signal. Hopefully, + * the call will succeed when retried in the loop soon after. */ } hThread = CreateThread(NULL, 0, @@ -312,8 +315,9 @@ pg_signal_thread(LPVOID param) CloseHandle(hThread); /* - * Background thread is running with our instance of the pipe. So replace our reference - * with the newly created one and loop back up for another run. + * Background thread is running with our instance of the pipe. So + * replace our reference with the newly created one and loop back + * up for another run. */ pipe = newpipe; } @@ -322,8 +326,8 @@ pg_signal_thread(LPVOID param) /* * Connection failed. Cleanup and try again. * - * This should never happen. If it does, we have a small race condition until we loop - * up and re-create the pipe. + * This should never happen. If it does, we have a small race + * condition until we loop up and re-create the pipe. */ CloseHandle(pipe); pipe = INVALID_HANDLE_VALUE; diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index e05048681b1..3355606e450 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.25 2010/02/17 05:51:40 mha Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.26 2010/02/26 02:00:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ * This flag changes the behaviour *globally* for all socket operations, * so it should only be set for very short periods of time. */ -int pgwin32_noblock = 0; +int pgwin32_noblock = 0; #undef socket #undef accept @@ -326,8 +326,8 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f) if (pgwin32_noblock) { /* - * No data received, and we are in "emulated non-blocking mode", so return - * indicating that we'd block if we were to continue. + * No data received, and we are in "emulated non-blocking mode", so + * return indicating that we'd block if we were to continue. */ errno = EWOULDBLOCK; return -1; |