diff options
Diffstat (limited to 'src/backend/port/win32')
| -rw-r--r-- | src/backend/port/win32/error.c | 4 | ||||
| -rw-r--r-- | src/backend/port/win32/security.c | 38 | ||||
| -rw-r--r-- | src/backend/port/win32/sema.c | 6 | ||||
| -rw-r--r-- | src/backend/port/win32/shmem.c | 4 | ||||
| -rw-r--r-- | src/backend/port/win32/signal.c | 32 | ||||
| -rw-r--r-- | src/backend/port/win32/socket.c | 14 |
6 files changed, 49 insertions, 49 deletions
diff --git a/src/backend/port/win32/error.c b/src/backend/port/win32/error.c index c7f0a24f102..eb660a3ef83 100644 --- a/src/backend/port/win32/error.c +++ b/src/backend/port/win32/error.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/error.c,v 1.5 2005/10/07 16:34:48 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/error.c,v 1.6 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -178,7 +178,7 @@ _dosmaperr(unsigned long e) errno = doserrors[i].doserr; ereport(DEBUG5, (errmsg_internal("mapped win32 error code %lu to %d", - e, errno))); + e, errno))); return; } } diff --git a/src/backend/port/win32/security.c b/src/backend/port/win32/security.c index 9283f3f6942..f610b893617 100644 --- a/src/backend/port/win32/security.c +++ b/src/backend/port/win32/security.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.8 2004/12/31 22:00:37 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.9 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,8 +15,8 @@ static BOOL pgwin32_get_dynamic_tokeninfo(HANDLE token, - TOKEN_INFORMATION_CLASS class, char **InfoBuffer, - char *errbuf, int errsize); + TOKEN_INFORMATION_CLASS class, char **InfoBuffer, + char *errbuf, int errsize); /* * Returns nonzero if the current user has administrative privileges, @@ -30,7 +30,7 @@ pgwin32_is_admin(void) { HANDLE AccessToken; char *InfoBuffer = NULL; - char errbuf[256]; + char errbuf[256]; PTOKEN_GROUPS Groups; PSID AdministratorsSid; PSID PowerUsersSid; @@ -57,7 +57,7 @@ pgwin32_is_admin(void) CloseHandle(AccessToken); if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, + SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsSid)) { write_stderr("could not get SID for Administrators group: error code %d\n", @@ -66,7 +66,7 @@ pgwin32_is_admin(void) } if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0, + SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0, 0, &PowerUsersSid)) { write_stderr("could not get SID for PowerUsers group: error code %d\n", @@ -114,8 +114,8 @@ pgwin32_is_service(void) { static int _is_service = -1; HANDLE AccessToken; - char *InfoBuffer = NULL; - char errbuf[256]; + char *InfoBuffer = NULL; + char errbuf[256]; PTOKEN_GROUPS Groups; PTOKEN_USER User; PSID ServiceSid; @@ -138,14 +138,14 @@ pgwin32_is_service(void) if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenUser, &InfoBuffer, errbuf, sizeof(errbuf))) { - fprintf(stderr,errbuf); + fprintf(stderr, errbuf); return -1; } User = (PTOKEN_USER) InfoBuffer; if (!AllocateAndInitializeSid(&NtAuthority, 1, - SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, + SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &LocalSystemSid)) { fprintf(stderr, "could not get SID for local system account\n"); @@ -169,14 +169,14 @@ pgwin32_is_service(void) if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups, &InfoBuffer, errbuf, sizeof(errbuf))) { - fprintf(stderr,errbuf); + fprintf(stderr, errbuf); return -1; } Groups = (PTOKEN_GROUPS) InfoBuffer; if (!AllocateAndInitializeSid(&NtAuthority, 1, - SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0, + SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0, &ServiceSid)) { fprintf(stderr, "could not get SID for service group\n"); @@ -213,17 +213,17 @@ static BOOL pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class, char **InfoBuffer, char *errbuf, int errsize) { - DWORD InfoBufferSize; + DWORD InfoBufferSize; if (GetTokenInformation(token, class, NULL, 0, &InfoBufferSize)) { - snprintf(errbuf,errsize,"could not get token information: got zero size\n"); + snprintf(errbuf, errsize, "could not get token information: got zero size\n"); return FALSE; } if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - snprintf(errbuf,errsize,"could not get token information: error code %d\n", + snprintf(errbuf, errsize, "could not get token information: error code %d\n", (int) GetLastError()); return FALSE; } @@ -231,18 +231,18 @@ pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class, *InfoBuffer = malloc(InfoBufferSize); if (*InfoBuffer == NULL) { - snprintf(errbuf,errsize,"could not allocate %d bytes for token information\n", + snprintf(errbuf, errsize, "could not allocate %d bytes for token information\n", (int) InfoBufferSize); return FALSE; } - if (!GetTokenInformation(token, class, *InfoBuffer, + if (!GetTokenInformation(token, class, *InfoBuffer, InfoBufferSize, &InfoBufferSize)) { - snprintf(errbuf,errsize,"could not get token information: error code %d\n", + snprintf(errbuf, errsize, "could not get token information: error code %d\n", (int) GetLastError()); return FALSE; } - + return TRUE; } diff --git a/src/backend/port/win32/sema.c b/src/backend/port/win32/sema.c index 7942e696e3c..a9d62f057f1 100644 --- a/src/backend/port/win32/sema.c +++ b/src/backend/port/win32/sema.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/sema.c,v 1.10 2004/12/31 22:00:37 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/sema.c,v 1.11 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -216,8 +216,8 @@ semop(int semId, struct sembuf * sops, int nsops) if (nsops != 1) { /* - * Not supported (we return on 1st success, and don't cancel - * earlier ops) + * Not supported (we return on 1st success, and don't cancel earlier + * ops) */ errno = E2BIG; return -1; diff --git a/src/backend/port/win32/shmem.c b/src/backend/port/win32/shmem.c index 49f5696ceb7..dbb9cdc0f1c 100644 --- a/src/backend/port/win32/shmem.c +++ b/src/backend/port/win32/shmem.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/shmem.c,v 1.10 2004/12/31 22:00:37 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/shmem.c,v 1.11 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ shmat(int memId, void *shmaddr, int flag) /* TODO -- shmat needs to count # attached to shared mem */ void *lpmem = MapViewOfFileEx((HANDLE) memId, FILE_MAP_WRITE | FILE_MAP_READ, - 0, 0, /* (DWORD)pshmdsc->segsize */ 0 /* s_segsize */ , shmaddr); + 0, 0, /* (DWORD)pshmdsc->segsize */ 0 /* s_segsize */ , shmaddr); if (lpmem == NULL) { diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index e0c9dba16f4..a32427f28f5 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.11 2004/12/31 22:00:37 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.12 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT]; static int pg_signal_mask; DLLIMPORT HANDLE pgwin32_signal_event; -HANDLE pgwin32_initial_signal_pipe = INVALID_HANDLE_VALUE; +HANDLE pgwin32_initial_signal_pipe = INVALID_HANDLE_VALUE; /* Signal handling thread function */ @@ -73,12 +73,12 @@ pgwin32_signal_initialize(void) signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL); if (signal_thread_handle == NULL) ereport(FATAL, - (errmsg_internal("failed to create signal handler thread"))); + (errmsg_internal("failed to create signal handler thread"))); /* Create console control handle to pick up Ctrl-C etc */ if (!SetConsoleCtrlHandler(pg_console_handler, TRUE)) ereport(FATAL, - (errmsg_internal("failed to set console control handler"))); + (errmsg_internal("failed to set console control handler"))); } @@ -112,9 +112,9 @@ pgwin32_dispatch_queued_signals(void) LeaveCriticalSection(&pg_signal_crit_sec); sig(i); EnterCriticalSection(&pg_signal_crit_sec); - break; /* Restart outer loop, in case signal mask - * or queue has been modified inside - * signal handler */ + break; /* Restart outer loop, in case signal mask or + * queue has been modified inside signal + * handler */ } } } @@ -133,8 +133,8 @@ pqsigsetmask(int mask) pg_signal_mask = mask; /* - * Dispatch any signals queued up right away, in case we have - * unblocked one or more signals previously queued + * Dispatch any signals queued up right away, in case we have unblocked + * one or more signals previously queued */ pgwin32_dispatch_queued_signals(); @@ -165,7 +165,7 @@ pgwin32_create_signal_listener(pid_t pid) wsprintf(pipename, "\\\\.\\pipe\\pgsignal_%d", (int) pid); pipe = CreateNamedPipe(pipename, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL); if (pipe == INVALID_HANDLE_VALUE) @@ -218,8 +218,8 @@ pg_signal_dispatch_thread(LPVOID param) CloseHandle(pipe); return 0; } - WriteFile(pipe, &sigNum, 1, &bytes, NULL); /* Don't care if it works - * or not.. */ + WriteFile(pipe, &sigNum, 1, &bytes, NULL); /* Don't care if it works or + * not.. */ FlushFileBuffers(pipe); DisconnectNamedPipe(pipe); CloseHandle(pipe); @@ -233,7 +233,7 @@ static DWORD WINAPI pg_signal_thread(LPVOID param) { char pipename[128]; - HANDLE pipe = pgwin32_initial_signal_pipe; + HANDLE pipe = pgwin32_initial_signal_pipe; wsprintf(pipename, "\\\\.\\pipe\\pgsignal_%d", GetCurrentProcessId()); @@ -245,8 +245,8 @@ pg_signal_thread(LPVOID param) if (pipe == INVALID_HANDLE_VALUE) { pipe = 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 (pipe == INVALID_HANDLE_VALUE) { @@ -260,7 +260,7 @@ pg_signal_thread(LPVOID param) if (fConnected) { hThread = CreateThread(NULL, 0, - (LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread, + (LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread, (LPVOID) pipe, 0, NULL); if (hThread == INVALID_HANDLE_VALUE) write_stderr("could not create signal dispatch thread: error code %d\n", diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index e65197e4d96..808977a2374 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.8 2004/12/31 22:00:37 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.9 2005/10/15 02:49:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -178,8 +178,8 @@ pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen) SOCKET rs; /* - * Poll for signals, but don't return with EINTR, since we don't - * handle that in pqcomm.c + * Poll for signals, but don't return with EINTR, since we don't handle + * that in pqcomm.c */ pgwin32_poll_signals(); @@ -351,8 +351,8 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c if (WSAGetLastError() != WSAEWOULDBLOCK) /* - * Not completed, and not just "would block", so an - * error occured + * Not completed, and not just "would block", so an error + * occured */ FD_SET(writefds->fd_array[i], &outwritefds); } @@ -423,8 +423,8 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c if (r != WAIT_TIMEOUT && r != WAIT_IO_COMPLETION && r != (WAIT_OBJECT_0 + numevents)) { /* - * We scan all events, even those not signalled, in case more than - * one event has been tagged but Wait.. can only return one. + * We scan all events, even those not signalled, in case more than one + * event has been tagged but Wait.. can only return one. */ WSANETWORKEVENTS resEvents; |