diff options
Diffstat (limited to 'src/port')
-rw-r--r-- | src/port/dirmod.c | 6 | ||||
-rw-r--r-- | src/port/getaddrinfo.c | 2 | ||||
-rw-r--r-- | src/port/getopt_long.c | 2 | ||||
-rw-r--r-- | src/port/gettimeofday.c | 4 | ||||
-rw-r--r-- | src/port/inet_net_ntop.c | 4 | ||||
-rw-r--r-- | src/port/open.c | 20 | ||||
-rw-r--r-- | src/port/path.c | 2 | ||||
-rw-r--r-- | src/port/win32security.c | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/src/port/dirmod.c b/src/port/dirmod.c index 4ce8cce0056..eac59bdfdac 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -168,7 +168,7 @@ pgsymlink(const char *oldpath, const char *newpath) CreateDirectory(newpath, 0); dirhandle = CreateFile(newpath, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, - FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0); + FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0); if (dirhandle == INVALID_HANDLE_VALUE) return -1; @@ -198,9 +198,9 @@ pgsymlink(const char *oldpath, const char *newpath) * we use our own definition */ if (!DeviceIoControl(dirhandle, - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS), + CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS), reparseBuf, - reparseBuf->ReparseDataLength + REPARSE_JUNCTION_DATA_BUFFER_HEADER_SIZE, + reparseBuf->ReparseDataLength + REPARSE_JUNCTION_DATA_BUFFER_HEADER_SIZE, 0, 0, &len, 0)) { LPSTR msg; diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index 4de989152e4..e5b5702c799 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -99,7 +99,7 @@ haveNativeWindowsIPv6routines(void) getaddrinfo_ptr = (getaddrinfo_ptr_t) GetProcAddress(hLibrary, "getaddrinfo"); freeaddrinfo_ptr = (freeaddrinfo_ptr_t) GetProcAddress(hLibrary, - "freeaddrinfo"); + "freeaddrinfo"); getnameinfo_ptr = (getnameinfo_ptr_t) GetProcAddress(hLibrary, "getnameinfo"); diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index 0f589d631bf..ff379db29b0 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -119,7 +119,7 @@ getopt_long(int argc, char *const argv[], if (opterr && has_arg == required_argument) fprintf(stderr, - "%s: option requires an argument -- %s\n", + "%s: option requires an argument -- %s\n", argv[0], place); place = EMSG; diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c index f84d4e096a4..e11f0680526 100644 --- a/src/port/gettimeofday.c +++ b/src/port/gettimeofday.c @@ -75,8 +75,8 @@ init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime) * version and development SDK specific... */ pg_get_system_time = (PgGetSystemTimeFn) GetProcAddress( - GetModuleHandle(TEXT("kernel32.dll")), - "GetSystemTimePreciseAsFileTime"); + GetModuleHandle(TEXT("kernel32.dll")), + "GetSystemTimePreciseAsFileTime"); if (pg_get_system_time == NULL) { /* diff --git a/src/port/inet_net_ntop.c b/src/port/inet_net_ntop.c index cebcda0e615..f27fda96ca1 100644 --- a/src/port/inet_net_ntop.c +++ b/src/port/inet_net_ntop.c @@ -258,8 +258,8 @@ inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) *tp++ = ':'; /* Is this address an encapsulated IPv4? */ if (i == 6 && best.base == 0 && (best.len == 6 || - (best.len == 7 && words[7] != 0x0001) || - (best.len == 5 && words[5] == 0xffff))) + (best.len == 7 && words[7] != 0x0001) || + (best.len == 5 && words[5] == 0xffff))) { int n; diff --git a/src/port/open.c b/src/port/open.c index aa313422610..17a7145ad9f 100644 --- a/src/port/open.c +++ b/src/port/open.c @@ -69,7 +69,7 @@ pgwin32_open(const char *fileName, int fileFlags,...) assert((fileFlags & ((O_RDONLY | O_WRONLY | O_RDWR) | O_APPEND | (O_RANDOM | O_SEQUENTIAL | O_TEMPORARY) | _O_SHORT_LIVED | O_DSYNC | O_DIRECT | - (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags); + (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags); sa.nLength = sizeof(sa); sa.bInheritHandle = TRUE; @@ -77,19 +77,19 @@ pgwin32_open(const char *fileName, int fileFlags,...) while ((h = CreateFile(fileName, /* cannot use O_RDONLY, as it == 0 */ - (fileFlags & O_RDWR) ? (GENERIC_WRITE | GENERIC_READ) : - ((fileFlags & O_WRONLY) ? GENERIC_WRITE : GENERIC_READ), + (fileFlags & O_RDWR) ? (GENERIC_WRITE | GENERIC_READ) : + ((fileFlags & O_WRONLY) ? GENERIC_WRITE : GENERIC_READ), /* These flags allow concurrent rename/unlink */ - (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), + (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), &sa, openFlagsToCreateFileFlags(fileFlags), FILE_ATTRIBUTE_NORMAL | - ((fileFlags & O_RANDOM) ? FILE_FLAG_RANDOM_ACCESS : 0) | - ((fileFlags & O_SEQUENTIAL) ? FILE_FLAG_SEQUENTIAL_SCAN : 0) | - ((fileFlags & _O_SHORT_LIVED) ? FILE_ATTRIBUTE_TEMPORARY : 0) | - ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0) | - ((fileFlags & O_DIRECT) ? FILE_FLAG_NO_BUFFERING : 0) | - ((fileFlags & O_DSYNC) ? FILE_FLAG_WRITE_THROUGH : 0), + ((fileFlags & O_RANDOM) ? FILE_FLAG_RANDOM_ACCESS : 0) | + ((fileFlags & O_SEQUENTIAL) ? FILE_FLAG_SEQUENTIAL_SCAN : 0) | + ((fileFlags & _O_SHORT_LIVED) ? FILE_ATTRIBUTE_TEMPORARY : 0) | + ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0) | + ((fileFlags & O_DIRECT) ? FILE_FLAG_NO_BUFFERING : 0) | + ((fileFlags & O_DSYNC) ? FILE_FLAG_WRITE_THROUGH : 0), NULL)) == INVALID_HANDLE_VALUE) { /* diff --git a/src/port/path.c b/src/port/path.c index 46f20b1ef86..25783936243 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -475,7 +475,7 @@ get_progname(const char *argv0) #if defined(__CYGWIN__) || defined(WIN32) /* strip ".exe" suffix, regardless of case */ if (strlen(progname) > sizeof(EXE) - 1 && - pg_strcasecmp(progname + strlen(progname) - (sizeof(EXE) - 1), EXE) == 0) + pg_strcasecmp(progname + strlen(progname) - (sizeof(EXE) - 1), EXE) == 0) progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0'; #endif diff --git a/src/port/win32security.c b/src/port/win32security.c index 93739e80b99..bb9d034a011 100644 --- a/src/port/win32security.c +++ b/src/port/win32security.c @@ -128,7 +128,7 @@ pgwin32_is_service(void) /* First check for LocalSystem */ 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"); |