summaryrefslogtreecommitdiff
path: root/src/port
diff options
context:
space:
mode:
authorBruce Momjian2013-05-29 20:58:43 +0000
committerBruce Momjian2013-05-29 20:58:43 +0000
commit9af4159fce6654aa0e081b00d02bca40b978745c (patch)
tree3aa507fc6cc67ed3d9f6ceec4d65d1e56cc08e1a /src/port
parent07ab261ef3a9575a4a2bd3045b222d7b3dee2c46 (diff)
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update pgindent instructions.
Diffstat (limited to 'src/port')
-rw-r--r--src/port/pgcheckdir.c1
-rw-r--r--src/port/pqsignal.c2
-rw-r--r--src/port/sprompt.c5
-rw-r--r--src/port/wait_error.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c
index aee59975afc..9d80192a8e6 100644
--- a/src/port/pgcheckdir.c
+++ b/src/port/pgcheckdir.c
@@ -68,6 +68,7 @@ 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
diff --git a/src/port/pqsignal.c b/src/port/pqsignal.c
index 9c523da8fed..1511e932afe 100644
--- a/src/port/pqsignal.c
+++ b/src/port/pqsignal.c
@@ -73,4 +73,4 @@ pqsignal(int signo, pqsigfunc func)
#endif /* !HAVE_POSIX_SIGNALS */
}
-#endif /* !defined(WIN32) || defined(FRONTEND) */
+#endif /* !defined(WIN32) || defined(FRONTEND) */
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 9a6415cc86a..c549a6f0bd8 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -66,7 +66,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
* automatically converts text between these code pages when writing to a
* console. To identify such file descriptors, it calls GetConsoleMode()
* on the underlying HANDLE, which in turn requires GENERIC_READ access on
- * the HANDLE. Opening termout in mode "w+" allows that detection to
+ * the HANDLE. Opening termout in mode "w+" allows that detection to
* succeed. Otherwise, write() would not recognize the descriptor as a
* console, and non-ASCII characters would display incorrectly.
*
@@ -86,11 +86,12 @@ 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
* most Windows terminal environments, including rxvt, mintty, Cygwin
- * xterm, Cygwin sshd, and PowerShell ISE. Switch to a more-generic test.
+ * xterm, Cygwin sshd, and PowerShell ISE. Switch to a more-generic test.
*/
|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
#endif
diff --git a/src/port/wait_error.c b/src/port/wait_error.c
index 01728d7f764..b75710f86a0 100644
--- a/src/port/wait_error.c
+++ b/src/port/wait_error.c
@@ -80,7 +80,7 @@ wait_result_to_str(int exitstatus)
else
snprintf(str, sizeof(str),
_("child process exited with unrecognized status %d"),
- exitstatus);
+ exitstatus);
return pstrdup(str);
}