From 886c0be3f65bdbb68e86ec2d66a8c1a4c34b2923 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 13 Mar 2014 01:34:42 -0400
Subject: [PATCH] C comments: remove odd blank lines after #ifdef WIN32 lines
---
src/backend/access/transam/xlog.c | 1 -
src/backend/libpq/pqcomm.c | 1 -
src/backend/main/main.c | 2 --
src/backend/postmaster/postmaster.c | 3 +--
src/backend/storage/file/fd.c | 1 -
src/backend/utils/adt/pg_locale.c | 3 ---
src/backend/utils/adt/selfuncs.c | 1 -
src/backend/utils/error/elog.c | 2 --
src/bin/initdb/initdb.c | 1 -
src/interfaces/libpq/fe-connect.c | 1 -
src/pl/plperl/plperl.c | 1 -
src/port/getaddrinfo.c | 3 ---
src/port/getrusage.c | 1 -
src/port/path.c | 2 --
src/port/sprompt.c | 2 --
src/test/regress/pg_regress.c | 2 --
src/timezone/zic.c | 1 -
17 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 141edf43278..5f3c3b9be1e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4182,7 +4182,6 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr endptr)
xlde->d_name)));
#ifdef WIN32
-
/*
* On Windows, if another process (e.g another backend)
* holds the file open in FILE_SHARE_DELETE mode, unlink
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 2b247932ac1..1eae183e33a 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -692,7 +692,6 @@ StreamConnection(pgsocket server_fd, Port *port)
}
#ifdef WIN32
-
/*
* This is a Win32 socket optimization. The ideal size is 32k.
* http://support.microsoft.com/kb/823764/EN-US/
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 98da177de94..a8ab4c4ab6f 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -107,7 +107,6 @@ main(int argc, char *argv[])
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("postgres"));
#ifdef WIN32
-
/*
* Windows uses codepages rather than the environment, so we work around
* that by querying the environment explicitly first for LC_COLLATE and
@@ -183,7 +182,6 @@ main(int argc, char *argv[])
#endif
#ifdef WIN32
-
/*
* Start our win32 signal implementation
*
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 5db01d104a1..e9072b76efc 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1063,7 +1063,6 @@ PostmasterMain(int argc, char *argv[])
InitPostmasterDeathWatchHandle();
#ifdef WIN32
-
/*
* Initialize I/O completion port used to deliver list of dead children.
*/
@@ -2929,8 +2928,8 @@ CleanupBackend(int pid,
* assume everything is all right and proceed to remove the backend from
* the active backend list.
*/
-#ifdef WIN32
+#ifdef WIN32
/*
* On win32, also treat ERROR_WAIT_NO_CHILDREN (128) as nonfatal case,
* since that sometimes happens under load when the process fails to start
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 2918f75c0eb..4dc809dc01d 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -1957,7 +1957,6 @@ ReadDir(DIR *dir, const char *dirname)
return dent;
#ifdef WIN32
-
/*
* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
* released version
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index f34446329f5..0c8474df54a 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -463,7 +463,6 @@ PGLC_localeconv(void)
save_lc_numeric = pstrdup(save_lc_numeric);
#ifdef WIN32
-
/*
* Ideally, monetary and numeric local symbols could be returned in any
* server encoding. Unfortunately, the WIN32 API does not allow
@@ -645,7 +644,6 @@ cache_locale_time(void)
save_lc_time = pstrdup(save_lc_time);
#ifdef WIN32
-
/*
* On WIN32, there is no way to get locale-specific time values in a
* specified locale, like we do for monetary/numeric. We can only get
@@ -1172,7 +1170,6 @@ wchar2char(char *to, const wchar_t *from, size_t tolen, pg_locale_t locale)
return 0;
#ifdef WIN32
-
/*
* On Windows, the "Unicode" locales assume UTF16 not UTF8 encoding, and
* for some reason mbstowcs and wcstombs won't do this for us, so we use
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 5ca3c0241bc..1ffc0160b77 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3950,7 +3950,6 @@ convert_string_datum(Datum value, Oid typid)
xfrmlen = strxfrm(NULL, val, 0);
#endif
#ifdef WIN32
-
/*
* On Windows, strxfrm returns INT_MAX when an error occurs. Instead
* of trying to allocate this much memory (and fail), just return the
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index d28b7494115..3668d161610 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2057,7 +2057,6 @@ write_console(const char *line, int len)
int rc;
#ifdef WIN32
-
/*
* Try to convert the message to UTF16 and write it with WriteConsoleW().
* Fall back on write() if anything fails.
@@ -2887,7 +2886,6 @@ send_message_to_server_log(ErrorData *edata)
if (redirection_done && !am_syslogger)
write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_STDERR);
#ifdef WIN32
-
/*
* In a win32 service environment, there is no usable stderr. Capture
* anything going there and write it to the eventlog instead.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a7d5f7a153b..44231273faf 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2891,7 +2891,6 @@ void
get_restricted_token(void)
{
#ifdef WIN32
-
/*
* Before we execute another program, make sure that we are running with a
* restricted token. If not, re-execute ourselves with one.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 1f0eeaf4c60..dedb6e74f13 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -2667,7 +2667,6 @@ makeEmptyPGconn(void)
PGconn *conn;
#ifdef WIN32
-
/*
* Make sure socket support is up and running.
*/
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index f8ccaa59e89..e91b71e7779 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -697,7 +697,6 @@ plperl_init_interp(void)
int nargs = 3;
#ifdef WIN32
-
/*
* The perl library on startup does horrible things like call
* setlocale(LC_ALL,""). We have protected against that on most platforms
diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index e6ff1cdc117..52a20c5c2cc 100644
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -144,7 +144,6 @@ getaddrinfo(const char *node, const char *service,
struct addrinfo hints;
#ifdef WIN32
-
/*
* If Windows has native IPv6 support, use the native Windows routine.
* Otherwise, fall through and use our own code.
@@ -267,7 +266,6 @@ freeaddrinfo(struct addrinfo * res)
if (res)
{
#ifdef WIN32
-
/*
* If Windows has native IPv6 support, use the native Windows routine.
* Otherwise, fall through and use our own code.
@@ -359,7 +357,6 @@ getnameinfo(const struct sockaddr * sa, int salen,
char *service, int servicelen, int flags)
{
#ifdef WIN32
-
/*
* If Windows has native IPv6 support, use the native Windows routine.
* Otherwise, fall through and use our own code.
diff --git a/src/port/getrusage.c b/src/port/getrusage.c
index a29ae8b6d36..9e39e027d8a 100644
--- a/src/port/getrusage.c
+++ b/src/port/getrusage.c
@@ -32,7 +32,6 @@ int
getrusage(int who, struct rusage * rusage)
{
#ifdef WIN32
-
FILETIME starttime;
FILETIME exittime;
FILETIME kerneltime;
diff --git a/src/port/path.c b/src/port/path.c
index 8765907a57f..39d6e43404a 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -222,7 +222,6 @@ canonicalize_path(char *path)
int pending_strips;
#ifdef WIN32
-
/*
* The Windows command processor will accept suitably quoted paths with
* forward slashes, but barfs badly with mixed forward and back slashes.
@@ -372,7 +371,6 @@ path_is_relative_and_below_cwd(const char *path)
else if (path_contains_parent_reference(path))
return false;
#ifdef WIN32
-
/*
* On Win32, a drive letter _not_ followed by a slash, e.g. 'E:abc', is
* relative to the cwd on that drive, or the drive's root directory if
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 38d7628a605..4120acf914a 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -57,7 +57,6 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
return NULL;
#ifdef WIN32
-
/*
* A Windows console has an "input code page" and an "output code page";
* these usually match each other, but they rarely match the "Windows ANSI
@@ -86,7 +85,6 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
#endif
if (!termin || !termout
#ifdef WIN32
-
/*
* Direct console I/O does not work from the MSYS 1.0.10 console. Writes
* reach nowhere user-visible; reads block indefinitely. XXX This affects
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 475a11a7f6f..abde5b477c6 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -438,7 +438,6 @@ convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, c
snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
#ifdef WIN32
-
/*
* On Windows only, clean out the test tablespace dir, or create it if it
* doesn't exist. On other platforms we expect the Makefile to take care
@@ -1195,7 +1194,6 @@ run_diff(const char *cmd, const char *filename)
exit(2);
}
#ifdef WIN32
-
/*
* On WIN32, if the 'diff' command cannot be found, system() returns 1,
* but produces nothing to stdout, so we check for that here.
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index cda704266ad..c6a811e018b 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -2848,7 +2848,6 @@ mkdirs(char *argname)
{
*cp = '\0';
#ifdef WIN32
-
/*
* DOS drive specifier?
*/
--
GitLab