diff options
Diffstat (limited to 'src/include/utils')
-rw-r--r-- | src/include/utils/acl.h | 10 | ||||
-rw-r--r-- | src/include/utils/array.h | 53 | ||||
-rw-r--r-- | src/include/utils/builtins.h | 4 | ||||
-rw-r--r-- | src/include/utils/datetime.h | 6 | ||||
-rw-r--r-- | src/include/utils/elog.h | 50 | ||||
-rw-r--r-- | src/include/utils/errcodes.h | 24 | ||||
-rw-r--r-- | src/include/utils/guc.h | 8 | ||||
-rw-r--r-- | src/include/utils/guc_tables.h | 24 | ||||
-rw-r--r-- | src/include/utils/help_config.h | 6 | ||||
-rw-r--r-- | src/include/utils/inet.h | 4 | ||||
-rw-r--r-- | src/include/utils/lsyscache.h | 20 | ||||
-rw-r--r-- | src/include/utils/memutils.h | 7 | ||||
-rw-r--r-- | src/include/utils/palloc.h | 6 | ||||
-rw-r--r-- | src/include/utils/portal.h | 63 | ||||
-rw-r--r-- | src/include/utils/rel.h | 6 | ||||
-rw-r--r-- | src/include/utils/selfuncs.h | 8 | ||||
-rw-r--r-- | src/include/utils/tuplestore.h | 8 |
17 files changed, 158 insertions, 149 deletions
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 3849cf2e857..8226381fbaf 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.58 2003/08/01 00:15:25 tgl Exp $ + * $Id: acl.h,v 1.59 2003/08/04 00:43:32 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -61,7 +61,7 @@ typedef struct AclItem * and the lower 15 bits are the actual privileges. */ #define ACLITEM_GET_PRIVS(item) ((item).ai_privs & 0x7FFF) -#define ACLITEM_GET_GOPTIONS(item) (((item).ai_privs >> 15) & 0x7FFF) +#define ACLITEM_GET_GOPTIONS(item) (((item).ai_privs >> 15) & 0x7FFF) #define ACLITEM_GET_IDTYPE(item) ((item).ai_privs >> 30) #define ACL_GRANT_OPTION_FOR(privs) (((privs) & 0x7FFF) << 15) @@ -190,14 +190,14 @@ typedef enum AclObjectKind ACL_KIND_OPCLASS, /* pg_opclass */ ACL_KIND_CONVERSION, /* pg_conversion */ MAX_ACL_KIND /* MUST BE LAST */ -} AclObjectKind; +} AclObjectKind; /* * routines used internally */ extern Acl *acldefault(GrantObjectType objtype, AclId ownerid); extern Acl *aclinsert3(const Acl *old_acl, const AclItem *mod_aip, - unsigned modechg, DropBehavior behavior); + unsigned modechg, DropBehavior behavior); /* * SQL functions (from acl.c) @@ -224,7 +224,7 @@ extern AclResult pg_language_aclcheck(Oid lang_oid, AclId userid, AclMode mode); extern AclResult pg_namespace_aclcheck(Oid nsp_oid, AclId userid, AclMode mode); extern void aclcheck_error(AclResult aclerr, AclObjectKind objectkind, - const char *objectname); + const char *objectname); /* ownercheck routines just return true (owner) or false (not) */ extern bool pg_class_ownercheck(Oid class_oid, AclId userid); diff --git a/src/include/utils/array.h b/src/include/utils/array.h index 50c222a9b4d..048210087a8 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.42 2003/07/14 20:34:18 tgl Exp $ + * $Id: array.h,v 1.43 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,6 +36,7 @@ typedef struct ArrayBuildState { MemoryContext mcontext; /* where all the temp stuff is kept */ Datum *dvalues; /* array of accumulated Datums */ + /* * The allocated size of dvalues[] is always a multiple of * ARRAY_ELEMS_CHUNKSIZE @@ -46,22 +47,22 @@ typedef struct ArrayBuildState int16 typlen; /* needed info about datatype */ bool typbyval; char typalign; -} ArrayBuildState; +} ArrayBuildState; /* * structure to cache type metadata needed for array manipulation */ typedef struct ArrayMetaState { - Oid element_type; - int16 typlen; - bool typbyval; - char typalign; - char typdelim; - Oid typelem; - Oid typiofunc; - FmgrInfo proc; -} ArrayMetaState; + Oid element_type; + int16 typlen; + bool typbyval; + char typalign; + char typdelim; + Oid typelem; + Oid typiofunc; + FmgrInfo proc; +} ArrayMetaState; /* * fmgr macros for array objects @@ -151,22 +152,22 @@ extern ArrayType *construct_array(Datum *elems, int nelems, Oid elmtype, int elmlen, bool elmbyval, char elmalign); extern ArrayType *construct_md_array(Datum *elems, - int ndims, - int *dims, - int *lbs, - Oid elmtype, int elmlen, bool elmbyval, char elmalign); + int ndims, + int *dims, + int *lbs, + Oid elmtype, int elmlen, bool elmbyval, char elmalign); extern void deconstruct_array(ArrayType *array, Oid elmtype, int elmlen, bool elmbyval, char elmalign, Datum **elemsp, int *nelemsp); -extern ArrayBuildState *accumArrayResult(ArrayBuildState *astate, - Datum dvalue, bool disnull, - Oid element_type, - MemoryContext rcontext); -extern Datum makeArrayResult(ArrayBuildState *astate, - MemoryContext rcontext); -extern Datum makeMdArrayResult(ArrayBuildState *astate, int ndims, - int *dims, int *lbs, MemoryContext rcontext); +extern ArrayBuildState *accumArrayResult(ArrayBuildState * astate, + Datum dvalue, bool disnull, + Oid element_type, + MemoryContext rcontext); +extern Datum makeArrayResult(ArrayBuildState * astate, + MemoryContext rcontext); +extern Datum makeMdArrayResult(ArrayBuildState * astate, int ndims, + int *dims, int *lbs, MemoryContext rcontext); /* * prototypes for functions defined in arrayutils.c @@ -187,8 +188,8 @@ extern Datum array_push(PG_FUNCTION_ARGS); extern Datum array_cat(PG_FUNCTION_ARGS); extern ArrayType *create_singleton_array(FunctionCallInfo fcinfo, - Oid element_type, - Datum element, - int ndims); + Oid element_type, + Datum element, + int ndims); #endif /* ARRAY_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index f2164590a36..b5e755882a0 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.224 2003/07/30 22:56:24 tgl Exp $ + * $Id: builtins.h,v 1.225 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -408,7 +408,7 @@ extern Datum texticregexne(PG_FUNCTION_ARGS); extern Datum textregexsubstr(PG_FUNCTION_ARGS); extern Datum similar_escape(PG_FUNCTION_ARGS); extern const char *assign_regex_flavor(const char *value, - bool doit, bool interactive); + bool doit, bool interactive); /* regproc.c */ extern Datum regprocin(PG_FUNCTION_ARGS); diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 6fe4723bbee..109a86b0a91 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.41 2003/07/17 22:28:42 tgl Exp $ + * $Id: datetime.h,v 1.42 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -268,8 +268,8 @@ extern int day_tab[2][13]; || (((m) == UTIME_MAXMONTH) && ((d) <= UTIME_MAXDAY)))))) /* Julian-date equivalents of Day 0 in Unix and Postgres reckoning */ -#define UNIX_EPOCH_JDATE 2440588 /* == date2j(1970, 1, 1) */ -#define POSTGRES_EPOCH_JDATE 2451545 /* == date2j(2000, 1, 1) */ +#define UNIX_EPOCH_JDATE 2440588 /* == date2j(1970, 1, 1) */ +#define POSTGRES_EPOCH_JDATE 2451545 /* == date2j(2000, 1, 1) */ extern void GetCurrentDateTime(struct tm * tm); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 5c5a66a7617..faa4783d4eb 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.60 2003/07/27 18:37:52 tgl Exp $ + * $Id: elog.h,v 1.61 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,12 +45,12 @@ #define FATAL 21 /* fatal error - abort process */ #define PANIC 22 /* take down the other backends with me */ - /*#define DEBUG DEBUG1*/ /* Backward compatibility with pre-7.3 */ + /* #define DEBUG DEBUG1 */ /* Backward compatibility with pre-7.3 */ /* macros for representing SQLSTATE strings compactly */ #define PGSIXBIT(ch) (((ch) - '0') & 0x3F) -#define PGUNSIXBIT(val) (((val) & 0x3F) + '0') +#define PGUNSIXBIT(val) (((val) & 0x3F) + '0') #define MAKE_SQLSTATE(ch1,ch2,ch3,ch4,ch5) \ (PGSIXBIT(ch1) + (PGSIXBIT(ch2) << 6) + (PGSIXBIT(ch3) << 12) + \ @@ -80,7 +80,7 @@ * ... other errxxx() fields as needed ...)); * * The error level is required, and so is a primary error message (errmsg - * or errmsg_internal). All else is optional. errcode() defaults to + * or errmsg_internal). All else is optional. errcode() defaults to * ERRCODE_INTERNAL_ERROR if elevel is ERROR or more, ERRCODE_WARNING * if elevel is WARNING, or ERRCODE_SUCCESSFUL_COMPLETION if elevel is * NOTICE or below. @@ -91,41 +91,46 @@ (errfinish rest) : (void) 0) extern bool errstart(int elevel, const char *filename, int lineno, - const char *funcname); -extern void errfinish(int dummy, ...); + const char *funcname); +extern void errfinish(int dummy,...); -extern int errcode(int sqlerrcode); +extern int errcode(int sqlerrcode); -extern int errcode_for_file_access(void); -extern int errcode_for_socket_access(void); +extern int errcode_for_file_access(void); +extern int errcode_for_socket_access(void); -extern int errmsg(const char *fmt, ...) +extern int +errmsg(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errmsg_internal(const char *fmt, ...) +extern int +errmsg_internal(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errdetail(const char *fmt, ...) +extern int +errdetail(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errhint(const char *fmt, ...) +extern int +errhint(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errcontext(const char *fmt, ...) +extern int +errcontext(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errfunction(const char *funcname); -extern int errposition(int cursorpos); +extern int errfunction(const char *funcname); +extern int errposition(int cursorpos); /*---------- @@ -133,10 +138,10 @@ extern int errposition(int cursorpos); * elog(ERROR, "portal \"%s\" not found", stmt->portalname); *---------- */ -#define elog errstart(ERROR, __FILE__, __LINE__, PG_FUNCNAME_MACRO), elog_finish +#define elog errstart(ERROR, __FILE__, __LINE__, PG_FUNCNAME_MACRO), elog_finish extern void -elog_finish(int elevel, const char *fmt, ...) +elog_finish(int elevel, const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 2, 3))); @@ -147,9 +152,9 @@ __attribute__((format(printf, 2, 3))); typedef struct ErrorContextCallback { struct ErrorContextCallback *previous; - void (*callback) (void *arg); - void *arg; -} ErrorContextCallback; + void (*callback) (void *arg); + void *arg; +} ErrorContextCallback; extern DLLIMPORT ErrorContextCallback *error_context_stack; @@ -161,11 +166,12 @@ typedef enum PGERROR_TERSE, /* single-line error messages */ PGERROR_DEFAULT, /* recommended style */ PGERROR_VERBOSE /* all the facts, ma'am */ -} PGErrorVerbosity; +} PGErrorVerbosity; extern PGErrorVerbosity Log_error_verbosity; extern bool Log_timestamp; extern bool Log_pid; + #ifdef HAVE_SYSLOG extern int Use_syslog; #endif diff --git a/src/include/utils/errcodes.h b/src/include/utils/errcodes.h index f076c7327bc..8db8e52320c 100644 --- a/src/include/utils/errcodes.h +++ b/src/include/utils/errcodes.h @@ -5,13 +5,13 @@ * * The error code list is kept in its own source file for possible use by * automatic tools. Each error code is identified by a five-character string - * following the SQLSTATE conventions. The exact representation of the + * following the SQLSTATE conventions. The exact representation of the * string is determined by the MAKE_SQLSTATE() macro, which is not defined * in this file; it can be defined by the caller for special purposes. * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $Id: errcodes.h,v 1.3 2003/07/31 21:34:18 tgl Exp $ + * $Id: errcodes.h,v 1.4 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,9 +91,9 @@ #define ERRCODE_ARRAY_ELEMENT_ERROR MAKE_SQLSTATE('2','2', '0','2','E') /* SQL99's actual definition of "array element error" is subscript error */ #define ERRCODE_ARRAY_SUBSCRIPT_ERROR ERRCODE_ARRAY_ELEMENT_ERROR -#define ERRCODE_CHARACTER_NOT_IN_REPERTOIRE MAKE_SQLSTATE('2','2', '0','2','1') +#define ERRCODE_CHARACTER_NOT_IN_REPERTOIRE MAKE_SQLSTATE('2','2', '0','2','1') #define ERRCODE_DATETIME_FIELD_OVERFLOW MAKE_SQLSTATE('2','2', '0','0','8') -#define ERRCODE_DATETIME_VALUE_OUT_OF_RANGE ERRCODE_DATETIME_FIELD_OVERFLOW +#define ERRCODE_DATETIME_VALUE_OUT_OF_RANGE ERRCODE_DATETIME_FIELD_OVERFLOW #define ERRCODE_DIVISION_BY_ZERO MAKE_SQLSTATE('2','2', '0','1','2') #define ERRCODE_ERROR_IN_ASSIGNMENT MAKE_SQLSTATE('2','2', '0','0','5') #define ERRCODE_ESCAPE_CHARACTER_CONFLICT MAKE_SQLSTATE('2','2', '0','0','B') @@ -110,18 +110,18 @@ #define ERRCODE_INVALID_REGULAR_EXPRESSION MAKE_SQLSTATE('2','2', '0','1','B') #define ERRCODE_INVALID_TIME_ZONE_DISPLACEMENT_VALUE MAKE_SQLSTATE('2','2', '0','0','9') #define ERRCODE_INVALID_USE_OF_ESCAPE_CHARACTER MAKE_SQLSTATE('2','2', '0','0','C') -#define ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH MAKE_SQLSTATE('2','2', '0','0','G') +#define ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH MAKE_SQLSTATE('2','2', '0','0','G') #define ERRCODE_NULL_VALUE_NOT_ALLOWED MAKE_SQLSTATE('2','2', '0','0','4') #define ERRCODE_NULL_VALUE_NO_INDICATOR_PARAMETER MAKE_SQLSTATE('2','2', '0','0','2') #define ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE MAKE_SQLSTATE('2','2', '0','0','3') -#define ERRCODE_STRING_DATA_LENGTH_MISMATCH MAKE_SQLSTATE('2','2', '0','2','6') +#define ERRCODE_STRING_DATA_LENGTH_MISMATCH MAKE_SQLSTATE('2','2', '0','2','6') #define ERRCODE_STRING_DATA_RIGHT_TRUNCATION MAKE_SQLSTATE('2','2', '0','0','1') #define ERRCODE_SUBSTRING_ERROR MAKE_SQLSTATE('2','2', '0','1','1') #define ERRCODE_TRIM_ERROR MAKE_SQLSTATE('2','2', '0','2','7') #define ERRCODE_UNTERMINATED_C_STRING MAKE_SQLSTATE('2','2', '0','2','4') #define ERRCODE_ZERO_LENGTH_CHARACTER_STRING MAKE_SQLSTATE('2','2', '0','0','F') #define ERRCODE_FLOATING_POINT_EXCEPTION MAKE_SQLSTATE('2','2', 'P','0','1') -#define ERRCODE_INVALID_TEXT_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','2') +#define ERRCODE_INVALID_TEXT_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','2') #define ERRCODE_INVALID_BINARY_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','3') #define ERRCODE_BAD_COPY_FILE_FORMAT MAKE_SQLSTATE('2','2', 'P','0','4') #define ERRCODE_UNTRANSLATABLE_CHARACTER MAKE_SQLSTATE('2','2', 'P','0','5') @@ -158,7 +158,7 @@ #define ERRCODE_TRIGGERED_DATA_CHANGE_VIOLATION MAKE_SQLSTATE('2','7', '0','0','0') /* Class 28 - Invalid Authorization Specification */ -#define ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION MAKE_SQLSTATE('2','8', '0','0','0') +#define ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION MAKE_SQLSTATE('2','8', '0','0','0') /* Class 2B - Dependent Privilege Descriptors Still Exist */ #define ERRCODE_DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST MAKE_SQLSTATE('2','B', '0','0','0') @@ -169,7 +169,7 @@ /* Class 2F - SQL Routine Exception */ #define ERRCODE_SQL_ROUTINE_EXCEPTION MAKE_SQLSTATE('2','F', '0','0','0') -#define ERRCODE_S_R_E_FUNCTION_EXECUTED_NO_RETURN_STATEMENT MAKE_SQLSTATE('2','F', '0','0','5') +#define ERRCODE_S_R_E_FUNCTION_EXECUTED_NO_RETURN_STATEMENT MAKE_SQLSTATE('2','F', '0','0','5') #define ERRCODE_S_R_E_MODIFYING_SQL_DATA_NOT_PERMITTED MAKE_SQLSTATE('2','F', '0','0','2') #define ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED MAKE_SQLSTATE('2','F', '0','0','3') #define ERRCODE_S_R_E_READING_SQL_DATA_NOT_PERMITTED MAKE_SQLSTATE('2','F', '0','0','4') @@ -255,15 +255,15 @@ #define ERRCODE_INVALID_COLUMN_REFERENCE MAKE_SQLSTATE('4','2', 'P','1','0') #define ERRCODE_INVALID_COLUMN_DEFINITION MAKE_SQLSTATE('4','2', '6','1','1') #define ERRCODE_INVALID_CURSOR_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','1') -#define ERRCODE_INVALID_DATABASE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','2') -#define ERRCODE_INVALID_FUNCTION_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','3') +#define ERRCODE_INVALID_DATABASE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','2') +#define ERRCODE_INVALID_FUNCTION_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','3') #define ERRCODE_INVALID_PSTATEMENT_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','4') #define ERRCODE_INVALID_SCHEMA_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','5') #define ERRCODE_INVALID_TABLE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','6') #define ERRCODE_INVALID_OBJECT_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','7') /* Class 44 - WITH CHECK OPTION Violation */ -#define ERRCODE_WITH_CHECK_OPTION_VIOLATION MAKE_SQLSTATE('4','4', '0','0','0') +#define ERRCODE_WITH_CHECK_OPTION_VIOLATION MAKE_SQLSTATE('4','4', '0','0','0') /* Class 53 - Insufficient Resources (PostgreSQL-specific error class) */ #define ERRCODE_INSUFFICIENT_RESOURCES MAKE_SQLSTATE('5','3', '0','0','0') diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 979b5171e80..6b5816ddc86 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright 2000-2003 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $Id: guc.h,v 1.38 2003/07/28 19:31:32 tgl Exp $ + * $Id: guc.h,v 1.39 2003/08/04 00:43:32 momjian Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -40,7 +40,7 @@ * configuration file, or by client request in the connection startup * packet (e.g., from libpq's PGOPTIONS variable). Furthermore, an * already-started backend will ignore changes to such an option in the - * configuration file. The idea is that these options are fixed for a + * configuration file. The idea is that these options are fixed for a * given backend once it's started, but they can vary across backends. * * SUSET options can be set at postmaster startup, with the SIGHUP @@ -146,8 +146,8 @@ extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *va extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name); #ifdef EXEC_BACKEND -void write_nondefault_variables(GucContext context); -void read_nondefault_variables(void); +void write_nondefault_variables(GucContext context); +void read_nondefault_variables(void); #endif #endif /* GUC_H */ diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index b1abc0b1074..742b3b2ff64 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * - * $Id: guc_tables.h,v 1.4 2003/07/28 19:31:32 tgl Exp $ + * $Id: guc_tables.h,v 1.5 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,17 +68,17 @@ enum config_type * Generic fields applicable to all types of variables * * The short description should be less than 80 chars in length. Some - * applications may use the long description as well, and will append - * it to the short description. (separated by a newline or '. ') + * applications may use the long description as well, and will append + * it to the short description. (separated by a newline or '. ') */ struct config_generic { /* constant fields, must be set correctly in initial value: */ const char *name; /* name of variable - MUST BE FIRST */ GucContext context; /* context required to set the variable */ - enum config_group group; /* to help organize variables by function */ - const char *short_desc; /* short desc. of this variable's purpose */ - const char *long_desc; /* long desc. of this variable's purpose */ + enum config_group group; /* to help organize variables by function */ + const char *short_desc; /* short desc. of this variable's purpose */ + const char *long_desc; /* long desc. of this variable's purpose */ int flags; /* flag bits, see below */ /* variable fields, initialized at runtime: */ enum config_type vartype; /* type of variable (set only at startup) */ @@ -95,8 +95,8 @@ struct config_generic #define GUC_NO_SHOW_ALL 0x0004 /* exclude from SHOW ALL */ #define GUC_NO_RESET_ALL 0x0008 /* exclude from RESET ALL */ #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_NOT_IN_SAMPLE 0x0020 /* not in postgresql.conf.sample */ +#define GUC_DISALLOW_IN_FILE 0x0040 /* can't set in postgresql.conf */ /* bit values in status field */ #define GUC_HAVE_TENTATIVE 0x0001 /* tentative value is defined */ @@ -167,10 +167,10 @@ struct config_string }; /* constant tables corresponding to enums above and in guc.h */ -extern const char * const config_group_names[]; -extern const char * const config_type_names[]; -extern const char * const GucContext_Names[]; -extern const char * const GucSource_Names[]; +extern const char *const config_group_names[]; +extern const char *const config_type_names[]; +extern const char *const GucContext_Names[]; +extern const char *const GucSource_Names[]; /* the current set of variables */ extern struct config_generic **guc_variables; diff --git a/src/include/utils/help_config.h b/src/include/utils/help_config.h index 45645f0216b..cd2c6e02fc7 100644 --- a/src/include/utils/help_config.h +++ b/src/include/utils/help_config.h @@ -1,11 +1,11 @@ /*------------------------------------------------------------------------- * * help_config.h - * Interface to the --help-config option of main.c - * + * Interface to the --help-config option of main.c + * * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * - * $Id: help_config.h,v 1.1 2003/07/04 16:41:22 tgl Exp $ + * $Id: help_config.h,v 1.2 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index dd6df6d56da..9b375ed24cb 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: inet.h,v 1.14 2003/06/24 22:21:23 momjian Exp $ + * $Id: inet.h,v 1.15 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ typedef struct unsigned char family; unsigned char bits; unsigned char type; - unsigned char ip_addr[16]; /* 128 bits of address */ + unsigned char ip_addr[16]; /* 128 bits of address */ } inet_struct; /* diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 1f8bcb06d1e..129492a3253 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.76 2003/07/01 19:10:53 tgl Exp $ + * $Id: lsyscache.h,v 1.77 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ typedef enum IOFuncSelector IOFunc_output, IOFunc_receive, IOFunc_send -} IOFuncSelector; +} IOFuncSelector; extern bool op_in_opclass(Oid opno, Oid opclass); extern bool op_requires_recheck(Oid opno, Oid opclass); @@ -67,13 +67,13 @@ extern void get_typlenbyval(Oid typid, int16 *typlen, bool *typbyval); extern void get_typlenbyvalalign(Oid typid, int16 *typlen, bool *typbyval, char *typalign); extern void get_type_io_data(Oid typid, - IOFuncSelector which_func, - int16 *typlen, - bool *typbyval, - char *typalign, - char *typdelim, - Oid *typelem, - Oid *func); + IOFuncSelector which_func, + int16 *typlen, + bool *typbyval, + char *typalign, + char *typdelim, + Oid *typelem, + Oid *func); extern char get_typstorage(Oid typid); extern int32 get_typtypmod(Oid typid); extern Node *get_typdefault(Oid typid); @@ -87,7 +87,7 @@ extern void getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); extern void getTypeBinaryInputInfo(Oid type, Oid *typReceive, Oid *typElem); extern void getTypeBinaryOutputInfo(Oid type, Oid *typSend, Oid *typElem, - bool *typIsVarlena); + bool *typIsVarlena); extern Oid getBaseType(Oid typid); extern int32 get_typavgwidth(Oid typid, int32 typmod); extern int32 get_attavgwidth(Oid relid, AttrNumber attnum); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 6934d109623..6d04ddba5d5 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.51 2003/05/02 20:54:36 tgl Exp $ + * $Id: memutils.h,v 1.52 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,6 +70,7 @@ extern DLLIMPORT MemoryContext PostmasterContext; extern DLLIMPORT MemoryContext CacheMemoryContext; extern DLLIMPORT MemoryContext MessageContext; extern DLLIMPORT MemoryContext TopTransactionContext; + /* These two are transient links to contexts owned by other objects: */ extern DLLIMPORT MemoryContext QueryContext; extern DLLIMPORT MemoryContext PortalContext; @@ -127,8 +128,8 @@ extern MemoryContext AllocSetContextCreate(MemoryContext parent, * Recommended alloc parameters for "small" contexts that are not expected * to contain much data (for example, a context to contain a query plan). */ -#define ALLOCSET_SMALL_MINSIZE 0 +#define ALLOCSET_SMALL_MINSIZE 0 #define ALLOCSET_SMALL_INITSIZE (1 * 1024) -#define ALLOCSET_SMALL_MAXSIZE (8 * 1024) +#define ALLOCSET_SMALL_MAXSIZE (8 * 1024) #endif /* MEMUTILS_H */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 7dabc52f318..7ba40efda9d 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -21,7 +21,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.24 2002/12/16 16:22:46 tgl Exp $ + * $Id: palloc.h,v 1.25 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size); #define palloc(sz) MemoryContextAlloc(CurrentMemoryContext, (sz)) -#define palloc0(sz) MemoryContextAllocZero(CurrentMemoryContext, (sz)) +#define palloc0(sz) MemoryContextAllocZero(CurrentMemoryContext, (sz)) /* * The result of palloc() is always word-aligned, so we can skip testing @@ -61,7 +61,7 @@ extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size); * issue that it evaluates the argument multiple times isn't a problem in * practice. */ -#define palloc0fast(sz) \ +#define palloc0fast(sz) \ ( MemSetTest(0, sz) ? \ MemoryContextAllocZeroAligned(CurrentMemoryContext, sz) : \ MemoryContextAllocZero(CurrentMemoryContext, sz) ) diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 7da359cbe73..6c7664f04db 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -9,7 +9,7 @@ * * Scrolling (nonsequential access) and suspension of execution are allowed * only for portals that contain a single SELECT-type query. We do not want - * to let the client suspend an update-type query partway through! Because + * to let the client suspend an update-type query partway through! Because * the query rewriter does not allow arbitrary ON SELECT rewrite rules, * only queries that were originally update-type could produce multiple * parse/plan trees; so the restriction to a single query is not a problem @@ -18,13 +18,13 @@ * For SQL cursors, we support three kinds of scroll behavior: * * (1) Neither NO SCROLL nor SCROLL was specified: to remain backward - * compatible, we allow backward fetches here, unless it would - * impose additional runtime overhead to do so. + * compatible, we allow backward fetches here, unless it would + * impose additional runtime overhead to do so. * * (2) NO SCROLL was specified: don't allow any backward fetches. * * (3) SCROLL was specified: allow all kinds of backward fetches, even - * if we need to take a performance hit to do so. (The planner sticks + * if we need to take a performance hit to do so. (The planner sticks * a Materialize node atop the query plan if needed.) * * Case #1 is converted to #2 or #3 by looking at the query itself and @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.44 2003/05/08 18:16:37 tgl Exp $ + * $Id: portal.h,v 1.45 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,8 +58,8 @@ * single result from the user's viewpoint. However, the rule rewriter * may expand the single source query to zero or many actual queries.) * - * PORTAL_ONE_SELECT: the portal contains one single SELECT query. We run - * the Executor incrementally as results are demanded. This strategy also + * PORTAL_ONE_SELECT: the portal contains one single SELECT query. We run + * the Executor incrementally as results are demanded. This strategy also * supports holdable cursors (the Executor results can be dumped into a * tuplestore for access after transaction completion). * @@ -77,7 +77,7 @@ typedef enum PortalStrategy PORTAL_ONE_SELECT, PORTAL_UTIL_SELECT, PORTAL_MULTI_QUERY -} PortalStrategy; +} PortalStrategy; /* * Note: typedef Portal is declared in tcop/dest.h as @@ -89,7 +89,7 @@ typedef struct PortalData /* Bookkeeping data */ const char *name; /* portal's name */ MemoryContext heap; /* subsidiary memory for portal */ - void (*cleanup) (Portal portal, bool isError); /* cleanup hook */ + void (*cleanup) (Portal portal, bool isError); /* cleanup hook */ TransactionId createXact; /* the xid of the creating xact */ /* The query or queries the portal will execute */ @@ -97,15 +97,16 @@ typedef struct PortalData const char *commandTag; /* command tag for original query */ List *parseTrees; /* parse tree(s) */ List *planTrees; /* plan tree(s) */ - MemoryContext queryContext; /* where the above trees live */ + MemoryContext queryContext; /* where the above trees live */ + /* * Note: queryContext effectively identifies which prepared statement * the portal depends on, if any. The queryContext is *not* owned by - * the portal and is not to be deleted by portal destruction. (But for - * a cursor it is the same as "heap", and that context is deleted by - * portal destruction.) + * the portal and is not to be deleted by portal destruction. (But + * for a cursor it is the same as "heap", and that context is deleted + * by portal destruction.) */ - ParamListInfo portalParams; /* params to pass to query */ + ParamListInfo portalParams; /* params to pass to query */ /* Features/options */ PortalStrategy strategy; /* see above */ @@ -113,7 +114,7 @@ typedef struct PortalData /* Status data */ bool portalReady; /* PortalStart complete? */ - bool portalUtilReady; /* PortalRunUtility complete? */ + bool portalUtilReady; /* PortalRunUtility complete? */ bool portalActive; /* portal is running (can't delete it) */ bool portalDone; /* portal is finished (don't re-run it) */ @@ -126,21 +127,21 @@ typedef struct PortalData int16 *formats; /* a format code for each column */ /* - * Where we store tuples for a held cursor or a PORTAL_UTIL_SELECT query. - * (A cursor held past the end of its transaction no longer has any - * active executor state.) + * Where we store tuples for a held cursor or a PORTAL_UTIL_SELECT + * query. (A cursor held past the end of its transaction no longer has + * any active executor state.) */ - Tuplestorestate *holdStore; /* store for holdable cursors */ - MemoryContext holdContext; /* memory containing holdStore */ + Tuplestorestate *holdStore; /* store for holdable cursors */ + MemoryContext holdContext; /* memory containing holdStore */ /* * atStart, atEnd and portalPos indicate the current cursor position. - * portalPos is zero before the first row, N after fetching N'th row of - * query. After we run off the end, portalPos = # of rows in query, and - * atEnd is true. If portalPos overflows, set posOverflow (this causes - * us to stop relying on its value for navigation). Note that atStart - * implies portalPos == 0, but not the reverse (portalPos could have - * overflowed). + * portalPos is zero before the first row, N after fetching N'th row + * of query. After we run off the end, portalPos = # of rows in + * query, and atEnd is true. If portalPos overflows, set posOverflow + * (this causes us to stop relying on its value for navigation). Note + * that atStart implies portalPos == 0, but not the reverse (portalPos + * could have overflowed). */ bool atStart; bool atEnd; @@ -172,11 +173,11 @@ extern void PortalDrop(Portal portal, bool isError); extern void DropDependentPortals(MemoryContext queryContext); extern Portal GetPortalByName(const char *name); extern void PortalDefineQuery(Portal portal, - const char *sourceText, - const char *commandTag, - List *parseTrees, - List *planTrees, - MemoryContext queryContext); + const char *sourceText, + const char *commandTag, + List *parseTrees, + List *planTrees, + MemoryContext queryContext); extern void PortalCreateHoldStore(Portal portal); #endif /* PORTAL_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index fd5e0c56b76..29f1923b935 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.65 2003/05/28 16:04:02 tgl Exp $ + * $Id: rel.h,v 1.66 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -132,8 +132,8 @@ typedef struct RelationData /* These are non-NULL only for an index relation: */ Form_pg_index rd_index; /* pg_index tuple describing this index */ - struct HeapTupleData *rd_indextuple; /* all of pg_index tuple */ - /* "struct HeapTupleData *" avoids need to include htup.h here */ + struct HeapTupleData *rd_indextuple; /* all of pg_index tuple */ + /* "struct HeapTupleData *" avoids need to include htup.h here */ Form_pg_am rd_am; /* pg_am tuple for index's AM */ /* index access support info (used only for an index relation) */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index cea19f26930..3eec90c9423 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: selfuncs.h,v 1.13 2003/05/15 15:50:20 petere Exp $ + * $Id: selfuncs.h,v 1.14 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,16 +66,16 @@ extern Datum nlikejoinsel(PG_FUNCTION_ARGS); extern Datum icnlikejoinsel(PG_FUNCTION_ARGS); extern Selectivity booltestsel(Query *root, BoolTestType booltesttype, - Node *arg, int varRelid, JoinType jointype); + Node *arg, int varRelid, JoinType jointype); extern Selectivity nulltestsel(Query *root, NullTestType nulltesttype, - Node *arg, int varRelid); + Node *arg, int varRelid); extern void mergejoinscansel(Query *root, Node *clause, Selectivity *leftscan, Selectivity *rightscan); extern double estimate_num_groups(Query *root, List *groupExprs, - double input_rows); + double input_rows); extern Datum btcostestimate(PG_FUNCTION_ARGS); extern Datum rtcostestimate(PG_FUNCTION_ARGS); diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 6a021ba52fd..4732a47ca78 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -8,7 +8,7 @@ * a dumbed-down version of tuplesort.c; it does no sorting of tuples * but can only store and regurgitate a sequence of tuples. However, * because no sort is required, it is allowed to start reading the sequence - * before it has all been written. This is particularly useful for cursors, + * before it has all been written. This is particularly useful for cursors, * because it allows random access within the already-scanned portion of * a query without having to process the underlying scan to completion. * A temporary file is used to handle the data if it exceeds the @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplestore.h,v 1.11 2003/04/29 03:21:30 tgl Exp $ + * $Id: tuplestore.h,v 1.12 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,8 +37,8 @@ typedef struct Tuplestorestate Tuplestorestate; */ extern Tuplestorestate *tuplestore_begin_heap(bool randomAccess, - bool interXact, - int maxKBytes); + bool interXact, + int maxKBytes); extern void tuplestore_puttuple(Tuplestorestate *state, void *tuple); |