diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/date.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/datetime.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/geo_ops.c | 56 | ||||
-rw-r--r-- | src/backend/utils/adt/nabstime.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/oracle_compat.c | 4 | ||||
-rw-r--r-- | src/backend/utils/cache/lsyscache.c | 4 | ||||
-rw-r--r-- | src/backend/utils/cache/relcache.c | 8 |
7 files changed, 46 insertions, 46 deletions
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 7bb7fdf596c..afad0ecbf7a 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.29 1999/02/13 23:19:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.30 1999/02/21 03:49:27 scrappy Exp $ * * NOTES * This code is actually (almost) unused. @@ -73,7 +73,7 @@ #define ABSTIMEMIN(t1, t2) abstimele((t1),(t2)) ? (t1) : (t2) #define ABSTIMEMAX(t1, t2) abstimelt((t1),(t2)) ? (t2) : (t1) -#if FALSE +#ifdef NOT_USED static char *unit_tab[] = { "second", "seconds", "minute", "minutes", "hour", "hours", "day", "days", "week", "weeks", @@ -96,7 +96,7 @@ static int sec_tab[] = { static void reltime2tm(int32 time, struct tm * tm); -#if FALSE +#ifdef NOT_USED static int correct_unit(char *unit, int *unptr); static int correct_dir(char *direction, int *signptr); @@ -205,7 +205,7 @@ reltime2tm(int32 time, struct tm * tm) return; } /* reltime2tm() */ -#if FALSE +#ifdef NOT_USED int dummyfunc() { @@ -990,7 +990,7 @@ isreltime(char *str) } /* isreltime() */ #endif -#if FALSE +#ifdef NOT_USED int dummyfunc() { diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 658526678a1..cae20001304 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.28 1999/02/13 23:19:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.29 1999/02/21 03:49:30 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); -#if 0 +#ifdef NOT_USED static int day_tab[2][12] = { {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}}; @@ -100,7 +100,7 @@ date_in(char *str) elog(ERROR, "Unrecognized date external representation %s", str); } -#if 0 +#ifdef NOT_USED if (tm->tm_year < 0 || tm->tm_year > 32767) elog(ERROR, "date_in: year must be limited to values 0 through 32767 in '%s'", str); if (tm->tm_mon < 1 || tm->tm_mon > 12) diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 63f6be0cada..72166c5a54f 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.40 1999/02/13 23:19:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.41 1999/02/21 03:49:30 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -218,7 +218,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p) cp++; if (*cp == LDELIM) { -#if FALSE +#ifdef NOT_USED /* nested delimiters with only one point? */ if (npts <= 1) return FALSE; @@ -821,7 +821,7 @@ line_out(LINE *line) #ifdef GEODEBUG printf("line_construct_pp- line is vertical\n"); #endif -#if FALSE +#ifdef NOT_USED result->m = DBL_MAX; #endif @@ -835,7 +835,7 @@ line_out(LINE *line) #ifdef GEODEBUG printf("line_construct_pp- line is horizontal\n"); #endif -#if FALSE +#ifdef NOT_USED result->m = 0.0; #endif @@ -882,7 +882,7 @@ line_construct_pm(Point *pt, double m) result->B = -1.0; result->C = pt->y - m * pt->x; -#if FALSE +#ifdef NOT_USED result->m = m; #endif @@ -907,7 +907,7 @@ line_construct_pp(Point *pt1, Point *pt2) #ifdef GEODEBUG printf("line_construct_pp- line is vertical\n"); #endif -#if FALSE +#ifdef NOT_USED result->m = DBL_MAX; #endif @@ -921,7 +921,7 @@ line_construct_pp(Point *pt1, Point *pt2) #ifdef GEODEBUG printf("line_construct_pp- line is horizontal\n"); #endif -#if FALSE +#ifdef NOT_USED result->m = 0.0; #endif @@ -929,7 +929,7 @@ line_construct_pp(Point *pt1, Point *pt2) else { /* use "mx - y + yinter = 0" */ -#if FALSE +#ifdef NOT_USED result->A = (pt1->y - pt2->y) / (pt1->x - pt2->x); #endif result->A = (pt2->y - pt1->y) / (pt2->x - pt1->x); @@ -939,7 +939,7 @@ line_construct_pp(Point *pt1, Point *pt2) printf("line_construct_pp- line is neither vertical nor horizontal (diffs x=%.*g, y=%.*g\n", digits8, (pt2->x - pt1->x), digits8, (pt2->y - pt1->y)); #endif -#if FALSE +#ifdef NOT_USED result->m = result->A; #endif } @@ -960,7 +960,7 @@ line_intersect(LINE *l1, LINE *l2) bool line_parallel(LINE *l1, LINE *l2) { -#if FALSE +#ifdef NOT_USED return FPeq(l1->m, l2->m); #endif if (FPzero(l1->B)) @@ -972,7 +972,7 @@ line_parallel(LINE *l1, LINE *l2) bool line_perp(LINE *l1, LINE *l2) { -#if FALSE +#ifdef NOT_USED if (l1->m) return FPeq(l2->m / l1->m, -1.0); else if (l2->m) @@ -989,7 +989,7 @@ line_perp(LINE *l1, LINE *l2) bool line_vertical(LINE *line) { -#if FALSE +#ifdef NOT_USED return FPeq(line->A, -1.0) && FPzero(line->B); #endif return FPzero(line->B); @@ -998,7 +998,7 @@ line_vertical(LINE *line) bool line_horizontal(LINE *line) { -#if FALSE +#ifdef NOT_USED return FPzero(line->m); #endif return FPzero(line->A); @@ -1065,7 +1065,7 @@ line_interpt(LINE *l1, LINE *l2) if (line_parallel(l1, l2)) return NULL; -#if FALSE +#ifdef NOT_USED if (line_vertical(l1)) result = point_construct(l2->m * l1->C + l2->C, l1->C); else if (line_vertical(l2)) @@ -1079,7 +1079,7 @@ line_interpt(LINE *l1, LINE *l2) if (line_vertical(l1)) { -#if FALSE +#ifdef NOT_USED x = l1->C; y = -((l2->A * x + l2->C) / l2->B); #endif @@ -1089,7 +1089,7 @@ line_interpt(LINE *l1, LINE *l2) } else if (line_vertical(l2)) { -#if FALSE +#ifdef NOT_USED x = l2->C; y = -((l1->A * x + l1->C) / l1->B); #endif @@ -1099,7 +1099,7 @@ line_interpt(LINE *l1, LINE *l2) } else { -#if FALSE +#ifdef NOT_USED x = (l2->B * l1->C - l1->B * l2->C) / (l2->A * l1->B - l1->A * l2->B); y = -((l1->A * x + l1->C) / l1->B); #endif @@ -1654,7 +1654,7 @@ lseg_in(char *str) || (*s != '\0')) elog(ERROR, "Bad lseg external representation '%s'", str); -#if FALSE +#ifdef NOT_USED lseg->m = point_sl(&lseg->p[0], &lseg->p[1]); #endif @@ -1685,7 +1685,7 @@ lseg_construct(Point *pt1, Point *pt2) result->p[1].x = pt2->x; result->p[1].y = pt2->y; -#if FALSE +#ifdef NOT_USED result->m = point_sl(pt1, pt2); #endif @@ -1701,7 +1701,7 @@ statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2) lseg->p[1].x = pt2->x; lseg->p[1].y = pt2->y; -#if FALSE +#ifdef NOT_USED lseg->m = point_sl(pt1, pt2); #endif } @@ -1750,7 +1750,7 @@ lseg_intersect(LSEG *l1, LSEG *l2) bool lseg_parallel(LSEG *l1, LSEG *l2) { -#if FALSE +#ifdef NOT_USED return FPeq(l1->m, l2->m); #endif return (FPeq(point_sl(&(l1->p[0]), &(l1->p[1])), @@ -2010,7 +2010,7 @@ dist_ps(Point *pt, LSEG *lseg) } else { -#if FALSE +#ifdef NOT_USED m = (-1) * (lseg->p[1].y - lseg->p[0].y) / (lseg->p[1].x - lseg->p[0].x); #endif @@ -2303,7 +2303,7 @@ close_pl(Point *pt, LINE *line) double invm; result = palloc(sizeof(Point)); -#if FALSE +#ifdef NOT_USED if (FPeq(line->A, -1.0) && FPzero(line->B)) { /* vertical */ } @@ -2314,7 +2314,7 @@ close_pl(Point *pt, LINE *line) result->y = pt->y; return result; -#if FALSE +#ifdef NOT_USED } else if (FPzero(line->m)) { /* horizontal */ @@ -2327,7 +2327,7 @@ close_pl(Point *pt, LINE *line) return result; } /* drop a perpendicular and find the intersection point */ -#if FALSE +#ifdef NOT_USED invm = -1.0 / line->m; #endif /* invert and flip the sign on the slope to get a perpendicular */ @@ -3059,7 +3059,7 @@ poly_same(POLYGON *polya, POLYGON *polyb) return plist_same(polya->npts, polya->p, polyb->p); -#if FALSE +#ifdef NOT_USED for (i = 0; i < polya->npts; i++) { if ((polya->p[i].x != polyb->p[i].x) @@ -3085,7 +3085,7 @@ poly_overlap(POLYGON *polya, POLYGON *polyb) * Determine if polygon A contains polygon B by determining if A's * bounding box contains B's bounding box. *-----------------------------------------------------------------*/ -#if FALSE +#ifdef NOT_USED bool poly_contain(POLYGON *polya, POLYGON *polyb) { @@ -3139,7 +3139,7 @@ poly_contain(POLYGON *polya, POLYGON *polyb) * Determine if polygon A is contained by polygon B by determining * if A's bounding box is contained by B's bounding box. *-----------------------------------------------------------------*/ -#if FALSE +#ifdef NOT_USED bool poly_contained(POLYGON *polya, POLYGON *polyb) { diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index f4a0da81814..8e3b1463ee8 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.c,v 1.52 1999/02/13 23:19:24 momjian Exp $ + * $Id: nabstime.c,v 1.53 1999/02/21 03:49:32 scrappy Exp $ * */ #include <stdio.h> @@ -63,7 +63,7 @@ GetCurrentAbsoluteTime(void) CTimeZone = -tm->tm_gmtoff; /* tm_gmtoff is Sun/DEC-ism */ CDayLight = (tm->tm_isdst > 0); -#if 0 +#ifdef NOT_USED /* * XXX is there a better way to get local timezone string w/o * tzname? - tgl 97/03/18 diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 084e0911a48..ce24c4635ab 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -1,7 +1,7 @@ /* * Edmund Mergl <E.Mergl@bawue.de> * - * $Id: oracle_compat.c,v 1.16 1998/09/01 04:32:45 momjian Exp $ + * $Id: oracle_compat.c,v 1.17 1999/02/21 03:49:32 scrappy Exp $ * */ @@ -444,7 +444,7 @@ rtrim(text *string, text *set) ret = (text *) palloc(VARHDRSZ + m); VARSIZE(ret) = VARHDRSZ + m; -#if FALSE +#ifdef NOT_USED memcpy(VARDATA(ret), ptr - VARSIZE(ret) + m, m); #endif diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 335d98915e9..54c930173ce 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.24 1999/02/13 23:19:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.25 1999/02/21 03:49:33 scrappy Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -217,7 +217,7 @@ get_opname(Oid opno) else { /* don't throw an error anymore; we want to continue... */ -#if FALSE +#ifdef NOT_USED elog(ERROR, "can't look up operator %d\n", opno); #endif return NULL; diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index c9d008a055e..464d94021a6 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.58 1999/02/13 23:19:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.59 1999/02/21 03:49:36 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -235,7 +235,7 @@ do { \ static void formrdesc(char *relationName, u_int natts, FormData_pg_attribute *att); -#if 0 /* See comments at line 1304 */ +#ifdef NOT_USED /* See comments at line 1304 */ static void RelationFlushIndexes(Relation *r, Oid accessMethodId); #endif @@ -1298,7 +1298,7 @@ RelationFlushRelation(Relation *relationPtr, FreeTriggerDesc(relation); -#if 0 +#ifdef NOT_USED if (relation->rd_rules) { int j; @@ -1427,7 +1427,7 @@ RelationFlushIndexes(Relation *r, void RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId) { -#if 0 +#ifdef NOT_USED /* * 25 aug 1992: mao commented out the ht walk below. it should be |