diff options
Diffstat (limited to 'src/include/utils')
-rw-r--r-- | src/include/utils/acl.h | 22 | ||||
-rw-r--r-- | src/include/utils/builtins.h | 4 | ||||
-rw-r--r-- | src/include/utils/datetime.h | 10 | ||||
-rw-r--r-- | src/include/utils/elog.h | 21 | ||||
-rw-r--r-- | src/include/utils/errcodes.h | 4 | ||||
-rw-r--r-- | src/include/utils/guc.h | 75 | ||||
-rw-r--r-- | src/include/utils/guc_tables.h | 11 | ||||
-rw-r--r-- | src/include/utils/hsearch.h | 6 | ||||
-rw-r--r-- | src/include/utils/lsyscache.h | 6 | ||||
-rw-r--r-- | src/include/utils/portal.h | 8 | ||||
-rw-r--r-- | src/include/utils/rel.h | 18 | ||||
-rw-r--r-- | src/include/utils/relcache.h | 4 | ||||
-rw-r--r-- | src/include/utils/resowner.h | 36 | ||||
-rw-r--r-- | src/include/utils/selfuncs.h | 4 | ||||
-rw-r--r-- | src/include/utils/timestamp.h | 5 | ||||
-rw-r--r-- | src/include/utils/typcache.h | 14 |
16 files changed, 128 insertions, 120 deletions
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 9e6705079fe..1d44e2d2038 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.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/acl.h,v 1.74 2004/08/29 04:13:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.75 2004/08/29 05:06:58 momjian Exp $ * * NOTES * An ACL array is simply an array of AclItems, representing the union @@ -72,7 +72,7 @@ typedef struct AclItem #define ACLITEM_GET_IDTYPE(item) ((item).ai_privs >> 30) #define ACL_GRANT_OPTION_FOR(privs) (((AclMode) (privs) & 0x7FFF) << 15) -#define ACL_OPTION_TO_PRIVS(privs) (((AclMode) (privs) >> 15) & 0x7FFF) +#define ACL_OPTION_TO_PRIVS(privs) (((AclMode) (privs) >> 15) & 0x7FFF) #define ACLITEM_SET_PRIVS(item,privs) \ ((item).ai_privs = ((item).ai_privs & ~((AclMode) 0x7FFF)) | \ @@ -223,11 +223,11 @@ typedef enum AclObjectKind */ extern Acl *acldefault(GrantObjectType objtype, AclId ownerid); extern Acl *aclupdate(const Acl *old_acl, const AclItem *mod_aip, - int modechg, AclId ownerid, DropBehavior behavior); + int modechg, AclId ownerid, DropBehavior behavior); extern Acl *aclnewowner(const Acl *old_acl, AclId oldownerid, AclId newownerid); - + extern AclMode aclmask(const Acl *acl, AclId userid, AclId ownerid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); /* * SQL functions (from acl.c) @@ -249,17 +249,17 @@ extern AclId get_grosysid(char *groname); extern char *get_groname(AclId grosysid); extern AclMode pg_class_aclmask(Oid table_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclMode pg_database_aclmask(Oid db_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclMode pg_proc_aclmask(Oid proc_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclMode pg_language_aclmask(Oid lang_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclMode pg_namespace_aclmask(Oid nsp_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclMode pg_tablespace_aclmask(Oid spc_oid, AclId userid, - AclMode mask, AclMaskHow how); + AclMode mask, AclMaskHow how); extern AclResult pg_class_aclcheck(Oid table_oid, AclId userid, AclMode mode); extern AclResult pg_database_aclcheck(Oid db_oid, AclId userid, AclMode mode); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 66a56d0db95..e94b57a2f3c 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.248 2004/08/29 04:13:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.249 2004/08/29 05:06:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -246,7 +246,7 @@ extern Datum btname_pattern_cmp(PG_FUNCTION_ARGS); extern Datum bttext_pattern_cmp(PG_FUNCTION_ARGS); /* float.c */ -extern DLLIMPORT int extra_float_digits; +extern DLLIMPORT int extra_float_digits; extern double get_float8_infinity(void); extern float get_float4_infinity(void); diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index ad6b550ac42..bc0c33952a4 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,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/datetime.h,v 1.50 2004/08/29 04:13:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.51 2004/08/29 05:06:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -260,14 +260,14 @@ extern const int day_tab[2][13]; /* * Datetime input parsing routines (ParseDateTime, DecodeDateTime, etc) - * return zero or a positive value on success. On failure, they return + * return zero or a positive value on success. On failure, they return * one of these negative code values. DateTimeParseError may be used to * produce a correct ereport. */ #define DTERR_BAD_FORMAT (-1) #define DTERR_FIELD_OVERFLOW (-2) -#define DTERR_MD_FIELD_OVERFLOW (-3) /* triggers hint about DateStyle */ -#define DTERR_INTERVAL_OVERFLOW (-4) +#define DTERR_MD_FIELD_OVERFLOW (-3) /* triggers hint about DateStyle */ +#define DTERR_INTERVAL_OVERFLOW (-4) #define DTERR_TZDISP_OVERFLOW (-5) @@ -289,7 +289,7 @@ extern int DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm, fsec_t *fsec); extern void DateTimeParseError(int dterr, const char *str, - const char *datatype); + const char *datatype); extern int DetermineLocalTimeZone(struct pg_tm * tm); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 201d029f016..98bea52eb94 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.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/elog.h,v 1.74 2004/08/29 04:13:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.75 2004/08/29 05:06:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,10 +34,10 @@ #define NOTICE 18 /* Helpful messages to users about query * operation; sent to client and server * log by default. */ -#define WARNING 19 /* Warnings. NOTICE is for expected messages - * like implicit sequence creation by SERIAL. - * WARNING is for unexpected messages. - */ +#define WARNING 19 /* Warnings. NOTICE is for expected + * messages like implicit sequence + * creation by SERIAL. WARNING is for + * unexpected messages. */ #define ERROR 20 /* user error - abort transaction; return * to known state */ /* Save ERROR value in PGERROR so it can be restored when Win32 includes @@ -207,7 +207,7 @@ extern DLLIMPORT ErrorContextCallback *error_context_stack; { \ PG_exception_stack = &local_sigjmp_buf -#define PG_CATCH() \ +#define PG_CATCH() \ } \ else \ { \ @@ -272,11 +272,11 @@ typedef enum extern PGErrorVerbosity Log_error_verbosity; extern char *Log_line_prefix; -extern int Log_destination; +extern int Log_destination; /* Log destination bitmap */ -#define LOG_DESTINATION_STDERR 1 -#define LOG_DESTINATION_SYSLOG 2 +#define LOG_DESTINATION_STDERR 1 +#define LOG_DESTINATION_SYSLOG 2 #define LOG_DESTINATION_EVENTLOG 4 /* Other exported functions */ @@ -287,7 +287,8 @@ extern void DebugFileOpen(void); * not available). Used before ereport/elog can be used * safely (memory context, GUC load etc) */ -extern void write_stderr(const char *fmt,...) +extern void +write_stderr(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); diff --git a/src/include/utils/errcodes.h b/src/include/utils/errcodes.h index a695b90a2ea..5ef9461f444 100644 --- a/src/include/utils/errcodes.h +++ b/src/include/utils/errcodes.h @@ -11,7 +11,7 @@ * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/errcodes.h,v 1.14 2004/07/31 07:39:20 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/errcodes.h,v 1.15 2004/08/29 05:06:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,7 +119,7 @@ #define ERRCODE_INDICATOR_OVERFLOW MAKE_SQLSTATE('2','2', '0','2','2') #define ERRCODE_INTERVAL_FIELD_OVERFLOW MAKE_SQLSTATE('2','2', '0','1','5') #define ERRCODE_INVALID_ARGUMENT_FOR_LOG MAKE_SQLSTATE('2','2', '0','1','E') -#define ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION MAKE_SQLSTATE('2','2', '0', '1', 'F') +#define ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION MAKE_SQLSTATE('2','2', '0', '1', 'F') #define ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION MAKE_SQLSTATE('2','2', '0', '1', 'G') #define ERRCODE_INVALID_CHARACTER_VALUE_FOR_CAST MAKE_SQLSTATE('2','2', '0','1','8') #define ERRCODE_INVALID_DATETIME_FORMAT MAKE_SQLSTATE('2','2', '0','0','7') diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index c7e67bb8fa7..f6db492dd86 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2004, PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.50 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.51 2004/08/29 05:06:58 momjian Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -82,7 +82,7 @@ typedef enum * * PGC_S_TEST is used when testing values to be stored as per-database or * per-user defaults ("doit" will always be false, so this never gets stored - * as the actual source of any value). This is an interactive case, but + * as the actual source of any value). This is an interactive case, but * it needs its own source value because some assign hooks need to make * different validity checks in this case. */ @@ -102,12 +102,12 @@ typedef enum PGC_S_SESSION /* SET command */ } GucSource; -typedef const char* (*GucStringAssignHook)(const char *newval, bool doit, GucSource source); -typedef bool (*GucBoolAssignHook)(bool newval, bool doit, GucSource source); -typedef bool (*GucIntAssignHook)(int newval, bool doit, GucSource source); -typedef bool (*GucRealAssignHook)(double newval, bool doit, GucSource source); +typedef const char *(*GucStringAssignHook) (const char *newval, bool doit, GucSource source); +typedef bool (*GucBoolAssignHook) (bool newval, bool doit, GucSource source); +typedef bool (*GucIntAssignHook) (int newval, bool doit, GucSource source); +typedef bool (*GucRealAssignHook) (double newval, bool doit, GucSource source); -typedef const char* (*GucShowHook)(void); +typedef const char *(*GucShowHook) (void); #define GUC_QUALIFIER_SEPARATOR '.' @@ -147,42 +147,42 @@ extern void SetConfigOption(const char *name, const char *value, GucContext context, GucSource source); extern void DefineCustomBoolVariable( - const char* name, - const char* short_desc, - const char* long_desc, - bool* valueAddr, - GucContext context, - GucBoolAssignHook assign_hook, - GucShowHook show_hook); + const char *name, + const char *short_desc, + const char *long_desc, + bool *valueAddr, + GucContext context, + GucBoolAssignHook assign_hook, + GucShowHook show_hook); extern void DefineCustomIntVariable( - const char* name, - const char* short_desc, - const char* long_desc, - int* valueAddr, - GucContext context, - GucIntAssignHook assign_hook, - GucShowHook show_hook); + const char *name, + const char *short_desc, + const char *long_desc, + int *valueAddr, + GucContext context, + GucIntAssignHook assign_hook, + GucShowHook show_hook); extern void DefineCustomRealVariable( - const char* name, - const char* short_desc, - const char* long_desc, - double* valueAddr, - GucContext context, - GucRealAssignHook assign_hook, - GucShowHook show_hook); + const char *name, + const char *short_desc, + const char *long_desc, + double *valueAddr, + GucContext context, + GucRealAssignHook assign_hook, + GucShowHook show_hook); extern void DefineCustomStringVariable( - const char* name, - const char* short_desc, - const char* long_desc, - char** valueAddr, - GucContext context, - GucStringAssignHook assign_hook, - GucShowHook show_hook); + const char *name, + const char *short_desc, + const char *long_desc, + char **valueAddr, + GucContext context, + GucStringAssignHook assign_hook, + GucShowHook show_hook); -extern void EmitWarningsOnPlaceholders(const char* className); +extern void EmitWarningsOnPlaceholders(const char *className); extern const char *GetConfigOption(const char *name); extern const char *GetConfigOptionResetString(const char *name); @@ -225,12 +225,15 @@ extern void read_nondefault_variables(void); /* in utils/adt/datetime.c */ extern bool ClearDateCache(bool newval, bool doit, GucSource source); + /* in utils/adt/regexp.c */ extern const char *assign_regex_flavor(const char *value, bool doit, GucSource source); + /* in catalog/namespace.c */ extern const char *assign_search_path(const char *newval, bool doit, GucSource source); + /* in access/transam/xlog.c */ extern const char *assign_xlog_sync_method(const char *method, bool doit, GucSource source); diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index fff83ba0ea7..527fdc88537 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.15 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.16 2004/08/29 05:06:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,8 +85,8 @@ typedef struct guc_stack int status; /* previous status bits, see below */ GucSource tentative_source; /* source of the tentative_value */ GucSource source; /* source of the actual value */ - union config_var_value tentative_val; /* previous tentative val */ - union config_var_value value; /* previous actual value */ + union config_var_value tentative_val; /* previous tentative val */ + union config_var_value value; /* previous actual value */ } GucStack; /* @@ -122,7 +122,8 @@ struct config_generic #define GUC_REPORT 0x0010 /* auto-report changes to client */ #define GUC_NOT_IN_SAMPLE 0x0020 /* not in postgresql.conf.sample */ #define GUC_DISALLOW_IN_FILE 0x0040 /* can't set in postgresql.conf */ -#define GUC_CUSTOM_PLACEHOLDER 0x0080 /* placeholder for a custom variable */ +#define GUC_CUSTOM_PLACEHOLDER 0x0080 /* placeholder for a custom + * variable */ /* bit values in status field */ #define GUC_HAVE_TENTATIVE 0x0001 /* tentative value is defined */ @@ -200,4 +201,4 @@ extern struct config_generic **get_guc_variables(void); extern void build_guc_variables(void); -#endif /* GUC_TABLES_H */ +#endif /* GUC_TABLES_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index b6eafb58073..c19f662a610 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.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/hsearch.h,v 1.31 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.32 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ */ typedef uint32 (*HashValueFunc) (const void *key, Size keysize); typedef int (*HashCompareFunc) (const void *key1, const void *key2, - Size keysize); + Size keysize); /* * Space allocation function for a hashtable --- designed to match malloc(). @@ -61,7 +61,7 @@ typedef void *(*HashAllocFunc) (Size request); typedef struct HASHELEMENT { struct HASHELEMENT *link; /* link to next entry in same bucket */ - uint32 hashvalue; /* hash function result for this entry */ + uint32 hashvalue; /* hash function result for this entry */ } HASHELEMENT; /* A hash bucket is a linked list of HASHELEMENTs */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 3cfa1b73109..496d2bcf11f 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,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/lsyscache.h,v 1.89 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.90 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,8 +26,8 @@ typedef enum IOFuncSelector extern bool op_in_opclass(Oid opno, Oid opclass); extern void get_op_opclass_properties(Oid opno, Oid opclass, - int *strategy, Oid *subtype, - bool *recheck); + int *strategy, Oid *subtype, + bool *recheck); extern Oid get_opclass_member(Oid opclass, Oid subtype, int16 strategy); extern Oid get_op_hash_function(Oid opno); extern Oid get_opclass_proc(Oid opclass, Oid subtype, int16 procnum); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 2b9b0f0c905..4f28fd2fc3c 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,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/portal.h,v 1.51 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.52 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -105,7 +105,7 @@ typedef struct PortalData const char *name; /* portal's name */ MemoryContext heap; /* subsidiary memory for portal */ ResourceOwner resowner; /* resources owned by portal */ - void (*cleanup) (Portal portal); /* cleanup hook */ + void (*cleanup) (Portal portal); /* cleanup hook */ TransactionId createXact; /* the xid of the creating xact */ /* The query or queries the portal will execute */ @@ -182,9 +182,9 @@ extern void AtCommit_Portals(void); extern void AtAbort_Portals(void); extern void AtCleanup_Portals(void); extern void AtSubCommit_Portals(TransactionId parentXid, - ResourceOwner parentXactOwner); + ResourceOwner parentXactOwner); extern void AtSubAbort_Portals(TransactionId parentXid, - ResourceOwner parentXactOwner); + ResourceOwner parentXactOwner); extern void AtSubCleanup_Portals(void); extern Portal CreatePortal(const char *name, bool allowDup, bool dupSilent); extern Portal CreateNewPortal(void); diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index e68fde8ed77..2875efac6fa 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.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/rel.h,v 1.78 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.79 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,21 +106,23 @@ typedef struct RelationData { RelFileNode rd_node; /* relation physical identifier */ /* use "struct" here to avoid needing to include smgr.h: */ - struct SMgrRelationData *rd_smgr; /* cached file handle, or NULL */ + struct SMgrRelationData *rd_smgr; /* cached file handle, or NULL */ BlockNumber rd_targblock; /* current insertion target block, or * InvalidBlockNumber */ int rd_refcnt; /* reference count */ bool rd_istemp; /* rel uses the local buffer mgr */ bool rd_isnailed; /* rel is nailed in cache */ bool rd_isvalid; /* relcache entry is valid */ - char rd_indexvalid; /* state of rd_indexlist: 0 = not valid, - * 1 = valid, 2 = temporarily forced */ - TransactionId rd_createxact; /* rel was created in current xact */ + char rd_indexvalid; /* state of rd_indexlist: 0 = not valid, 1 + * = valid, 2 = temporarily forced */ + TransactionId rd_createxact; /* rel was created in current xact */ + /* * rd_createxact is the XID of the highest subtransaction the rel has * survived into; or zero if the rel was not created in the current - * transaction. This should be relied on only for optimization purposes; - * it is possible for new-ness to be "forgotten" (eg, after CLUSTER). + * transaction. This should be relied on only for optimization + * purposes; it is possible for new-ness to be "forgotten" (eg, after + * CLUSTER). */ Form_pg_class rd_rel; /* RELATION tuple */ TupleDesc rd_att; /* tuple descriptor */ @@ -141,7 +143,7 @@ typedef struct RelationData * index access support info (used only for an index relation) * * Note: only default operators and support procs for each opclass are - * cached, namely those with subtype zero. The arrays are indexed by + * cached, namely those with subtype zero. The arrays are indexed by * strategy or support number, which is a sufficient identifier given * that restriction. */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index e0446c83784..20809d0fd4c 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.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/relcache.h,v 1.44 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.45 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,7 +67,7 @@ extern void RelationCacheInvalidate(void); extern void AtEOXact_RelationCache(bool isCommit); extern void AtEOSubXact_RelationCache(bool isCommit, TransactionId myXid, - TransactionId parentXid); + TransactionId parentXid); /* * Routines to help manage rebuilding of relcache init file diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 62e8ecb8db7..2d89d7dff24 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.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/include/utils/resowner.h,v 1.3 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.4 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ extern DLLIMPORT ResourceOwner TopTransactionResourceOwner; /* * Resource releasing is done in three phases: pre-locks, locks, and - * post-locks. The pre-lock phase must release any resources that are + * post-locks. The pre-lock phase must release any resources that are * visible to other backends (such as pinned buffers); this ensures that * when we release a lock that another backend may be waiting on, it will * see us as being fully out of our transaction. The post-lock phase @@ -58,9 +58,9 @@ typedef enum * by providing a callback of this form. */ typedef void (*ResourceReleaseCallback) (ResourceReleasePhase phase, - bool isCommit, - bool isTopLevel, - void *arg); + bool isCommit, + bool isTopLevel, + void *arg); /* @@ -69,19 +69,19 @@ typedef void (*ResourceReleaseCallback) (ResourceReleasePhase phase, /* generic routines */ extern ResourceOwner ResourceOwnerCreate(ResourceOwner parent, - const char *name); + const char *name); extern void ResourceOwnerRelease(ResourceOwner owner, - ResourceReleasePhase phase, - bool isCommit, - bool isTopLevel); + ResourceReleasePhase phase, + bool isCommit, + bool isTopLevel); extern void ResourceOwnerDelete(ResourceOwner owner); extern ResourceOwner ResourceOwnerGetParent(ResourceOwner owner); extern void ResourceOwnerNewParent(ResourceOwner owner, - ResourceOwner newparent); + ResourceOwner newparent); extern void RegisterResourceReleaseCallback(ResourceReleaseCallback callback, - void *arg); + void *arg); extern void UnregisterResourceReleaseCallback(ResourceReleaseCallback callback, - void *arg); + void *arg); /* support for buffer refcount management */ extern void ResourceOwnerEnlargeBuffers(ResourceOwner owner); @@ -91,20 +91,20 @@ extern void ResourceOwnerForgetBuffer(ResourceOwner owner, Buffer buffer); /* support for catcache refcount management */ extern void ResourceOwnerEnlargeCatCacheRefs(ResourceOwner owner); extern void ResourceOwnerRememberCatCacheRef(ResourceOwner owner, - HeapTuple tuple); + HeapTuple tuple); extern void ResourceOwnerForgetCatCacheRef(ResourceOwner owner, - HeapTuple tuple); + HeapTuple tuple); extern void ResourceOwnerEnlargeCatCacheListRefs(ResourceOwner owner); extern void ResourceOwnerRememberCatCacheListRef(ResourceOwner owner, - CatCList *list); + CatCList *list); extern void ResourceOwnerForgetCatCacheListRef(ResourceOwner owner, - CatCList *list); + CatCList *list); /* support for relcache refcount management */ extern void ResourceOwnerEnlargeRelationRefs(ResourceOwner owner); extern void ResourceOwnerRememberRelationRef(ResourceOwner owner, - Relation rel); + Relation rel); extern void ResourceOwnerForgetRelationRef(ResourceOwner owner, - Relation rel); + Relation rel); #endif /* RESOWNER_H */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index a052477fd39..84edb000f47 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,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/selfuncs.h,v 1.18 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.19 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ extern double estimate_num_groups(Query *root, List *groupExprs, double input_rows); extern Selectivity estimate_hash_bucketsize(Query *root, Node *hashkey, - int nbuckets); + int nbuckets); extern Datum btcostestimate(PG_FUNCTION_ARGS); extern Datum rtcostestimate(PG_FUNCTION_ARGS); diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index e392b38b14b..724da08a22b 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,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/timestamp.h,v 1.38 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.39 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -252,7 +252,7 @@ extern Datum now(PG_FUNCTION_ARGS); /* Internal routines (not fmgr-callable) */ extern int tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *dt); -extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, +extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, char **tzn); extern void dt2time(Timestamp dt, int *hour, int *min, int *sec, fsec_t *fsec); @@ -263,6 +263,7 @@ extern Timestamp SetEpochTimestamp(void); extern void GetEpochTime(struct pg_tm * tm); extern int timestamp_cmp_internal(Timestamp dt1, Timestamp dt2); + /* timestamp comparison works for timestamptz also */ #define timestamptz_cmp_internal(dt1,dt2) timestamp_cmp_internal(dt1, dt2) diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h index b94bcd9356e..f91704d8638 100644 --- a/src/include/utils/typcache.h +++ b/src/include/utils/typcache.h @@ -9,7 +9,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/typcache.h,v 1.5 2004/08/29 04:13:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.6 2004/08/29 05:06:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,17 +48,17 @@ typedef struct TypeCacheEntry /* * Pre-set-up fmgr call info for the equality operator and the btree * comparison function. These are kept in the type cache to avoid - * problems with memory leaks in repeated calls to array_eq and array_cmp. - * There is not currently a need to maintain call info for the lt_opr - * or gt_opr. + * problems with memory leaks in repeated calls to array_eq and + * array_cmp. There is not currently a need to maintain call info for + * the lt_opr or gt_opr. */ FmgrInfo eq_opr_finfo; FmgrInfo cmp_proc_finfo; /* * Tuple descriptor if it's a composite type (row type). NULL if not - * composite or information hasn't yet been requested. (NOTE: this - * is actually just a link to information maintained by relcache.c.) + * composite or information hasn't yet been requested. (NOTE: this is + * actually just a link to information maintained by relcache.c.) */ TupleDesc tupDesc; } TypeCacheEntry; @@ -77,7 +77,7 @@ extern TypeCacheEntry *lookup_type_cache(Oid type_id, int flags); extern TupleDesc lookup_rowtype_tupdesc(Oid type_id, int32 typmod); extern TupleDesc lookup_rowtype_tupdesc_noerror(Oid type_id, int32 typmod, - bool noError); + bool noError); extern void assign_record_type_typmod(TupleDesc tupDesc); |