summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorBruce Momjian2001-10-28 06:26:15 +0000
committerBruce Momjian2001-10-28 06:26:15 +0000
commit6783b2372ef13c141649840a836ff0a954ea1d4d (patch)
tree81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/backend/utils
parentc29797deeb5dfca61b8959344b682b4c32fe53a1 (diff)
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/ascii.c3
-rw-r--r--src/backend/utils/adt/datetime.c14
-rw-r--r--src/backend/utils/adt/encode.c4
-rw-r--r--src/backend/utils/adt/float.c5
-rw-r--r--src/backend/utils/adt/formatting.c240
-rw-r--r--src/backend/utils/adt/name.c3
-rw-r--r--src/backend/utils/adt/numeric.c4
-rw-r--r--src/backend/utils/adt/numutils.c3
-rw-r--r--src/backend/utils/adt/pg_locale.c3
-rw-r--r--src/backend/utils/adt/quote.c3
-rw-r--r--src/backend/utils/adt/selfuncs.c10
-rw-r--r--src/backend/utils/cache/catcache.c4
-rw-r--r--src/backend/utils/cache/relcache.c4
-rw-r--r--src/backend/utils/hash/dynahash.c4
-rw-r--r--src/backend/utils/hash/pg_crc.c3
-rw-r--r--src/backend/utils/init/postinit.c4
-rw-r--r--src/backend/utils/mb/conv.c10
-rw-r--r--src/backend/utils/mb/encnames.c7
-rw-r--r--src/backend/utils/mb/wchar.c3
-rw-r--r--src/backend/utils/misc/guc.c114
-rw-r--r--src/backend/utils/misc/ps_status.c4
-rw-r--r--src/backend/utils/mmgr/aset.c3
-rw-r--r--src/backend/utils/sort/tuplesort.c13
-rw-r--r--src/backend/utils/sort/tuplestore.c10
-rw-r--r--src/backend/utils/time/tqual.c4
25 files changed, 244 insertions, 235 deletions
diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c
index c08960ca208..8617470de99 100644
--- a/src/backend/utils/adt/ascii.c
+++ b/src/backend/utils/adt/ascii.c
@@ -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 */
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 06b249a8e13..fd6653c8fa7 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.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 */
diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c
index e5308aca27a..2a59c25b35a 100644
--- a/src/backend/utils/adt/encode.c
+++ b/src/backend/utils/adt/encode.c
@@ -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[] =
{
{
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index c7dc220d078..fb575c8bb94 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -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 */
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 0957783a4ad..270abc161e4 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -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,
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index cc3c8a791f7..75da7170e3a 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -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
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 4e7398448b8..f447caa66c1 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -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++;
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index bb7f8944417..ebba29a01ec 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -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
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 17abbbd5a3f..28d282e60d7 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -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 */
diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c
index 45e4c1133dc..39a1ec4df16 100644
--- a/src/backend/utils/adt/quote.c
+++ b/src/backend/utils/adt/quote.c
@@ -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
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index e7d319e9b65..71756271119 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.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)
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index fe347fe5fbd..efac9a73a95 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.84 2001/10/25 05:49:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.85 2001/10/28 06:25:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@
#include "utils/syscache.h"
- /* #define CACHEDEBUG *//* turns DEBUG elogs on */
+ /* #define CACHEDEBUG */ /* turns DEBUG elogs on */
/*
* Constants related to size of the catcache.
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 1073841f9d1..9f1698df64d 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.147 2001/10/25 05:49:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.148 2001/10/28 06:25:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -379,7 +379,7 @@ scan_pg_rel_ind(RelationBuildDescInfo buildinfo)
default:
elog(ERROR, "ScanPgRelation: bad buildinfo");
- return_tuple = NULL; /* keep compiler quiet */
+ return_tuple = NULL; /* keep compiler quiet */
}
heap_close(pg_class_desc, AccessShareLock);
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index d12cbcbbf1d..904b32ac29a 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.39 2001/10/25 05:49:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.40 2001/10/28 06:25:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -630,7 +630,7 @@ hash_search(HTAB *hashp,
{
/* no free elements. allocate another chunk of buckets */
if (!element_alloc(hashp))
- return NULL; /* out of memory */
+ return NULL; /* out of memory */
currBucket = hctl->freeList;
Assert(currBucket != NULL);
}
diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c
index 86a714aa40b..4ed8c665286 100644
--- a/src/backend/utils/hash/pg_crc.c
+++ b/src/backend/utils/hash/pg_crc.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.4 2001/10/25 05:49:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.5 2001/10/28 06:25:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -413,4 +413,5 @@ const uint64 crc_table[256] = {
INT64CONST(0x5DEDC41A34BBEEB2), INT64CONST(0x1F1D25F19D51D821),
INT64CONST(0xD80C07CD676F8394), INT64CONST(0x9AFCE626CE85B507)
};
+
#endif /* INT64_IS_BUSTED */
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index edec4a8329b..3dc6deb0cb4 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.95 2001/10/25 05:49:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.96 2001/10/28 06:25:54 momjian Exp $
*
*
*-------------------------------------------------------------------------
@@ -409,7 +409,7 @@ ShutdownPostgres(void)
* has to happen before bufmgr shutdown, so having smgr register a
* callback for it wouldn't work.
*/
- smgrDoPendingDeletes(false); /* delete as though aborting xact */
+ smgrDoPendingDeletes(false); /* delete as though aborting xact */
}
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index a3ff9aaf8f2..3a890a674cb 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
* WIN1250 client encoding support contributed by Pavel Behal
* SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
*
- * $Id: conv.c,v 1.33 2001/10/25 05:49:51 momjian Exp $
+ * $Id: conv.c,v 1.34 2001/10/28 06:25:54 momjian Exp $
*
*
*/
@@ -63,7 +63,6 @@
#include "Unicode/utf8_to_alt.map"
#include "Unicode/utf8_to_koi8r.map"
#include "Unicode/utf8_to_win1251.map"
-
#endif /* UNICODE_CONVERSION */
/*
@@ -619,7 +618,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
{
if (lc == LC_CNS11643_3 || lc == LC_CNS11643_4)
{
- *p++ = 0x9d; /* LCPRV2 */
+ *p++ = 0x9d; /* LCPRV2 */
}
*p++ = lc; /* Plane No. */
*p++ = (cnsBuf >> 8) & 0x00ff;
@@ -1677,7 +1676,7 @@ pg_enconv pg_enconv_tbl[] =
{
{
PG_SQL_ASCII, ascii2mic, mic2ascii, ascii2utf, utf2ascii
- } ,
+ },
{
PG_EUC_JP, euc_jp2mic, mic2euc_jp, euc_jp_to_utf, utf_to_euc_jp
},
@@ -1765,7 +1764,7 @@ pg_enconv pg_enconv_tbl[] =
{
{
PG_SQL_ASCII, ascii2mic, mic2ascii, 0, 0
- } ,
+ },
{
PG_EUC_JP, euc_jp2mic, mic2euc_jp, 0, 0
},
@@ -1845,4 +1844,5 @@ pg_enconv pg_enconv_tbl[] =
PG_WIN1250, win12502mic, mic2win1250, 0, 0
},
};
+
#endif /* UNICODE_CONVERSION */
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
index 7667e478aab..84446a26403 100644
--- a/src/backend/utils/mb/encnames.c
+++ b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
* Encoding names and routines for work with it. All
* in this file is shared bedween FE and BE.
*
- * $Id: encnames.c,v 1.5 2001/10/25 05:49:51 momjian Exp $
+ * $Id: encnames.c,v 1.6 2001/10/28 06:25:56 momjian Exp $
*/
#ifdef FRONTEND
#include "postgres_fe.h"
@@ -38,7 +38,7 @@ pg_encname pg_encname_tbl[] =
{
{
"alt", PG_ALT
- } , /* IBM866 */
+ }, /* IBM866 */
{
"big5", PG_BIG5
}, /* Big5; Chinese for Taiwan Multi-byte set */
@@ -191,7 +191,7 @@ pg_enc2name pg_enc2name_tbl[] =
{
{
"SQL_ASCII", PG_SQL_ASCII
- } ,
+ },
{
"EUC_JP", PG_EUC_JP
},
@@ -418,4 +418,5 @@ PG_encoding_to_char(PG_FUNCTION_ARGS)
return DirectFunctionCall1(namein, CStringGetDatum(encoding_name));
}
+
#endif
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
index 9d778d00418..4f6a54c8ee5 100644
--- a/src/backend/utils/mb/wchar.c
+++ b/src/backend/utils/mb/wchar.c
@@ -1,7 +1,7 @@
/*
* conversion functions between pg_wchar and multi-byte streams.
* Tatsuo Ishii
- * $Id: wchar.c,v 1.25 2001/10/25 05:49:51 momjian Exp $
+ * $Id: wchar.c,v 1.26 2001/10/28 06:25:56 momjian Exp $
*
* WIN1250 client encoding updated by Pavel Behal
*
@@ -602,4 +602,5 @@ pg_database_encoding_max_length(void)
{
return pg_wchar_table[GetDatabaseEncoding()].maxmblen;
}
+
#endif
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ff57dc92bbe..52aa0e0387f 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.56 2001/10/25 05:49:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.57 2001/10/28 06:25:56 momjian Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -95,11 +95,11 @@ bool Password_encryption = false;
*/
enum config_type
{
- PGC_NONE = 0,
- PGC_BOOL,
- PGC_INT,
- PGC_REAL,
- PGC_STRING
+ PGC_NONE = 0,
+ PGC_BOOL,
+ PGC_INT,
+ PGC_REAL,
+ PGC_STRING
};
@@ -194,7 +194,7 @@ static struct config_bool
{
{
"enable_seqscan", PGC_USERSET, &enable_seqscan, true, NULL
- } ,
+ },
{
"enable_indexscan", PGC_USERSET, &enable_indexscan, true, NULL
},
@@ -353,34 +353,34 @@ static struct config_int
{
{
"geqo_threshold", PGC_USERSET, &geqo_rels,
- DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
- } ,
+ DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
+ },
{
"geqo_pool_size", PGC_USERSET, &Geqo_pool_size,
- DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
+ DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
},
{
"geqo_effort", PGC_USERSET, &Geqo_effort,
- 1, 1, INT_MAX, NULL, NULL
+ 1, 1, INT_MAX, NULL, NULL
},
{
"geqo_generations", PGC_USERSET, &Geqo_generations,
- 0, 0, INT_MAX, NULL, NULL
+ 0, 0, INT_MAX, NULL, NULL
},
{
"geqo_random_seed", PGC_USERSET, &Geqo_random_seed,
- -1, INT_MIN, INT_MAX, NULL, NULL
+ -1, INT_MIN, INT_MAX, NULL, NULL
},
{
"deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout,
- 1000, 0, INT_MAX, NULL, NULL
+ 1000, 0, INT_MAX, NULL, NULL
},
#ifdef ENABLE_SYSLOG
{
"syslog", PGC_SIGHUP, &Use_syslog,
- 0, 0, 2, NULL, NULL
+ 0, 0, 2, NULL, NULL
},
#endif
@@ -391,116 +391,116 @@ static struct config_int
*/
{
"max_connections", PGC_POSTMASTER, &MaxBackends,
- DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
+ DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
},
{
"shared_buffers", PGC_POSTMASTER, &NBuffers,
- DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
+ DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
},
{
"port", PGC_POSTMASTER, &PostPortNumber,
- DEF_PGPORT, 1, 65535, NULL, NULL
+ DEF_PGPORT, 1, 65535, NULL, NULL
},
{
"unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions,
- 0777, 0000, 0777, NULL, NULL
+ 0777, 0000, 0777, NULL, NULL
},
{
"sort_mem", PGC_USERSET, &SortMem,
- 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
+ 512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
},
{
"vacuum_mem", PGC_USERSET, &VacuumMem,
- 8192, 1024, INT_MAX, NULL, NULL
+ 8192, 1024, INT_MAX, NULL, NULL
},
{
"max_files_per_process", PGC_BACKEND, &max_files_per_process,
- 1000, 25, INT_MAX, NULL, NULL
+ 1000, 25, INT_MAX, NULL, NULL
},
{
"debug_level", PGC_USERSET, &DebugLvl,
- 0, 0, 16, NULL, NULL
+ 0, 0, 16, NULL, NULL
},
#ifdef LOCK_DEBUG
{
"trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin,
- BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
+ BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
},
{
"trace_lock_table", PGC_SUSET, &Trace_lock_table,
- 0, 0, INT_MAX, NULL, NULL
+ 0, 0, INT_MAX, NULL, NULL
},
#endif
{
"max_expr_depth", PGC_USERSET, &max_expr_depth,
- DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
+ DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
},
{
"max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations,
- 100, 10, INT_MAX, NULL, NULL
+ 100, 10, INT_MAX, NULL, NULL
},
{
"max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages,
- 10000, 1000, INT_MAX, NULL, NULL
+ 10000, 1000, INT_MAX, NULL, NULL
},
{
"max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact,
- 64, 10, INT_MAX, NULL, NULL
+ 64, 10, INT_MAX, NULL, NULL
},
{
"authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout,
- 60, 1, 600, NULL, NULL
+ 60, 1, 600, NULL, NULL
},
{
"pre_auth_delay", PGC_SIGHUP, &PreAuthDelay,
- 0, 0, 60, NULL, NULL
+ 0, 0, 60, NULL, NULL
},
{
"checkpoint_segments", PGC_SIGHUP, &CheckPointSegments,
- 3, 1, INT_MAX, NULL, NULL
+ 3, 1, INT_MAX, NULL, NULL
},
{
"checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout,
- 300, 30, 3600, NULL, NULL
+ 300, 30, 3600, NULL, NULL
},
{
"wal_buffers", PGC_POSTMASTER, &XLOGbuffers,
- 8, 4, INT_MAX, NULL, NULL
+ 8, 4, INT_MAX, NULL, NULL
},
{
"wal_files", PGC_SIGHUP, &XLOGfiles,
- 0, 0, 64, NULL, NULL
+ 0, 0, 64, NULL, NULL
},
{
"wal_debug", PGC_SUSET, &XLOG_DEBUG,
- 0, 0, 16, NULL, NULL
+ 0, 0, 16, NULL, NULL
},
{
"commit_delay", PGC_USERSET, &CommitDelay,
- 0, 0, 100000, NULL, NULL
+ 0, 0, 100000, NULL, NULL
},
{
"commit_siblings", PGC_USERSET, &CommitSiblings,
- 5, 1, 1000, NULL, NULL
+ 5, 1, 1000, NULL, NULL
},
{
@@ -514,29 +514,29 @@ static struct config_real
{
{
"effective_cache_size", PGC_USERSET, &effective_cache_size,
- DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
- } ,
+ DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
+ },
{
"random_page_cost", PGC_USERSET, &random_page_cost,
- DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
+ DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
},
{
"cpu_tuple_cost", PGC_USERSET, &cpu_tuple_cost,
- DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
+ DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
},
{
"cpu_index_tuple_cost", PGC_USERSET, &cpu_index_tuple_cost,
- DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
+ DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
},
{
"cpu_operator_cost", PGC_USERSET, &cpu_operator_cost,
- DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
+ DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
},
{
"geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias,
- DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
- MAX_GEQO_SELECTION_BIAS, NULL, NULL
+ DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
+ MAX_GEQO_SELECTION_BIAS, NULL, NULL
},
{
@@ -550,49 +550,49 @@ static struct config_string
{
{
"default_transaction_isolation", PGC_USERSET, &default_iso_level_string,
- "read committed", check_defaultxactisolevel, assign_defaultxactisolevel
- } ,
+ "read committed", check_defaultxactisolevel, assign_defaultxactisolevel
+ },
{
"dynamic_library_path", PGC_SUSET, &Dynamic_library_path,
- "$libdir", NULL, NULL
+ "$libdir", NULL, NULL
},
{
"krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile,
- PG_KRB_SRVTAB, NULL, NULL
+ PG_KRB_SRVTAB, NULL, NULL
},
#ifdef ENABLE_SYSLOG
{
"syslog_facility", PGC_POSTMASTER, &Syslog_facility,
- "LOCAL0", check_facility, NULL
+ "LOCAL0", check_facility, NULL
},
{
"syslog_ident", PGC_POSTMASTER, &Syslog_ident,
- "postgres", NULL, NULL
+ "postgres", NULL, NULL
},
#endif
{
"unix_socket_group", PGC_POSTMASTER, &Unix_socket_group,
- "", NULL, NULL
+ "", NULL, NULL
},
{
"unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir,
- "", NULL, NULL
+ "", NULL, NULL
},
{
"virtual_host", PGC_POSTMASTER, &VirtualHost,
- "", NULL, NULL
+ "", NULL, NULL
},
{
"wal_sync_method", PGC_SIGHUP, &XLOG_sync_method,
- XLOG_sync_method_default, check_xlog_sync_method,
- assign_xlog_sync_method
+ XLOG_sync_method_default, check_xlog_sync_method,
+ assign_xlog_sync_method
},
{
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 65d2e10cdb2..f1bd25036b3 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -5,7 +5,7 @@
* to contain some useful information. Mechanism differs wildly across
* platforms.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.8 2001/10/25 05:49:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.9 2001/10/28 06:25:57 momjian Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* various details abducted from various places
@@ -126,7 +126,7 @@ save_ps_display_args(int argc, char *argv[])
end_of_area = argv[i] + strlen(argv[i]);
}
- if (end_of_area == NULL)/* probably can't happen? */
+ if (end_of_area == NULL) /* probably can't happen? */
{
ps_buffer = NULL;
ps_buffer_size = 0;
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 24fd0d17931..f45fb63fd82 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.42 2001/10/25 05:49:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.43 2001/10/28 06:25:57 momjian Exp $
*
* NOTE:
* This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -1082,4 +1082,5 @@ AllocSetCheck(MemoryContext context)
name, block);
}
}
+
#endif /* MEMORY_CONTEXT_CHECKING */
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 5cf8e3ad1dc..796be9d6c7f 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -78,7 +78,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.19 2001/10/25 05:49:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.20 2001/10/28 06:25:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -104,13 +104,12 @@
*/
typedef enum
{
- TSS_INITIAL, /* Loading tuples; still within memory
+ TSS_INITIAL, /* Loading tuples; still within memory
* limit */
- TSS_BUILDRUNS, /* Loading tuples; writing to tape */
- TSS_SORTEDINMEM,/* Sort completed entirely in memory */
- TSS_SORTEDONTAPE, /* Sort completed, final run is on
- * tape */
- TSS_FINALMERGE /* Performing final merge on-the-fly */
+ TSS_BUILDRUNS, /* Loading tuples; writing to tape */
+ TSS_SORTEDINMEM, /* Sort completed entirely in memory */
+ TSS_SORTEDONTAPE, /* Sort completed, final run is on tape */
+ TSS_FINALMERGE /* Performing final merge on-the-fly */
} TupSortStatus;
/*
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index 6e241c480f4..b7e35d5a18e 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -26,7 +26,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.4 2001/10/25 05:49:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplestore.c,v 1.5 2001/10/28 06:25:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,11 +43,11 @@
*/
typedef enum
{
- TSS_INITIAL, /* Loading tuples; still within memory
+ TSS_INITIAL, /* Loading tuples; still within memory
* limit */
- TSS_WRITEFILE, /* Loading tuples; writing to temp file */
- TSS_READMEM, /* Reading tuples; entirely in memory */
- TSS_READFILE /* Reading tuples from temp file */
+ TSS_WRITEFILE, /* Loading tuples; writing to temp file */
+ TSS_READMEM, /* Reading tuples; entirely in memory */
+ TSS_READFILE /* Reading tuples from temp file */
} TupStoreStatus;
/*
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 194959f6ccf..59194948496 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.43 2001/10/25 05:49:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.44 2001/10/28 06:25:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -324,7 +324,7 @@ HeapTupleSatisfiesUpdate(HeapTuple tuple)
{
if (th->t_infomask & HEAP_MARKED_FOR_UPDATE)
return HeapTupleMayBeUpdated;
- return HeapTupleUpdated; /* updated by other */
+ return HeapTupleUpdated; /* updated by other */
}
if (TransactionIdIsCurrentTransactionId(th->t_xmax))