C comments: remove odd blank lines after #ifdef WIN32 lines

bmomjian · bmomjian · commit 242c2737fbec · 2014-03-13T01:42:24.000-04:00
A few more
diff --git 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
@@ -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
@@ -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
@@ -65,15 +65,16 @@ 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
 	 */
 	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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,6 @@ GetMessageEncoding(void)`
`1048`	`1048`	`}`
`1049`	`1049`
`1050`	`1050`	`#ifdef WIN32`
`1051`		`-`
`1052`	`1051`	`/*`
`1053`	`1052`	`* Result is palloc'ed null-terminated utf16 string. The character length`
`1054`	`1053`	`* is also passed to utf16len if not null. Returns NULL iff failed.`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,6 @@ walkdir(char path, void (action) (char *fname, bool isdir))`
`565`	`565`	`}`
`566`	`566`
`567`	`567`	`#ifdef WIN32`
`568`		`-`
`569`	`568`	`/*`
`570`	`569`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`571`	`570`	`* released version`
Original file line number	Diff line number	Diff line change
`@@ -846,8 +846,8 @@ FindEndOfXLOG(void)`
`846`	`846`	`}`
`847`	`847`	`errno = 0;`
`848`	`848`	`}`
`849`		`-#ifdef WIN32`
`850`	`849`
	`850`	`+#ifdef WIN32`
`851`	`851`	`/*`
`852`	`852`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`853`	`853`	`* released version`
`@@ -908,8 +908,8 @@ KillExistingXLOG(void)`
`908`	`908`	`}`
`909`	`909`	`errno = 0;`
`910`	`910`	`}`
`911`		`-#ifdef WIN32`
`912`	`911`
	`912`	`+#ifdef WIN32`
`913`	`913`	`/*`
`914`	`914`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`915`	`915`	`* released version`
`@@ -965,8 +965,8 @@ KillExistingArchiveStatus(void)`
`965`	`965`	`}`
`966`	`966`	`errno = 0;`
`967`	`967`	`}`
`968`		`-#ifdef WIN32`
`969`	`968`
	`969`	`+#ifdef WIN32`
`970`	`970`	`/*`
`971`	`971`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`972`	`972`	`* released version`
Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,16 @@ pgfnames(const char *path)`
`65`	`65`	`}`
`66`	`66`	`errno = 0;`
`67`	`67`	`}`
`68`		`-#ifdef WIN32`
`69`	`68`
	`69`	`+#ifdef WIN32`
`70`	`70`	`/*`
`71`	`71`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`72`	`72`	`* released version`
`73`	`73`	`*/`
`74`	`74`	`if (GetLastError() == ERROR_NO_MORE_FILES)`
`75`	`75`	`errno = 0;`
`76`	`76`	`#endif`
	`77`	`+`
`77`	`78`	`if (errno)`
`78`	`79`	`{`
`79`	`80`	`#ifndef FRONTEND`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ pg_check_dir(const char *dir)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`#ifdef WIN32`
`71`		`-`
`72`	`71`	`/*`
`73`	`72`	`* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in`
`74`	`73`	`* released version`