diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 16 | ||||
-rw-r--r-- | src/backend/utils/adt/datetime.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/oracle_compat.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/regexp.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/ruleutils.c | 14 | ||||
-rw-r--r-- | src/backend/utils/adt/selfuncs.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/timestamp.c | 7 | ||||
-rw-r--r-- | src/backend/utils/error/elog.c | 16 | ||||
-rw-r--r-- | src/backend/utils/misc/help_config.c | 16 |
9 files changed, 46 insertions, 45 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 53540e1fa4c..df8265d9995 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.96 2003/08/04 02:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.97 2003/08/08 21:42:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1194,7 +1194,7 @@ array_length_coerce(PG_FUNCTION_ARGS) { Oid elemtype; FmgrInfo coerce_finfo; - } alc_extra; + } alc_extra; alc_extra *my_extra; FunctionCallInfoData locfcinfo; @@ -2036,7 +2036,7 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType) { ArrayMetaState inp_extra; ArrayMetaState ret_extra; - } am_extra; + } am_extra; am_extra *my_extra; ArrayMetaState *inp_extra; ArrayMetaState *ret_extra; @@ -2531,7 +2531,7 @@ array_cmp(FunctionCallInfo fcinfo) char typalign; FmgrInfo eqproc; FmgrInfo ordproc; - } ac_extra; + } ac_extra; ac_extra *my_extra; element_type = ARR_ELEMTYPE(array1); @@ -2896,7 +2896,7 @@ array_type_coerce(PG_FUNCTION_ARGS) Oid srctype; Oid desttype; FmgrInfo coerce_finfo; - } atc_extra; + } atc_extra; atc_extra *my_extra; FunctionCallInfoData locfcinfo; @@ -2989,7 +2989,7 @@ array_type_coerce(PG_FUNCTION_ARGS) * rcontext is where to keep working state */ ArrayBuildState * -accumArrayResult(ArrayBuildState * astate, +accumArrayResult(ArrayBuildState *astate, Datum dvalue, bool disnull, Oid element_type, MemoryContext rcontext) @@ -3051,7 +3051,7 @@ accumArrayResult(ArrayBuildState * astate, * rcontext is where to construct result */ Datum -makeArrayResult(ArrayBuildState * astate, +makeArrayResult(ArrayBuildState *astate, MemoryContext rcontext) { int dims[1]; @@ -3073,7 +3073,7 @@ makeArrayResult(ArrayBuildState * astate, * rcontext is where to construct result */ Datum -makeMdArrayResult(ArrayBuildState * astate, +makeMdArrayResult(ArrayBuildState *astate, int ndims, int *dims, int *lbs, diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index c94f9bf6f97..f6bfafa3cef 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.112 2003/08/05 18:30:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.113 2003/08/08 21:42:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -711,7 +711,7 @@ TrimTrailingZeros(char *str) * *numfields - set to the actual number of fields detected * * The fields extracted from the input are stored as separate, null-terminated - * strings in the workspace at lowstr. Any text is converted to lower case. + * strings in the workspace at lowstr. Any text is converted to lower case. * * Several field types are assigned: * DTK_NUMBER - digits and (possibly) a decimal point @@ -769,7 +769,7 @@ ParseDateTime(const char *timestr, char *lowstr, else if ((*cp == '-') || (*cp == '/') || (*cp == '.')) { /* save delimiting character to use later */ - char delim = *cp; + char delim = *cp; *lp++ = *cp++; /* second field is all digits? then no embedded text month */ @@ -833,7 +833,7 @@ ParseDateTime(const char *timestr, char *lowstr, */ if ((*cp == '-') || (*cp == '/') || (*cp == '.')) { - char delim = *cp; + char delim = *cp; ftype[nf] = DTK_DATE; *lp++ = *cp++; @@ -2415,7 +2415,7 @@ DecodeNumber(int flen, char *str, int fmask, if (*cp == '.') { - double frac; + double frac; /* * More than two digits before decimal point? Then could be a date diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 4e0c14be164..cd9ad553c3d 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.47 2003/08/04 00:43:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.48 2003/08/08 21:42:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -872,7 +872,7 @@ ascii(PG_FUNCTION_ARGS) ********************************************************************/ Datum -chr(PG_FUNCTION_ARGS) +chr (PG_FUNCTION_ARGS) { int32 cvalue = PG_GETARG_INT32(0); text *result; diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 4951c5e4606..66976b9d83e 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.48 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.49 2003/08/08 21:42:07 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -73,7 +73,7 @@ typedef struct cached_re_str text *cre_pat; /* original RE (untoasted TEXT form) */ int cre_flags; /* compile flags: extended,icase etc */ regex_t cre_re; /* the compiled regular expression */ -} cached_re_str; +} cached_re_str; static int num_res = 0; /* # of cached re's */ static cached_re_str re_array[MAX_CACHED_RES]; /* cached re's */ diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index dc0807fc132..49cc73f24e4 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * back to source text * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.149 2003/08/04 00:43:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.150 2003/08/08 21:42:09 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -181,15 +181,15 @@ static void get_names_for_var(Var *var, deparse_context *context, char **schemaname, char **refname, char **attname); static RangeTblEntry *find_rte_by_refname(const char *refname, deparse_context *context); -static const char *get_simple_binary_op_name(OpExpr * expr); +static const char *get_simple_binary_op_name(OpExpr *expr); static bool isSimpleNode(Node *node, Node *parentNode, int prettyFlags); static void appendStringInfoSpaces(StringInfo buf, int count); static void appendContextKeyword(deparse_context *context, const char *str, int indentBefore, int indentAfter, int indentPlus); static void get_rule_expr(Node *node, deparse_context *context, bool showimplicit); -static void get_oper_expr(OpExpr * expr, deparse_context *context); -static void get_func_expr(FuncExpr * expr, deparse_context *context, +static void get_oper_expr(OpExpr *expr, deparse_context *context); +static void get_func_expr(FuncExpr *expr, deparse_context *context, bool showimplicit); static void get_agg_expr(Aggref *aggref, deparse_context *context); static Node *strip_type_coercion(Node *expr, Oid resultType); @@ -2439,7 +2439,7 @@ find_rte_by_refname(const char *refname, deparse_context *context) * will return single char binary operator name, or NULL if it's not */ static const char * -get_simple_binary_op_name(OpExpr * expr) +get_simple_binary_op_name(OpExpr *expr) { List *args = expr->args; @@ -3235,7 +3235,7 @@ get_rule_expr(Node *node, deparse_context *context, * get_oper_expr - Parse back an OpExpr node */ static void -get_oper_expr(OpExpr * expr, deparse_context *context) +get_oper_expr(OpExpr *expr, deparse_context *context) { StringInfo buf = context->buf; Oid opno = expr->opno; @@ -3298,7 +3298,7 @@ get_oper_expr(OpExpr * expr, deparse_context *context) * get_func_expr - Parse back a FuncExpr node */ static void -get_func_expr(FuncExpr * expr, deparse_context *context, +get_func_expr(FuncExpr *expr, deparse_context *context, bool showimplicit) { StringInfo buf = context->buf; diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 3baa12cc855..67996f23257 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.144 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.145 2003/08/08 21:42:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2030,7 +2030,7 @@ estimate_num_groups(Query *root, List *groupExprs, double input_rows) { /* varinfos is a List of these */ Var *var; double ndistinct; - } MyVarInfo; + } MyVarInfo; /* We should not be called unless query has GROUP BY (or DISTINCT) */ Assert(groupExprs != NIL); diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index b8a5e3fcb19..e76ec646690 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.91 2003/08/08 00:10:31 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.92 2003/08/08 21:42:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1307,11 +1307,12 @@ timestamp_cmp_internal(Timestamp dt1, Timestamp dt2) #ifdef HAVE_INT64_TIMESTAMP return ((dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0)); #else + /* * When using float representation, we have to be wary of NaNs. * - * We consider all NANs to be equal and larger than any non-NAN. This - * is somewhat arbitrary; the important thing is to have a consistent + * We consider all NANs to be equal and larger than any non-NAN. This is + * somewhat arbitrary; the important thing is to have a consistent * sort order. */ if (isnan(dt1)) diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index ccbb74bb4ad..0a4d85436d1 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.118 2003/08/04 02:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.119 2003/08/08 21:42:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,7 +115,7 @@ typedef struct ErrorData char *context; /* context message */ int cursorpos; /* cursor index into query string */ int saved_errno; /* errno at entry */ -} ErrorData; +} ErrorData; /* We provide a small stack of ErrorData records for re-entrant cases */ #define ERRORDATA_STACK_SIZE 5 @@ -138,9 +138,9 @@ static int recursion_depth = 0; /* to detect actual recursion */ } while (0) -static void send_message_to_server_log(ErrorData * edata); -static void send_message_to_frontend(ErrorData * edata); -static char *expand_fmt_string(const char *fmt, ErrorData * edata); +static void send_message_to_server_log(ErrorData *edata); +static void send_message_to_frontend(ErrorData *edata); +static char *expand_fmt_string(const char *fmt, ErrorData *edata); static const char *useful_strerror(int errnum); static const char *error_severity(int elevel); static const char *print_timestamp(void); @@ -1024,7 +1024,7 @@ write_syslog(int level, const char *line) * Write error report to server's log */ static void -send_message_to_server_log(ErrorData * edata) +send_message_to_server_log(ErrorData *edata) { StringInfoData buf; @@ -1151,7 +1151,7 @@ send_message_to_server_log(ErrorData * edata) * Write error report to client */ static void -send_message_to_frontend(ErrorData * edata) +send_message_to_frontend(ErrorData *edata) { StringInfoData msgbuf; @@ -1289,7 +1289,7 @@ send_message_to_frontend(ErrorData * edata) * The result is a palloc'd string. */ static char * -expand_fmt_string(const char *fmt, ErrorData * edata) +expand_fmt_string(const char *fmt, ErrorData *edata) { StringInfoData buf; const char *cp; diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c index ed117bef18d..b056a71a3b2 100644 --- a/src/backend/utils/misc/help_config.c +++ b/src/backend/utils/misc/help_config.c @@ -25,7 +25,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/help_config.c,v 1.4 2003/08/04 00:43:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/help_config.c,v 1.5 2003/08/08 21:42:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -117,11 +117,11 @@ typedef union struct config_real real; struct config_int integer; struct config_string string; -} mixedStruct; +} mixedStruct; /* function prototypes */ -static bool varMatches(mixedStruct * structToTest); +static bool varMatches(mixedStruct *structToTest); static int compareMixedStructs(const void *, const void *); static mixedStruct **varsToDisplay(int *resultListSize); static const char *usageErrMsg(void); @@ -129,8 +129,8 @@ static void helpMessage(void); static void listAllGroups(void); static void printGenericHead(struct config_generic structToPrint); static void printGenericFoot(struct config_generic structToPrint); -static void printMixedStruct(mixedStruct * structToPrint); -static bool displayStruct(mixedStruct * structToDisplay); +static void printMixedStruct(mixedStruct *structToPrint); +static bool displayStruct(mixedStruct *structToDisplay); /* @@ -275,7 +275,7 @@ varsToDisplay(int *resultListSize) * + It's flag bits are set to GUC_DISALLOW_IN_FILE */ static bool -displayStruct(mixedStruct * structToDisplay) +displayStruct(mixedStruct *structToDisplay) { if (structToDisplay->generic.flags & (GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | @@ -292,7 +292,7 @@ displayStruct(mixedStruct * structToDisplay) * be returned to the user. */ static bool -varMatches(mixedStruct * structToTest) +varMatches(mixedStruct *structToTest) { bool matches = false; bool specificSearch = false; /* This is true if the user @@ -347,7 +347,7 @@ varMatches(mixedStruct * structToTest) * a different format, depending on what the user wants to see. */ static void -printMixedStruct(mixedStruct * structToPrint) +printMixedStruct(mixedStruct *structToPrint) { printGenericHead(structToPrint->generic); |