From 242c2737fbec05a756e516f6e2fec4b739cc49d1 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 13 Mar 2014 01:42:24 -0400 Subject: [PATCH] C comments: remove odd blank lines after #ifdef WIN32 lines A few more --- src/backend/utils/mb/mbutils.c | 1 - src/bin/initdb/initdb.c | 1 - src/bin/pg_resetxlog/pg_resetxlog.c | 6 +++--- src/common/pgfnames.c | 3 ++- src/port/pgcheckdir.c | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 15cf0d806b..ad255ee693 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -1048,7 +1048,6 @@ GetMessageEncoding(void) } #ifdef WIN32 - /* * Result is palloc'ed null-terminated utf16 string. The character length * is also passed to utf16len if not null. Returns NULL iff failed. diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 44231273fa..61bd785307 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -565,7 +565,6 @@ walkdir(char *path, void (*action) (char *fname, bool isdir)) } #ifdef WIN32 - /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index 54690af031..28a4f191f3 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -846,8 +846,8 @@ FindEndOfXLOG(void) } errno = 0; } -#ifdef WIN32 +#ifdef WIN32 /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version @@ -908,8 +908,8 @@ KillExistingXLOG(void) } errno = 0; } -#ifdef WIN32 +#ifdef WIN32 /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version @@ -965,8 +965,8 @@ KillExistingArchiveStatus(void) } errno = 0; } -#ifdef WIN32 +#ifdef WIN32 /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version diff --git a/src/common/pgfnames.c b/src/common/pgfnames.c index e612ace7d8..9a68163dd7 100644 --- a/src/common/pgfnames.c +++ b/src/common/pgfnames.c @@ -65,8 +65,8 @@ pgfnames(const char *path) } errno = 0; } -#ifdef WIN32 +#ifdef WIN32 /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version @@ -74,6 +74,7 @@ pgfnames(const char *path) if (GetLastError() == ERROR_NO_MORE_FILES) errno = 0; #endif + if (errno) { #ifndef FRONTEND diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c index 665b5c1099..fc97f8cc1d 100644 --- a/src/port/pgcheckdir.c +++ b/src/port/pgcheckdir.c @@ -68,7 +68,6 @@ pg_check_dir(const char *dir) } #ifdef WIN32 - /* * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in * released version -- 2.40.0