summaryrefslogtreecommitdiff
path: root/src/port
diff options
context:
space:
mode:
authorBruce Momjian2005-11-22 18:17:34 +0000
committerBruce Momjian2005-11-22 18:17:34 +0000
commit436a2956d80db29ac1dff640b631620d856b4f70 (patch)
treedb2252048385dd23a7d7a196e8685cb0a5816f7a /src/port
parente196eedd8a95380fb392c00b9e7ea88a0e46053e (diff)
Re-run pgindent, fixing a problem where comment lines after a blank
comment line where output as too long, and update typedefs for /lib directory. Also fix case where identifiers were used as variable names in the backend, but as typedefs in ecpg (favor the backend for indenting). Backpatch to 8.1.X.
Diffstat (limited to 'src/port')
-rw-r--r--src/port/exec.c12
-rw-r--r--src/port/path.c6
-rw-r--r--src/port/strtol.c3
-rw-r--r--src/port/unsetenv.c6
4 files changed, 14 insertions, 13 deletions
diff --git a/src/port/exec.c b/src/port/exec.c
index e754b182157..80fbccfd3bc 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/exec.c,v 1.39 2005/10/15 02:49:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.40 2005/11/22 18:17:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -95,8 +95,8 @@ validate_exec(const char *path)
/*
* Ensure that the file exists and is a regular file.
*
- * XXX if you have a broken system where stat() looks at the symlink instead
- * of the underlying file, you lose.
+ * XXX if you have a broken system where stat() looks at the symlink
+ * instead of the underlying file, you lose.
*/
if (stat(path, &buf) < 0)
return -1;
@@ -297,9 +297,9 @@ resolve_symlinks(char *path)
* points, for example). After following the final symlink, we use
* getcwd() to figure out where the heck we're at.
*
- * One might think we could skip all this if path doesn't point to a symlink
- * to start with, but that's wrong. We also want to get rid of any
- * directory symlinks that are present in the given path. We expect
+ * One might think we could skip all this if path doesn't point to a
+ * symlink to start with, but that's wrong. We also want to get rid of
+ * any directory symlinks that are present in the given path. We expect
* getcwd() to give us an accurate, symlink-free path.
*/
if (!getcwd(orig_wd, MAXPGPATH))
diff --git a/src/port/path.c b/src/port/path.c
index c6137bd0a13..29ae7146f88 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/path.c,v 1.61 2005/10/15 02:49:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/path.c,v 1.62 2005/11/22 18:17:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -280,8 +280,8 @@ canonicalize_path(char *path)
/*
* Remove any trailing uses of "." and process ".." ourselves
*
- * Note that "/../.." should reduce to just "/", while "../.." has to be kept
- * as-is. In the latter case we put back mistakenly trimmed ".."
+ * Note that "/../.." should reduce to just "/", while "../.." has to be
+ * kept as-is. In the latter case we put back mistakenly trimmed ".."
* components below. Also note that we want a Windows drive spec to be
* visible to trim_directory(), but it's not part of the logic that's
* looking at the name components; hence distinction between path and
diff --git a/src/port/strtol.c b/src/port/strtol.c
index a948489390e..a103b446e62 100644
--- a/src/port/strtol.c
+++ b/src/port/strtol.c
@@ -103,7 +103,8 @@ int base;
* digit is > 7 (or 8), the number is too big, and we will return a range
* error.
*
- * Set any if any `digits' consumed; make it negative to indicate overflow.
+ * Set any if any `digits' consumed; make it negative to indicate
+ * overflow.
*/
cutoff = neg ? -(unsigned long) LONG_MIN : LONG_MAX;
cutlim = cutoff % (unsigned long) base;
diff --git a/src/port/unsetenv.c b/src/port/unsetenv.c
index 6509ff79f3e..bdfb3f68143 100644
--- a/src/port/unsetenv.c
+++ b/src/port/unsetenv.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/port/unsetenv.c,v 1.5 2005/10/15 02:49:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/unsetenv.c,v 1.6 2005/11/22 18:17:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,8 +33,8 @@ unsetenv(const char *name)
* presented string. This method fails on such platforms. Hopefully all
* such platforms have unsetenv() and thus won't be using this hack.
*
- * Note that repeatedly setting and unsetting a var using this code will leak
- * memory.
+ * Note that repeatedly setting and unsetting a var using this code will
+ * leak memory.
*/
envstr = (char *) malloc(strlen(name) + 2);