diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 01e2903816..f5198392c4 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -4,7 +4,7 @@ /* Returns a better readable representaion of variable key ( sets pointer ) */ -extern GBT_VARKEY_R +extern GBT_VARKEY_R gbt_var_key_readable(const GBT_VARKEY * k) { diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c index 9f26dec670..a8e1dbfe73 100644 --- a/contrib/tsearch2/tsvector.c +++ b/contrib/tsearch2/tsvector.c @@ -1003,47 +1003,47 @@ Datum tsvector_cmp(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_INT32(res); + PG_RETURN_INT32(res); } Datum tsvector_lt(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res < 0) ? true : false); + PG_RETURN_BOOL((res < 0) ? true : false); } Datum tsvector_le(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res <= 0) ? true : false); + PG_RETURN_BOOL((res <= 0) ? true : false); } Datum tsvector_eq(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res == 0) ? true : false); + PG_RETURN_BOOL((res == 0) ? true : false); } Datum tsvector_ge(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res >= 0) ? true : false); + PG_RETURN_BOOL((res >= 0) ? true : false); } Datum tsvector_gt(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res > 0) ? true : false); + PG_RETURN_BOOL((res > 0) ? true : false); } Datum tsvector_ne(PG_FUNCTION_ARGS) { RUNCMP - PG_RETURN_BOOL((res != 0) ? true : false); + PG_RETURN_BOOL((res != 0) ? true : false); } diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 3bb38e4227..c0ef2ca763 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.183 2004/08/29 05:06:40 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.184 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1704,7 +1704,7 @@ CommitTransactionCommand(void) AbortOutOfAnyTransaction(); s = CurrentTransactionState; /* changed by * AbortOutOfAnyTransaction - * */ + * */ /* AbortOutOfAnyTransaction sets the blockState */ break; diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e8f9ea20de..f05e083066 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.167 2004/08/29 16:34:47 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.168 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2484,9 +2484,9 @@ got_record:; /* * Allocate or enlarge readRecordBuf as needed. To avoid useless * small increases, round its size to a multiple of BLCKSZ, and make - * sure it's at least 4*BLCKSZ to start with. (That is enough for - * all "normal" records, but very large commit or abort records might - * need more space.) + * sure it's at least 4*BLCKSZ to start with. (That is enough for all + * "normal" records, but very large commit or abort records might need + * more space.) */ if (total_len > readRecordBufSize) { diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index aa95d97d0e..38696cf707 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.142 2004/08/29 21:08:47 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.143 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1117,24 +1117,27 @@ dbase_redo(XLogRecPtr lsn, XLogRecord *record) xl_dbase_create_rec *xlrec = (xl_dbase_create_rec *) XLogRecGetData(record); char *dst_path = xlrec->src_path + strlen(xlrec->src_path) + 1; struct stat st; + #ifndef WIN32 char buf[2 * MAXPGPATH + 100]; #endif /* - * Our theory for replaying a CREATE is to forcibly drop the target - * subdirectory if present, then re-copy the source data. This - * may be more work than needed, but it is simple to implement. + * Our theory for replaying a CREATE is to forcibly drop the + * target subdirectory if present, then re-copy the source data. + * This may be more work than needed, but it is simple to + * implement. */ if (stat(dst_path, &st) == 0 && S_ISDIR(st.st_mode)) { if (!rmtree(dst_path, true)) ereport(WARNING, - (errmsg("could not remove database directory \"%s\"", - dst_path))); + (errmsg("could not remove database directory \"%s\"", + dst_path))); } #ifndef WIN32 + /* * Copy this subdirectory to the new location * @@ -1164,7 +1167,10 @@ dbase_redo(XLogRecPtr lsn, XLogRecord *record) { xl_dbase_drop_rec *xlrec = (xl_dbase_drop_rec *) XLogRecGetData(record); - /* Drop pages for this database that are in the shared buffer cache */ + /* + * Drop pages for this database that are in the shared buffer + * cache + */ DropBuffers(xlrec->db_id); if (!rmtree(xlrec->dir_path, true)) diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 3b44ebb19f..b9fbd2b5ea 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -45,7 +45,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.10 2004/08/29 21:08:47 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.11 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -146,27 +146,27 @@ TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo) /* OK, go for it */ if (mkdir(dir, S_IRWXU) < 0) { - char *parentdir; + char *parentdir; if (errno != ENOENT || !isRedo) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not create directory \"%s\": %m", - dir))); + errmsg("could not create directory \"%s\": %m", + dir))); /* Try to make parent directory too */ parentdir = pstrdup(dir); get_parent_directory(parentdir); if (mkdir(parentdir, S_IRWXU) < 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not create directory \"%s\": %m", - parentdir))); + errmsg("could not create directory \"%s\": %m", + parentdir))); pfree(parentdir); if (mkdir(dir, S_IRWXU) < 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not create directory \"%s\": %m", - dir))); + errmsg("could not create directory \"%s\": %m", + dir))); } } @@ -444,7 +444,8 @@ DropTableSpace(DropTableSpaceStmt *stmt) tablespacename); /* - * Remove the pg_tablespace tuple (this will roll back if we fail below) + * Remove the pg_tablespace tuple (this will roll back if we fail + * below) */ simple_heap_delete(rel, &tuple->t_self); @@ -598,8 +599,8 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo) /* * Okay, try to remove the symlink. We must however deal with the * possibility that it's a directory instead of a symlink --- this - * could happen during WAL replay (see TablespaceCreateDbspace), - * and it is also the normal case on Windows. + * could happen during WAL replay (see TablespaceCreateDbspace), and + * it is also the normal case on Windows. */ if (lstat(location, &st) == 0 && S_ISDIR(st.st_mode)) { @@ -959,14 +960,14 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record) char *linkloc; /* - * Attempt to coerce target directory to safe permissions. If this - * fails, it doesn't exist or has the wrong owner. + * Attempt to coerce target directory to safe permissions. If + * this fails, it doesn't exist or has the wrong owner. */ if (chmod(location, 0700) != 0) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not set permissions on directory \"%s\": %m", - location))); + errmsg("could not set permissions on directory \"%s\": %m", + location))); /* Create or re-create the PG_VERSION file in the target directory */ set_short_version(location); @@ -980,8 +981,8 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record) if (errno != EEXIST) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not create symbolic link \"%s\": %m", - linkloc))); + errmsg("could not create symbolic link \"%s\": %m", + linkloc))); } pfree(linkloc); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 67c1c02b6d..8ace2777d4 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.289 2004/08/29 05:06:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.290 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1704,10 +1704,10 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, if (!(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED)) { /* - * There cannot be another concurrently running VACUUM. - * If the tuple had been moved in by a previous VACUUM, - * the visibility check would have set XMIN_COMMITTED. If - * the tuple had been moved in by the currently running + * There cannot be another concurrently running VACUUM. If + * the tuple had been moved in by a previous VACUUM, the + * visibility check would have set XMIN_COMMITTED. If the + * tuple had been moved in by the currently running * VACUUM, the loop would have been terminated. We had * elog(ERROR, ...) here, but as we are testing for a * can't-happen condition, Assert() seems more diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index cb4a3cde71..f262754a56 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.101 2004/08/29 05:06:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.102 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -270,6 +270,7 @@ assign_timezone(const char *value, bool doit, GucSource source) CStringGetDatum(val), ObjectIdGetDatum(InvalidOid), Int32GetDatum(-1))); + pfree(val); if (interval->month != 0) { @@ -284,6 +285,7 @@ assign_timezone(const char *value, bool doit, GucSource source) { /* Here we change from SQL to Unix sign convention */ CTimeZone = -interval->time; + HasCTZSet = true; } pfree(interval); @@ -448,10 +450,10 @@ show_timezone(void) if (HasCTZSet) { - Interval interval; + Interval interval; - interval.month = 0; - interval.time = -CTimeZone; + interval. month = 0; + interval. time = -CTimeZone; tzn = DatumGetCString(DirectFunctionCall1(interval_out, IntervalPGetDatum(&interval))); diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index a6898e75c8..d8f228f2b9 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.174 2004/08/29 05:06:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.175 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -431,8 +431,8 @@ preprocess_expression(Query *parse, Node *expr, int kind) /* * If it's a qual or havingQual, convert it to implicit-AND format. * (We don't want to do this before eval_const_expressions, since the - * latter would be unable to simplify a top-level AND correctly. - * Also, SS_process_sublinks expects explicit-AND format.) + * latter would be unable to simplify a top-level AND correctly. Also, + * SS_process_sublinks expects explicit-AND format.) */ if (kind == EXPRKIND_QUAL) expr = (Node *) make_ands_implicit((Expr *) expr); diff --git a/src/backend/port/beos/support.c b/src/backend/port/beos/support.c index 86053d79c0..a5f237e43b 100644 --- a/src/backend/port/beos/support.c +++ b/src/backend/port/beos/support.c @@ -168,7 +168,7 @@ beos_startup(int argc, char **argv) /* Main server loop */ for (;;) { - int32 opcode = 0; + int32 opcode = 0; char datas[4000]; /* diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index de84e45f2b..4835f4eab3 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.4 2004/08/29 05:06:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.5 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,15 +33,15 @@ TranslateSocketError(void) { switch (WSAGetLastError()) { - case WSANOTINITIALISED: - case WSAENETDOWN: - case WSAEINPROGRESS: - case WSAEINVAL: - case WSAESOCKTNOSUPPORT: - case WSAEFAULT: - case WSAEINVALIDPROVIDER: - case WSAEINVALIDPROCTABLE: - case WSAEMSGSIZE: + case WSANOTINITIALISED: + case WSAENETDOWN: + case WSAEINPROGRESS: + case WSAEINVAL: + case WSAESOCKTNOSUPPORT: + case WSAEFAULT: + case WSAEINVALIDPROVIDER: + case WSAEINVALIDPROCTABLE: + case WSAEMSGSIZE: errno = EINVAL; break; case WSAEAFNOSUPPORT: diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 8377e103eb..b81a7e67e5 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.30 2004/08/29 05:06:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.31 2004/08/30 02:54:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -237,7 +237,6 @@ tas_dummy() /* really means: extern int tas(slock_t asm("nop"); } #endif /* __sparc || __sparc__ */ - #endif /* not __GNUC__ */ #endif /* HAVE_SPINLOCKS */ diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 54e56061cf..6e7ebed875 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.110 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.111 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -737,9 +737,9 @@ mdsync(void) * may seem a bit unclean -- md calling smgr? But it's really * the best solution. It ensures that the open file reference * isn't permanently leaked if we get an error here. (You may - * say "but an unreferenced SMgrRelation is still a leak!" - * Not really, because the only case in which a checkpoint is - * done by a process that isn't about to shut down is in the + * say "but an unreferenced SMgrRelation is still a leak!" Not + * really, because the only case in which a checkpoint is done + * by a process that isn't about to shut down is in the * bgwriter, and it will periodically do smgrcloseall(). This * fact justifies our not closing the reln in the success path * either, which is a good thing since in non-bgwriter cases diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index ec1d902a10..71e82d71ed 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.80 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.81 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -339,8 +339,8 @@ smgrcreate(SMgrRelation reln, bool isTemp, bool isRedo) return; /* - * Make a non-transactional XLOG entry showing the file creation. - * It's non-transactional because we should replay it whether the + * Make a non-transactional XLOG entry showing the file creation. It's + * non-transactional because we should replay it whether the * transaction commits or not; if not, the file will be dropped at * abort time. */ diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index fcded9b763..66f5fd8cfe 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.102 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.103 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,7 @@ Datum date_in(PG_FUNCTION_ARGS) { char *str = PG_GETARG_CSTRING(0); - DateADT date; + DateADT date; fsec_t fsec; struct pg_tm tt, *tm = &tt; @@ -109,13 +109,13 @@ date_in(PG_FUNCTION_ARGS) Datum date_out(PG_FUNCTION_ARGS) { - DateADT date = PG_GETARG_DATEADT(0); + DateADT date = PG_GETARG_DATEADT(0); char *result; struct pg_tm tt, *tm = &tt; char buf[MAXDATELEN + 1]; - j2date(date + POSTGRES_EPOCH_JDATE, + j2date(date +POSTGRES_EPOCH_JDATE, &(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday)); EncodeDateOnly(tm, DateStyle, buf); @@ -141,7 +141,7 @@ date_recv(PG_FUNCTION_ARGS) Datum date_send(PG_FUNCTION_ARGS) { - DateADT date = PG_GETARG_DATEADT(0); + DateADT date = PG_GETARG_DATEADT(0); StringInfoData buf; pq_begintypsend(&buf); @@ -717,7 +717,7 @@ date_timestamp(PG_FUNCTION_ARGS) Datum timestamp_date(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); DateADT result; struct pg_tm tt, *tm = &tt; @@ -726,7 +726,7 @@ timestamp_date(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) PG_RETURN_NULL(); - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -769,7 +769,7 @@ timestamptz_date(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) PG_RETURN_NULL(); - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -823,7 +823,7 @@ Datum date_text(PG_FUNCTION_ARGS) { /* Input is a Date, but may as well leave it in Datum form */ - Datum date = PG_GETARG_DATUM(0); + Datum date = PG_GETARG_DATUM(0); text *result; char *str; int len; @@ -1322,7 +1322,7 @@ overlaps_time(PG_FUNCTION_ARGS) Datum timestamp_time(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); TimeADT result; struct pg_tm tt, *tm = &tt; @@ -1331,7 +1331,7 @@ timestamp_time(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) PG_RETURN_NULL(); - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -1368,7 +1368,7 @@ timestamptz_time(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) PG_RETURN_NULL(); - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -1394,7 +1394,7 @@ timestamptz_time(PG_FUNCTION_ARGS) Datum datetime_timestamp(PG_FUNCTION_ARGS) { - DateADT date = PG_GETARG_DATEADT(0); + DateADT date = PG_GETARG_DATEADT(0); TimeADT time = PG_GETARG_TIMEADT(1); Timestamp result; @@ -2246,7 +2246,7 @@ timestamptz_timetz(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) PG_RETURN_NULL(); - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -2268,15 +2268,15 @@ timestamptz_timetz(PG_FUNCTION_ARGS) Datum datetimetz_timestamptz(PG_FUNCTION_ARGS) { - DateADT date = PG_GETARG_DATEADT(0); + DateADT date = PG_GETARG_DATEADT(0); TimeTzADT *time = PG_GETARG_TIMETZADT_P(1); TimestampTz result; #ifdef HAVE_INT64_TIMESTAMP - result = (((date * INT64CONST(86400000000)) + time->time) + result = (((date *INT64CONST(86400000000)) +time->time) + (time->zone * INT64CONST(1000000))); #else - result = (((date * 86400.0) + time->time) + time->zone); + result = (((date *86400.0) +time->time) + time->zone); #endif PG_RETURN_TIMESTAMP(result); diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 6e0311d8ae..4459d286c9 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.133 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.134 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -666,6 +666,7 @@ j2day(int date) unsigned int day; day = date; + day += 1; day %= 7; @@ -1585,7 +1586,7 @@ int DetermineLocalTimeZone(struct pg_tm * tm) { int tz; - int date, + int date , sec; pg_time_t day, mysec, @@ -1609,7 +1610,8 @@ DetermineLocalTimeZone(struct pg_tm * tm) if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday)) goto overflow; date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - UNIX_EPOCH_JDATE; - day = ((pg_time_t) date) * 86400; + + day = ((pg_time_t) date) *86400; if (day / 86400 != date) goto overflow; sec = tm->tm_sec + (tm->tm_min + tm->tm_hour * 60) * 60; diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 13c23bb57a..369353e6ce 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.77 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.78 2004/08/30 02:54:39 momjian Exp $ * * * Portions Copyright (c) 1999-2004, PostgreSQL Global Development Group @@ -3556,6 +3556,7 @@ NUM_prepare_locale(NUMProc *Np) */ if (lconv->decimal_point && *lconv->decimal_point) Np->decimal = lconv->decimal_point; + else Np->decimal = "."; @@ -3579,6 +3580,7 @@ NUM_prepare_locale(NUMProc *Np) Np->L_negative_sign = "-"; Np->L_positive_sign = "+"; Np->decimal = "."; + Np->L_thousands_sep = ","; Np->L_currency_symbol = " "; } diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 4a2e862fb7..09c5b66129 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.125 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.126 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -547,7 +547,7 @@ btabstimecmp(PG_FUNCTION_ARGS) Datum timestamp_abstime(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); AbsoluteTime result; fsec_t fsec; int tz; @@ -816,6 +816,7 @@ tintervalin(PG_FUNCTION_ARGS) t2; interval = (TimeInterval) palloc(sizeof(TimeIntervalData)); + if (istinterval(intervalstr, &t1, &t2) == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), @@ -823,14 +824,15 @@ tintervalin(PG_FUNCTION_ARGS) intervalstr))); if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - interval->status = T_INTERVAL_INVAL; /* undefined */ + interval ->status = T_INTERVAL_INVAL; /* undefined */ + else - interval->status = T_INTERVAL_VALID; + interval ->status = T_INTERVAL_VALID; i_start = ABSTIMEMIN(t1, t2); i_end = ABSTIMEMAX(t1, t2); - interval->data[0] = i_start; - interval->data[1] = i_end; + interval ->data[0] = i_start; + interval ->data[1] = i_end; PG_RETURN_TIMEINTERVAL(interval); } @@ -877,15 +879,16 @@ tintervalrecv(PG_FUNCTION_ARGS) interval = (TimeInterval) palloc(sizeof(TimeIntervalData)); - interval->status = pq_getmsgint(buf, sizeof(interval->status)); + interval ->status = pq_getmsgint(buf, sizeof(interval->status)); + if (!(interval->status == T_INTERVAL_INVAL || interval->status == T_INTERVAL_VALID)) ereport(ERROR, (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION), errmsg("invalid status in external \"tinterval\" value"))); - interval->data[0] = pq_getmsgint(buf, sizeof(interval->data[0])); - interval->data[1] = pq_getmsgint(buf, sizeof(interval->data[1])); + interval ->data[0] = pq_getmsgint(buf, sizeof(interval->data[0])); + interval ->data[1] = pq_getmsgint(buf, sizeof(interval->data[1])); PG_RETURN_TIMEINTERVAL(interval); } @@ -931,7 +934,7 @@ interval_reltime(PG_FUNCTION_ARGS) year = 0; month = 0; } - else if (abs(interval->month) >= 12) + else if (abs(interval->month) >=12) { year = (interval->month / 12); month = (interval->month % 12); @@ -1016,12 +1019,13 @@ mktinterval(PG_FUNCTION_ARGS) interval = (TimeInterval) palloc(sizeof(TimeIntervalData)); if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - interval->status = T_INTERVAL_INVAL; + interval ->status = T_INTERVAL_INVAL; + else { - interval->status = T_INTERVAL_VALID; - interval->data[0] = tstart; - interval->data[1] = tend; + interval ->status = T_INTERVAL_VALID; + interval ->data[0] = tstart; + interval ->data[1] = tend; } PG_RETURN_TIMEINTERVAL(interval); diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 9c312643c5..9c8abfb365 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -14,7 +14,7 @@ * Copyright (c) 1998-2004, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.78 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.79 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -462,7 +462,7 @@ numeric_send(PG_FUNCTION_ARGS) * scale of the attribute have to be applied on the value. */ Datum -numeric(PG_FUNCTION_ARGS) +numeric (PG_FUNCTION_ARGS) { Numeric num = PG_GETARG_NUMERIC(0); int32 typmod = PG_GETARG_INT32(1); diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index b1f66d9c9a..412a0a3231 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.164 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.165 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2755,7 +2755,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid) return (interval->time + (interval->month * ((365.25 / 12.0) * 86400000000.0))); #else return interval->time + - interval->month * (365.25 / 12.0 * 24.0 * 60.0 * 60.0); + interval ->month * (365.25 / 12.0 * 24.0 * 60.0 * 60.0); #endif } case RELTIMEOID: @@ -2770,7 +2770,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid) #ifdef HAVE_INT64_TIMESTAMP if (interval->status != 0) - return ((interval->data[1] - interval->data[0]) * 1000000.0); + return ((interval->data[1] - interval->data[0]) *1000000.0); #else if (interval->status != 0) return interval->data[1] - interval->data[0]; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 375ff13068..83286502e8 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.112 2004/08/29 05:06:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.113 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -135,7 +135,7 @@ timestamp_in(PG_FUNCTION_ARGS) Datum timestamp_out(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); char *result; struct pg_tm tt, *tm = &tt; @@ -166,13 +166,14 @@ Datum timestamp_recv(PG_FUNCTION_ARGS) { StringInfo buf = (StringInfo) PG_GETARG_POINTER(0); - Timestamp timestamp; + Timestamp timestamp; struct pg_tm tt, *tm = &tt; fsec_t fsec; #ifdef HAVE_INT64_TIMESTAMP timestamp = (Timestamp) pq_getmsgint64(buf); + #else timestamp = (Timestamp) pq_getmsgfloat8(buf); #endif @@ -180,7 +181,7 @@ timestamp_recv(PG_FUNCTION_ARGS) /* rangecheck: see if timestamp_out would like it */ if (TIMESTAMP_NOT_FINITE(timestamp)) /* ok */ ; - else if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + else if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -194,7 +195,7 @@ timestamp_recv(PG_FUNCTION_ARGS) Datum timestamp_send(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); StringInfoData buf; pq_begintypsend(&buf); @@ -214,7 +215,7 @@ timestamp_send(PG_FUNCTION_ARGS) Datum timestamp_scale(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); int32 typmod = PG_GETARG_INT32(1); Timestamp result; @@ -416,6 +417,7 @@ timestamptz_recv(PG_FUNCTION_ARGS) #ifdef HAVE_INT64_TIMESTAMP timestamp = (TimestampTz) pq_getmsgint64(buf); + #else timestamp = (TimestampTz) pq_getmsgfloat8(buf); #endif @@ -423,7 +425,7 @@ timestamptz_recv(PG_FUNCTION_ARGS) /* rangecheck: see if timestamptz_out would like it */ if (TIMESTAMP_NOT_FINITE(timestamp)) /* ok */ ; - else if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + else if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -577,11 +579,12 @@ interval_recv(PG_FUNCTION_ARGS) interval = (Interval *) palloc(sizeof(Interval)); #ifdef HAVE_INT64_TIMESTAMP - interval->time = pq_getmsgint64(buf); + interval ->time = pq_getmsgint64(buf); + #else - interval->time = pq_getmsgfloat8(buf); + interval ->time = pq_getmsgfloat8(buf); #endif - interval->month = pq_getmsgint(buf, sizeof(interval->month)); + interval ->month = pq_getmsgint(buf, sizeof(interval->month)); PG_RETURN_INTERVAL_P(interval); } @@ -676,25 +679,28 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) } else if (range == INTERVAL_MASK(YEAR)) { - interval->month = ((interval->month / 12) * 12); - interval->time = 0; + interval ->month = ((interval->month / 12) *12); + interval ->time = 0; } else if (range == INTERVAL_MASK(MONTH)) { - interval->month %= 12; - interval->time = 0; + interval ->month %= 12; + interval ->time = 0; } /* YEAR TO MONTH */ else if (range == (INTERVAL_MASK(YEAR) | INTERVAL_MASK(MONTH))) - interval->time = 0; + interval ->time = 0; + else if (range == INTERVAL_MASK(DAY)) { - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP - interval->time = (((int) (interval->time / INT64CONST(86400000000))) - * INT64CONST(86400000000)); + interval ->time = (((int) (interval->time / INT64CONST(86400000000))) + * INT64CONST(86400000000)); + #else - interval->time = (((int) (interval->time / 86400)) * 86400); + interval ->time = (((int) (interval->time / 86400)) * 86400); #endif } else if (range == INTERVAL_MASK(HOUR)) @@ -706,15 +712,17 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double day; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP day = (interval->time / INT64CONST(86400000000)); - interval->time -= (day * INT64CONST(86400000000)); - interval->time = ((interval->time / INT64CONST(3600000000)) - * INT64CONST(3600000000)); + interval ->time -= (day * INT64CONST(86400000000)); + interval ->time = ((interval->time / INT64CONST(3600000000)) + *INT64CONST(3600000000)); + #else TMODULO(interval->time, day, 86400.0); - interval->time = (((int) (interval->time / 3600)) * 3600.0); + interval ->time = (((int) (interval->time / 3600)) * 3600.0); #endif } else if (range == INTERVAL_MASK(MINUTE)) @@ -726,15 +734,17 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double hour; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP hour = (interval->time / INT64CONST(3600000000)); - interval->time -= (hour * INT64CONST(3600000000)); - interval->time = ((interval->time / INT64CONST(60000000)) - * INT64CONST(60000000)); + interval ->time -= (hour * INT64CONST(3600000000)); + interval ->time = ((interval->time / INT64CONST(60000000)) + *INT64CONST(60000000)); + #else TMODULO(interval->time, hour, 3600.0); - interval->time = (((int) (interval->time / 60)) * 60); + interval ->time = (((int) (interval->time / 60)) * 60); #endif } else if (range == INTERVAL_MASK(SECOND)) @@ -746,10 +756,12 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double minute; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP minute = (interval->time / INT64CONST(60000000)); - interval->time -= (minute * INT64CONST(60000000)); + interval ->time -= (minute * INT64CONST(60000000)); + #else TMODULO(interval->time, minute, 60.0); /* interval->time = (int)(interval->time); */ @@ -759,12 +771,14 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) else if (range == (INTERVAL_MASK(DAY) | INTERVAL_MASK(HOUR))) { - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP - interval->time = ((interval->time / INT64CONST(3600000000)) - * INT64CONST(3600000000)); + interval ->time = ((interval->time / INT64CONST(3600000000)) + *INT64CONST(3600000000)); + #else - interval->time = (((int) (interval->time / 3600)) * 3600); + interval ->time = (((int) (interval->time / 3600)) * 3600); #endif } /* DAY TO MINUTE */ @@ -772,12 +786,14 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) { - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP - interval->time = ((interval->time / INT64CONST(60000000)) - * INT64CONST(60000000)); + interval ->time = ((interval->time / INT64CONST(60000000)) + *INT64CONST(60000000)); + #else - interval->time = (((int) (interval->time / 60)) * 60); + interval ->time = (((int) (interval->time / 60)) * 60); #endif } /* DAY TO SECOND */ @@ -785,7 +801,8 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE) | INTERVAL_MASK(SECOND))) - interval->month = 0; + interval ->month = 0; + /* HOUR TO MINUTE */ else if (range == (INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) @@ -797,15 +814,17 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double day; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP day = (interval->time / INT64CONST(86400000000)); - interval->time -= (day * INT64CONST(86400000000)); - interval->time = ((interval->time / INT64CONST(60000000)) - * INT64CONST(60000000)); + interval ->time -= (day * INT64CONST(86400000000)); + interval ->time = ((interval->time / INT64CONST(60000000)) + *INT64CONST(60000000)); + #else TMODULO(interval->time, day, 86400.0); - interval->time = (((int) (interval->time / 60)) * 60); + interval ->time = (((int) (interval->time / 60)) * 60); #endif } /* HOUR TO SECOND */ @@ -820,10 +839,12 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double day; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP day = (interval->time / INT64CONST(86400000000)); - interval->time -= (day * INT64CONST(86400000000)); + interval ->time -= (day * INT64CONST(86400000000)); + #else TMODULO(interval->time, day, 86400.0); #endif @@ -839,10 +860,12 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) double hour; #endif - interval->month = 0; + interval ->month = 0; + #ifdef HAVE_INT64_TIMESTAMP hour = (interval->time / INT64CONST(3600000000)); - interval->time -= (hour * INT64CONST(3600000000)); + interval ->time -= (hour * INT64CONST(3600000000)); + #else TMODULO(interval->time, hour, 3600.0); #endif @@ -870,17 +893,17 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod) #ifdef HAVE_INT64_TIMESTAMP if (interval->time >= INT64CONST(0)) { - interval->time = (((interval->time + IntervalOffsets[precision]) / IntervalScales[precision]) - * IntervalScales[precision]); + interval ->time = (((interval->time + IntervalOffsets[precision]) /IntervalScales[precision]) + * IntervalScales[precision]); } else { - interval->time = -(((-interval->time + IntervalOffsets[precision]) / IntervalScales[precision]) - * IntervalScales[precision]); + interval ->time = -(((-interval->time + IntervalOffsets[precision]) /IntervalScales[precision]) + * IntervalScales[precision]); } #else - interval->time = (rint(((double) interval->time) * IntervalScales[precision]) - / IntervalScales[precision]); + interval ->time = (rint(((double) interval->time) *IntervalScales[precision]) + / IntervalScales[precision]); #endif } } @@ -963,7 +986,7 @@ dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec) int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, char **tzn) { - Timestamp date; + Timestamp date; Timestamp time; pg_time_t utime; @@ -988,7 +1011,7 @@ timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, char **tzn if (time < INT64CONST(0)) { time += INT64CONST(86400000000); - date -= 1; + date -=1; } #else TMODULO(time, date, 86400e0); @@ -996,15 +1019,15 @@ timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, char **tzn if (time < 0) { time += 86400; - date -= 1; + date -=1; } #endif /* add offset to go from J2000 back to standard Julian date */ - date += POSTGRES_EPOCH_JDATE; + date +=POSTGRES_EPOCH_JDATE; /* Julian day routine does not work for negative Julian days */ - if (date < 0 || date > (Timestamp) INT_MAX) + if (date <0 || date >(Timestamp) INT_MAX) return -1; j2date((int) date, &tm->tm_year, &tm->tm_mon, &tm->tm_mday); @@ -1100,11 +1123,11 @@ int tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result) { #ifdef HAVE_INT64_TIMESTAMP - int date; + int date; int64 time; #else - double date, + double date, time; #endif @@ -1113,17 +1136,18 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result) return -1; date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - POSTGRES_EPOCH_JDATE; + time = time2t(tm->tm_hour, tm->tm_min, tm->tm_sec, fsec); #ifdef HAVE_INT64_TIMESTAMP - *result = (date * INT64CONST(86400000000)) + time; + *result = (date *INT64CONST(86400000000)) +time; /* check for major overflow */ if ((*result - time) / INT64CONST(86400000000) != date) return -1; /* check for just-barely overflow (okay except time-of-day wraps) */ - if ((*result < 0) ? (date >= 0) : (date < 0)) + if ((*result < 0) ? (date >=0) : (date <0)) return -1; #else - *result = ((date * 86400) + time); + *result = ((date *86400) +time); #endif if (tzp != NULL) *result = dt2local(*result, -(*tzp)); @@ -1235,7 +1259,7 @@ dt2local(Timestamp dt, int tz) Datum timestamp_finite(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); PG_RETURN_BOOL(!TIMESTAMP_NOT_FINITE(timestamp)); } @@ -1884,12 +1908,13 @@ timestamp_mi(PG_FUNCTION_ARGS) Datum timestamp_pl_interval(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); Interval *span = PG_GETARG_INTERVAL_P(1); Timestamp result; if (TIMESTAMP_NOT_FINITE(timestamp)) result = timestamp; + else { if (span->month != 0) @@ -1898,7 +1923,7 @@ timestamp_pl_interval(PG_FUNCTION_ARGS) *tm = &tt; fsec_t fsec; - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -1919,13 +1944,13 @@ timestamp_pl_interval(PG_FUNCTION_ARGS) if (tm->tm_mday > day_tab[isleap(tm->tm_year)][tm->tm_mon - 1]) tm->tm_mday = (day_tab[isleap(tm->tm_year)][tm->tm_mon - 1]); - if (tm2timestamp(tm, fsec, NULL, ×tamp) != 0) + if (tm2timestamp(tm, fsec, NULL, ×tamp) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); } - timestamp += span->time; + timestamp +=span->time; result = timestamp; } @@ -1935,7 +1960,7 @@ timestamp_pl_interval(PG_FUNCTION_ARGS) Datum timestamp_mi_interval(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); Interval *span = PG_GETARG_INTERVAL_P(1); Interval tspan; @@ -1968,6 +1993,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) result = timestamp; + else { if (span->month != 0) @@ -1976,7 +2002,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) *tm = &tt; fsec_t fsec; - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -1999,13 +2025,13 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS) tz = DetermineLocalTimeZone(tm); - if (tm2timestamp(tm, fsec, &tz, ×tamp) != 0) + if (tm2timestamp(tm, fsec, &tz, ×tamp) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); } - timestamp += span->time; + timestamp +=span->time; result = timestamp; } @@ -2513,7 +2539,7 @@ Datum timestamp_text(PG_FUNCTION_ARGS) { /* Input is a Timestamp, but may as well leave it in Datum form */ - Datum timestamp = PG_GETARG_DATUM(0); + Datum timestamp = PG_GETARG_DATUM(0); text *result; char *str; int len; @@ -2574,7 +2600,7 @@ Datum timestamptz_text(PG_FUNCTION_ARGS) { /* Input is a Timestamp, but may as well leave it in Datum form */ - Datum timestamp = PG_GETARG_DATUM(0); + Datum timestamp = PG_GETARG_DATUM(0); text *result; char *str; int len; @@ -2694,7 +2720,7 @@ Datum timestamp_trunc(PG_FUNCTION_ARGS) { text *units = PG_GETARG_TEXT_P(0); - Timestamp timestamp = PG_GETARG_TIMESTAMP(1); + Timestamp timestamp = PG_GETARG_TIMESTAMP(1); Timestamp result; int type, val; @@ -2714,7 +2740,7 @@ timestamp_trunc(PG_FUNCTION_ARGS) if (type == UNITS) { - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -2833,7 +2859,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS) if (type == UNITS) { - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3175,7 +3201,7 @@ Datum timestamp_part(PG_FUNCTION_ARGS) { text *units = PG_GETARG_TEXT_P(0); - Timestamp timestamp = PG_GETARG_TIMESTAMP(1); + Timestamp timestamp = PG_GETARG_TIMESTAMP(1); float8 result; int type, val; @@ -3200,7 +3226,7 @@ timestamp_part(PG_FUNCTION_ARGS) if (type == UNITS) { - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3279,9 +3305,9 @@ timestamp_part(PG_FUNCTION_ARGS) case DTK_CENTURY: /* - * centuries AD, c>0: year in [ (c-1)*100+1 : c*100 - * ] centuries BC, c<0: year in [ c*100 : - * (c+1)*100-1 ] there is no number 0 century. + * centuries AD, c>0: year in [ (c-1)*100+1 : c*100 ] + * centuries BC, c<0: year in [ c*100 : (c+1)*100-1 + * ] there is no number 0 century. */ if (tm->tm_year > 0) result = ((tm->tm_year + 99) / 100); @@ -3333,7 +3359,7 @@ timestamp_part(PG_FUNCTION_ARGS) * convert to timestamptz to produce consistent * results */ - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3353,7 +3379,7 @@ timestamp_part(PG_FUNCTION_ARGS) break; } case DTK_DOW: - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3361,7 +3387,7 @@ timestamp_part(PG_FUNCTION_ARGS) break; case DTK_DOY: - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3424,7 +3450,7 @@ timestamptz_part(PG_FUNCTION_ARGS) if (type == UNITS) { - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3548,14 +3574,14 @@ timestamptz_part(PG_FUNCTION_ARGS) { case DTK_EPOCH: #ifdef HAVE_INT64_TIMESTAMP - result = ((timestamp - SetEpochTimestamp()) / 1000000e0); + result = ((timestamp -SetEpochTimestamp()) /1000000e0); #else - result = timestamp - SetEpochTimestamp(); + result = timestamp -SetEpochTimestamp(); #endif break; case DTK_DOW: - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3563,7 +3589,7 @@ timestamptz_part(PG_FUNCTION_ARGS) break; case DTK_DOY: - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3738,7 +3764,7 @@ Datum timestamp_zone(PG_FUNCTION_ARGS) { text *zone = PG_GETARG_TEXT_P(0); - Timestamp timestamp = PG_GETARG_TIMESTAMP(1); + Timestamp timestamp = PG_GETARG_TIMESTAMP(1); TimestampTz result; int tz; int type, @@ -3780,7 +3806,7 @@ Datum timestamp_izone(PG_FUNCTION_ARGS) { Interval *zone = PG_GETARG_INTERVAL_P(0); - Timestamp timestamp = PG_GETARG_TIMESTAMP(1); + Timestamp timestamp = PG_GETARG_TIMESTAMP(1); TimestampTz result; int tz; @@ -3811,7 +3837,7 @@ timestamp_izone(PG_FUNCTION_ARGS) Datum timestamp_timestamptz(PG_FUNCTION_ARGS) { - Timestamp timestamp = PG_GETARG_TIMESTAMP(0); + Timestamp timestamp = PG_GETARG_TIMESTAMP(0); PG_RETURN_TIMESTAMPTZ(timestamp2timestamptz(timestamp)); } @@ -3827,9 +3853,10 @@ timestamp2timestamptz(Timestamp timestamp) if (TIMESTAMP_NOT_FINITE(timestamp)) result = timestamp; + else { - if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) != 0) + if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); @@ -3861,9 +3888,10 @@ timestamptz_timestamp(PG_FUNCTION_ARGS) if (TIMESTAMP_NOT_FINITE(timestamp)) result = timestamp; + else { - if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) != 0) + if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn) !=0) ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index e50427d2e3..de88e86bbc 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.82 2004/08/29 04:12:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.83 2004/08/30 02:54:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ static void fmgr_info_C_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedur static void fmgr_info_other_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedureTuple); static CFuncHashTabEntry *lookup_C_func(HeapTuple procedureTuple); static void record_C_func(HeapTuple procedureTuple, - PGFunction user_fn, Pg_finfo_record *inforec); + PGFunction user_fn, Pg_finfo_record *inforec); static Datum fmgr_oldstyle(PG_FUNCTION_ARGS); static Datum fmgr_security_definer(PG_FUNCTION_ARGS); @@ -244,8 +244,8 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt, if (fbp == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("internal function \"%s\" is not in internal lookup table", - prosrc))); + errmsg("internal function \"%s\" is not in internal lookup table", + prosrc))); pfree(prosrc); /* Should we check that nargs, strict, retset match the table? */ finfo->fn_addr = fbp->func; @@ -300,7 +300,10 @@ fmgr_info_C_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedureTuple) *probinstring; void *libraryhandle; - /* Get prosrc and probin strings (link symbol and library filename) */ + /* + * Get prosrc and probin strings (link symbol and library + * filename) + */ prosrcattr = SysCacheGetAttr(PROCOID, procedureTuple, Anum_pg_proc_prosrc, &isnull); if (isnull) @@ -470,7 +473,7 @@ fetch_finfo_record(void *filehandle, char *funcname) static CFuncHashTabEntry * lookup_C_func(HeapTuple procedureTuple) { - Oid fn_oid = HeapTupleGetOid(procedureTuple); + Oid fn_oid = HeapTupleGetOid(procedureTuple); CFuncHashTabEntry *entry; if (CFuncHash == NULL) @@ -495,9 +498,9 @@ static void record_C_func(HeapTuple procedureTuple, PGFunction user_fn, Pg_finfo_record *inforec) { - Oid fn_oid = HeapTupleGetOid(procedureTuple); + Oid fn_oid = HeapTupleGetOid(procedureTuple); CFuncHashTabEntry *entry; - bool found; + bool found; /* Create the hash table if it doesn't exist yet */ if (CFuncHash == NULL) @@ -758,8 +761,8 @@ fmgr_oldstyle(PG_FUNCTION_ARGS) */ ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), - errmsg("function %u has too many arguments (%d, maximum is %d)", - fcinfo->flinfo->fn_oid, n_arguments, 16))); + errmsg("function %u has too many arguments (%d, maximum is %d)", + fcinfo->flinfo->fn_oid, n_arguments, 16))); returnValue = NULL; /* keep compiler quiet */ break; } @@ -1622,8 +1625,8 @@ fmgr(Oid procedureId,...) if (n_arguments > FUNC_MAX_ARGS) ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), - errmsg("function %u has too many arguments (%d, maximum is %d)", - flinfo.fn_oid, n_arguments, FUNC_MAX_ARGS))); + errmsg("function %u has too many arguments (%d, maximum is %d)", + flinfo.fn_oid, n_arguments, FUNC_MAX_ARGS))); va_start(pvar, procedureId); for (i = 0; i < n_arguments; i++) fcinfo.arg[i] = (Datum) va_arg(pvar, char *); diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c index 0dcf3e8a8c..4bdbfe9563 100644 --- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c +++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c @@ -7,7 +7,7 @@ * * 1999/1/15 Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c,v 1.4 2003/11/29 22:40:08 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c,v 1.5 2004/08/30 02:54:40 momjian Exp $ */ /* can be used in either frontend or backend */ @@ -19,7 +19,7 @@ typedef struct { unsigned short code, peer; -} codes_t; +} codes_t; /* map Big5 Level 1 to CNS 11643-1992 Plane 1 */ static codes_t big5Level1ToCnsPlane1[25] = { /* range */ @@ -205,7 +205,7 @@ static unsigned short b2c3[][2] = { }; static unsigned short BinarySearchRange - (codes_t * array, int high, unsigned short code) + (codes_t *array, int high, unsigned short code) { int low, mid, diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c index a5af5426c1..24594355e2 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.9 2004/08/29 04:12:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.10 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ typedef struct pg_utf_to_local *map2; /* from UTF-8 map name */ int size1; /* size of map1 */ int size2; /* size of map2 */ -} pg_conv_map; +} pg_conv_map; static pg_conv_map maps[] = { {PG_SQL_ASCII}, /* SQL/ASCII */ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c7191baf4a..252d4a7f9e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.234 2004/08/29 05:06:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.235 2004/08/30 02:54:40 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -3861,13 +3861,13 @@ flatten_set_variable_args(const char *name, List *args) * Coerce to interval and back to normalize the value * and account for any typmod. */ - Datum interval; + Datum interval; char *intervalout; interval = - DirectFunctionCall3(interval_in, - CStringGetDatum(val), - ObjectIdGetDatum(InvalidOid), + DirectFunctionCall3(interval_in, + CStringGetDatum(val), + ObjectIdGetDatum(InvalidOid), Int32GetDatum(arg->typename->typmod)); intervalout = diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index 181b9df11d..4075e2c45e 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.6 2004/08/29 05:06:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.7 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ ResourceOwnerRelease(ResourceOwner owner, save = CurrentResourceOwner; PG_TRY(); - ResourceOwnerReleaseInternal(owner, phase, isCommit, isTopLevel); + ResourceOwnerReleaseInternal(owner, phase, isCommit, isTopLevel); PG_CATCH(); { CurrentResourceOwner = save; diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c index 6d72b60b09..38bfd5177b 100644 --- a/src/bin/pgevent/pgevent.c +++ b/src/bin/pgevent/pgevent.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.2 2004/08/29 05:06:54 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.3 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -107,7 +107,7 @@ DllUnregisterServer(void) * DllMain --- is an optional entry point into a DLL. */ -BOOL WINAPI +BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index d684511a29..db50fb25b4 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/dbcommands.h,v 1.34 2004/08/29 21:08:47 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/dbcommands.h,v 1.35 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,14 +27,14 @@ typedef struct xl_dbase_create_rec Oid db_id; char src_path[1]; /* VARIABLE LENGTH STRING */ /* dst_path follows src_path */ -} xl_dbase_create_rec; +} xl_dbase_create_rec; typedef struct xl_dbase_drop_rec { /* Records dropping of a single subdirectory incl. contents */ Oid db_id; char dir_path[1]; /* VARIABLE LENGTH STRING */ -} xl_dbase_drop_rec; +} xl_dbase_drop_rec; extern void createdb(const CreatedbStmt *stmt); extern void dropdb(const char *dbname); diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h index 8aba919ab3..7e99c7e6b7 100644 --- a/src/include/commands/tablespace.h +++ b/src/include/commands/tablespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.4 2004/08/29 21:08:47 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.5 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,12 +25,12 @@ typedef struct xl_tblspc_create_rec { Oid ts_id; char ts_path[1]; /* VARIABLE LENGTH STRING */ -} xl_tblspc_create_rec; +} xl_tblspc_create_rec; typedef struct xl_tblspc_drop_rec { Oid ts_id; -} xl_tblspc_drop_rec; +} xl_tblspc_drop_rec; extern void CreateTableSpace(CreateTableSpaceStmt *stmt); extern void DropTableSpace(DropTableSpaceStmt *stmt); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index e94b57a2f3..b1d7b9a854 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.249 2004/08/29 05:06:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.250 2004/08/30 02:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -718,7 +718,7 @@ extern Datum numeric_in(PG_FUNCTION_ARGS); extern Datum numeric_out(PG_FUNCTION_ARGS); extern Datum numeric_recv(PG_FUNCTION_ARGS); extern Datum numeric_send(PG_FUNCTION_ARGS); -extern Datum numeric(PG_FUNCTION_ARGS); +extern Datum numeric (PG_FUNCTION_ARGS); extern Datum numeric_abs(PG_FUNCTION_ARGS); extern Datum numeric_uminus(PG_FUNCTION_ARGS); extern Datum numeric_uplus(PG_FUNCTION_ARGS); diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index d8d95c03cc..8acfc1ecf0 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -15,7 +15,7 @@ char *ECPGalloc(long, int); static int -deccall2(decimal * arg1, decimal * arg2, int (*ptr) (numeric *, numeric *)) +deccall2(decimal *arg1, decimal *arg2, int (*ptr) (numeric *, numeric *)) { numeric *a1, *a2; @@ -53,7 +53,7 @@ deccall2(decimal * arg1, decimal * arg2, int (*ptr) (numeric *, numeric *)) } static int -deccall3(decimal * arg1, decimal * arg2, decimal * result, int (*ptr) (numeric *, numeric *, numeric *)) +deccall3(decimal *arg1, decimal *arg2, decimal *result, int (*ptr) (numeric *, numeric *, numeric *)) { numeric *a1, *a2, @@ -118,7 +118,7 @@ deccall3(decimal * arg1, decimal * arg2, decimal * result, int (*ptr) (numeric * /* we start with the numeric functions */ int -decadd(decimal * arg1, decimal * arg2, decimal * sum) +decadd(decimal *arg1, decimal *arg2, decimal *sum) { deccall3(arg1, arg2, sum, PGTYPESnumeric_add); @@ -131,13 +131,13 @@ decadd(decimal * arg1, decimal * arg2, decimal * sum) } int -deccmp(decimal * arg1, decimal * arg2) +deccmp(decimal *arg1, decimal *arg2) { return (deccall2(arg1, arg2, PGTYPESnumeric_cmp)); } void -deccopy(decimal * src, decimal * target) +deccopy(decimal *src, decimal *target) { memcpy(target, src, sizeof(decimal)); } @@ -162,7 +162,7 @@ ecpg_strndup(const char *str, size_t len) } int -deccvasc(char *cp, int len, decimal * np) +deccvasc(char *cp, int len, decimal *np) { char *str = ecpg_strndup(cp, len); /* decimal_in always * converts the complete @@ -208,7 +208,7 @@ deccvasc(char *cp, int len, decimal * np) } int -deccvdbl(double dbl, decimal * np) +deccvdbl(double dbl, decimal *np) { numeric *nres = PGTYPESnumeric_new(); int result = 1; @@ -229,7 +229,7 @@ deccvdbl(double dbl, decimal * np) } int -deccvint(int in, decimal * np) +deccvint(int in, decimal *np) { numeric *nres = PGTYPESnumeric_new(); int result = 1; @@ -250,7 +250,7 @@ deccvint(int in, decimal * np) } int -deccvlong(long lng, decimal * np) +deccvlong(long lng, decimal *np) { numeric *nres = PGTYPESnumeric_new(); int result = 1; @@ -271,7 +271,7 @@ deccvlong(long lng, decimal * np) } int -decdiv(decimal * n1, decimal * n2, decimal * result) +decdiv(decimal *n1, decimal *n2, decimal *result) { int i; @@ -296,7 +296,7 @@ decdiv(decimal * n1, decimal * n2, decimal * result) } int -decmul(decimal * n1, decimal * n2, decimal * result) +decmul(decimal *n1, decimal *n2, decimal *result) { int i; @@ -317,7 +317,7 @@ decmul(decimal * n1, decimal * n2, decimal * result) } int -decsub(decimal * n1, decimal * n2, decimal * result) +decsub(decimal *n1, decimal *n2, decimal *result) { int i; @@ -338,7 +338,7 @@ decsub(decimal * n1, decimal * n2, decimal * result) } int -dectoasc(decimal * np, char *cp, int len, int right) +dectoasc(decimal *np, char *cp, int len, int right) { char *str; numeric *nres = PGTYPESnumeric_new(); @@ -373,7 +373,7 @@ dectoasc(decimal * np, char *cp, int len, int right) } int -dectodbl(decimal * np, double *dblp) +dectodbl(decimal *np, double *dblp) { numeric *nres = PGTYPESnumeric_new(); int i; @@ -391,7 +391,7 @@ dectodbl(decimal * np, double *dblp) } int -dectoint(decimal * np, int *ip) +dectoint(decimal *np, int *ip) { int ret; numeric *nres = PGTYPESnumeric_new(); @@ -411,7 +411,7 @@ dectoint(decimal * np, int *ip) } int -dectolong(decimal * np, long *lngp) +dectolong(decimal *np, long *lngp) { int ret; numeric *nres = PGTYPESnumeric_new();; @@ -453,7 +453,7 @@ rdatestr(date d, char *str) * */ int -rstrdate(char *str, date * d) +rstrdate(char *str, date *d) { date dat; char strbuf[10]; @@ -511,7 +511,7 @@ rstrdate(char *str, date * d) } void -rtoday(date * d) +rtoday(date *d) { PGTYPESdate_today(d); return; @@ -530,7 +530,7 @@ rjulmdy(date d, short mdy[3]) } int -rdefmtdate(date * d, char *fmt, char *str) +rdefmtdate(date *d, char *fmt, char *str) { /* TODO: take care of DBCENTURY environment variable */ /* PGSQL functions allow all centuries */ @@ -567,7 +567,7 @@ rfmtdate(date d, char *fmt, char *str) } int -rmdyjul(short mdy[3], date * d) +rmdyjul(short mdy[3], date *d) { int mdy_int[3]; @@ -587,13 +587,13 @@ rdayofweek(date d) /* And the datetime stuff */ void -dtcurrent(timestamp * ts) +dtcurrent(timestamp *ts) { PGTYPEStimestamp_current(ts); } int -dtcvasc(char *str, timestamp * ts) +dtcvasc(char *str, timestamp *ts) { timestamp ts_tmp; int i; @@ -616,13 +616,13 @@ dtcvasc(char *str, timestamp * ts) } int -dtsub(timestamp * ts1, timestamp * ts2, interval * iv) +dtsub(timestamp *ts1, timestamp *ts2, interval *iv) { return PGTYPEStimestamp_sub(ts1, ts2, iv); } int -dttoasc(timestamp * ts, char *output) +dttoasc(timestamp *ts, char *output) { char *asctime = PGTYPEStimestamp_to_asc(*ts); @@ -632,13 +632,13 @@ dttoasc(timestamp * ts, char *output) } int -dttofmtasc(timestamp * ts, char *output, int str_len, char *fmtstr) +dttofmtasc(timestamp *ts, char *output, int str_len, char *fmtstr) { return PGTYPEStimestamp_fmt_asc(ts, output, str_len, fmtstr); } int -intoasc(interval * i, char *str) +intoasc(interval *i, char *str) { str = PGTYPESinterval_to_asc(i); @@ -963,7 +963,7 @@ rtypwidth(int sqltype, int sqllen) } int -dtcvfmtasc(char *inbuf, char *fmtstr, timestamp * dtvalue) +dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue) { return PGTYPEStimestamp_defmt_asc(inbuf, fmtstr, dtvalue); } diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h index f1edf1618c..fba723f40d 100644 --- a/src/interfaces/ecpg/include/pgtypes_interval.h +++ b/src/interfaces/ecpg/include/pgtypes_interval.h @@ -12,7 +12,7 @@ typedef struct #endif long month; /* months and years, after time for * alignment */ -} interval; +} interval; #ifdef __cplusplus extern "C" diff --git a/src/interfaces/ecpg/include/pgtypes_numeric.h b/src/interfaces/ecpg/include/pgtypes_numeric.h index d4846a337a..70856728cd 100644 --- a/src/interfaces/ecpg/include/pgtypes_numeric.h +++ b/src/interfaces/ecpg/include/pgtypes_numeric.h @@ -23,7 +23,7 @@ typedef struct * NUMERIC_NAN */ NumericDigit *buf; /* start of alloc'd space for digits[] */ NumericDigit *digits; /* decimal digits */ -} numeric; +} numeric; typedef struct { @@ -35,14 +35,14 @@ typedef struct int sign; /* NUMERIC_POS, NUMERIC_NEG, or * NUMERIC_NAN */ NumericDigit digits[DECSIZE]; /* decimal digits */ -} decimal; +} decimal; #ifdef __cplusplus extern "C" { #endif - numeric * PGTYPESnumeric_new(void); +numeric *PGTYPESnumeric_new(void); void PGTYPESnumeric_free(numeric *); numeric *PGTYPESnumeric_from_asc(char *, char **); char *PGTYPESnumeric_to_asc(numeric *, int); diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c index cc8788af57..30781d734f 100644 --- a/src/interfaces/ecpg/pgtypeslib/datetime.c +++ b/src/interfaces/ecpg/pgtypeslib/datetime.c @@ -111,7 +111,7 @@ PGTYPESdate_julmdy(date jd, int *mdy) } void -PGTYPESdate_mdyjul(int *mdy, date * jdate) +PGTYPESdate_mdyjul(int *mdy, date *jdate) { /* month is mdy[0] */ /* day is mdy[1] */ @@ -124,14 +124,14 @@ int PGTYPESdate_dayofweek(date dDate) { /* - * Sunday: 0 Monday: 1 Tuesday: 2 Wednesday: 3 Thursday: - * 4 Friday: 5 Saturday: 6 + * Sunday: 0 Monday: 1 Tuesday: 2 Wednesday: 3 Thursday: 4 + * Friday: 5 Saturday: 6 */ return (int) (dDate + date2j(2000, 1, 1) + 1) % 7; } void -PGTYPESdate_today(date * d) +PGTYPESdate_today(date *d) { struct tm ts; @@ -316,7 +316,7 @@ PGTYPESdate_fmt_asc(date dDate, char *fmtstring, char *outbuf) #define PGTYPES_DATE_MONTH_MAXLENGTH 20 /* probably even less :-) */ int -PGTYPESdate_defmt_asc(date * d, char *fmt, char *str) +PGTYPESdate_defmt_asc(date *d, char *fmt, char *str) { /* * token[2] = { 4,6 } means that token 2 starts at position 4 and ends diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index a5a13f8b53..f906b449b0 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -2729,7 +2729,7 @@ int PGTYPEStimestamp_defmt_scan(char **, char *, timestamp *, int *, int *, int int *, int *, int *, int *); int -PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp * d, +PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp *d, int *year, int *month, int *day, int *hour, int *minute, int *second, int *tz) diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index 39576bf369..e1d34e8a7b 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -720,7 +720,7 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec) } /* interval2tm() */ static int -tm2interval(struct tm * tm, fsec_t fsec, interval * span) +tm2interval(struct tm * tm, fsec_t fsec, interval *span) { span->month = ((tm->tm_year * 12) + tm->tm_mon); #ifdef HAVE_INT64_TIMESTAMP @@ -797,7 +797,7 @@ PGTYPESinterval_from_asc(char *str, char **endptr) } char * -PGTYPESinterval_to_asc(interval * span) +PGTYPESinterval_to_asc(interval *span) { struct tm tt, *tm = &tt; @@ -821,7 +821,7 @@ PGTYPESinterval_to_asc(interval * span) } int -PGTYPESinterval_copy(interval * intvlsrc, interval * intrcldest) +PGTYPESinterval_copy(interval *intvlsrc, interval *intrcldest) { intrcldest->time = intvlsrc->time; intrcldest->month = intvlsrc->month; diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c index a79d8bcf90..a59a7478d8 100644 --- a/src/interfaces/ecpg/pgtypeslib/numeric.c +++ b/src/interfaces/ecpg/pgtypeslib/numeric.c @@ -28,7 +28,7 @@ * ---------- */ static int -apply_typmod(numeric * var, long typmod) +apply_typmod(numeric *var, long typmod) { int precision; int scale; @@ -108,7 +108,7 @@ apply_typmod(numeric * var, long typmod) * ---------- */ static int -alloc_var(numeric * var, int ndigits) +alloc_var(numeric *var, int ndigits) { digitbuf_free(var->buf); var->buf = digitbuf_alloc(ndigits + 1); @@ -141,7 +141,7 @@ PGTYPESnumeric_new(void) * ---------- */ static int -set_var_from_str(char *str, char **ptr, numeric * dest) +set_var_from_str(char *str, char **ptr, numeric *dest) { bool have_dp = FALSE; int i = 0; @@ -271,7 +271,7 @@ set_var_from_str(char *str, char **ptr, numeric * dest) * ---------- */ static char * -get_str_from_var(numeric * var, int dscale) +get_str_from_var(numeric *var, int dscale) { char *str; char *cp; @@ -385,7 +385,7 @@ PGTYPESnumeric_from_asc(char *str, char **endptr) } char * -PGTYPESnumeric_to_asc(numeric * num, int dscale) +PGTYPESnumeric_to_asc(numeric *num, int dscale) { if (dscale < 0) dscale = num->dscale; @@ -401,7 +401,7 @@ PGTYPESnumeric_to_asc(numeric * num, int dscale) * ---------- */ static void -zero_var(numeric * var) +zero_var(numeric *var) { digitbuf_free(var->buf); var->buf = NULL; @@ -412,7 +412,7 @@ zero_var(numeric * var) } void -PGTYPESnumeric_free(numeric * var) +PGTYPESnumeric_free(numeric *var) { digitbuf_free(var->buf); free(var); @@ -428,7 +428,7 @@ PGTYPESnumeric_free(numeric * var) * ---------- */ static int -cmp_abs(numeric * var1, numeric * var2) +cmp_abs(numeric *var1, numeric *var2) { int i1 = 0; int i2 = 0; @@ -486,7 +486,7 @@ cmp_abs(numeric * var1, numeric * var2) * ---------- */ static int -add_abs(numeric * var1, numeric * var2, numeric * result) +add_abs(numeric *var1, numeric *var2, numeric *result) { NumericDigit *res_buf; NumericDigit *res_digits; @@ -574,7 +574,7 @@ add_abs(numeric * var1, numeric * var2, numeric * result) * ---------- */ static int -sub_abs(numeric * var1, numeric * var2, numeric * result) +sub_abs(numeric *var1, numeric *var2, numeric *result) { NumericDigit *res_buf; NumericDigit *res_digits; @@ -658,7 +658,7 @@ sub_abs(numeric * var1, numeric * var2, numeric * result) * ---------- */ int -PGTYPESnumeric_add(numeric * var1, numeric * var2, numeric * result) +PGTYPESnumeric_add(numeric *var1, numeric *var2, numeric *result) { /* * Decide on the signs of the two variables what to do @@ -787,7 +787,7 @@ PGTYPESnumeric_add(numeric * var1, numeric * var2, numeric * result) * ---------- */ int -PGTYPESnumeric_sub(numeric * var1, numeric * var2, numeric * result) +PGTYPESnumeric_sub(numeric *var1, numeric *var2, numeric *result) { /* * Decide on the signs of the two variables what to do @@ -918,7 +918,7 @@ PGTYPESnumeric_sub(numeric * var1, numeric * var2, numeric * result) * ---------- */ int -PGTYPESnumeric_mul(numeric * var1, numeric * var2, numeric * result) +PGTYPESnumeric_mul(numeric *var1, numeric *var2, numeric *result) { NumericDigit *res_buf; NumericDigit *res_digits; @@ -1009,7 +1009,7 @@ PGTYPESnumeric_mul(numeric * var1, numeric * var2, numeric * result) * Note that this must be called before div_var. */ static int -select_div_scale(numeric * var1, numeric * var2, int *rscale) +select_div_scale(numeric *var1, numeric *var2, int *rscale) { int weight1, weight2, @@ -1076,7 +1076,7 @@ select_div_scale(numeric * var1, numeric * var2, int *rscale) } int -PGTYPESnumeric_div(numeric * var1, numeric * var2, numeric * result) +PGTYPESnumeric_div(numeric *var1, numeric *var2, numeric *result) { NumericDigit *res_digits; int res_ndigits; @@ -1282,7 +1282,7 @@ PGTYPESnumeric_div(numeric * var1, numeric * var2, numeric * result) int -PGTYPESnumeric_cmp(numeric * var1, numeric * var2) +PGTYPESnumeric_cmp(numeric *var1, numeric *var2) { /* use cmp_abs function to calculate the result */ @@ -1313,7 +1313,7 @@ PGTYPESnumeric_cmp(numeric * var1, numeric * var2) } int -PGTYPESnumeric_from_int(signed int int_val, numeric * var) +PGTYPESnumeric_from_int(signed int int_val, numeric *var) { /* implicit conversion */ signed long int long_int = int_val; @@ -1322,7 +1322,7 @@ PGTYPESnumeric_from_int(signed int int_val, numeric * var) } int -PGTYPESnumeric_from_long(signed long int long_val, numeric * var) +PGTYPESnumeric_from_long(signed long int long_val, numeric *var) { /* calculate the size of the long int number */ /* a number n needs log_10 n digits */ @@ -1392,7 +1392,7 @@ PGTYPESnumeric_from_long(signed long int long_val, numeric * var) } int -PGTYPESnumeric_copy(numeric * src, numeric * dst) +PGTYPESnumeric_copy(numeric *src, numeric *dst) { int i; @@ -1415,7 +1415,7 @@ PGTYPESnumeric_copy(numeric * src, numeric * dst) } int -PGTYPESnumeric_from_double(double d, numeric * dst) +PGTYPESnumeric_from_double(double d, numeric *dst) { char buffer[100]; numeric *tmp; @@ -1432,7 +1432,7 @@ PGTYPESnumeric_from_double(double d, numeric * dst) } static int -numericvar_to_double_no_overflow(numeric * var, double *dp) +numericvar_to_double_no_overflow(numeric *var, double *dp) { char *tmp; double val; @@ -1456,7 +1456,7 @@ numericvar_to_double_no_overflow(numeric * var, double *dp) } int -PGTYPESnumeric_to_double(numeric * nv, double *dp) +PGTYPESnumeric_to_double(numeric *nv, double *dp) { double tmp; int i; @@ -1468,7 +1468,7 @@ PGTYPESnumeric_to_double(numeric * nv, double *dp) } int -PGTYPESnumeric_to_int(numeric * nv, int *ip) +PGTYPESnumeric_to_int(numeric *nv, int *ip) { long l; int i; @@ -1487,7 +1487,7 @@ PGTYPESnumeric_to_int(numeric * nv, int *ip) } int -PGTYPESnumeric_to_long(numeric * nv, long *lp) +PGTYPESnumeric_to_long(numeric *nv, long *lp) { int i; long l = 0; @@ -1515,7 +1515,7 @@ PGTYPESnumeric_to_long(numeric * nv, long *lp) } int -PGTYPESnumeric_to_decimal(numeric * src, decimal * dst) +PGTYPESnumeric_to_decimal(numeric *src, decimal *dst) { int i; @@ -1538,7 +1538,7 @@ PGTYPESnumeric_to_decimal(numeric * src, decimal * dst) } int -PGTYPESnumeric_from_decimal(decimal * src, numeric * dst) +PGTYPESnumeric_from_decimal(decimal *src, numeric *dst) { int i; diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index 671d42e67d..fc16817039 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -50,7 +50,7 @@ dt2local(timestamp dt, int tz) * Returns -1 on failure (overflow). */ int -tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp * result) +tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp *result) { #ifdef HAVE_INT64_TIMESTAMP int dDate; @@ -372,7 +372,7 @@ PGTYPEStimestamp_to_asc(timestamp tstamp) } void -PGTYPEStimestamp_current(timestamp * ts) +PGTYPEStimestamp_current(timestamp *ts) { struct tm tm; @@ -382,7 +382,7 @@ PGTYPEStimestamp_current(timestamp * ts) } static int -dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm * tm, +dttofmtasc_replace(timestamp *ts, date dDate, int dow, struct tm * tm, char *output, int *pstr_len, char *fmtstr) { union un_fmt_comb replace_val; @@ -772,7 +772,7 @@ dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm * tm, int -PGTYPEStimestamp_fmt_asc(timestamp * ts, char *output, int str_len, char *fmtstr) +PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmtstr) { struct tm tm; fsec_t fsec; @@ -787,7 +787,7 @@ PGTYPEStimestamp_fmt_asc(timestamp * ts, char *output, int str_len, char *fmtstr } int -PGTYPEStimestamp_sub(timestamp * ts1, timestamp * ts2, interval * iv) +PGTYPEStimestamp_sub(timestamp *ts1, timestamp *ts2, interval *iv) { if (TIMESTAMP_NOT_FINITE(*ts1) || TIMESTAMP_NOT_FINITE(*ts2)) return PGTYPES_TS_ERR_EINFTIME; @@ -804,7 +804,7 @@ PGTYPEStimestamp_sub(timestamp * ts1, timestamp * ts2, interval * iv) } int -PGTYPEStimestamp_defmt_asc(char *str, char *fmt, timestamp * d) +PGTYPEStimestamp_defmt_asc(char *str, char *fmt, timestamp *d) { int year, month, diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 5004f0eff0..004e533267 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.65 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.66 2004/08/30 02:54:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,300 +42,300 @@ static ScanKeyword ScanKeywords[] = { {"analyze", ANALYZE}, {"and", AND}, {"any", ANY}, - {"array", ARRAY}, - {"as", AS}, - {"asc", ASC}, - {"assertion", ASSERTION}, - {"assignment", ASSIGNMENT}, - {"at", AT}, - {"authorization", AUTHORIZATION}, - {"backward", BACKWARD}, - {"before", BEFORE}, - {"begin", BEGIN_P}, - {"between", BETWEEN}, - {"bigint", BIGINT}, - {"binary", BINARY}, - {"bit", BIT}, - {"boolean", BOOLEAN_P}, - {"both", BOTH}, - {"by", BY}, - {"cache", CACHE}, - {"called", CALLED}, - {"cascade", CASCADE}, - {"case", CASE}, - {"cast", CAST}, - {"chain", CHAIN}, - {"char", CHAR_P}, - {"character", CHARACTER}, - {"characteristics", CHARACTERISTICS}, - {"check", CHECK}, - {"checkpoint", CHECKPOINT}, - {"class", CLASS}, - {"close", CLOSE}, - {"cluster", CLUSTER}, - {"coalesce", COALESCE}, - {"collate", COLLATE}, - {"column", COLUMN}, - {"comment", COMMENT}, - {"commit", COMMIT}, - {"committed", COMMITTED}, - {"constraint", CONSTRAINT}, - {"constraints", CONSTRAINTS}, - {"conversion", CONVERSION_P}, - {"convert", CONVERT}, - {"copy", COPY}, - {"create", CREATE}, - {"createdb", CREATEDB}, - {"createuser", CREATEUSER}, - {"cross", CROSS}, - {"csv", CSV}, - {"current_date", CURRENT_DATE}, - {"current_time", CURRENT_TIME}, - {"current_timestamp", CURRENT_TIMESTAMP}, - {"current_user", CURRENT_USER}, - {"cursor", CURSOR}, - {"cycle", CYCLE}, - {"database", DATABASE}, - {"day", DAY_P}, - {"deallocate", DEALLOCATE}, - {"dec", DEC}, - {"decimal", DECIMAL_P}, - {"declare", DECLARE}, - {"default", DEFAULT}, - {"defaults", DEFAULTS}, - {"deferrable", DEFERRABLE}, - {"deferred", DEFERRED}, - {"definer", DEFINER}, - {"delete", DELETE_P}, - {"delimiter", DELIMITER}, - {"delimiters", DELIMITERS}, - {"desc", DESC}, - {"distinct", DISTINCT}, - {"do", DO}, - {"domain", DOMAIN_P}, - {"double", DOUBLE_P}, - {"drop", DROP}, - {"each", EACH}, - {"else", ELSE}, - {"encoding", ENCODING}, - {"encrypted", ENCRYPTED}, - {"end", END_P}, - {"escape", ESCAPE}, - {"except", EXCEPT}, - {"excluding", EXCLUDING}, - {"exclusive", EXCLUSIVE}, - {"execute", EXECUTE}, - {"exists", EXISTS}, - {"explain", EXPLAIN}, - {"external", EXTERNAL}, - {"extract", EXTRACT}, - {"false", FALSE_P}, - {"fetch", FETCH}, - {"first", FIRST_P}, - {"float", FLOAT_P}, - {"for", FOR}, - {"force", FORCE}, - {"foreign", FOREIGN}, - {"forward", FORWARD}, - {"freeze", FREEZE}, - {"from", FROM}, - {"full", FULL}, - {"function", FUNCTION}, - {"get", GET}, - {"global", GLOBAL}, - {"grant", GRANT}, - {"group", GROUP_P}, - {"handler", HANDLER}, - {"having", HAVING}, - {"hold", HOLD}, - {"hour", HOUR_P}, - {"ilike", ILIKE}, - {"immediate", IMMEDIATE}, - {"immutable", IMMUTABLE}, - {"implicit", IMPLICIT_P}, - {"in", IN_P}, - {"including", INCLUDING}, - {"increment", INCREMENT}, - {"index", INDEX}, - {"inherits", INHERITS}, - {"initially", INITIALLY}, - {"inner", INNER_P}, - {"inout", INOUT}, - {"input", INPUT_P}, - {"insensitive", INSENSITIVE}, - {"insert", INSERT}, - {"instead", INSTEAD}, - {"int", INT_P}, - {"integer", INTEGER}, - {"intersect", INTERSECT}, - {"interval", INTERVAL}, - {"into", INTO}, - {"invoker", INVOKER}, - {"is", IS}, - {"isnull", ISNULL}, - {"isolation", ISOLATION}, - {"join", JOIN}, - {"key", KEY}, - {"lancompiler", LANCOMPILER}, - {"language", LANGUAGE}, - {"large", LARGE_P}, - {"last", LAST_P}, - {"leading", LEADING}, - {"left", LEFT}, - {"level", LEVEL}, - {"like", LIKE}, - {"limit", LIMIT}, - {"listen", LISTEN}, - {"load", LOAD}, - {"local", LOCAL}, - {"location", LOCATION}, - {"lock", LOCK_P}, - {"match", MATCH}, - {"maxvalue", MAXVALUE}, - {"minute", MINUTE_P}, - {"minvalue", MINVALUE}, - {"mode", MODE}, - {"month", MONTH_P}, - {"move", MOVE}, - {"names", NAMES}, - {"national", NATIONAL}, - {"natural", NATURAL}, - {"nchar", NCHAR}, - {"new", NEW}, - {"next", NEXT}, - {"no", NO}, - {"nocreatedb", NOCREATEDB}, - {"nocreateuser", NOCREATEUSER}, - {"none", NONE}, - {"not", NOT}, - {"nothing", NOTHING}, - {"notify", NOTIFY}, - {"notnull", NOTNULL}, - {"nowait", NOWAIT}, - {"null", NULL_P}, - {"nullif", NULLIF}, - {"numeric", NUMERIC}, - {"object", OBJECT_P}, - {"of", OF}, - {"off", OFF}, - {"offset", OFFSET}, - {"oids", OIDS}, - {"old", OLD}, - {"on", ON}, - {"only", ONLY}, - {"operator", OPERATOR}, - {"option", OPTION}, - {"or", OR}, - {"order", ORDER}, - {"out", OUT_P}, - {"outer", OUTER_P}, - {"overlaps", OVERLAPS}, - {"owner", OWNER}, - {"partial", PARTIAL}, - {"password", PASSWORD}, - {"position", POSITION}, - {"precision", PRECISION}, - {"prepare", PREPARE}, - {"preserve", PRESERVE}, - {"primary", PRIMARY}, - {"prior", PRIOR}, - {"privileges", PRIVILEGES}, - {"procedural", PROCEDURAL}, - {"procedure", PROCEDURE}, - {"quote", QUOTE}, - {"read", READ}, - {"real", REAL}, - {"recheck", RECHECK}, - {"references", REFERENCES}, - {"reindex", REINDEX}, - {"relative", RELATIVE_P}, - {"rename", RENAME}, - {"repeatable", REPEATABLE}, - {"replace", REPLACE}, - {"reset", RESET}, - {"restart", RESTART}, - {"restrict", RESTRICT}, - {"returns", RETURNS}, - {"revoke", REVOKE}, - {"right", RIGHT}, - {"rollback", ROLLBACK}, - {"row", ROW}, - {"rows", ROWS}, - {"rule", RULE}, - {"schema", SCHEMA}, - {"scroll", SCROLL}, - {"second", SECOND_P}, - {"security", SECURITY}, - {"select", SELECT}, - {"sequence", SEQUENCE}, - {"serializable", SERIALIZABLE}, - {"session", SESSION}, - {"session_user", SESSION_USER}, - {"set", SET}, - {"setof", SETOF}, - {"share", SHARE}, - {"show", SHOW}, - {"similar", SIMILAR}, - {"simple", SIMPLE}, - {"smallint", SMALLINT}, - {"some", SOME}, - {"stable", STABLE}, - {"start", START}, - {"statement", STATEMENT}, - {"statistics", STATISTICS}, - {"stdin", STDIN}, - {"stdout", STDOUT}, - {"storage", STORAGE}, - {"strict", STRICT_P}, - {"substring", SUBSTRING}, - {"sysid", SYSID}, - {"table", TABLE}, - {"tablespace", TABLESPACE}, - {"temp", TEMP}, - {"template", TEMPLATE}, - {"temporary", TEMPORARY}, - {"then", THEN}, - {"time", TIME}, - {"timestamp", TIMESTAMP}, - {"to", TO}, - {"toast", TOAST}, - {"trailing", TRAILING}, - {"transaction", TRANSACTION}, - {"treat", TREAT}, - {"trigger", TRIGGER}, - {"trim", TRIM}, - {"true", TRUE_P}, - {"truncate", TRUNCATE}, - {"trusted", TRUSTED}, - {"type", TYPE_P}, - {"uncommitted", UNCOMMITTED}, - {"unencrypted", UNENCRYPTED}, - {"union", UNION}, - {"unique", UNIQUE}, - {"unknown", UNKNOWN}, - {"unlisten", UNLISTEN}, - {"until", UNTIL}, - {"update", UPDATE}, - {"usage", USAGE}, - {"user", USER}, - {"using", USING}, - {"vacuum", VACUUM}, - {"valid", VALID}, - {"values", VALUES}, - {"varchar", VARCHAR}, - {"varying", VARYING}, - {"verbose", VERBOSE}, - {"view", VIEW}, - {"volatile", VOLATILE}, - {"when", WHEN}, - {"where", WHERE}, - {"with", WITH}, - {"without", WITHOUT}, - {"work", WORK}, - {"write", WRITE}, - {"year", YEAR_P}, - {"zone", ZONE}, -}; + {"array", ARRAY}, + {"as", AS}, + {"asc", ASC}, + {"assertion", ASSERTION}, + {"assignment", ASSIGNMENT}, + {"at", AT}, + {"authorization", AUTHORIZATION}, + {"backward", BACKWARD}, + {"before", BEFORE}, + {"begin", BEGIN_P}, + {"between", BETWEEN}, + {"bigint", BIGINT}, + {"binary", BINARY}, + {"bit", BIT}, + {"boolean", BOOLEAN_P}, + {"both", BOTH}, + {"by", BY}, + {"cache", CACHE}, + {"called", CALLED}, + {"cascade", CASCADE}, + {"case", CASE}, + {"cast", CAST}, + {"chain", CHAIN}, + {"char", CHAR_P}, + {"character", CHARACTER}, + {"characteristics", CHARACTERISTICS}, + {"check", CHECK}, + {"checkpoint", CHECKPOINT}, + {"class", CLASS}, + {"close", CLOSE}, + {"cluster", CLUSTER}, + {"coalesce", COALESCE}, + {"collate", COLLATE}, + {"column", COLUMN}, + {"comment", COMMENT}, + {"commit", COMMIT}, + {"committed", COMMITTED}, + {"constraint", CONSTRAINT}, + {"constraints", CONSTRAINTS}, + {"conversion", CONVERSION_P}, + {"convert", CONVERT}, + {"copy", COPY}, + {"create", CREATE}, + {"createdb", CREATEDB}, + {"createuser", CREATEUSER}, + {"cross", CROSS}, + {"csv", CSV}, + {"current_date", CURRENT_DATE}, + {"current_time", CURRENT_TIME}, + {"current_timestamp", CURRENT_TIMESTAMP}, + {"current_user", CURRENT_USER}, + {"cursor", CURSOR}, + {"cycle", CYCLE}, + {"database", DATABASE}, + {"day", DAY_P}, + {"deallocate", DEALLOCATE}, + {"dec", DEC}, + {"decimal", DECIMAL_P}, + {"declare", DECLARE}, + {"default", DEFAULT}, + {"defaults", DEFAULTS}, + {"deferrable", DEFERRABLE}, + {"deferred", DEFERRED}, + {"definer", DEFINER}, + {"delete", DELETE_P}, + {"delimiter", DELIMITER}, + {"delimiters", DELIMITERS}, + {"desc", DESC}, + {"distinct", DISTINCT}, + {"do", DO}, + {"domain", DOMAIN_P}, + {"double", DOUBLE_P}, + {"drop", DROP}, + {"each", EACH}, + {"else", ELSE}, + {"encoding", ENCODING}, + {"encrypted", ENCRYPTED}, + {"end", END_P}, + {"escape", ESCAPE}, + {"except", EXCEPT}, + {"excluding", EXCLUDING}, + {"exclusive", EXCLUSIVE}, + {"execute", EXECUTE}, + {"exists", EXISTS}, + {"explain", EXPLAIN}, + {"external", EXTERNAL}, + {"extract", EXTRACT}, + {"false", FALSE_P}, + {"fetch", FETCH}, + {"first", FIRST_P}, + {"float", FLOAT_P}, + {"for", FOR}, + {"force", FORCE}, + {"foreign", FOREIGN}, + {"forward", FORWARD}, + {"freeze", FREEZE}, + {"from", FROM}, + {"full", FULL}, + {"function", FUNCTION}, + {"get", GET}, + {"global", GLOBAL}, + {"grant", GRANT}, + {"group", GROUP_P}, + {"handler", HANDLER}, + {"having", HAVING}, + {"hold", HOLD}, + {"hour", HOUR_P}, + {"ilike", ILIKE}, + {"immediate", IMMEDIATE}, + {"immutable", IMMUTABLE}, + {"implicit", IMPLICIT_P}, + {"in", IN_P}, + {"including", INCLUDING}, + {"increment", INCREMENT}, + {"index", INDEX}, + {"inherits", INHERITS}, + {"initially", INITIALLY}, + {"inner", INNER_P}, + {"inout", INOUT}, + {"input", INPUT_P}, + {"insensitive", INSENSITIVE}, + {"insert", INSERT}, + {"instead", INSTEAD}, + {"int", INT_P}, + {"integer", INTEGER}, + {"intersect", INTERSECT}, + {"interval", INTERVAL}, + {"into", INTO}, + {"invoker", INVOKER}, + {"is", IS}, + {"isnull", ISNULL}, + {"isolation", ISOLATION}, + {"join", JOIN}, + {"key", KEY}, + {"lancompiler", LANCOMPILER}, + {"language", LANGUAGE}, + {"large", LARGE_P}, + {"last", LAST_P}, + {"leading", LEADING}, + {"left", LEFT}, + {"level", LEVEL}, + {"like", LIKE}, + {"limit", LIMIT}, + {"listen", LISTEN}, + {"load", LOAD}, + {"local", LOCAL}, + {"location", LOCATION}, + {"lock", LOCK_P}, + {"match", MATCH}, + {"maxvalue", MAXVALUE}, + {"minute", MINUTE_P}, + {"minvalue", MINVALUE}, + {"mode", MODE}, + {"month", MONTH_P}, + {"move", MOVE}, + {"names", NAMES}, + {"national", NATIONAL}, + {"natural", NATURAL}, + {"nchar", NCHAR}, + {"new", NEW}, + {"next", NEXT}, + {"no", NO}, + {"nocreatedb", NOCREATEDB}, + {"nocreateuser", NOCREATEUSER}, + {"none", NONE}, + {"not", NOT}, + {"nothing", NOTHING}, + {"notify", NOTIFY}, + {"notnull", NOTNULL}, + {"nowait", NOWAIT}, + {"null", NULL_P}, + {"nullif", NULLIF}, + {"numeric", NUMERIC}, + {"object", OBJECT_P}, + {"of", OF}, + {"off", OFF}, + {"offset", OFFSET}, + {"oids", OIDS}, + {"old", OLD}, + {"on", ON}, + {"only", ONLY}, + {"operator", OPERATOR}, + {"option", OPTION}, + {"or", OR}, + {"order", ORDER}, + {"out", OUT_P}, + {"outer", OUTER_P}, + {"overlaps", OVERLAPS}, + {"owner", OWNER}, + {"partial", PARTIAL}, + {"password", PASSWORD}, + {"position", POSITION}, + {"precision", PRECISION}, + {"prepare", PREPARE}, + {"preserve", PRESERVE}, + {"primary", PRIMARY}, + {"prior", PRIOR}, + {"privileges", PRIVILEGES}, + {"procedural", PROCEDURAL}, + {"procedure", PROCEDURE}, + {"quote", QUOTE}, + {"read", READ}, + {"real", REAL}, + {"recheck", RECHECK}, + {"references", REFERENCES}, + {"reindex", REINDEX}, + {"relative", RELATIVE_P}, + {"rename", RENAME}, + {"repeatable", REPEATABLE}, + {"replace", REPLACE}, + {"reset", RESET}, + {"restart", RESTART}, + {"restrict", RESTRICT}, + {"returns", RETURNS}, + {"revoke", REVOKE}, + {"right", RIGHT}, + {"rollback", ROLLBACK}, + {"row", ROW}, + {"rows", ROWS}, + {"rule", RULE}, + {"schema", SCHEMA}, + {"scroll", SCROLL}, + {"second", SECOND_P}, + {"security", SECURITY}, + {"select", SELECT}, + {"sequence", SEQUENCE}, + {"serializable", SERIALIZABLE}, + {"session", SESSION}, + {"session_user", SESSION_USER}, + {"set", SET}, + {"setof", SETOF}, + {"share", SHARE}, + {"show", SHOW}, + {"similar", SIMILAR}, + {"simple", SIMPLE}, + {"smallint", SMALLINT}, + {"some", SOME}, + {"stable", STABLE}, + {"start", START}, + {"statement", STATEMENT}, + {"statistics", STATISTICS}, + {"stdin", STDIN}, + {"stdout", STDOUT}, + {"storage", STORAGE}, + {"strict", STRICT_P}, + {"substring", SUBSTRING}, + {"sysid", SYSID}, + {"table", TABLE}, + {"tablespace", TABLESPACE}, + {"temp", TEMP}, + {"template", TEMPLATE}, + {"temporary", TEMPORARY}, + {"then", THEN}, + {"time", TIME}, + {"timestamp", TIMESTAMP}, + {"to", TO}, + {"toast", TOAST}, + {"trailing", TRAILING}, + {"transaction", TRANSACTION}, + {"treat", TREAT}, + {"trigger", TRIGGER}, + {"trim", TRIM}, + {"true", TRUE_P}, + {"truncate", TRUNCATE}, + {"trusted", TRUSTED}, + {"type", TYPE_P}, + {"uncommitted", UNCOMMITTED}, + {"unencrypted", UNENCRYPTED}, + {"union", UNION}, + {"unique", UNIQUE}, + {"unknown", UNKNOWN}, + {"unlisten", UNLISTEN}, + {"until", UNTIL}, + {"update", UPDATE}, + {"usage", USAGE}, + {"user", USER}, + {"using", USING}, + {"vacuum", VACUUM}, + {"valid", VALID}, + {"values", VALUES}, + {"varchar", VARCHAR}, + {"varying", VARYING}, + {"verbose", VERBOSE}, + {"view", VIEW}, + {"volatile", VOLATILE}, + {"when", WHEN}, + {"where", WHERE}, + {"with", WITH}, + {"without", WITHOUT}, + {"work", WORK}, + {"write", WRITE}, + {"year", YEAR_P}, + {"zone", ZONE}, + }; /* * ScanKeywordLookup - see if a given word is a keyword @@ -349,53 +349,54 @@ static ScanKeyword ScanKeywords[] = { * keywords are to be matched in this way even though non-keyword identifiers * receive a different case-normalization mapping. */ -ScanKeyword * -ScanKeywordLookup(char *text) -{ - int len, - i; - char word[NAMEDATALEN]; - ScanKeyword *low; - ScanKeyword *high; + ScanKeyword * + ScanKeywordLookup(char *text) + { + int len, + i; + char word[NAMEDATALEN]; + ScanKeyword *low; + ScanKeyword *high; + + len = strlen(text); + /* We assume all keywords are shorter than NAMEDATALEN. */ + if (len >= NAMEDATALEN) + return NULL; + + /* + * Apply an ASCII-only downcasing. We must not use tolower() + * since it may produce the wrong translation in some locales (eg, + * Turkish). + */ + for (i = 0; i < len; i++) + { + char ch = text[i]; + + if (ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; + word[i] = ch; + } + word[len] = '\0'; + + /* + * Now do a binary search using plain strcmp() comparison. + */ + low = &ScanKeywords[0]; + high = endof(ScanKeywords) - 1; + while (low <= high) + { + ScanKeyword *middle; + int difference; + + middle = low + (high - low) / 2; + difference = strcmp(middle->name, word); + if (difference == 0) + return middle; + else if (difference < 0) + low = middle + 1; + else + high = middle - 1; + } - len = strlen(text); - /* We assume all keywords are shorter than NAMEDATALEN. */ - if (len >= NAMEDATALEN) return NULL; - - /* - * Apply an ASCII-only downcasing. We must not use tolower() since it - * may produce the wrong translation in some locales (eg, Turkish). - */ - for (i = 0; i < len; i++) - { - char ch = text[i]; - - if (ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; - word[i] = ch; } - word[len] = '\0'; - - /* - * Now do a binary search using plain strcmp() comparison. - */ - low = &ScanKeywords[0]; - high = endof(ScanKeywords) - 1; - while (low <= high) - { - ScanKeyword *middle; - int difference; - - middle = low + (high - low) / 2; - difference = strcmp(middle->name, word); - if (difference == 0) - return middle; - else if (difference < 0) - low = middle + 1; - else - high = middle - 1; - } - - return NULL; -} diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 7b8b607e57..5ac115fe79 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.161 2004/08/29 05:07:00 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.162 2004/08/30 02:54:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -458,7 +458,7 @@ pqPrepareAsyncResult(PGconn *conn) * a trailing newline, and should not be more than one line). */ void -pqInternalNotice(const PGNoticeHooks * hooks, const char *fmt,...) +pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) { char msgBuf[1024]; va_list args; @@ -503,7 +503,7 @@ pqInternalNotice(const PGNoticeHooks * hooks, const char *fmt,...) * Returns TRUE if OK, FALSE if not enough memory to add the row */ int -pqAddTuple(PGresult *res, PGresAttValue * tup) +pqAddTuple(PGresult *res, PGresAttValue *tup) { if (res->ntups >= res->tupArrSize) { @@ -592,7 +592,7 @@ pqSaveParameterStatus(PGconn *conn, const char *name, const char *value) * Store new info as a single malloc block */ pstatus = (pgParameterStatus *) malloc(sizeof(pgParameterStatus) + - strlen(name) + strlen(value) + 2); + strlen(name) +strlen(value) + 2); if (pstatus) { char *ptr; diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c index 9fe877841c..aeb5e0faf0 100644 --- a/src/interfaces/libpq/fe-protocol2.c +++ b/src/interfaces/libpq/fe-protocol2.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.13 2004/08/29 05:07:00 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.14 2004/08/30 02:54:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1395,7 +1395,7 @@ pqFunctionCall2(PGconn *conn, Oid fnid, */ char * pqBuildStartupPacket2(PGconn *conn, int *packetlen, - const PQEnvironmentOption * options) + const PQEnvironmentOption *options) { StartupPacket *startpacket; diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c index 68789067d2..425da12102 100644 --- a/src/interfaces/libpq/fe-protocol3.c +++ b/src/interfaces/libpq/fe-protocol3.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.15 2004/08/29 05:07:00 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.16 2004/08/30 02:54:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ static int getNotify(PGconn *conn); static int getCopyStart(PGconn *conn, ExecStatusType copytype); static int getReadyForQuery(PGconn *conn); static int build_startup_packet(const PGconn *conn, char *packet, - const PQEnvironmentOption * options); + const PQEnvironmentOption *options); /* @@ -1400,7 +1400,7 @@ pqFunctionCall3(PGconn *conn, Oid fnid, */ char * pqBuildStartupPacket3(PGconn *conn, int *packetlen, - const PQEnvironmentOption * options) + const PQEnvironmentOption *options) { char *startpacket; @@ -1423,7 +1423,7 @@ pqBuildStartupPacket3(PGconn *conn, int *packetlen, */ static int build_startup_packet(const PGconn *conn, char *packet, - const PQEnvironmentOption * options) + const PQEnvironmentOption *options) { int packet_len = 0; const PQEnvironmentOption *next_eo; diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 3037b0d266..e32dec920c 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.91 2004/08/29 05:07:00 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.92 2004/08/30 02:54:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,7 @@ typedef struct pgresAttDesc Oid typid; /* type id */ int typlen; /* type size */ int atttypmod; /* type-specific modifier info */ -} PGresAttDesc; +} PGresAttDesc; /* * Data for a single attribute of a single tuple @@ -115,7 +115,7 @@ typedef struct pgresAttValue int len; /* length in bytes of the value */ char *value; /* actual value, plus terminating zero * byte */ -} PGresAttValue; +} PGresAttValue; /* Typedef for message-field list entries */ typedef struct pgMessageField @@ -123,7 +123,7 @@ typedef struct pgMessageField struct pgMessageField *next; /* list link */ char code; /* field code */ char contents[1]; /* field value (VARIABLE LENGTH) */ -} PGMessageField; +} PGMessageField; /* Fields needed for notice handling */ typedef struct @@ -132,7 +132,7 @@ typedef struct void *noticeRecArg; PQnoticeProcessor noticeProc; /* notice message processor */ void *noticeProcArg; -} PGNoticeHooks; +} PGNoticeHooks; struct pg_result { @@ -184,7 +184,7 @@ typedef enum PGASYNC_READY, /* result ready for PQgetResult */ PGASYNC_COPY_IN, /* Copy In data transfer in progress */ PGASYNC_COPY_OUT /* Copy Out data transfer in progress */ -} PGAsyncStatusType; +} PGAsyncStatusType; /* PGSetenvStatusType defines the state of the PQSetenv state machine */ /* (this is used only for 2.0-protocol connections) */ @@ -197,14 +197,14 @@ typedef enum SETENV_STATE_QUERY2_SEND, /* About to send a status query */ SETENV_STATE_QUERY2_WAIT, /* Waiting for query to complete */ SETENV_STATE_IDLE -} PGSetenvStatusType; +} PGSetenvStatusType; /* Typedef for the EnvironmentOptions[] array */ typedef struct PQEnvironmentOption { const char *envName, /* name of an environment variable */ *pgName; /* name of corresponding SET variable */ -} PQEnvironmentOption; +} PQEnvironmentOption; /* Typedef for parameter-status list entries */ typedef struct pgParameterStatus @@ -213,7 +213,7 @@ typedef struct pgParameterStatus char *name; /* parameter name */ char *value; /* parameter value */ /* Note: name and value are stored in same malloc block as struct is */ -} pgParameterStatus; +} pgParameterStatus; /* large-object-access data ... allocated only if large-object code is used. */ typedef struct pgLobjfuncs @@ -226,7 +226,7 @@ typedef struct pgLobjfuncs Oid fn_lo_tell; /* OID of backend function lo_tell */ Oid fn_lo_read; /* OID of backend function LOread */ Oid fn_lo_write; /* OID of backend function LOwrite */ -} PGlobjfuncs; +} PGlobjfuncs; /* * PGconn stores all the state data associated with a single connection @@ -380,10 +380,10 @@ extern void pqClearAsyncResult(PGconn *conn); extern void pqSaveErrorResult(PGconn *conn); extern PGresult *pqPrepareAsyncResult(PGconn *conn); extern void -pqInternalNotice(const PGNoticeHooks * hooks, const char *fmt,...) +pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) /* This lets gcc check the format string for consistency. */ __attribute__((format(printf, 2, 3))); -extern int pqAddTuple(PGresult *res, PGresAttValue * tup); +extern int pqAddTuple(PGresult *res, PGresAttValue *tup); extern void pqSaveMessageField(PGresult *res, char code, const char *value); extern void pqSaveParameterStatus(PGconn *conn, const char *name, @@ -395,7 +395,7 @@ extern void pqHandleSendFailure(PGconn *conn); extern PostgresPollingStatusType pqSetenvPoll(PGconn *conn); extern char *pqBuildStartupPacket2(PGconn *conn, int *packetlen, - const PQEnvironmentOption * options); + const PQEnvironmentOption *options); extern void pqParseInput2(PGconn *conn); extern int pqGetCopyData2(PGconn *conn, char **buffer, int async); extern int pqGetline2(PGconn *conn, char *s, int maxlen); @@ -409,7 +409,7 @@ extern PGresult *pqFunctionCall2(PGconn *conn, Oid fnid, /* === in fe-protocol3.c === */ extern char *pqBuildStartupPacket3(PGconn *conn, int *packetlen, - const PQEnvironmentOption * options); + const PQEnvironmentOption *options); extern void pqParseInput3(PGconn *conn); extern int pqGetErrorNotice3(PGconn *conn, bool isError); extern int pqGetCopyData3(PGconn *conn, char **buffer, int async); diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 4ccb7ec6e3..ae4a157ac4 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -33,7 +33,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.49 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.50 2004/08/30 02:54:41 momjian Exp $ * **********************************************************************/ @@ -88,7 +88,7 @@ typedef struct plperl_proc_desc Oid arg_typioparam[FUNC_MAX_ARGS]; bool arg_is_rowtype[FUNC_MAX_ARGS]; SV *reference; -} plperl_proc_desc; +} plperl_proc_desc; /********************************************************************** @@ -275,7 +275,7 @@ plperl_safe_init(void) * turn a tuple into a hash expression and add it to a list **********************************************************************/ static void -plperl_sv_add_tuple_value(SV * rv, HeapTuple tuple, TupleDesc tupdesc) +plperl_sv_add_tuple_value(SV *rv, HeapTuple tuple, TupleDesc tupdesc) { int i; char *value; @@ -384,7 +384,7 @@ plperl_trigger_build_args(FunctionCallInfo fcinfo) * check return value from plperl function **********************************************************************/ static int -plperl_is_set(SV * sv) +plperl_is_set(SV *sv) { int i = 0; int len = 0; @@ -432,7 +432,7 @@ plperl_is_set(SV * sv) * extract a list of keys from a hash **********************************************************************/ static AV * -plperl_get_keys(HV * hv) +plperl_get_keys(HV *hv) { AV *ret; SV **svp; @@ -458,7 +458,7 @@ plperl_get_keys(HV * hv) * extract a given key (by index) from a list of keys **********************************************************************/ static char * -plperl_get_key(AV * keys, int index) +plperl_get_key(AV *keys, int index) { SV **svp; int len; @@ -478,7 +478,7 @@ plperl_get_key(AV * keys, int index) * **********************************************************************/ static char * -plperl_get_elem(HV * hash, char *key) +plperl_get_elem(HV *hash, char *key) { SV **svp; @@ -496,7 +496,7 @@ plperl_get_elem(HV * hash, char *key) * set up the new tuple returned from a trigger **********************************************************************/ static HeapTuple -plperl_modify_tuple(HV * hvTD, TriggerData *tdata, HeapTuple otup, Oid fn_oid) +plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup, Oid fn_oid) { SV **svp; HV *hvNew; @@ -700,8 +700,8 @@ plperl_create_sub(char *s, bool trusted) * **********************************************************************/ -EXTERN_C void boot_DynaLoader(pTHX_ CV * cv); -EXTERN_C void boot_SPI(pTHX_ CV * cv); +EXTERN_C void boot_DynaLoader(pTHX_ CV *cv); +EXTERN_C void boot_SPI(pTHX_ CV *cv); static void plperl_init_shared_libs(pTHX) @@ -717,7 +717,7 @@ plperl_init_shared_libs(pTHX) * stored in the prodesc structure. massages the input parms properly **********************************************************************/ static SV * -plperl_call_perl_func(plperl_proc_desc * desc, FunctionCallInfo fcinfo) +plperl_call_perl_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo) { dSP; SV *retval; @@ -815,7 +815,7 @@ plperl_call_perl_func(plperl_proc_desc * desc, FunctionCallInfo fcinfo) * through the RV stored in the prodesc structure. massages the input parms properly **********************************************************************/ static SV * -plperl_call_perl_trigger_func(plperl_proc_desc * desc, FunctionCallInfo fcinfo, SV * td) +plperl_call_perl_trigger_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo, SV *td) { dSP; SV *retval; diff --git a/src/pl/plperl/ppport.h b/src/pl/plperl/ppport.h index 5e1d0846ba..592908f27f 100644 --- a/src/pl/plperl/ppport.h +++ b/src/pl/plperl/ppport.h @@ -344,7 +344,7 @@ typedef NVTYPE NV; #else #if defined(USE_THREADS) static SV * -newRV_noinc(SV * sv) +newRV_noinc(SV *sv) { SV *nsv = (SV *) newRV(sv); @@ -367,7 +367,7 @@ newRV_noinc(SV * sv) #if defined(NEED_newCONSTSUB) static #else -extern void newCONSTSUB(HV * stash, char *name, SV * sv); +extern void newCONSTSUB(HV *stash, char *name, SV *sv); #endif #if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL) @@ -545,7 +545,7 @@ SV *sv; ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8)) == (SVf_POK) \ ? ((lp = SvCUR(sv)), SvPVX(sv)) : my_sv_2pvbyte(aTHX_ sv, &lp)) static char * -my_sv_2pvbyte(pTHX_ register SV * sv, STRLEN * lp) +my_sv_2pvbyte(pTHX_ register SV *sv, STRLEN *lp) { sv_utf8_downgrade(sv, 0); return SvPV(sv, *lp); @@ -560,7 +560,7 @@ my_sv_2pvbyte(pTHX_ register SV * sv, STRLEN * lp) ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \ ? SvPVX(sv) : sv_2pv_nolen(sv)) static char * -sv_2pv_nolen(pTHX_ register SV * sv) +sv_2pv_nolen(pTHX_ register SV *sv) { STRLEN n_a; diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index 61c4474908..02b61c7396 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.80 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.81 2004/08/30 02:54:42 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -90,7 +90,7 @@ typedef struct plpgsql_hashent { PLpgSQL_func_hashkey key; PLpgSQL_function *function; -} plpgsql_HashEnt; +} plpgsql_HashEnt; #define FUNCS_PER_USER 128 /* initial table size */ @@ -102,7 +102,7 @@ typedef struct { const char *label; int sqlerrstate; -} ExceptionLabelMap; +} ExceptionLabelMap; static const ExceptionLabelMap exception_label_map[] = { #include "plerrcodes.h" @@ -116,7 +116,7 @@ static const ExceptionLabelMap exception_label_map[] = { */ static PLpgSQL_function *do_compile(FunctionCallInfo fcinfo, HeapTuple procTup, - PLpgSQL_func_hashkey * hashkey, + PLpgSQL_func_hashkey *hashkey, bool forValidator); static void plpgsql_compile_error_callback(void *arg); static char **fetchArgNames(HeapTuple procTup, int nargs); @@ -124,12 +124,12 @@ static PLpgSQL_row *build_row_var(Oid classOid); static PLpgSQL_type *build_datatype(HeapTuple typeTup, int32 typmod); static void compute_function_hashkey(FunctionCallInfo fcinfo, Form_pg_proc procStruct, - PLpgSQL_func_hashkey * hashkey, + PLpgSQL_func_hashkey *hashkey, bool forValidator); -static PLpgSQL_function *plpgsql_HashTableLookup(PLpgSQL_func_hashkey * func_key); -static void plpgsql_HashTableInsert(PLpgSQL_function * function, - PLpgSQL_func_hashkey * func_key); -static void plpgsql_HashTableDelete(PLpgSQL_function * function); +static PLpgSQL_function *plpgsql_HashTableLookup(PLpgSQL_func_hashkey *func_key); +static void plpgsql_HashTableInsert(PLpgSQL_function *function, + PLpgSQL_func_hashkey *func_key); +static void plpgsql_HashTableDelete(PLpgSQL_function *function); /* * This routine is a crock, and so is everyplace that calls it. The problem @@ -254,7 +254,7 @@ plpgsql_compile(FunctionCallInfo fcinfo, bool forValidator) static PLpgSQL_function * do_compile(FunctionCallInfo fcinfo, HeapTuple procTup, - PLpgSQL_func_hashkey * hashkey, + PLpgSQL_func_hashkey *hashkey, bool forValidator) { Form_pg_proc procStruct = (Form_pg_proc) GETSTRUCT(procTup); @@ -1437,7 +1437,7 @@ plpgsql_parse_dblwordrowtype(char *word) * to the current datum array, and optionally to the current namespace. */ PLpgSQL_variable * -plpgsql_build_variable(char *refname, int lineno, PLpgSQL_type * dtype, +plpgsql_build_variable(char *refname, int lineno, PLpgSQL_type *dtype, bool add2namespace) { PLpgSQL_variable *result; @@ -1789,7 +1789,7 @@ plpgsql_parse_err_condition(char *condname) * ---------- */ void -plpgsql_adddatum(PLpgSQL_datum * new) +plpgsql_adddatum(PLpgSQL_datum *new) { if (plpgsql_nDatums == datums_alloc) { @@ -1865,7 +1865,7 @@ plpgsql_add_initdatums(int **varnos) static void compute_function_hashkey(FunctionCallInfo fcinfo, Form_pg_proc procStruct, - PLpgSQL_func_hashkey * hashkey, + PLpgSQL_func_hashkey *hashkey, bool forValidator) { int i; @@ -1944,7 +1944,7 @@ plpgsql_HashTableInit(void) } static PLpgSQL_function * -plpgsql_HashTableLookup(PLpgSQL_func_hashkey * func_key) +plpgsql_HashTableLookup(PLpgSQL_func_hashkey *func_key) { plpgsql_HashEnt *hentry; @@ -1959,8 +1959,8 @@ plpgsql_HashTableLookup(PLpgSQL_func_hashkey * func_key) } static void -plpgsql_HashTableInsert(PLpgSQL_function * function, - PLpgSQL_func_hashkey * func_key) +plpgsql_HashTableInsert(PLpgSQL_function *function, + PLpgSQL_func_hashkey *func_key) { plpgsql_HashEnt *hentry; bool found; @@ -1982,7 +1982,7 @@ plpgsql_HashTableInsert(PLpgSQL_function * function, } static void -plpgsql_HashTableDelete(PLpgSQL_function * function) +plpgsql_HashTableDelete(PLpgSQL_function *function) { plpgsql_HashEnt *hentry; diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index bad50b4030..902723843c 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.117 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.118 2004/08/30 02:54:42 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -74,98 +74,98 @@ static PLpgSQL_expr *active_simple_exprs = NULL; * Local function forward declarations ************************************************************/ static void plpgsql_exec_error_callback(void *arg); -static PLpgSQL_var *copy_var(PLpgSQL_var * var); -static PLpgSQL_rec *copy_rec(PLpgSQL_rec * rec); +static PLpgSQL_var *copy_var(PLpgSQL_var *var); +static PLpgSQL_rec *copy_rec(PLpgSQL_rec *rec); -static int exec_stmt_block(PLpgSQL_execstate * estate, - PLpgSQL_stmt_block * block); -static int exec_stmts(PLpgSQL_execstate * estate, - PLpgSQL_stmts * stmts); -static int exec_stmt(PLpgSQL_execstate * estate, - PLpgSQL_stmt * stmt); -static int exec_stmt_assign(PLpgSQL_execstate * estate, - PLpgSQL_stmt_assign * stmt); -static int exec_stmt_perform(PLpgSQL_execstate * estate, - PLpgSQL_stmt_perform * stmt); -static int exec_stmt_getdiag(PLpgSQL_execstate * estate, - PLpgSQL_stmt_getdiag * stmt); -static int exec_stmt_if(PLpgSQL_execstate * estate, - PLpgSQL_stmt_if * stmt); -static int exec_stmt_loop(PLpgSQL_execstate * estate, - PLpgSQL_stmt_loop * stmt); -static int exec_stmt_while(PLpgSQL_execstate * estate, - PLpgSQL_stmt_while * stmt); -static int exec_stmt_fori(PLpgSQL_execstate * estate, - PLpgSQL_stmt_fori * stmt); -static int exec_stmt_fors(PLpgSQL_execstate * estate, - PLpgSQL_stmt_fors * stmt); -static int exec_stmt_select(PLpgSQL_execstate * estate, - PLpgSQL_stmt_select * stmt); -static int exec_stmt_open(PLpgSQL_execstate * estate, - PLpgSQL_stmt_open * stmt); -static int exec_stmt_fetch(PLpgSQL_execstate * estate, - PLpgSQL_stmt_fetch * stmt); -static int exec_stmt_close(PLpgSQL_execstate * estate, - PLpgSQL_stmt_close * stmt); -static int exec_stmt_exit(PLpgSQL_execstate * estate, - PLpgSQL_stmt_exit * stmt); -static int exec_stmt_return(PLpgSQL_execstate * estate, - PLpgSQL_stmt_return * stmt); -static int exec_stmt_return_next(PLpgSQL_execstate * estate, - PLpgSQL_stmt_return_next * stmt); -static int exec_stmt_raise(PLpgSQL_execstate * estate, - PLpgSQL_stmt_raise * stmt); -static int exec_stmt_execsql(PLpgSQL_execstate * estate, - PLpgSQL_stmt_execsql * stmt); -static int exec_stmt_dynexecute(PLpgSQL_execstate * estate, - PLpgSQL_stmt_dynexecute * stmt); -static int exec_stmt_dynfors(PLpgSQL_execstate * estate, - PLpgSQL_stmt_dynfors * stmt); +static int exec_stmt_block(PLpgSQL_execstate *estate, + PLpgSQL_stmt_block *block); +static int exec_stmts(PLpgSQL_execstate *estate, + PLpgSQL_stmts *stmts); +static int exec_stmt(PLpgSQL_execstate *estate, + PLpgSQL_stmt *stmt); +static int exec_stmt_assign(PLpgSQL_execstate *estate, + PLpgSQL_stmt_assign *stmt); +static int exec_stmt_perform(PLpgSQL_execstate *estate, + PLpgSQL_stmt_perform *stmt); +static int exec_stmt_getdiag(PLpgSQL_execstate *estate, + PLpgSQL_stmt_getdiag *stmt); +static int exec_stmt_if(PLpgSQL_execstate *estate, + PLpgSQL_stmt_if *stmt); +static int exec_stmt_loop(PLpgSQL_execstate *estate, + PLpgSQL_stmt_loop *stmt); +static int exec_stmt_while(PLpgSQL_execstate *estate, + PLpgSQL_stmt_while *stmt); +static int exec_stmt_fori(PLpgSQL_execstate *estate, + PLpgSQL_stmt_fori *stmt); +static int exec_stmt_fors(PLpgSQL_execstate *estate, + PLpgSQL_stmt_fors *stmt); +static int exec_stmt_select(PLpgSQL_execstate *estate, + PLpgSQL_stmt_select *stmt); +static int exec_stmt_open(PLpgSQL_execstate *estate, + PLpgSQL_stmt_open *stmt); +static int exec_stmt_fetch(PLpgSQL_execstate *estate, + PLpgSQL_stmt_fetch *stmt); +static int exec_stmt_close(PLpgSQL_execstate *estate, + PLpgSQL_stmt_close *stmt); +static int exec_stmt_exit(PLpgSQL_execstate *estate, + PLpgSQL_stmt_exit *stmt); +static int exec_stmt_return(PLpgSQL_execstate *estate, + PLpgSQL_stmt_return *stmt); +static int exec_stmt_return_next(PLpgSQL_execstate *estate, + PLpgSQL_stmt_return_next *stmt); +static int exec_stmt_raise(PLpgSQL_execstate *estate, + PLpgSQL_stmt_raise *stmt); +static int exec_stmt_execsql(PLpgSQL_execstate *estate, + PLpgSQL_stmt_execsql *stmt); +static int exec_stmt_dynexecute(PLpgSQL_execstate *estate, + PLpgSQL_stmt_dynexecute *stmt); +static int exec_stmt_dynfors(PLpgSQL_execstate *estate, + PLpgSQL_stmt_dynfors *stmt); -static void plpgsql_estate_setup(PLpgSQL_execstate * estate, - PLpgSQL_function * func, +static void plpgsql_estate_setup(PLpgSQL_execstate *estate, + PLpgSQL_function *func, ReturnSetInfo *rsi); -static void exec_eval_cleanup(PLpgSQL_execstate * estate); +static void exec_eval_cleanup(PLpgSQL_execstate *estate); -static void exec_prepare_plan(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr); +static void exec_prepare_plan(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr); static bool exec_simple_check_node(Node *node); -static void exec_simple_check_plan(PLpgSQL_expr * expr); -static Datum exec_eval_simple_expr(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +static void exec_simple_check_plan(PLpgSQL_expr *expr); +static Datum exec_eval_simple_expr(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull, Oid *rettype); -static void exec_assign_expr(PLpgSQL_execstate * estate, - PLpgSQL_datum * target, - PLpgSQL_expr * expr); -static void exec_assign_value(PLpgSQL_execstate * estate, - PLpgSQL_datum * target, +static void exec_assign_expr(PLpgSQL_execstate *estate, + PLpgSQL_datum *target, + PLpgSQL_expr *expr); +static void exec_assign_value(PLpgSQL_execstate *estate, + PLpgSQL_datum *target, Datum value, Oid valtype, bool *isNull); -static void exec_eval_datum(PLpgSQL_execstate * estate, - PLpgSQL_datum * datum, +static void exec_eval_datum(PLpgSQL_execstate *estate, + PLpgSQL_datum *datum, Oid expectedtypeid, Oid *typeid, Datum *value, bool *isnull); -static int exec_eval_integer(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +static int exec_eval_integer(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull); -static bool exec_eval_boolean(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +static bool exec_eval_boolean(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull); -static Datum exec_eval_expr(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +static Datum exec_eval_expr(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull, Oid *rettype); -static int exec_run_select(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, int maxtuples, Portal *portalP); -static void exec_move_row(PLpgSQL_execstate * estate, - PLpgSQL_rec * rec, - PLpgSQL_row * row, +static int exec_run_select(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, int maxtuples, Portal *portalP); +static void exec_move_row(PLpgSQL_execstate *estate, + PLpgSQL_rec *rec, + PLpgSQL_row *row, HeapTuple tup, TupleDesc tupdesc); -static HeapTuple make_tuple_from_row(PLpgSQL_execstate * estate, - PLpgSQL_row * row, +static HeapTuple make_tuple_from_row(PLpgSQL_execstate *estate, + PLpgSQL_row *row, TupleDesc tupdesc); static char *convert_value_to_string(Datum value, Oid valtype); static Datum exec_cast_value(Datum value, Oid valtype, @@ -177,9 +177,9 @@ static Datum exec_cast_value(Datum value, Oid valtype, static Datum exec_simple_cast_value(Datum value, Oid valtype, Oid reqtype, int32 reqtypmod, bool *isnull); -static void exec_init_tuple_store(PLpgSQL_execstate * estate); +static void exec_init_tuple_store(PLpgSQL_execstate *estate); static bool compatible_tupdesc(TupleDesc td1, TupleDesc td2); -static void exec_set_found(PLpgSQL_execstate * estate, bool state); +static void exec_set_found(PLpgSQL_execstate *estate, bool state); /* ---------- @@ -188,7 +188,7 @@ static void exec_set_found(PLpgSQL_execstate * estate, bool state); * ---------- */ Datum -plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) +plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo) { PLpgSQL_execstate estate; ErrorContextCallback plerrcontext; @@ -438,7 +438,7 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) * ---------- */ HeapTuple -plpgsql_exec_trigger(PLpgSQL_function * func, +plpgsql_exec_trigger(PLpgSQL_function *func, TriggerData *trigdata) { PLpgSQL_execstate estate; @@ -759,7 +759,7 @@ plpgsql_exec_error_callback(void *arg) * ---------- */ static PLpgSQL_var * -copy_var(PLpgSQL_var * var) +copy_var(PLpgSQL_var *var) { PLpgSQL_var *new = palloc(sizeof(PLpgSQL_var)); @@ -771,7 +771,7 @@ copy_var(PLpgSQL_var * var) static PLpgSQL_rec * -copy_rec(PLpgSQL_rec * rec) +copy_rec(PLpgSQL_rec *rec) { PLpgSQL_rec *new = palloc(sizeof(PLpgSQL_rec)); @@ -786,7 +786,7 @@ copy_rec(PLpgSQL_rec * rec) static bool -exception_matches_conditions(ErrorData *edata, PLpgSQL_condition * cond) +exception_matches_conditions(ErrorData *edata, PLpgSQL_condition *cond) { for (; cond != NULL; cond = cond->next) { @@ -818,7 +818,7 @@ exception_matches_conditions(ErrorData *edata, PLpgSQL_condition * cond) * ---------- */ static int -exec_stmt_block(PLpgSQL_execstate * estate, PLpgSQL_stmt_block * block) +exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block) { volatile int rc = -1; int i; @@ -912,7 +912,7 @@ exec_stmt_block(PLpgSQL_execstate * estate, PLpgSQL_stmt_block * block) SPI_result_code_string(xrc)); PG_TRY(); - rc = exec_stmts(estate, block->body); + rc = exec_stmts(estate, block->body); PG_CATCH(); { ErrorData *edata; @@ -1006,7 +1006,7 @@ exec_stmt_block(PLpgSQL_execstate * estate, PLpgSQL_stmt_block * block) * ---------- */ static int -exec_stmts(PLpgSQL_execstate * estate, PLpgSQL_stmts * stmts) +exec_stmts(PLpgSQL_execstate *estate, PLpgSQL_stmts *stmts) { int rc; int i; @@ -1028,7 +1028,7 @@ exec_stmts(PLpgSQL_execstate * estate, PLpgSQL_stmts * stmts) * ---------- */ static int -exec_stmt(PLpgSQL_execstate * estate, PLpgSQL_stmt * stmt) +exec_stmt(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt) { PLpgSQL_stmt *save_estmt; int rc = -1; @@ -1137,7 +1137,7 @@ exec_stmt(PLpgSQL_execstate * estate, PLpgSQL_stmt * stmt) * ---------- */ static int -exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt) +exec_stmt_assign(PLpgSQL_execstate *estate, PLpgSQL_stmt_assign *stmt) { Assert(stmt->varno >= 0); @@ -1153,7 +1153,7 @@ exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt) * ---------- */ static int -exec_stmt_perform(PLpgSQL_execstate * estate, PLpgSQL_stmt_perform * stmt) +exec_stmt_perform(PLpgSQL_execstate *estate, PLpgSQL_stmt_perform *stmt) { PLpgSQL_expr *expr = stmt->expr; int rc; @@ -1183,7 +1183,7 @@ exec_stmt_perform(PLpgSQL_execstate * estate, PLpgSQL_stmt_perform * stmt) * ---------- */ static int -exec_stmt_getdiag(PLpgSQL_execstate * estate, PLpgSQL_stmt_getdiag * stmt) +exec_stmt_getdiag(PLpgSQL_execstate *estate, PLpgSQL_stmt_getdiag *stmt) { int i; PLpgSQL_datum *var; @@ -1233,7 +1233,7 @@ exec_stmt_getdiag(PLpgSQL_execstate * estate, PLpgSQL_stmt_getdiag * stmt) * ---------- */ static int -exec_stmt_if(PLpgSQL_execstate * estate, PLpgSQL_stmt_if * stmt) +exec_stmt_if(PLpgSQL_execstate *estate, PLpgSQL_stmt_if *stmt) { bool value; bool isnull = false; @@ -1262,7 +1262,7 @@ exec_stmt_if(PLpgSQL_execstate * estate, PLpgSQL_stmt_if * stmt) * ---------- */ static int -exec_stmt_loop(PLpgSQL_execstate * estate, PLpgSQL_stmt_loop * stmt) +exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt) { int rc; @@ -1304,7 +1304,7 @@ exec_stmt_loop(PLpgSQL_execstate * estate, PLpgSQL_stmt_loop * stmt) * ---------- */ static int -exec_stmt_while(PLpgSQL_execstate * estate, PLpgSQL_stmt_while * stmt) +exec_stmt_while(PLpgSQL_execstate *estate, PLpgSQL_stmt_while *stmt) { bool value; bool isnull = false; @@ -1354,7 +1354,7 @@ exec_stmt_while(PLpgSQL_execstate * estate, PLpgSQL_stmt_while * stmt) * ---------- */ static int -exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt) +exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt) { PLpgSQL_var *var; Datum value; @@ -1474,7 +1474,7 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt) * ---------- */ static int -exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt) +exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt) { PLpgSQL_rec *rec = NULL; PLpgSQL_row *row = NULL; @@ -1604,7 +1604,7 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt) * ---------- */ static int -exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt) +exec_stmt_select(PLpgSQL_execstate *estate, PLpgSQL_stmt_select *stmt) { PLpgSQL_rec *rec = NULL; PLpgSQL_row *row = NULL; @@ -1661,7 +1661,7 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt) * ---------- */ static int -exec_stmt_exit(PLpgSQL_execstate * estate, PLpgSQL_stmt_exit * stmt) +exec_stmt_exit(PLpgSQL_execstate *estate, PLpgSQL_stmt_exit *stmt) { /* * If the exit has a condition, check that it's true @@ -1688,7 +1688,7 @@ exec_stmt_exit(PLpgSQL_execstate * estate, PLpgSQL_stmt_exit * stmt) * ---------- */ static int -exec_stmt_return(PLpgSQL_execstate * estate, PLpgSQL_stmt_return * stmt) +exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt) { /* * If processing a set-returning PL/PgSQL function, the final RETURN @@ -1772,8 +1772,8 @@ exec_stmt_return(PLpgSQL_execstate * estate, PLpgSQL_stmt_return * stmt) * ---------- */ static int -exec_stmt_return_next(PLpgSQL_execstate * estate, - PLpgSQL_stmt_return_next * stmt) +exec_stmt_return_next(PLpgSQL_execstate *estate, + PLpgSQL_stmt_return_next *stmt) { TupleDesc tupdesc; int natts; @@ -1873,7 +1873,7 @@ exec_stmt_return_next(PLpgSQL_execstate * estate, } static void -exec_init_tuple_store(PLpgSQL_execstate * estate) +exec_init_tuple_store(PLpgSQL_execstate *estate) { ReturnSetInfo *rsi = estate->rsi; MemoryContext oldcxt; @@ -1902,7 +1902,7 @@ exec_init_tuple_store(PLpgSQL_execstate * estate) * ---------- */ static int -exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) +exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt) { Oid paramtypeid; Datum paramvalue; @@ -1972,8 +1972,8 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) * ---------- */ static void -plpgsql_estate_setup(PLpgSQL_execstate * estate, - PLpgSQL_function * func, +plpgsql_estate_setup(PLpgSQL_execstate *estate, + PLpgSQL_function *func, ReturnSetInfo *rsi) { estate->retval = (Datum) 0; @@ -2017,7 +2017,7 @@ plpgsql_estate_setup(PLpgSQL_execstate * estate, * ---------- */ static void -exec_eval_cleanup(PLpgSQL_execstate * estate) +exec_eval_cleanup(PLpgSQL_execstate *estate) { /* Clear result of a full SPI_exec */ if (estate->eval_tuptable != NULL) @@ -2035,8 +2035,8 @@ exec_eval_cleanup(PLpgSQL_execstate * estate) * ---------- */ static void -exec_prepare_plan(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr) +exec_prepare_plan(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr) { int i; _SPI_plan *spi_plan; @@ -2104,8 +2104,8 @@ exec_prepare_plan(PLpgSQL_execstate * estate, * ---------- */ static int -exec_stmt_execsql(PLpgSQL_execstate * estate, - PLpgSQL_stmt_execsql * stmt) +exec_stmt_execsql(PLpgSQL_execstate *estate, + PLpgSQL_stmt_execsql *stmt) { int i; Datum *values; @@ -2195,8 +2195,8 @@ exec_stmt_execsql(PLpgSQL_execstate * estate, * ---------- */ static int -exec_stmt_dynexecute(PLpgSQL_execstate * estate, - PLpgSQL_stmt_dynexecute * stmt) +exec_stmt_dynexecute(PLpgSQL_execstate *estate, + PLpgSQL_stmt_dynexecute *stmt) { Datum query; bool isnull = false; @@ -2309,7 +2309,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate, * ---------- */ static int -exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) +exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt) { Datum query; bool isnull = false; @@ -2469,7 +2469,7 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) * ---------- */ static int -exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) +exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt) { PLpgSQL_var *curvar = NULL; char *curname = NULL; @@ -2673,7 +2673,7 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) * ---------- */ static int -exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt) +exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt) { PLpgSQL_var *curvar = NULL; PLpgSQL_rec *rec = NULL; @@ -2746,7 +2746,7 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt) * ---------- */ static int -exec_stmt_close(PLpgSQL_execstate * estate, PLpgSQL_stmt_close * stmt) +exec_stmt_close(PLpgSQL_execstate *estate, PLpgSQL_stmt_close *stmt) { PLpgSQL_var *curvar = NULL; Portal portal; @@ -2786,8 +2786,8 @@ exec_stmt_close(PLpgSQL_execstate * estate, PLpgSQL_stmt_close * stmt) * ---------- */ static void -exec_assign_expr(PLpgSQL_execstate * estate, PLpgSQL_datum * target, - PLpgSQL_expr * expr) +exec_assign_expr(PLpgSQL_execstate *estate, PLpgSQL_datum *target, + PLpgSQL_expr *expr) { Datum value; Oid valtype; @@ -2804,8 +2804,8 @@ exec_assign_expr(PLpgSQL_execstate * estate, PLpgSQL_datum * target, * ---------- */ static void -exec_assign_value(PLpgSQL_execstate * estate, - PLpgSQL_datum * target, +exec_assign_value(PLpgSQL_execstate *estate, + PLpgSQL_datum *target, Datum value, Oid valtype, bool *isNull) { switch (target->dtype) @@ -3195,8 +3195,8 @@ exec_assign_value(PLpgSQL_execstate * estate, * at the stored value in the case of pass-by-reference datatypes. */ static void -exec_eval_datum(PLpgSQL_execstate * estate, - PLpgSQL_datum * datum, +exec_eval_datum(PLpgSQL_execstate *estate, + PLpgSQL_datum *datum, Oid expectedtypeid, Oid *typeid, Datum *value, @@ -3348,8 +3348,8 @@ exec_eval_datum(PLpgSQL_execstate * estate, * ---------- */ static int -exec_eval_integer(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +exec_eval_integer(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull) { Datum exprdatum; @@ -3370,8 +3370,8 @@ exec_eval_integer(PLpgSQL_execstate * estate, * ---------- */ static bool -exec_eval_boolean(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +exec_eval_boolean(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull) { Datum exprdatum; @@ -3392,8 +3392,8 @@ exec_eval_boolean(PLpgSQL_execstate * estate, * ---------- */ static Datum -exec_eval_expr(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +exec_eval_expr(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull, Oid *rettype) { @@ -3455,8 +3455,8 @@ exec_eval_expr(PLpgSQL_execstate * estate, * ---------- */ static int -exec_run_select(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, int maxtuples, Portal *portalP) +exec_run_select(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, int maxtuples, Portal *portalP) { int i; Datum *values; @@ -3535,8 +3535,8 @@ exec_run_select(PLpgSQL_execstate * estate, * ---------- */ static Datum -exec_eval_simple_expr(PLpgSQL_execstate * estate, - PLpgSQL_expr * expr, +exec_eval_simple_expr(PLpgSQL_execstate *estate, + PLpgSQL_expr *expr, bool *isNull, Oid *rettype) { @@ -3643,9 +3643,9 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate, * ---------- */ static void -exec_move_row(PLpgSQL_execstate * estate, - PLpgSQL_rec * rec, - PLpgSQL_row * row, +exec_move_row(PLpgSQL_execstate *estate, + PLpgSQL_rec *rec, + PLpgSQL_row *row, HeapTuple tup, TupleDesc tupdesc) { /* @@ -3769,8 +3769,8 @@ exec_move_row(PLpgSQL_execstate * estate, * ---------- */ static HeapTuple -make_tuple_from_row(PLpgSQL_execstate * estate, - PLpgSQL_row * row, +make_tuple_from_row(PLpgSQL_execstate *estate, + PLpgSQL_row *row, TupleDesc tupdesc) { int natts = tupdesc->natts; @@ -4127,7 +4127,7 @@ exec_simple_check_node(Node *node) * ---------- */ static void -exec_simple_check_plan(PLpgSQL_expr * expr) +exec_simple_check_plan(PLpgSQL_expr *expr) { _SPI_plan *spi_plan = (_SPI_plan *) expr->plan; Plan *plan; @@ -4214,7 +4214,7 @@ compatible_tupdesc(TupleDesc td1, TupleDesc td2) * ---------- */ static void -exec_set_found(PLpgSQL_execstate * estate, bool state) +exec_set_found(PLpgSQL_execstate *estate, bool state) { PLpgSQL_var *var; diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c index 3de37a3ad1..7c0db8dee8 100644 --- a/src/pl/plpgsql/src/pl_funcs.c +++ b/src/pl/plpgsql/src/pl_funcs.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.35 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.36 2004/08/30 02:54:42 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -56,7 +56,7 @@ static bool ns_localmode = false; * ---------- */ void -plpgsql_dstring_init(PLpgSQL_dstring * ds) +plpgsql_dstring_init(PLpgSQL_dstring *ds) { ds->value = palloc(ds->alloc = 512); ds->used = 0; @@ -69,7 +69,7 @@ plpgsql_dstring_init(PLpgSQL_dstring * ds) * ---------- */ void -plpgsql_dstring_free(PLpgSQL_dstring * ds) +plpgsql_dstring_free(PLpgSQL_dstring *ds) { pfree(ds->value); } @@ -80,7 +80,7 @@ plpgsql_dstring_free(PLpgSQL_dstring * ds) * ---------- */ void -plpgsql_dstring_append(PLpgSQL_dstring * ds, char *str) +plpgsql_dstring_append(PLpgSQL_dstring *ds, char *str) { int len = strlen(str); int needed = ds->used + len + 1; @@ -105,7 +105,7 @@ plpgsql_dstring_append(PLpgSQL_dstring * ds, char *str) * ---------- */ char * -plpgsql_dstring_get(PLpgSQL_dstring * ds) +plpgsql_dstring_get(PLpgSQL_dstring *ds) { return ds->value; } @@ -422,7 +422,7 @@ plpgsql_convert_ident(const char *s, char **output, int numidents) * Statement type as a string, for use in error messages etc. */ const char * -plpgsql_stmt_typename(PLpgSQL_stmt * stmt) +plpgsql_stmt_typename(PLpgSQL_stmt *stmt) { switch (stmt->cmd_type) { @@ -478,28 +478,28 @@ plpgsql_stmt_typename(PLpgSQL_stmt * stmt) static int dump_indent; static void dump_ind(); -static void dump_stmt(PLpgSQL_stmt * stmt); -static void dump_block(PLpgSQL_stmt_block * block); -static void dump_assign(PLpgSQL_stmt_assign * stmt); -static void dump_if(PLpgSQL_stmt_if * stmt); -static void dump_loop(PLpgSQL_stmt_loop * stmt); -static void dump_while(PLpgSQL_stmt_while * stmt); -static void dump_fori(PLpgSQL_stmt_fori * stmt); -static void dump_fors(PLpgSQL_stmt_fors * stmt); -static void dump_select(PLpgSQL_stmt_select * stmt); -static void dump_exit(PLpgSQL_stmt_exit * stmt); -static void dump_return(PLpgSQL_stmt_return * stmt); -static void dump_return_next(PLpgSQL_stmt_return_next * stmt); -static void dump_raise(PLpgSQL_stmt_raise * stmt); -static void dump_execsql(PLpgSQL_stmt_execsql * stmt); -static void dump_dynexecute(PLpgSQL_stmt_dynexecute * stmt); -static void dump_dynfors(PLpgSQL_stmt_dynfors * stmt); -static void dump_getdiag(PLpgSQL_stmt_getdiag * stmt); -static void dump_open(PLpgSQL_stmt_open * stmt); -static void dump_fetch(PLpgSQL_stmt_fetch * stmt); -static void dump_close(PLpgSQL_stmt_close * stmt); -static void dump_perform(PLpgSQL_stmt_perform * stmt); -static void dump_expr(PLpgSQL_expr * expr); +static void dump_stmt(PLpgSQL_stmt *stmt); +static void dump_block(PLpgSQL_stmt_block *block); +static void dump_assign(PLpgSQL_stmt_assign *stmt); +static void dump_if(PLpgSQL_stmt_if *stmt); +static void dump_loop(PLpgSQL_stmt_loop *stmt); +static void dump_while(PLpgSQL_stmt_while *stmt); +static void dump_fori(PLpgSQL_stmt_fori *stmt); +static void dump_fors(PLpgSQL_stmt_fors *stmt); +static void dump_select(PLpgSQL_stmt_select *stmt); +static void dump_exit(PLpgSQL_stmt_exit *stmt); +static void dump_return(PLpgSQL_stmt_return *stmt); +static void dump_return_next(PLpgSQL_stmt_return_next *stmt); +static void dump_raise(PLpgSQL_stmt_raise *stmt); +static void dump_execsql(PLpgSQL_stmt_execsql *stmt); +static void dump_dynexecute(PLpgSQL_stmt_dynexecute *stmt); +static void dump_dynfors(PLpgSQL_stmt_dynfors *stmt); +static void dump_getdiag(PLpgSQL_stmt_getdiag *stmt); +static void dump_open(PLpgSQL_stmt_open *stmt); +static void dump_fetch(PLpgSQL_stmt_fetch *stmt); +static void dump_close(PLpgSQL_stmt_close *stmt); +static void dump_perform(PLpgSQL_stmt_perform *stmt); +static void dump_expr(PLpgSQL_expr *expr); static void @@ -512,7 +512,7 @@ dump_ind() } static void -dump_stmt(PLpgSQL_stmt * stmt) +dump_stmt(PLpgSQL_stmt *stmt) { printf("%3d:", stmt->lineno); switch (stmt->cmd_type) @@ -584,7 +584,7 @@ dump_stmt(PLpgSQL_stmt * stmt) } static void -dump_stmts(PLpgSQL_stmts * stmts) +dump_stmts(PLpgSQL_stmts *stmts) { int i; @@ -595,7 +595,7 @@ dump_stmts(PLpgSQL_stmts * stmts) } static void -dump_block(PLpgSQL_stmt_block * block) +dump_block(PLpgSQL_stmt_block *block) { int i; char *name; @@ -635,7 +635,7 @@ dump_block(PLpgSQL_stmt_block * block) } static void -dump_assign(PLpgSQL_stmt_assign * stmt) +dump_assign(PLpgSQL_stmt_assign *stmt) { dump_ind(); printf("ASSIGN var %d := ", stmt->varno); @@ -644,7 +644,7 @@ dump_assign(PLpgSQL_stmt_assign * stmt) } static void -dump_if(PLpgSQL_stmt_if * stmt) +dump_if(PLpgSQL_stmt_if *stmt) { dump_ind(); printf("IF "); @@ -663,7 +663,7 @@ dump_if(PLpgSQL_stmt_if * stmt) } static void -dump_loop(PLpgSQL_stmt_loop * stmt) +dump_loop(PLpgSQL_stmt_loop *stmt) { dump_ind(); printf("LOOP\n"); @@ -675,7 +675,7 @@ dump_loop(PLpgSQL_stmt_loop * stmt) } static void -dump_while(PLpgSQL_stmt_while * stmt) +dump_while(PLpgSQL_stmt_while *stmt) { dump_ind(); printf("WHILE "); @@ -689,7 +689,7 @@ dump_while(PLpgSQL_stmt_while * stmt) } static void -dump_fori(PLpgSQL_stmt_fori * stmt) +dump_fori(PLpgSQL_stmt_fori *stmt) { dump_ind(); printf("FORI %s %s\n", stmt->var->refname, (stmt->reverse) ? "REVERSE" : "NORMAL"); @@ -712,7 +712,7 @@ dump_fori(PLpgSQL_stmt_fori * stmt) } static void -dump_fors(PLpgSQL_stmt_fors * stmt) +dump_fors(PLpgSQL_stmt_fors *stmt) { dump_ind(); printf("FORS %s ", (stmt->rec != NULL) ? stmt->rec->refname : stmt->row->refname); @@ -726,7 +726,7 @@ dump_fors(PLpgSQL_stmt_fors * stmt) } static void -dump_select(PLpgSQL_stmt_select * stmt) +dump_select(PLpgSQL_stmt_select *stmt) { dump_ind(); printf("SELECT "); @@ -749,7 +749,7 @@ dump_select(PLpgSQL_stmt_select * stmt) } static void -dump_open(PLpgSQL_stmt_open * stmt) +dump_open(PLpgSQL_stmt_open *stmt) { dump_ind(); printf("OPEN curvar=%d\n", stmt->curvar); @@ -781,7 +781,7 @@ dump_open(PLpgSQL_stmt_open * stmt) } static void -dump_fetch(PLpgSQL_stmt_fetch * stmt) +dump_fetch(PLpgSQL_stmt_fetch *stmt) { dump_ind(); printf("FETCH curvar=%d\n", stmt->curvar); @@ -802,14 +802,14 @@ dump_fetch(PLpgSQL_stmt_fetch * stmt) } static void -dump_close(PLpgSQL_stmt_close * stmt) +dump_close(PLpgSQL_stmt_close *stmt) { dump_ind(); printf("CLOSE curvar=%d\n", stmt->curvar); } static void -dump_perform(PLpgSQL_stmt_perform * stmt) +dump_perform(PLpgSQL_stmt_perform *stmt) { dump_ind(); printf("PERFORM expr = "); @@ -818,7 +818,7 @@ dump_perform(PLpgSQL_stmt_perform * stmt) } static void -dump_exit(PLpgSQL_stmt_exit * stmt) +dump_exit(PLpgSQL_stmt_exit *stmt) { dump_ind(); printf("EXIT lbl='%s'", stmt->label); @@ -831,7 +831,7 @@ dump_exit(PLpgSQL_stmt_exit * stmt) } static void -dump_return(PLpgSQL_stmt_return * stmt) +dump_return(PLpgSQL_stmt_return *stmt) { dump_ind(); printf("RETURN "); @@ -847,7 +847,7 @@ dump_return(PLpgSQL_stmt_return * stmt) } static void -dump_return_next(PLpgSQL_stmt_return_next * stmt) +dump_return_next(PLpgSQL_stmt_return_next *stmt) { dump_ind(); printf("RETURN NEXT "); @@ -861,7 +861,7 @@ dump_return_next(PLpgSQL_stmt_return_next * stmt) } static void -dump_raise(PLpgSQL_stmt_raise * stmt) +dump_raise(PLpgSQL_stmt_raise *stmt) { int i; @@ -873,7 +873,7 @@ dump_raise(PLpgSQL_stmt_raise * stmt) } static void -dump_execsql(PLpgSQL_stmt_execsql * stmt) +dump_execsql(PLpgSQL_stmt_execsql *stmt) { dump_ind(); printf("EXECSQL "); @@ -882,7 +882,7 @@ dump_execsql(PLpgSQL_stmt_execsql * stmt) } static void -dump_dynexecute(PLpgSQL_stmt_dynexecute * stmt) +dump_dynexecute(PLpgSQL_stmt_dynexecute *stmt) { dump_ind(); printf("EXECUTE "); @@ -891,7 +891,7 @@ dump_dynexecute(PLpgSQL_stmt_dynexecute * stmt) } static void -dump_dynfors(PLpgSQL_stmt_dynfors * stmt) +dump_dynfors(PLpgSQL_stmt_dynfors *stmt) { dump_ind(); printf("FORS %s EXECUTE ", (stmt->rec != NULL) ? stmt->rec->refname : stmt->row->refname); @@ -905,7 +905,7 @@ dump_dynfors(PLpgSQL_stmt_dynfors * stmt) } static void -dump_getdiag(PLpgSQL_stmt_getdiag * stmt) +dump_getdiag(PLpgSQL_stmt_getdiag *stmt) { int i; @@ -939,7 +939,7 @@ dump_getdiag(PLpgSQL_stmt_getdiag * stmt) } static void -dump_expr(PLpgSQL_expr * expr) +dump_expr(PLpgSQL_expr *expr) { int i; @@ -959,7 +959,7 @@ dump_expr(PLpgSQL_expr * expr) } void -plpgsql_dumptree(PLpgSQL_function * func) +plpgsql_dumptree(PLpgSQL_function *func) { int i; PLpgSQL_datum *d; diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index ce49eef9ee..c3919fc375 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.52 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.53 2004/08/30 02:54:42 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -149,7 +149,7 @@ typedef struct int alloc; int used; char *value; -} PLpgSQL_dstring; +} PLpgSQL_dstring; typedef struct @@ -163,7 +163,7 @@ typedef struct Oid typioparam; FmgrInfo typinput; /* lookup info for typinput function */ int32 atttypmod; /* typmod (taken from someplace else) */ -} PLpgSQL_type; +} PLpgSQL_type; /* @@ -175,7 +175,7 @@ typedef struct { /* Generic datum array item */ int dtype; int dno; -} PLpgSQL_datum; +} PLpgSQL_datum; /* * The variants PLpgSQL_var, PLpgSQL_row, and PLpgSQL_rec share these @@ -187,7 +187,7 @@ typedef struct int dno; char *refname; int lineno; -} PLpgSQL_variable; +} PLpgSQL_variable; typedef struct PLpgSQL_expr { /* SQL Query to plan and execute */ @@ -205,7 +205,7 @@ typedef struct PLpgSQL_expr /* params to pass to expr */ int nparams; int params[1]; /* VARIABLE SIZE ARRAY ... must be last */ -} PLpgSQL_expr; +} PLpgSQL_expr; typedef struct @@ -225,7 +225,7 @@ typedef struct Datum value; bool isnull; bool freeval; -} PLpgSQL_var; +} PLpgSQL_var; typedef struct @@ -247,7 +247,7 @@ typedef struct int nfields; char **fieldnames; int *varnos; -} PLpgSQL_row; +} PLpgSQL_row; typedef struct @@ -261,7 +261,7 @@ typedef struct TupleDesc tupdesc; bool freetup; bool freetupdesc; -} PLpgSQL_rec; +} PLpgSQL_rec; typedef struct @@ -270,7 +270,7 @@ typedef struct int rfno; char *fieldname; int recparentno; /* dno of parent record */ -} PLpgSQL_recfield; +} PLpgSQL_recfield; typedef struct @@ -279,7 +279,7 @@ typedef struct int dno; PLpgSQL_expr *subscript; int arrayparentno; /* dno of parent array variable */ -} PLpgSQL_arrayelem; +} PLpgSQL_arrayelem; typedef struct @@ -287,7 +287,7 @@ typedef struct int dtype; int dno; PLpgSQL_expr *argnum; -} PLpgSQL_trigarg; +} PLpgSQL_trigarg; typedef struct @@ -295,7 +295,7 @@ typedef struct int itemtype; int itemno; char name[1]; -} PLpgSQL_nsitem; +} PLpgSQL_nsitem; typedef struct PLpgSQL_ns @@ -304,14 +304,14 @@ typedef struct PLpgSQL_ns int items_used; PLpgSQL_nsitem **items; struct PLpgSQL_ns *upper; -} PLpgSQL_ns; +} PLpgSQL_ns; typedef struct { /* Generic execution node */ int cmd_type; int lineno; -} PLpgSQL_stmt; +} PLpgSQL_stmt; typedef struct @@ -319,7 +319,7 @@ typedef struct int stmts_alloc; /* XXX this oughta just be a List ... */ int stmts_used; PLpgSQL_stmt **stmts; -} PLpgSQL_stmts; +} PLpgSQL_stmts; typedef struct PLpgSQL_condition @@ -327,14 +327,14 @@ typedef struct PLpgSQL_condition int sqlerrstate; /* SQLSTATE code */ char *condname; /* condition name (for debugging) */ struct PLpgSQL_condition *next; -} PLpgSQL_condition; +} PLpgSQL_condition; typedef struct { /* One EXCEPTION ... WHEN clause */ int lineno; PLpgSQL_condition *conditions; PLpgSQL_stmts *action; -} PLpgSQL_exception; +} PLpgSQL_exception; typedef struct @@ -343,7 +343,7 @@ typedef struct * ... */ int exceptions_used; PLpgSQL_exception **exceptions; -} PLpgSQL_exceptions; +} PLpgSQL_exceptions; typedef struct @@ -355,7 +355,7 @@ typedef struct PLpgSQL_exceptions *exceptions; int n_initvars; int *initvarnos; -} PLpgSQL_stmt_block; +} PLpgSQL_stmt_block; typedef struct @@ -364,20 +364,20 @@ typedef struct int lineno; int varno; PLpgSQL_expr *expr; -} PLpgSQL_stmt_assign; +} PLpgSQL_stmt_assign; typedef struct { /* PERFORM statement */ int cmd_type; int lineno; PLpgSQL_expr *expr; -} PLpgSQL_stmt_perform; +} PLpgSQL_stmt_perform; typedef struct { /* Get Diagnostics item */ int item; /* id for diagnostic value desired */ int target; /* where to assign it */ -} PLpgSQL_diag_item; +} PLpgSQL_diag_item; typedef struct { /* Get Diagnostics statement */ @@ -385,7 +385,7 @@ typedef struct int lineno; int ndtitems; PLpgSQL_diag_item *dtitems; -} PLpgSQL_stmt_getdiag; +} PLpgSQL_stmt_getdiag; typedef struct @@ -395,7 +395,7 @@ typedef struct PLpgSQL_expr *cond; PLpgSQL_stmts *true_body; PLpgSQL_stmts *false_body; -} PLpgSQL_stmt_if; +} PLpgSQL_stmt_if; typedef struct @@ -404,7 +404,7 @@ typedef struct int lineno; char *label; PLpgSQL_stmts *body; -} PLpgSQL_stmt_loop; +} PLpgSQL_stmt_loop; typedef struct @@ -414,7 +414,7 @@ typedef struct char *label; PLpgSQL_expr *cond; PLpgSQL_stmts *body; -} PLpgSQL_stmt_while; +} PLpgSQL_stmt_while; typedef struct @@ -427,7 +427,7 @@ typedef struct PLpgSQL_expr *upper; int reverse; PLpgSQL_stmts *body; -} PLpgSQL_stmt_fori; +} PLpgSQL_stmt_fori; typedef struct @@ -439,7 +439,7 @@ typedef struct PLpgSQL_row *row; PLpgSQL_expr *query; PLpgSQL_stmts *body; -} PLpgSQL_stmt_fors; +} PLpgSQL_stmt_fors; typedef struct @@ -451,7 +451,7 @@ typedef struct PLpgSQL_row *row; PLpgSQL_expr *query; PLpgSQL_stmts *body; -} PLpgSQL_stmt_dynfors; +} PLpgSQL_stmt_dynfors; typedef struct @@ -461,7 +461,7 @@ typedef struct PLpgSQL_rec *rec; PLpgSQL_row *row; PLpgSQL_expr *query; -} PLpgSQL_stmt_select; +} PLpgSQL_stmt_select; typedef struct @@ -473,7 +473,7 @@ typedef struct PLpgSQL_expr *argquery; PLpgSQL_expr *query; PLpgSQL_expr *dynquery; -} PLpgSQL_stmt_open; +} PLpgSQL_stmt_open; typedef struct @@ -483,7 +483,7 @@ typedef struct PLpgSQL_rec *rec; PLpgSQL_row *row; int curvar; -} PLpgSQL_stmt_fetch; +} PLpgSQL_stmt_fetch; typedef struct @@ -491,7 +491,7 @@ typedef struct int cmd_type; int lineno; int curvar; -} PLpgSQL_stmt_close; +} PLpgSQL_stmt_close; typedef struct @@ -500,7 +500,7 @@ typedef struct int lineno; char *label; PLpgSQL_expr *cond; -} PLpgSQL_stmt_exit; +} PLpgSQL_stmt_exit; typedef struct @@ -510,7 +510,7 @@ typedef struct PLpgSQL_expr *expr; int retrecno; int retrowno; -} PLpgSQL_stmt_return; +} PLpgSQL_stmt_return; typedef struct { /* RETURN NEXT statement */ @@ -519,7 +519,7 @@ typedef struct PLpgSQL_rec *rec; PLpgSQL_row *row; PLpgSQL_expr *expr; -} PLpgSQL_stmt_return_next; +} PLpgSQL_stmt_return_next; typedef struct { /* RAISE statement */ @@ -529,7 +529,7 @@ typedef struct char *message; int nparams; int *params; -} PLpgSQL_stmt_raise; +} PLpgSQL_stmt_raise; typedef struct @@ -537,7 +537,7 @@ typedef struct int cmd_type; int lineno; PLpgSQL_expr *sqlstmt; -} PLpgSQL_stmt_execsql; +} PLpgSQL_stmt_execsql; typedef struct @@ -545,7 +545,7 @@ typedef struct int cmd_type; int lineno; PLpgSQL_expr *query; -} PLpgSQL_stmt_dynexecute; +} PLpgSQL_stmt_dynexecute; typedef struct PLpgSQL_func_hashkey @@ -566,7 +566,7 @@ typedef struct PLpgSQL_func_hashkey * zeroed! */ Oid argtypes[FUNC_MAX_ARGS]; -} PLpgSQL_func_hashkey; +} PLpgSQL_func_hashkey; typedef struct PLpgSQL_function @@ -602,7 +602,7 @@ typedef struct PLpgSQL_function int ndatums; PLpgSQL_datum **datums; PLpgSQL_stmt_block *action; -} PLpgSQL_function; +} PLpgSQL_function; typedef struct @@ -639,7 +639,7 @@ typedef struct PLpgSQL_function *err_func; /* current func */ PLpgSQL_stmt *err_stmt; /* current stmt */ const char *err_text; /* additional state info */ -} PLpgSQL_execstate; +} PLpgSQL_execstate; /********************************************************************** @@ -682,10 +682,10 @@ extern int plpgsql_parse_dblwordrowtype(char *word); extern PLpgSQL_type *plpgsql_parse_datatype(const char *string); extern PLpgSQL_type *plpgsql_build_datatype(Oid typeOid, int32 typmod); extern PLpgSQL_variable *plpgsql_build_variable(char *refname, int lineno, - PLpgSQL_type * dtype, + PLpgSQL_type *dtype, bool add2namespace); extern PLpgSQL_condition *plpgsql_parse_err_condition(char *condname); -extern void plpgsql_adddatum(PLpgSQL_datum * new); +extern void plpgsql_adddatum(PLpgSQL_datum *new); extern int plpgsql_add_initdatums(int **varnos); extern void plpgsql_HashTableInit(void); @@ -701,9 +701,9 @@ extern Datum plpgsql_validator(PG_FUNCTION_ARGS); * Functions in pl_exec.c * ---------- */ -extern Datum plpgsql_exec_function(PLpgSQL_function * func, +extern Datum plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo); -extern HeapTuple plpgsql_exec_trigger(PLpgSQL_function * func, +extern HeapTuple plpgsql_exec_trigger(PLpgSQL_function *func, TriggerData *trigdata); extern void plpgsql_xact_cb(XactEvent event, TransactionId parentXid, void *arg); @@ -711,10 +711,10 @@ extern void plpgsql_xact_cb(XactEvent event, TransactionId parentXid, void *arg) * Functions for the dynamic string handling in pl_funcs.c * ---------- */ -extern void plpgsql_dstring_init(PLpgSQL_dstring * ds); -extern void plpgsql_dstring_free(PLpgSQL_dstring * ds); -extern void plpgsql_dstring_append(PLpgSQL_dstring * ds, char *str); -extern char *plpgsql_dstring_get(PLpgSQL_dstring * ds); +extern void plpgsql_dstring_init(PLpgSQL_dstring *ds); +extern void plpgsql_dstring_free(PLpgSQL_dstring *ds); +extern void plpgsql_dstring_append(PLpgSQL_dstring *ds, char *str); +extern char *plpgsql_dstring_get(PLpgSQL_dstring *ds); /* ---------- * Functions for the namestack handling in pl_funcs.c @@ -733,8 +733,8 @@ extern void plpgsql_ns_rename(char *oldname, char *newname); * ---------- */ extern void plpgsql_convert_ident(const char *s, char **output, int numidents); -extern const char *plpgsql_stmt_typename(PLpgSQL_stmt * stmt); -extern void plpgsql_dumptree(PLpgSQL_function * func); +extern const char *plpgsql_stmt_typename(PLpgSQL_stmt *stmt); +extern void plpgsql_dumptree(PLpgSQL_function *func); /* ---------- * Externs in gram.y and scan.l diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 45340d0ed8..ecbf2dbce8 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.54 2004/08/29 05:07:01 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.55 2004/08/30 02:54:42 momjian Exp $ * ********************************************************************* */ @@ -2114,7 +2114,7 @@ PLy_spi_execute_query(char *query, int limit) oldcontext = CurrentMemoryContext; PG_TRY(); - rv = SPI_exec(query, limit); + rv = SPI_exec(query, limit); PG_CATCH(); { MemoryContextSwitchTo(oldcontext); @@ -2375,7 +2375,7 @@ PLy_output(volatile int level, PyObject * self, PyObject * args) oldcontext = CurrentMemoryContext; PG_TRY(); - elog(level, "%s", sv); + elog(level, "%s", sv); PG_CATCH(); { MemoryContextSwitchTo(oldcontext); diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 87cc2bf4a6..a59cef23f9 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -31,7 +31,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.90 2004/08/29 05:07:02 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.91 2004/08/30 02:54:42 momjian Exp $ * **********************************************************************/ @@ -109,7 +109,7 @@ typedef struct pltcl_proc_desc FmgrInfo arg_out_func[FUNC_MAX_ARGS]; Oid arg_typioparam[FUNC_MAX_ARGS]; bool arg_is_rowtype[FUNC_MAX_ARGS]; -} pltcl_proc_desc; +} pltcl_proc_desc; /********************************************************************** @@ -123,7 +123,7 @@ typedef struct pltcl_query_desc Oid *argtypes; FmgrInfo *arginfuncs; Oid *argtypioparams; -} pltcl_query_desc; +} pltcl_query_desc; /********************************************************************** @@ -156,9 +156,9 @@ static ErrorData *pltcl_error_in_progress = NULL; * Forward declarations **********************************************************************/ static void pltcl_init_all(void); -static void pltcl_init_interp(Tcl_Interp * interp); +static void pltcl_init_interp(Tcl_Interp *interp); -static void pltcl_init_load_unknown(Tcl_Interp * interp); +static void pltcl_init_load_unknown(Tcl_Interp *interp); Datum pltcl_call_handler(PG_FUNCTION_ARGS); Datum pltclu_call_handler(PG_FUNCTION_ARGS); @@ -170,28 +170,28 @@ static HeapTuple pltcl_trigger_handler(PG_FUNCTION_ARGS); static pltcl_proc_desc *compile_pltcl_function(Oid fn_oid, Oid tgreloid); -static int pltcl_elog(ClientData cdata, Tcl_Interp * interp, +static int pltcl_elog(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_quote(ClientData cdata, Tcl_Interp * interp, +static int pltcl_quote(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_argisnull(ClientData cdata, Tcl_Interp * interp, +static int pltcl_argisnull(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_returnnull(ClientData cdata, Tcl_Interp * interp, +static int pltcl_returnnull(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp, +static int pltcl_SPI_exec(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp, +static int pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp, +static int pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static int pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp * interp, +static int pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -static void pltcl_set_tuple_values(Tcl_Interp * interp, CONST84 char *arrayname, +static void pltcl_set_tuple_values(Tcl_Interp *interp, CONST84 char *arrayname, int tupno, HeapTuple tuple, TupleDesc tupdesc); static void pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc, - Tcl_DString * retval); + Tcl_DString *retval); /* @@ -292,7 +292,7 @@ pltcl_init_all(void) * pltcl_init_interp() - initialize a Tcl interpreter **********************************************************************/ static void -pltcl_init_interp(Tcl_Interp * interp) +pltcl_init_interp(Tcl_Interp *interp) { /************************************************************ * Install the commands for SPI support in the interpreter @@ -322,7 +322,7 @@ pltcl_init_interp(Tcl_Interp * interp) * table pltcl_modules (if it exists) **********************************************************************/ static void -pltcl_init_load_unknown(Tcl_Interp * interp) +pltcl_init_load_unknown(Tcl_Interp *interp) { int spi_rc; int tcl_rc; @@ -1267,7 +1267,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid) * pltcl_elog() - elog() support for PLTcl **********************************************************************/ static int -pltcl_elog(ClientData cdata, Tcl_Interp * interp, +pltcl_elog(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { volatile int level; @@ -1339,7 +1339,7 @@ pltcl_elog(ClientData cdata, Tcl_Interp * interp, * be used in SPI_exec query strings **********************************************************************/ static int -pltcl_quote(ClientData cdata, Tcl_Interp * interp, +pltcl_quote(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { char *tmp; @@ -1392,7 +1392,7 @@ pltcl_quote(ClientData cdata, Tcl_Interp * interp, * pltcl_argisnull() - determine if a specific argument is NULL **********************************************************************/ static int -pltcl_argisnull(ClientData cdata, Tcl_Interp * interp, +pltcl_argisnull(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { int argno; @@ -1449,7 +1449,7 @@ pltcl_argisnull(ClientData cdata, Tcl_Interp * interp, * pltcl_returnnull() - Cause a NULL return from a function **********************************************************************/ static int -pltcl_returnnull(ClientData cdata, Tcl_Interp * interp, +pltcl_returnnull(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { FunctionCallInfo fcinfo = pltcl_current_fcinfo; @@ -1488,7 +1488,7 @@ pltcl_returnnull(ClientData cdata, Tcl_Interp * interp, * for the Tcl interpreter **********************************************************************/ static int -pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp, +pltcl_SPI_exec(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { volatile int my_rc; @@ -1696,7 +1696,7 @@ pltcl_SPI_exec(ClientData cdata, Tcl_Interp * interp, * and not save the plan currently. **********************************************************************/ static int -pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp, +pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { int nargs; @@ -1843,7 +1843,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp, * pltcl_SPI_execp() - Execute a prepared plan **********************************************************************/ static int -pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp, +pltcl_SPI_execp(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { volatile int my_rc; @@ -2046,7 +2046,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp, ************************************************************/ oldcontext = CurrentMemoryContext; PG_TRY(); - spi_rc = SPI_execp(qdesc->plan, argvalues, nulls, count); + spi_rc = SPI_execp(qdesc->plan, argvalues, nulls, count); PG_CATCH(); { MemoryContextSwitchTo(oldcontext); @@ -2168,7 +2168,7 @@ pltcl_SPI_execp(ClientData cdata, Tcl_Interp * interp, * be used after insert queries **********************************************************************/ static int -pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp * interp, +pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]) { char buf[64]; @@ -2184,7 +2184,7 @@ pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp * interp, * of a given tuple **********************************************************************/ static void -pltcl_set_tuple_values(Tcl_Interp * interp, CONST84 char *arrayname, +pltcl_set_tuple_values(Tcl_Interp *interp, CONST84 char *arrayname, int tupno, HeapTuple tuple, TupleDesc tupdesc) { int i; @@ -2281,7 +2281,7 @@ pltcl_set_tuple_values(Tcl_Interp * interp, CONST84 char *arrayname, **********************************************************************/ static void pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc, - Tcl_DString * retval) + Tcl_DString *retval) { int i; char *outputstr; diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 4a44a098a9..94ef44a633 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.23 2004/08/29 05:07:02 momjian Exp $ + * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.24 2004/08/30 02:54:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -792,8 +792,8 @@ static const struct "Australia/Perth" }, /* (GMT+08:00) Perth */ /* {"W. Central Africa Standard Time", "W. Central Africa Daylight Time", - * ""}, Could not find a match for this one. Excluded for now. *//* (G - * MT+01:00) West Central Africa */ + * * ""}, Could not find a match for this one. Excluded for now. *//* ( + * G MT+01:00) West Central Africa */ { "W. Europe Standard Time", "W. Europe Daylight Time", "CET" diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index c6687cce1a..00bd106b3e 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -108,7 +108,6 @@ do -TAES_KEY \ -TAMT \ -TAMTS \ --TANY \ -TASN1_BIT_STRING \ -TASN1_BMPSTRING \ -TASN1_BOOLEAN \