mirror of
https://github.com/postgres/postgres.git
synced 2025-11-12 05:01:15 +03:00
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/* -----------------------------------------------------------------------
|
||||
* ascii.c
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.10 2001/10/25 05:49:43 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.11 2001/10/28 06:25:51 momjian Exp $
|
||||
*
|
||||
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
|
||||
*
|
||||
@@ -190,4 +190,5 @@ to_ascii_default(PG_FUNCTION_ARGS)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
#endif /* MULTIBYTE */
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.75 2001/10/25 05:49:43 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.76 2001/10/28 06:25:51 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -251,7 +251,7 @@ static datetkn deltatktbl[] = {
|
||||
{DDAY, UNITS, DTK_DAY}, /* "day" relative */
|
||||
{"days", UNITS, DTK_DAY}, /* "days" relative */
|
||||
{"dec", UNITS, DTK_DECADE}, /* "decade" relative */
|
||||
{"decs", UNITS, DTK_DECADE},/* "decades" relative */
|
||||
{"decs", UNITS, DTK_DECADE}, /* "decades" relative */
|
||||
{DDECADE, UNITS, DTK_DECADE}, /* "decade" relative */
|
||||
{"decades", UNITS, DTK_DECADE}, /* "decades" relative */
|
||||
{"h", UNITS, DTK_HOUR}, /* "hour" relative */
|
||||
@@ -268,8 +268,8 @@ static datetkn deltatktbl[] = {
|
||||
{"millisecon", UNITS, DTK_MILLISEC}, /* relative */
|
||||
{"mils", UNITS, DTK_MILLENNIUM}, /* "millennia" relative */
|
||||
{"min", UNITS, DTK_MINUTE}, /* "minute" relative */
|
||||
{"mins", UNITS, DTK_MINUTE},/* "minutes" relative */
|
||||
{"mins", UNITS, DTK_MINUTE},/* "minutes" relative */
|
||||
{"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */
|
||||
{"mins", UNITS, DTK_MINUTE}, /* "minutes" relative */
|
||||
{DMINUTE, UNITS, DTK_MINUTE}, /* "minute" relative */
|
||||
{"minutes", UNITS, DTK_MINUTE}, /* "minutes" relative */
|
||||
{"mon", UNITS, DTK_MONTH}, /* "months" relative */
|
||||
@@ -281,7 +281,7 @@ static datetkn deltatktbl[] = {
|
||||
{DMILLISEC, UNITS, DTK_MILLISEC},
|
||||
{"mseconds", UNITS, DTK_MILLISEC},
|
||||
{"msecs", UNITS, DTK_MILLISEC},
|
||||
{"qtr", UNITS, DTK_QUARTER},/* "quarter" relative */
|
||||
{"qtr", UNITS, DTK_QUARTER}, /* "quarter" relative */
|
||||
{DQUARTER, UNITS, DTK_QUARTER}, /* "quarter" relative */
|
||||
{"reltime", IGNORE, 0}, /* pre-v6.1 "Undefined Reltime" */
|
||||
{"s", UNITS, DTK_SECOND},
|
||||
@@ -290,11 +290,11 @@ static datetkn deltatktbl[] = {
|
||||
{"seconds", UNITS, DTK_SECOND},
|
||||
{"secs", UNITS, DTK_SECOND},
|
||||
{DTIMEZONE, UNITS, DTK_TZ}, /* "timezone" time offset */
|
||||
{"timezone", UNITS, DTK_TZ},/* "timezone" time offset */
|
||||
{"timezone", UNITS, DTK_TZ}, /* "timezone" time offset */
|
||||
{"timezone_h", UNITS, DTK_TZ_HOUR}, /* timezone hour units */
|
||||
{"timezone_m", UNITS, DTK_TZ_MINUTE}, /* timezone minutes units */
|
||||
{"undefined", RESERV, DTK_INVALID}, /* pre-v6.1 invalid time */
|
||||
{"us", UNITS, DTK_MICROSEC},/* "microsecond" relative */
|
||||
{"us", UNITS, DTK_MICROSEC}, /* "microsecond" relative */
|
||||
{"usec", UNITS, DTK_MICROSEC}, /* "microsecond" relative */
|
||||
{DMICROSEC, UNITS, DTK_MICROSEC}, /* "microsecond" relative */
|
||||
{"useconds", UNITS, DTK_MICROSEC}, /* "microseconds" relative */
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.4 2001/10/25 05:49:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.5 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -495,7 +495,7 @@ static struct
|
||||
{
|
||||
const char *name;
|
||||
struct pg_encoding enc;
|
||||
} enclist[] =
|
||||
} enclist[] =
|
||||
|
||||
{
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.75 2001/10/25 05:49:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.76 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -1897,7 +1897,7 @@ float84ge(PG_FUNCTION_ARGS)
|
||||
static const double one = 1.0,
|
||||
TWO52[2] = {
|
||||
4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
|
||||
-4.50359962737049600000e+15,/* 0xC3300000, 0x00000000 */
|
||||
-4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
|
||||
};
|
||||
|
||||
static double
|
||||
@@ -1981,4 +1981,5 @@ cbrt(double x)
|
||||
|
||||
return isneg ? -tmpres : tmpres;
|
||||
}
|
||||
|
||||
#endif /* !HAVE_CBRT */
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* -----------------------------------------------------------------------
|
||||
* formatting.c
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.42 2001/10/25 05:49:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.43 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
|
||||
@@ -521,132 +521,132 @@ static KeySuffix DCH_suff[] = {
|
||||
|
||||
typedef enum
|
||||
{
|
||||
DCH_A_D,
|
||||
DCH_A_M,
|
||||
DCH_AD,
|
||||
DCH_AM,
|
||||
DCH_B_C,
|
||||
DCH_BC,
|
||||
DCH_CC,
|
||||
DCH_DAY,
|
||||
DCH_DDD,
|
||||
DCH_DD,
|
||||
DCH_DY,
|
||||
DCH_Day,
|
||||
DCH_Dy,
|
||||
DCH_D,
|
||||
DCH_FX, /* global suffix */
|
||||
DCH_HH24,
|
||||
DCH_HH12,
|
||||
DCH_HH,
|
||||
DCH_IW,
|
||||
DCH_J,
|
||||
DCH_MI,
|
||||
DCH_MM,
|
||||
DCH_MONTH,
|
||||
DCH_MON,
|
||||
DCH_MS,
|
||||
DCH_Month,
|
||||
DCH_Mon,
|
||||
DCH_P_M,
|
||||
DCH_PM,
|
||||
DCH_Q,
|
||||
DCH_RM,
|
||||
DCH_SSSS,
|
||||
DCH_SS,
|
||||
DCH_TZ,
|
||||
DCH_US,
|
||||
DCH_WW,
|
||||
DCH_W,
|
||||
DCH_Y_YYY,
|
||||
DCH_YYYY,
|
||||
DCH_YYY,
|
||||
DCH_YY,
|
||||
DCH_Y,
|
||||
DCH_a_d,
|
||||
DCH_a_m,
|
||||
DCH_ad,
|
||||
DCH_am,
|
||||
DCH_b_c,
|
||||
DCH_bc,
|
||||
DCH_cc,
|
||||
DCH_day,
|
||||
DCH_ddd,
|
||||
DCH_dd,
|
||||
DCH_dy,
|
||||
DCH_d,
|
||||
DCH_fx,
|
||||
DCH_hh24,
|
||||
DCH_hh12,
|
||||
DCH_hh,
|
||||
DCH_iw,
|
||||
DCH_j,
|
||||
DCH_mi,
|
||||
DCH_mm,
|
||||
DCH_month,
|
||||
DCH_mon,
|
||||
DCH_ms,
|
||||
DCH_p_m,
|
||||
DCH_pm,
|
||||
DCH_q,
|
||||
DCH_rm,
|
||||
DCH_ssss,
|
||||
DCH_ss,
|
||||
DCH_tz,
|
||||
DCH_us,
|
||||
DCH_ww,
|
||||
DCH_w,
|
||||
DCH_y_yyy,
|
||||
DCH_yyyy,
|
||||
DCH_yyy,
|
||||
DCH_yy,
|
||||
DCH_y,
|
||||
DCH_A_D,
|
||||
DCH_A_M,
|
||||
DCH_AD,
|
||||
DCH_AM,
|
||||
DCH_B_C,
|
||||
DCH_BC,
|
||||
DCH_CC,
|
||||
DCH_DAY,
|
||||
DCH_DDD,
|
||||
DCH_DD,
|
||||
DCH_DY,
|
||||
DCH_Day,
|
||||
DCH_Dy,
|
||||
DCH_D,
|
||||
DCH_FX, /* global suffix */
|
||||
DCH_HH24,
|
||||
DCH_HH12,
|
||||
DCH_HH,
|
||||
DCH_IW,
|
||||
DCH_J,
|
||||
DCH_MI,
|
||||
DCH_MM,
|
||||
DCH_MONTH,
|
||||
DCH_MON,
|
||||
DCH_MS,
|
||||
DCH_Month,
|
||||
DCH_Mon,
|
||||
DCH_P_M,
|
||||
DCH_PM,
|
||||
DCH_Q,
|
||||
DCH_RM,
|
||||
DCH_SSSS,
|
||||
DCH_SS,
|
||||
DCH_TZ,
|
||||
DCH_US,
|
||||
DCH_WW,
|
||||
DCH_W,
|
||||
DCH_Y_YYY,
|
||||
DCH_YYYY,
|
||||
DCH_YYY,
|
||||
DCH_YY,
|
||||
DCH_Y,
|
||||
DCH_a_d,
|
||||
DCH_a_m,
|
||||
DCH_ad,
|
||||
DCH_am,
|
||||
DCH_b_c,
|
||||
DCH_bc,
|
||||
DCH_cc,
|
||||
DCH_day,
|
||||
DCH_ddd,
|
||||
DCH_dd,
|
||||
DCH_dy,
|
||||
DCH_d,
|
||||
DCH_fx,
|
||||
DCH_hh24,
|
||||
DCH_hh12,
|
||||
DCH_hh,
|
||||
DCH_iw,
|
||||
DCH_j,
|
||||
DCH_mi,
|
||||
DCH_mm,
|
||||
DCH_month,
|
||||
DCH_mon,
|
||||
DCH_ms,
|
||||
DCH_p_m,
|
||||
DCH_pm,
|
||||
DCH_q,
|
||||
DCH_rm,
|
||||
DCH_ssss,
|
||||
DCH_ss,
|
||||
DCH_tz,
|
||||
DCH_us,
|
||||
DCH_ww,
|
||||
DCH_w,
|
||||
DCH_y_yyy,
|
||||
DCH_yyyy,
|
||||
DCH_yyy,
|
||||
DCH_yy,
|
||||
DCH_y,
|
||||
|
||||
/* last */
|
||||
_DCH_last_
|
||||
_DCH_last_
|
||||
} DCH_poz;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
NUM_COMMA,
|
||||
NUM_DEC,
|
||||
NUM_0,
|
||||
NUM_9,
|
||||
NUM_B,
|
||||
NUM_C,
|
||||
NUM_D,
|
||||
NUM_E,
|
||||
NUM_FM,
|
||||
NUM_G,
|
||||
NUM_L,
|
||||
NUM_MI,
|
||||
NUM_PL,
|
||||
NUM_PR,
|
||||
NUM_RN,
|
||||
NUM_SG,
|
||||
NUM_SP,
|
||||
NUM_S,
|
||||
NUM_TH,
|
||||
NUM_V,
|
||||
NUM_b,
|
||||
NUM_c,
|
||||
NUM_d,
|
||||
NUM_e,
|
||||
NUM_fm,
|
||||
NUM_g,
|
||||
NUM_l,
|
||||
NUM_mi,
|
||||
NUM_pl,
|
||||
NUM_pr,
|
||||
NUM_rn,
|
||||
NUM_sg,
|
||||
NUM_sp,
|
||||
NUM_s,
|
||||
NUM_th,
|
||||
NUM_v,
|
||||
NUM_COMMA,
|
||||
NUM_DEC,
|
||||
NUM_0,
|
||||
NUM_9,
|
||||
NUM_B,
|
||||
NUM_C,
|
||||
NUM_D,
|
||||
NUM_E,
|
||||
NUM_FM,
|
||||
NUM_G,
|
||||
NUM_L,
|
||||
NUM_MI,
|
||||
NUM_PL,
|
||||
NUM_PR,
|
||||
NUM_RN,
|
||||
NUM_SG,
|
||||
NUM_SP,
|
||||
NUM_S,
|
||||
NUM_TH,
|
||||
NUM_V,
|
||||
NUM_b,
|
||||
NUM_c,
|
||||
NUM_d,
|
||||
NUM_e,
|
||||
NUM_fm,
|
||||
NUM_g,
|
||||
NUM_l,
|
||||
NUM_mi,
|
||||
NUM_pl,
|
||||
NUM_pr,
|
||||
NUM_rn,
|
||||
NUM_sg,
|
||||
NUM_sp,
|
||||
NUM_s,
|
||||
NUM_th,
|
||||
NUM_v,
|
||||
|
||||
/* last */
|
||||
_NUM_last_
|
||||
_NUM_last_
|
||||
} NUM_poz;
|
||||
|
||||
/* ----------
|
||||
@@ -861,7 +861,7 @@ typedef struct NUMProc
|
||||
*last_relevant, /* last relevant number after decimal
|
||||
* point */
|
||||
|
||||
*L_negative_sign,/* Locale */
|
||||
*L_negative_sign, /* Locale */
|
||||
*L_positive_sign,
|
||||
*decimal,
|
||||
*L_thousands_sep,
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.32 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.33 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -240,4 +240,5 @@ NameComputeLength(Name name)
|
||||
;
|
||||
return (uint32) length;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*
|
||||
* 1998 Jan Wieck
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.46 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.47 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
* ----------
|
||||
*/
|
||||
@@ -517,7 +517,7 @@ numeric_round(PG_FUNCTION_ARGS)
|
||||
|
||||
if (i < 0)
|
||||
{
|
||||
Assert(i == -1); /* better not have added more than 1 digit */
|
||||
Assert(i == -1); /* better not have added more than 1 digit */
|
||||
Assert(arg.digits > arg.buf);
|
||||
arg.digits--;
|
||||
arg.ndigits++;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.46 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.47 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -475,4 +475,5 @@ atof1(char *str, double *val)
|
||||
*val = v;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* The PostgreSQL locale utils.
|
||||
*
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.11 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.12 2001/10/28 06:25:52 momjian Exp $
|
||||
*
|
||||
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
|
||||
*
|
||||
@@ -196,4 +196,5 @@ PGLC_localeconv(void)
|
||||
CurrentLocaleConvValid = true;
|
||||
return &CurrentLocaleConv;
|
||||
}
|
||||
|
||||
#endif /* USE_LOCALE */
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.5 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.6 2001/10/28 06:25:53 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -289,4 +289,5 @@ do_quote_literal(text *lptr)
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.100 2001/10/25 05:49:45 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.101 2001/10/28 06:25:53 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -1102,7 +1102,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid)
|
||||
default:
|
||||
elog(ERROR, "booltestsel: unexpected booltesttype %d",
|
||||
(int) clause->booltesttype);
|
||||
selec = 0.0; /* Keep compiler quiet */
|
||||
selec = 0.0; /* Keep compiler quiet */
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1143,7 +1143,7 @@ booltestsel(Query *root, BooleanTest *clause, int varRelid)
|
||||
default:
|
||||
elog(ERROR, "booltestsel: unexpected booltesttype %d",
|
||||
(int) clause->booltesttype);
|
||||
selec = 0.0; /* Keep compiler quiet */
|
||||
selec = 0.0; /* Keep compiler quiet */
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -2037,7 +2037,7 @@ convert_string_datum(Datum value, Oid typid)
|
||||
|
||||
#ifdef USE_LOCALE
|
||||
/* Guess that transformed string is not much bigger than original */
|
||||
xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */
|
||||
xfrmsize = strlen(val) + 32; /* arbitrary pad value here... */
|
||||
xfrmstr = (char *) palloc(xfrmsize);
|
||||
xfrmlen = strxfrm(xfrmstr, val, xfrmsize);
|
||||
if (xfrmlen >= xfrmsize)
|
||||
@@ -2758,7 +2758,7 @@ regex_selectivity_sub(char *patt, int pattlen, bool case_insensitive)
|
||||
if (patt[pos] == '(')
|
||||
{
|
||||
if (paren_depth == 0)
|
||||
paren_pos = pos; /* remember start of parenthesized item */
|
||||
paren_pos = pos; /* remember start of parenthesized item */
|
||||
paren_depth++;
|
||||
}
|
||||
else if (patt[pos] == ')' && paren_depth > 0)
|
||||
|
||||
Reference in New Issue
Block a user