On Wednesday 10 June 2009 22:50:15 Bruce Momjian wrote:
> Tom Lane wrote:
> > Peter Eisentraut <[email protected]> writes:
> > > Btw., can you make pgindent remove whitespace at the end of lines?
> >
> > I think it usually does that already ...
>
> Yes.
Um, attached you will find a bunch of counterexamples.
Index: src/bin/initdb/initdb.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/initdb/initdb.c,v
retrieving revision 1.171
diff -u -3 -p -r1.171 initdb.c
--- src/bin/initdb/initdb.c 3 Jun 2009 16:17:49 -0000 1.171
+++ src/bin/initdb/initdb.c 10 Jun 2009 20:42:32 -0000
@@ -1356,9 +1356,9 @@ bootstrap_template1(char *short_version)
bki_lines = replace_token(bki_lines, "ENCODING", encodingid);
bki_lines = replace_token(bki_lines, "LC_COLLATE", lc_collate);
-
+
bki_lines = replace_token(bki_lines, "LC_CTYPE", lc_ctype);
-
+
/*
* Pass correct LC_xxx environment to bootstrap.
*
Index: src/bin/pg_ctl/pg_ctl.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_ctl/pg_ctl.c,v
retrieving revision 1.110
diff -u -3 -p -r1.110 pg_ctl.c
--- src/bin/pg_ctl/pg_ctl.c 5 Apr 2009 04:19:58 -0000 1.110
+++ src/bin/pg_ctl/pg_ctl.c 10 Jun 2009 20:42:32 -0000
@@ -1486,9 +1486,9 @@ CreateRestrictedProcess(char *cmd, PROCE
}
#ifndef __CYGWIN__
- AddUserToDacl(processInfo->hProcess);
+ AddUserToDacl(processInfo->hProcess);
#endif
-
+
CloseHandle(restrictedToken);
ResumeThread(processInfo->hThread);
Index: src/bin/pg_dump/dumputils.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/dumputils.c,v
retrieving revision 1.45
diff -u -3 -p -r1.45 dumputils.c
--- src/bin/pg_dump/dumputils.c 11 Mar 2009 03:33:29 -0000 1.45
+++ src/bin/pg_dump/dumputils.c 10 Jun 2009 20:42:33 -0000
@@ -59,7 +59,7 @@ init_parallel_dump_utils(void)
const char *
fmtId(const char *rawid)
{
- /*
+ /*
* The Tls code goes awry if we use a static var, so we provide for both
* static and auto, and omit any use of the static var when using Tls.
*/
@@ -87,7 +87,7 @@ fmtId(const char *rawid)
{
/* new buffer */
id_return = createPQExpBuffer();
-#ifdef WIN32
+#ifdef WIN32
if (parallel_init_done)
TlsSetValue(tls_index,id_return);
else
@@ -95,7 +95,7 @@ fmtId(const char *rawid)
#else
s_id_return = id_return;
#endif
-
+
}
/*
Index: src/bin/pg_dump/keywords.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/keywords.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 keywords.c
--- src/bin/pg_dump/keywords.c 8 Mar 2009 16:53:30 -0000 1.2
+++ src/bin/pg_dump/keywords.c 10 Jun 2009 20:42:33 -0000
@@ -18,7 +18,7 @@
#include "parser/keywords.h"
/*
- * We don't need the token number, so leave it out to avoid requiring other
+ * We don't need the token number, so leave it out to avoid requiring other
* backend headers.
*/
#define PG_KEYWORD(a,b,c) {a,0,c},
Index: src/bin/pg_dump/pg_backup_archiver.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v
retrieving revision 1.171
diff -u -3 -p -r1.171 pg_backup_archiver.c
--- src/bin/pg_dump/pg_backup_archiver.c 4 Jun 2009 19:16:48 -0000 1.171
+++ src/bin/pg_dump/pg_backup_archiver.c 10 Jun 2009 20:42:33 -0000
@@ -3487,12 +3487,12 @@ parallel_restore(RestoreArgs *args)
/*
* Close and reopen the input file so we have a private file pointer
- * that doesn't stomp on anyone else's file pointer, if we're actually
+ * that doesn't stomp on anyone else's file pointer, if we're actually
* going to need to read from the file. Otherwise, just close it
* except on Windows, where it will possibly be needed by other threads.
*
* Note: on Windows, since we are using threads not processes, the
- * reopen call *doesn't* close the original file pointer but just open
+ * reopen call *doesn't* close the original file pointer but just open
* a new one.
*/
if (te->section == SECTION_DATA )
@@ -3870,7 +3870,7 @@ CloneArchive(ArchiveHandle *AH)
ArchiveHandle *clone;
/* Make a "flat" copy */
- clone = (ArchiveHandle *) malloc(sizeof(ArchiveHandle));
+ clone = (ArchiveHandle *) malloc(sizeof(ArchiveHandle));
if (clone == NULL)
die_horribly(AH, modulename, "out of memory\n");
memcpy(clone, AH, sizeof(ArchiveHandle));
Index: src/bin/pg_dump/pg_backup_custom.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v
retrieving revision 1.41
diff -u -3 -p -r1.41 pg_backup_custom.c
--- src/bin/pg_dump/pg_backup_custom.c 2 Feb 2009 20:07:37 -0000 1.41
+++ src/bin/pg_dump/pg_backup_custom.c 10 Jun 2009 20:42:33 -0000
@@ -133,8 +133,8 @@ InitArchiveFmt_Custom(ArchiveHandle *AH)
AH->StartBlobPtr = _StartBlob;
AH->EndBlobPtr = _EndBlob;
AH->EndBlobsPtr = _EndBlobs;
- AH->ClonePtr = _Clone;
- AH->DeClonePtr = _DeClone;
+ AH->ClonePtr = _Clone;
+ AH->DeClonePtr = _DeClone;
/*
* Set up some special context used in compressing data.
@@ -842,7 +842,7 @@ _CloseArchive(ArchiveHandle *AH)
* is because on Windows, this is used within a multithreading context,
* and we don't want a thread closing the parent file handle.)
*/
-static void
+static void
_ReopenArchive(ArchiveHandle *AH)
{
lclContext *ctx = (lclContext *) AH->formatData;
@@ -858,12 +858,12 @@ _ReopenArchive(ArchiveHandle *AH)
errno = 0;
tpos = ftello(AH->FH);
if (errno)
- die_horribly(AH, modulename, "could not determine seek position in archive file: %s\n",
+ die_horribly(AH, modulename, "could not determine seek position in archive file: %s\n",
strerror(errno));
#ifndef WIN32
if (fclose(AH->FH) != 0)
- die_horribly(AH, modulename, "could not close archive file: %s\n",
+ die_horribly(AH, modulename, "could not close archive file: %s\n",
strerror(errno));
#endif
@@ -873,7 +873,7 @@ _ReopenArchive(ArchiveHandle *AH)
AH->fSpec, strerror(errno));
if (fseeko(AH->FH, tpos, SEEK_SET) != 0)
- die_horribly(AH, modulename, "could not set seek position in archive file: %s\n",
+ die_horribly(AH, modulename, "could not set seek position in archive file: %s\n",
strerror(errno));
}
@@ -1096,7 +1096,7 @@ static void
_DeClone(ArchiveHandle *AH)
{
lclContext *ctx = (lclContext *) AH->formatData;
-
+
free(ctx->zlibOut);
free(ctx->zlibIn);
free(ctx->zp);
Index: src/bin/pg_dump/pg_dump.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v
retrieving revision 1.538
diff -u -3 -p -r1.538 pg_dump.c
--- src/bin/pg_dump/pg_dump.c 27 May 2009 20:42:29 -0000 1.538
+++ src/bin/pg_dump/pg_dump.c 10 Jun 2009 20:42:34 -0000
@@ -1739,7 +1739,7 @@ dumpDatabase(Archive *AH)
appendStringLiteralAH(creaQry, datname, AH);
appendPQExpBuffer(creaQry, ";\n");
}
-
+
appendPQExpBuffer(delQry, "DROP DATABASE %s;\n",
fmtId(datname));
@@ -4815,7 +4815,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
tbinfo->atttypnames[j] = strdup("TEXT");
}
}
-
+
/*
* Get info about column defaults
*/
@@ -9940,7 +9940,7 @@ dumpTableSchema(Archive *fout, TableInfo
"(SELECT oid FROM pg_namespace "
"WHERE nspname = CURRENT_SCHEMA);\n");
}
-
+
/* Loop dumping statistics and storage statements */
for (j = 0; j < tbinfo->numatts; j++)
{
Index: src/bin/pg_dump/pg_dumpall.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v
retrieving revision 1.125
diff -u -3 -p -r1.125 pg_dumpall.c
--- src/bin/pg_dump/pg_dumpall.c 10 May 2009 02:51:44 -0000 1.125
+++ src/bin/pg_dump/pg_dumpall.c 10 Jun 2009 20:42:35 -0000
@@ -279,7 +279,7 @@ main(int argc, char *argv[])
disable_dollar_quoting = 1;
else if (strcmp(optarg, "disable-triggers") == 0)
disable_triggers = 1;
- else if (strcmp(optarg, "no-tablespaces") == 0)
+ else if (strcmp(optarg, "no-tablespaces") == 0)
no_tablespaces = 1;
else if (strcmp(optarg, "use-set-session-authorization") == 0)
use_setsessauth = 1;
Index: src/bin/pg_dump/pg_restore.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v
retrieving revision 1.99
diff -u -3 -p -r1.99 pg_restore.c
--- src/bin/pg_dump/pg_restore.c 14 Apr 2009 00:06:35 -0000 1.99
+++ src/bin/pg_dump/pg_restore.c 10 Jun 2009 20:42:35 -0000
@@ -278,9 +278,9 @@ main(int argc, char **argv)
break;
case 0:
- /*
- * This covers the long options without a short equivalent,
- * including those equivalent to -X xxx.
+ /*
+ * This covers the long options without a short equivalent,
+ * including those equivalent to -X xxx.
*/
break;
Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.205
diff -u -3 -p -r1.205 command.c
--- src/bin/psql/command.c 21 Apr 2009 15:49:06 -0000 1.205
+++ src/bin/psql/command.c 10 Jun 2009 20:42:35 -0000
@@ -1341,7 +1341,7 @@ connection_warnings(void)
server_version = server_ver_str;
}
- printf(_("%s (%s, server %s)\n"),
+ printf(_("%s (%s, server %s)\n"),
pset.progname, PG_VERSION, server_version);
}
else
Index: src/bin/psql/describe.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/describe.c,v
retrieving revision 1.214
diff -u -3 -p -r1.214 describe.c
--- src/bin/psql/describe.c 4 Jun 2009 19:17:39 -0000 1.214
+++ src/bin/psql/describe.c 10 Jun 2009 20:42:35 -0000
@@ -811,7 +811,7 @@ objectDescription(const char *pattern, b
if (!showSystem && !pattern)
appendPQExpBuffer(&buf, "WHERE n.nspname <> 'pg_catalog'\n"
" AND n.nspname <> 'information_schema'\n");
-
+
processSQLNamePattern(pset.db, &buf, pattern, !showSystem && !pattern, false,
"n.nspname", "o.oprname", NULL,
"pg_catalog.pg_operator_is_visible(o.oid)");
@@ -1123,7 +1123,7 @@ describeOneTableDetails(const char *sche
atooid(PQgetvalue(res, 0, 7)) : 0;
PQclear(res);
res = NULL;
-
+
/*
* If it's a sequence, fetch its values and store into an
* array that will be used later.
@@ -1131,7 +1131,7 @@ describeOneTableDetails(const char *sche
if (tableinfo.relkind == 'S')
{
PGresult *result;
-
+
#define SEQ_NUM_COLS 10
printfPQExpBuffer(&buf,
"SELECT sequence_name, last_value,\n"
@@ -1142,16 +1142,16 @@ describeOneTableDetails(const char *sche
fmtId(schemaname));
/* must be separate because fmtId isn't reentrant */
appendPQExpBuffer(&buf, ".%s", fmtId(relationname));
-
+
result = PSQLexec(buf.data, false);
if (!result)
goto error_return;
-
+
seq_values = pg_malloc_zero((SEQ_NUM_COLS+1) * sizeof(*seq_values));
-
- for (i = 0; i < SEQ_NUM_COLS; i++)
+
+ for (i = 0; i < SEQ_NUM_COLS; i++)
seq_values[i] = pg_strdup(PQgetvalue(result, 0, i));
-
+
PQclear(result);
}
@@ -1230,13 +1230,13 @@ describeOneTableDetails(const char *sche
if (tableinfo.relkind == 'S')
headers[cols++] = gettext_noop("Value");
-
+
if (verbose)
{
headers[cols++] = gettext_noop("Storage");
headers[cols++] = gettext_noop("Description");
}
-
+
printTableInit(&cont, &myopt, title.data, cols, numrows);
printTableInitialized = true;
@@ -1851,14 +1851,14 @@ error_return:
termPQExpBuffer(&buf);
termPQExpBuffer(&title);
termPQExpBuffer(&tmpbuf);
-
+
if (seq_values)
{
for (ptr = seq_values; *ptr; ptr++)
free(*ptr);
free(seq_values);
}
-
+
if (modifiers)
{
for (ptr = modifiers; *ptr; ptr++)
Index: src/bin/psql/print.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/print.c,v
retrieving revision 1.114
diff -u -3 -p -r1.114 print.c
--- src/bin/psql/print.c 4 Jun 2009 19:17:39 -0000 1.114
+++ src/bin/psql/print.c 10 Jun 2009 20:42:36 -0000
@@ -520,7 +520,7 @@ print_aligned_text(const printTableConte
if (col_count != 0 && cell_count != 0)
{
int rows = cell_count / col_count;
-
+
for (i = 0; i < col_count; i++)
width_average[i] /= rows;
}
@@ -640,7 +640,7 @@ print_aligned_text(const printTableConte
fout = PageOutput(INT_MAX, cont->opt->pager); /* force pager */
is_pager = true;
}
-
+
/* Check if newlines or our wrapping now need the pager */
if (!is_pager)
{
@@ -650,12 +650,12 @@ print_aligned_text(const printTableConte
int width,
nl_lines,
bytes_required;
-
+
pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding,
&width, &nl_lines, &bytes_required);
if (opt_numeric_locale && cont->align[i] == 'r')
width += additional_numeric_locale_len(*ptr);
-
+
/*
* A row can have both wrapping and newlines that cause
* it to display across multiple lines. We check
@@ -681,7 +681,7 @@ print_aligned_text(const printTableConte
}
IsPagerNeeded(cont, extra_output_lines, &fout, &is_pager);
}
-
+
/* time to output */
if (cont->opt->start_table)
{
@@ -2208,7 +2208,7 @@ void
printTable(const printTableContent *cont, FILE *fout, FILE *flog)
{
bool is_pager = false;
-
+
if (cancel_pressed)
return;
@@ -2412,11 +2412,11 @@ strlen_max_width(unsigned char *str, int
break;
curr_width += char_width;
-
+
str += PQmblen((char *) str, encoding);
}
*target_width = curr_width;
-
+
return str - start;
}
Index: src/bin/psql/print.h
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/print.h,v
retrieving revision 1.39
diff -u -3 -p -r1.39 print.h
--- src/bin/psql/print.h 1 Jan 2009 17:23:55 -0000 1.39
+++ src/bin/psql/print.h 10 Jun 2009 20:42:36 -0000
@@ -103,13 +103,13 @@ extern void html_escaped_print(const cha
extern void printTableInit(printTableContent *const content,
const printTableOpt *opt, const char *title,
const int ncolumns, const int nrows);
-extern void printTableAddHeader(printTableContent *const content,
+extern void printTableAddHeader(printTableContent *const content,
const char *header, const bool translate, const char align);
-extern void printTableAddCell(printTableContent *const content,
+extern void printTableAddCell(printTableContent *const content,
const char *cell, const bool translate);
-extern void printTableAddFooter(printTableContent *const content,
+extern void printTableAddFooter(printTableContent *const content,
const char *footer);
-extern void printTableSetFooter(printTableContent *const content,
+extern void printTableSetFooter(printTableContent *const content,
const char *footer);
extern void printTableCleanup(printTableContent *const content);
extern void printTable(const printTableContent *cont, FILE *fout, FILE *flog);
Index: src/include/c.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/c.h,v
retrieving revision 1.235
diff -u -3 -p -r1.235 c.h
--- src/include/c.h 26 Mar 2009 22:26:07 -0000 1.235
+++ src/include/c.h 10 Jun 2009 20:42:36 -0000
@@ -842,7 +842,7 @@ extern int fdatasync(int fildes);
#if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
#define USE_WIDE_UPPER_LOWER
#endif
-
+
/* EXEC_BACKEND defines */
#ifdef EXEC_BACKEND
#define NON_EXEC_STATIC
Index: src/include/miscadmin.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/miscadmin.h,v
retrieving revision 1.210
diff -u -3 -p -r1.210 miscadmin.h
--- src/include/miscadmin.h 5 May 2009 19:59:00 -0000 1.210
+++ src/include/miscadmin.h 10 Jun 2009 20:42:36 -0000
@@ -192,7 +192,7 @@ extern PGDLLIMPORT Oid MyDatabaseTableSp
extern int DateStyle;
extern int DateOrder;
-
+
/*
* IntervalStyles
* INTSTYLE_POSTGRES Like Postgres < 8.4 when DateStyle = 'iso'
Index: src/include/port.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port.h,v
retrieving revision 1.124
diff -u -3 -p -r1.124 port.h
--- src/include/port.h 7 Jan 2009 03:39:33 -0000 1.124
+++ src/include/port.h 10 Jun 2009 20:42:36 -0000
@@ -281,7 +281,7 @@ extern void copydir(char *fromdir, char
extern bool rmtree(const char *path, bool rmtopdir);
-/*
+/*
* stat() is not guaranteed to set the st_size field on win32, so we
* redefine it to our own implementation that is.
*
Index: src/include/access/clog.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/access/clog.h,v
retrieving revision 1.23
diff -u -3 -p -r1.23 clog.h
--- src/include/access/clog.h 1 Jan 2009 17:23:55 -0000 1.23
+++ src/include/access/clog.h 10 Jun 2009 20:42:36 -0000
@@ -32,7 +32,7 @@ typedef int XidStatus;
#define NUM_CLOG_BUFFERS 8
-extern void TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
+extern void TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
extern XidStatus TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
Index: src/include/access/nbtree.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/access/nbtree.h,v
retrieving revision 1.123
diff -u -3 -p -r1.123 nbtree.h
--- src/include/access/nbtree.h 1 Jan 2009 17:23:56 -0000 1.123
+++ src/include/access/nbtree.h 10 Jun 2009 20:42:36 -0000
@@ -287,7 +287,7 @@ typedef struct xl_btree_split
* than BlockNumber for alignment reasons: SizeOfBtreeSplit is only 16-bit
* aligned.)
*
- * If level > 0, an IndexTuple representing the HIKEY of the left page
+ * If level > 0, an IndexTuple representing the HIKEY of the left page
* follows. We don't need this on leaf pages, because it's the same
* as the leftmost key in the new right page. Also, it's suppressed if
* XLogInsert chooses to store the left page's whole page image.
Index: src/include/catalog/genbki.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/catalog/genbki.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 genbki.h
--- src/include/catalog/genbki.h 1 Jan 2009 17:23:56 -0000 1.2
+++ src/include/catalog/genbki.h 10 Jun 2009 20:42:36 -0000
@@ -16,7 +16,7 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef GENBKI_H
+#ifndef GENBKI_H
#define GENBKI_H
/* Introduces a catalog's structure definition */
Index: src/include/commands/comment.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/commands/comment.h,v
retrieving revision 1.23
diff -u -3 -p -r1.23 comment.h
--- src/include/commands/comment.h 1 Jan 2009 17:23:58 -0000 1.23
+++ src/include/commands/comment.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/commands/comment.h,v 1.23 2009/01/01 17:23:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/comment.h,v 1.23 2009/01/01 17:23:58 momjian Exp $
*
*-------------------------------------------------------------------------
*
Index: src/include/commands/proclang.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/commands/proclang.h,v
retrieving revision 1.14
diff -u -3 -p -r1.14 proclang.h
--- src/include/commands/proclang.h 17 May 2008 01:28:24 -0000 1.14
+++ src/include/commands/proclang.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/commands/proclang.h,v 1.14 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/commands/proclang.h,v 1.14 2008/05/17 01:28:24 adunstan Exp $
*
*-------------------------------------------------------------------------
*
Index: src/include/commands/trigger.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/commands/trigger.h,v
retrieving revision 1.72
diff -u -3 -p -r1.72 trigger.h
--- src/include/commands/trigger.h 22 Jan 2009 20:16:09 -0000 1.72
+++ src/include/commands/trigger.h 10 Jun 2009 20:42:36 -0000
@@ -39,7 +39,7 @@ typedef struct TriggerData
} TriggerData;
/*
- * TriggerEvent bit flags
+ * TriggerEvent bit flags
*
* Note that we assume different event types (INSERT/DELETE/UPDATE/TRUNCATE)
* can't be OR'd together in a single TriggerEvent. This is unlike the
Index: src/include/libpq/hba.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/libpq/hba.h,v
retrieving revision 1.55
diff -u -3 -p -r1.55 hba.h
--- src/include/libpq/hba.h 7 Jan 2009 13:09:21 -0000 1.55
+++ src/include/libpq/hba.h 10 Jun 2009 20:42:36 -0000
@@ -38,7 +38,7 @@ typedef enum ConnType
ctHostNoSSL
} ConnType;
-typedef struct
+typedef struct
{
int linenumber;
ConnType conntype;
Index: src/include/nodes/execnodes.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/nodes/execnodes.h,v
retrieving revision 1.204
diff -u -3 -p -r1.204 execnodes.h
--- src/include/nodes/execnodes.h 8 Apr 2009 21:51:38 -0000 1.204
+++ src/include/nodes/execnodes.h 10 Jun 2009 20:42:36 -0000
@@ -18,8 +18,8 @@
#include "access/heapam.h"
#include "access/skey.h"
#include "nodes/params.h"
-#include "nodes/plannodes.h"
-#include "nodes/tidbitmap.h"
+#include "nodes/plannodes.h"
+#include "nodes/tidbitmap.h"
#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapshot.h"
Index: src/include/port/aix.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/aix.h,v
retrieving revision 1.12
diff -u -3 -p -r1.12 aix.h
--- src/include/port/aix.h 17 May 2008 01:28:24 -0000 1.12
+++ src/include/port/aix.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/aix.h,v 1.12 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/aix.h,v 1.12 2008/05/17 01:28:24 adunstan Exp $
*/
#define CLASS_CONFLICT
#define DISABLE_XOPEN_NLS
Index: src/include/port/bsdi.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/bsdi.h,v
retrieving revision 1.14
diff -u -3 -p -r1.14 bsdi.h
--- src/include/port/bsdi.h 17 May 2008 01:28:24 -0000 1.14
+++ src/include/port/bsdi.h 10 Jun 2009 20:42:36 -0000
@@ -1,4 +1,4 @@
/*
- * $PostgreSQL: pgsql/src/include/port/bsdi.h,v 1.14 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/bsdi.h,v 1.14 2008/05/17 01:28:24 adunstan Exp $
*/
Index: src/include/port/sco.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/sco.h,v
retrieving revision 1.18
diff -u -3 -p -r1.18 sco.h
--- src/include/port/sco.h 17 May 2008 01:28:24 -0000 1.18
+++ src/include/port/sco.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/sco.h,v 1.18 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/sco.h,v 1.18 2008/05/17 01:28:24 adunstan Exp $
*
* see src/backend/libpq/pqcomm.c */
#define SCO_ACCEPT_BUG
Index: src/include/port/sunos4.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/sunos4.h,v
retrieving revision 1.11
diff -u -3 -p -r1.11 sunos4.h
--- src/include/port/sunos4.h 11 Dec 2008 09:17:07 -0000 1.11
+++ src/include/port/sunos4.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/sunos4.h,v 1.11 2008/12/11 09:17:07 petere Exp $
+ * $PostgreSQL: pgsql/src/include/port/sunos4.h,v 1.11 2008/12/11 09:17:07 petere Exp $
*
* sprintf() returns char *, not int, on SunOS 4.1.x */
#define SPRINTF_CHAR
Index: src/include/port/ultrix4.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/ultrix4.h,v
retrieving revision 1.12
diff -u -3 -p -r1.12 ultrix4.h
--- src/include/port/ultrix4.h 17 May 2008 01:28:24 -0000 1.12
+++ src/include/port/ultrix4.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/ultrix4.h,v 1.12 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/ultrix4.h,v 1.12 2008/05/17 01:28:24 adunstan Exp $
*/
#define NOFIXADE
#define NEED_STRDUP
Index: src/include/port/univel.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/univel.h,v
retrieving revision 1.24
diff -u -3 -p -r1.24 univel.h
--- src/include/port/univel.h 17 May 2008 01:28:24 -0000 1.24
+++ src/include/port/univel.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/univel.h,v 1.24 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/univel.h,v 1.24 2008/05/17 01:28:24 adunstan Exp $
*
***************************************
* Define this if you are compiling with
Index: src/include/port/unixware.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/unixware.h,v
retrieving revision 1.18
diff -u -3 -p -r1.18 unixware.h
--- src/include/port/unixware.h 17 May 2008 01:28:24 -0000 1.18
+++ src/include/port/unixware.h 10 Jun 2009 20:42:36 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/port/unixware.h,v 1.18 2008/05/17 01:28:24 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/unixware.h,v 1.18 2008/05/17 01:28:24 adunstan Exp $
*
* see src/backend/libpq/pqcomm.c */
#define SCO_ACCEPT_BUG
Index: src/include/port/win32/pwd.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/win32/pwd.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 pwd.h
--- src/include/port/win32/pwd.h 17 May 2008 01:28:25 -0000 1.3
+++ src/include/port/win32/pwd.h 10 Jun 2009 20:42:36 -0000
@@ -1,4 +1,4 @@
/*
- * $PostgreSQL: pgsql/src/include/port/win32/pwd.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/win32/pwd.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
*/
Index: src/include/port/win32/sys/wait.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port/win32/sys/wait.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 wait.h
--- src/include/port/win32/sys/wait.h 17 May 2008 01:28:25 -0000 1.3
+++ src/include/port/win32/sys/wait.h 10 Jun 2009 20:42:37 -0000
@@ -1,4 +1,4 @@
/*
- * $PostgreSQL: pgsql/src/include/port/win32/sys/wait.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/port/win32/sys/wait.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
*/
Index: src/include/storage/bufmgr.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/storage/bufmgr.h,v
retrieving revision 1.120
diff -u -3 -p -r1.120 bufmgr.h
--- src/include/storage/bufmgr.h 12 Jan 2009 05:10:45 -0000 1.120
+++ src/include/storage/bufmgr.h 10 Jun 2009 20:42:37 -0000
@@ -189,7 +189,7 @@ extern void DropDatabaseBuffers(Oid dbid
extern void PrintPinnedBufs(void);
#endif
extern Size BufferShmemSize(void);
-extern void BufferGetTag(Buffer buffer, RelFileNode *rnode,
+extern void BufferGetTag(Buffer buffer, RelFileNode *rnode,
ForkNumber *forknum, BlockNumber *blknum);
extern void SetBufferCommitInfoNeedsSave(Buffer buffer);
Index: src/include/storage/s_lock.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/storage/s_lock.h,v
retrieving revision 1.166
diff -u -3 -p -r1.166 s_lock.h
--- src/include/storage/s_lock.h 1 Jan 2009 17:24:01 -0000 1.166
+++ src/include/storage/s_lock.h 10 Jun 2009 20:42:37 -0000
@@ -815,7 +815,7 @@ spin_delay(void)
#endif
-
+
#endif /* !defined(HAS_TEST_AND_SET) */
Index: src/include/storage/sinvaladt.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/storage/sinvaladt.h,v
retrieving revision 1.50
diff -u -3 -p -r1.50 sinvaladt.h
--- src/include/storage/sinvaladt.h 1 Jan 2009 17:24:01 -0000 1.50
+++ src/include/storage/sinvaladt.h 10 Jun 2009 20:42:37 -0000
@@ -8,7 +8,7 @@
* must be delivered to all already-running backends before it can be
* forgotten. (If we run out of space, we instead deliver a "RESET"
* message to backends that have fallen too far behind.)
- *
+ *
* The struct type SharedInvalidationMessage, defining the contents of
* a single message, is defined in sinval.h.
*
Index: src/include/storage/smgr.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/storage/smgr.h,v
retrieving revision 1.66
diff -u -3 -p -r1.66 smgr.h
--- src/include/storage/smgr.h 12 Jan 2009 05:10:45 -0000 1.66
+++ src/include/storage/smgr.h 10 Jun 2009 20:42:37 -0000
@@ -68,7 +68,7 @@ extern void smgrclosenode(RelFileNode rn
extern void smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo);
extern void smgrdounlink(SMgrRelation reln, ForkNumber forknum,
bool isTemp, bool isRedo);
-extern void smgrextend(SMgrRelation reln, ForkNumber forknum,
+extern void smgrextend(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum, char *buffer, bool isTemp);
extern void smgrprefetch(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum);
Index: src/include/tsearch/ts_public.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/tsearch/ts_public.h,v
retrieving revision 1.13
diff -u -3 -p -r1.13 ts_public.h
--- src/include/tsearch/ts_public.h 15 Jan 2009 16:33:59 -0000 1.13
+++ src/include/tsearch/ts_public.h 10 Jun 2009 20:42:37 -0000
@@ -56,7 +56,7 @@ typedef struct
char *fragdelim;
int2 startsellen;
int2 stopsellen;
- int2 fragdelimlen;
+ int2 fragdelimlen;
} HeadlineParsedText;
/*
Index: src/include/utils/cash.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/utils/cash.h,v
retrieving revision 1.26
diff -u -3 -p -r1.26 cash.h
--- src/include/utils/cash.h 17 May 2008 01:28:25 -0000 1.26
+++ src/include/utils/cash.h 10 Jun 2009 20:42:37 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/include/utils/cash.h,v 1.26 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/utils/cash.h,v 1.26 2008/05/17 01:28:25 adunstan Exp $
*
*
* cash.h
Index: src/interfaces/ecpg/ecpglib/connect.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v
retrieving revision 1.53
diff -u -3 -p -r1.53 connect.c
--- src/interfaces/ecpg/ecpglib/connect.c 15 Jan 2009 11:52:55 -0000 1.53
+++ src/interfaces/ecpg/ecpglib/connect.c 10 Jun 2009 20:42:37 -0000
@@ -497,7 +497,7 @@ ECPGconnect(int lineno, int c, const cha
user ? "user=" : "", user ? user : "",
passwd ? "password=" : "", passwd ? passwd : "",
options ? options : "");
-
+
/* this is deprecated
* this->connection = PQsetdbLogin(host, port, options, NULL, realname, user, passwd);*/
this->connection = PQconnectdb(connect_string);
@@ -594,7 +594,7 @@ PGconn* ECPGget_PGconn(const char *conne
struct connection * con;
con=ecpg_get_connection(connection_name);
- if (con==NULL) return NULL;
+ if (con==NULL) return NULL;
return con->connection;
}
Index: src/interfaces/ecpg/ecpglib/error.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/error.c,v
retrieving revision 1.22
diff -u -3 -p -r1.22 error.c
--- src/interfaces/ecpg/ecpglib/error.c 16 Jan 2009 09:15:03 -0000 1.22
+++ src/interfaces/ecpg/ecpglib/error.c 10 Jun 2009 20:42:37 -0000
@@ -21,56 +21,56 @@ ecpg_raise(int line, int code, const cha
{
case ECPG_NOT_FOUND:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("no data found on line %d"), line);
break;
case ECPG_OUT_OF_MEMORY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("out of memory on line %d"), line);
break;
case ECPG_UNSUPPORTED:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("unsupported type \"%s\" on line %d"), str, line);
break;
case ECPG_TOO_MANY_ARGUMENTS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("too many arguments on line %d"), line);
break;
case ECPG_TOO_FEW_ARGUMENTS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("too few arguments on line %d"), line);
break;
case ECPG_INT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("invalid input syntax for type int: \"%s\", on line %d"), str, line);
break;
case ECPG_UINT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("invalid input syntax for type unsigned int: \"%s\", on line %d"), str, line);
break;
case ECPG_FLOAT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("invalid input syntax for floating-point type: \"%s\", on line %d"), str, line);
break;
@@ -78,124 +78,124 @@ ecpg_raise(int line, int code, const cha
case ECPG_CONVERT_BOOL:
if (str)
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("invalid syntax for type boolean: \"%s\", on line %d"), str, line);
else
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("could not convert boolean value: size mismatch, on line %d"), line);
break;
case ECPG_EMPTY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("empty query on line %d"), line);
break;
case ECPG_MISSING_INDICATOR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("null value without indicator on line %d"), line);
break;
case ECPG_NO_ARRAY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("variable does not have an array type on line %d"), line);
break;
case ECPG_DATA_NOT_ARRAY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("data read from server is not an array on line %d"), line);
break;
case ECPG_ARRAY_INSERT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("inserting an array of variables is not supported on line %d"), line);
break;
case ECPG_NO_CONN:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("connection \"%s\" does not exist on line %d"), str, line);
break;
case ECPG_NOT_CONN:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("not connected to connection \"%s\" on line %d"), str, line);
break;
case ECPG_INVALID_STMT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("invalid statement name \"%s\" on line %d"), str, line);
break;
case ECPG_UNKNOWN_DESCRIPTOR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("descriptor \"%s\" not found on line %d"), str, line);
break;
case ECPG_INVALID_DESCRIPTOR_INDEX:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("descriptor index out of range on line %d"), line);
break;
case ECPG_UNKNOWN_DESCRIPTOR_ITEM:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("unrecognized descriptor item \"%s\" on line %d"), str, line);
break;
case ECPG_VAR_NOT_NUMERIC:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("variable does not have a numeric type on line %d"), line);
break;
case ECPG_VAR_NOT_CHAR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("variable does not have a character type on line %d"), line);
break;
case ECPG_TRANS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("error in transaction processing on line %d"), line);
break;
case ECPG_CONNECT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("could not connect to database \"%s\" on line %d"), str, line);
break;
default:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
- /* translator: this string will be truncated at 149
+ /* translator: this string will be truncated at 149
characters expanded. */
ecpg_gettext("SQL error %d on line %d"), code, line);
break;
Index: src/interfaces/ecpg/ecpglib/execute.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/execute.c,v
retrieving revision 1.84
diff -u -3 -p -r1.84 execute.c
--- src/interfaces/ecpg/ecpglib/execute.c 20 May 2009 16:49:23 -0000 1.84
+++ src/interfaces/ecpg/ecpglib/execute.c 10 Jun 2009 20:42:37 -0000
@@ -353,7 +353,7 @@ ecpg_store_result(const PGresult *result
{
int len = 0;
- if (!PQfformat(results, act_field))
+ if (!PQfformat(results, act_field))
{
switch (var->type)
{
@@ -1193,7 +1193,7 @@ ecpg_execute(struct statement * stmt)
return false;
}
- /*
+ /*
* if var->type=ECPGt_char_variable we have a dynamic cursor we have
* to simulate a dynamic cursor because there is no backend
* functionality for it
@@ -1213,7 +1213,7 @@ ecpg_execute(struct statement * stmt)
* if the placeholder is '$0' we have to replace it on the client side
* this is for places we want to support variables at that are not supported in the backend
*/
- else if (stmt->command[position] == '0' )
+ else if (stmt->command[position] == '0' )
{
if (!insert_tobeinserted(position, 2, stmt, tobeinserted))
{
Index: src/interfaces/ecpg/include/decimal.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/include/decimal.h,v
retrieving revision 1.18
diff -u -3 -p -r1.18 decimal.h
--- src/interfaces/ecpg/include/decimal.h 17 Feb 2008 18:14:29 -0000 1.18
+++ src/interfaces/ecpg/include/decimal.h 10 Jun 2009 20:42:37 -0000
@@ -6,7 +6,7 @@
#include <ecpg_informix.h>
#ifndef _ECPGLIB_H /* source created by ecpg which defines this symbol */
-typedef decimal dec_t;
+typedef decimal dec_t;
#endif /* ndef _ECPGLIB_H */
#endif /* ndef _ECPG_DECIMAL_H */
Index: src/interfaces/ecpg/include/sqlda.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/include/sqlda.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 sqlda.h
--- src/interfaces/ecpg/include/sqlda.h 17 May 2008 01:28:25 -0000 1.3
+++ src/interfaces/ecpg/include/sqlda.h 10 Jun 2009 20:42:37 -0000
@@ -1,4 +1,4 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqlda.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqlda.h,v 1.3 2008/05/17 01:28:25 adunstan Exp $
*/
Index: src/interfaces/ecpg/include/sqltypes.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/include/sqltypes.h,v
retrieving revision 1.8
diff -u -3 -p -r1.8 sqltypes.h
--- src/interfaces/ecpg/include/sqltypes.h 17 May 2008 01:28:25 -0000 1.8
+++ src/interfaces/ecpg/include/sqltypes.h 10 Jun 2009 20:42:37 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqltypes.h,v 1.8 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqltypes.h,v 1.8 2008/05/17 01:28:25 adunstan Exp $
*/
#ifndef ECPG_SQLTYPES_H
#define ECPG_SQLTYPES_H
Index: src/interfaces/ecpg/pgtypeslib/interval.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v
retrieving revision 1.40
diff -u -3 -p -r1.40 interval.c
--- src/interfaces/ecpg/pgtypeslib/interval.c 20 May 2009 16:13:18 -0000 1.40
+++ src/interfaces/ecpg/pgtypeslib/interval.c 10 Jun 2009 20:42:37 -0000
@@ -28,7 +28,7 @@ strtoi(const char *nptr, char **endptr,
return (int) val;
}
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
*/
static void
@@ -50,7 +50,7 @@ AdjustFractSeconds(double frac, struct /
}
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
*/
static void
@@ -103,10 +103,10 @@ ISO8601IntegerWidth(char *fieldstart)
}
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
*/
-static inline void
+static inline void
ClearPgTm(struct /*pg_*/tm *tm, fsec_t *fsec)
{
tm->tm_year = 0;
@@ -118,10 +118,10 @@ ClearPgTm(struct /*pg_*/tm *tm, fsec_t *
*fsec = 0;
}
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
- *
+/* copy&pasted from .../src/backend/utils/adt/datetime.c
+ *
* * changesd struct pg_tm to struct tm
- *
+ *
* * Made the function static
*/
static int
@@ -231,7 +231,7 @@ DecodeISO8601Interval(char *str,
if (*str != '-')
return DTERR_BAD_FORMAT;
str++;
-
+
dterr = ParseISO8601Number(str, &str, &val, &fval);
if (dterr)
return dterr;
@@ -285,7 +285,7 @@ DecodeISO8601Interval(char *str,
AdjustFractSeconds(fval, tm, fsec, SECS_PER_HOUR);
if (unit == '\0')
return 0;
-
+
dterr = ParseISO8601Number(str, &str, &val, &fval);
if (dterr)
return dterr;
@@ -296,7 +296,7 @@ DecodeISO8601Interval(char *str,
if (*str != ':')
return DTERR_BAD_FORMAT;
str++;
-
+
dterr = ParseISO8601Number(str, &str, &val, &fval);
if (dterr)
return dterr;
@@ -791,7 +791,7 @@ AppendSeconds(char *cp, int sec, fsec_t
/* copy&pasted from .../src/backend/utils/adt/datetime.c
- *
+ *
* Change pg_tm to tm
*/
Index: src/interfaces/ecpg/pgtypeslib/timestamp.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/pgtypeslib/timestamp.c,v
retrieving revision 1.44
diff -u -3 -p -r1.44 timestamp.c
--- src/interfaces/ecpg/pgtypeslib/timestamp.c 20 May 2009 16:13:18 -0000 1.44
+++ src/interfaces/ecpg/pgtypeslib/timestamp.c 10 Jun 2009 20:42:37 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/timestamp.c,v 1.44 2009/05/20 16:13:18 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/timestamp.c,v 1.44 2009/05/20 16:13:18 meskes Exp $
*/
#include "postgres_fe.h"
Index: src/interfaces/ecpg/preproc/ecpg.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v
retrieving revision 1.109
diff -u -3 -p -r1.109 ecpg.c
--- src/interfaces/ecpg/preproc/ecpg.c 25 Feb 2009 13:03:07 -0000 1.109
+++ src/interfaces/ecpg/preproc/ecpg.c 10 Jun 2009 20:42:37 -0000
@@ -455,7 +455,7 @@ main(int argc, char *const argv[])
/* and parse the source */
base_yyparse();
- /*
+ /*
* Check whether all cursors were indeed opened. It
* does not really make sense to declare a cursor but
* not open it.
Index: src/interfaces/ecpg/preproc/output.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/preproc/output.c,v
retrieving revision 1.24
diff -u -3 -p -r1.24 output.c
--- src/interfaces/ecpg/preproc/output.c 20 Mar 2008 15:56:59 -0000 1.24
+++ src/interfaces/ecpg/preproc/output.c 10 Jun 2009 20:42:37 -0000
@@ -195,8 +195,8 @@ output_escaped_str(char *str, bool quote
else if (str[i] == '\\')
{
int j = i;
-
- /* check whether this is a continuation line
+
+ /* check whether this is a continuation line
* if it is, do not output anything because newlines are escaped anyway */
/* accept blanks after the '\' as some other compilers do too */
Index: src/interfaces/ecpg/preproc/type.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/preproc/type.c,v
retrieving revision 1.82
diff -u -3 -p -r1.82 type.c
--- src/interfaces/ecpg/preproc/type.c 23 Jan 2009 12:43:32 -0000 1.82
+++ src/interfaces/ecpg/preproc/type.c 10 Jun 2009 20:42:38 -0000
@@ -329,7 +329,7 @@ ECPGdump_a_simple(FILE *o, const char *n
{
char *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
char *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
- char *var_name, *ptr;
+ char *var_name, *ptr;
switch (type)
{
Index: src/interfaces/ecpg/preproc/type.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/preproc/type.h,v
retrieving revision 1.50
diff -u -3 -p -r1.50 type.h
--- src/interfaces/ecpg/preproc/type.h 20 May 2008 23:17:32 -0000 1.50
+++ src/interfaces/ecpg/preproc/type.h 10 Jun 2009 20:42:38 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.h,v 1.50 2008/05/20 23:17:32 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.h,v 1.50 2008/05/20 23:17:32 meskes Exp $
*/
#ifndef _ECPG_PREPROC_TYPE_H
#define _ECPG_PREPROC_TYPE_H
Index: src/interfaces/libpq/fe-secure.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v
retrieving revision 1.125
diff -u -3 -p -r1.125 fe-secure.c
--- src/interfaces/libpq/fe-secure.c 3 May 2009 17:16:58 -0000 1.125
+++ src/interfaces/libpq/fe-secure.c 10 Jun 2009 20:42:38 -0000
@@ -180,7 +180,7 @@ PQinitSSL(int do_init)
* Exported function to allow application to tell us it's already
* initialized OpenSSL and/or libcrypto.
*/
-void
+void
PQinitOpenSSL(int do_ssl, int do_crypto)
{
#ifdef USE_SSL
Index: src/interfaces/libpq/win32.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/win32.c,v
retrieving revision 1.25
diff -u -3 -p -r1.25 win32.c
--- src/interfaces/libpq/win32.c 1 Jan 2009 17:24:03 -0000 1.25
+++ src/interfaces/libpq/win32.c 10 Jun 2009 20:42:38 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/libpq/win32.c,v 1.25 2009/01/01 17:24:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/win32.c,v 1.25 2009/01/01 17:24:03 momjian Exp $
*
*
* FILE
Index: src/interfaces/libpq/win32.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/win32.h,v
retrieving revision 1.29
diff -u -3 -p -r1.29 win32.h
--- src/interfaces/libpq/win32.h 17 May 2008 01:28:25 -0000 1.29
+++ src/interfaces/libpq/win32.h 10 Jun 2009 20:42:38 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/interfaces/libpq/win32.h,v 1.29 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/win32.h,v 1.29 2008/05/17 01:28:25 adunstan Exp $
*/
#ifndef __win32_h_included
#define __win32_h_included
Index: src/pl/plperl/plperl.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/plperl.c,v
retrieving revision 1.149
diff -u -3 -p -r1.149 plperl.c
--- src/pl/plperl/plperl.c 6 Jun 2009 03:45:36 -0000 1.149
+++ src/pl/plperl/plperl.c 10 Jun 2009 20:42:38 -0000
@@ -273,7 +273,7 @@ _PG_init(void)
#define SAFE_MODULE \
"require Safe; $Safe::VERSION"
-/*
+/*
* The temporary enabling of the caller opcode here is to work around a
* bug in perl 5.10, which unkindly changed the way its Safe.pm works, without
* notice. It is quite safe, as caller is informational only, and in any case
@@ -455,7 +455,7 @@ plperl_init_interp(void)
/* only call this the first time through, as per perlembed man page */
if (interp_state == INTERP_NONE)
{
- char *dummy_env[1] = { NULL };
+ char *dummy_env[1] = { NULL };
PERL_SYS_INIT3(&nargs, (char ***) &embedding, (char ***) &dummy_env);
}
@@ -548,14 +548,14 @@ plperl_safe_init(void)
eval_pv(SAFE_OK, FALSE);
if (GetDatabaseEncoding() == PG_UTF8)
{
- /*
+ /*
* Fill in just enough information to set up this perl
* function in the safe container and call it.
* For some reason not entirely clear, it prevents errors that
* can arise from the regex code later trying to load
* utf8 modules.
*/
- plperl_proc_desc desc;
+ plperl_proc_desc desc;
FunctionCallInfoData fcinfo;
SV *ret;
SV *func;
@@ -576,7 +576,7 @@ plperl_safe_init(void)
fcinfo.arg[0] = CStringGetTextDatum("a");
fcinfo.argnull[0] = false;
-
+
/* and make the call */
ret = plperl_call_perl_func(&desc, &fcinfo);
}
Index: src/pl/plperl/spi_internal.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/spi_internal.c,v
retrieving revision 1.9
diff -u -3 -p -r1.9 spi_internal.c
--- src/pl/plperl/spi_internal.c 17 May 2008 01:28:25 -0000 1.9
+++ src/pl/plperl/spi_internal.c 10 Jun 2009 20:42:38 -0000
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/src/pl/plperl/spi_internal.c,v 1.9 2008/05/17 01:28:25 adunstan Exp $
+ * $PostgreSQL: pgsql/src/pl/plperl/spi_internal.c,v 1.9 2008/05/17 01:28:25 adunstan Exp $
*
*
* This kludge is necessary because of the conflicting
Index: src/pl/plpython/plpython.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plpython/plpython.c,v
retrieving revision 1.121
diff -u -3 -p -r1.121 plpython.c
--- src/pl/plpython/plpython.c 4 Jun 2009 18:33:08 -0000 1.121
+++ src/pl/plpython/plpython.c 10 Jun 2009 20:42:38 -0000
@@ -493,7 +493,7 @@ PLy_modify_tuple(PLyProcedure * proc, Py
PG_TRY();
{
if ((plntup = PyDict_GetItemString(pltd, "new")) == NULL)
- ereport(ERROR,
+ ereport(ERROR,
(errmsg("TD[\"new\"] deleted, cannot modify row")));
if (!PyDict_Check(plntup))
ereport(ERROR,
--
Sent via pgsql-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
