diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/acl.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/arrayutils.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/date.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/datetimes.c | 20 | ||||
-rw-r--r-- | src/backend/utils/adt/geo-selfuncs.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/like.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/varchar.c | 6 | ||||
-rw-r--r-- | src/backend/utils/cache/fcache.c | 3 | ||||
-rw-r--r-- | src/backend/utils/cache/relcache.c | 8 | ||||
-rw-r--r-- | src/backend/utils/error/elog.c | 4 | ||||
-rw-r--r-- | src/backend/utils/error/exc.c | 4 | ||||
-rw-r--r-- | src/backend/utils/hash/dynahash.c | 8 | ||||
-rw-r--r-- | src/backend/utils/mmgr/aset.c | 4 |
13 files changed, 33 insertions, 43 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index e6494ea1349..0556083ff1b 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.5 1996/11/06 10:30:36 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.6 1996/11/10 03:03:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -325,7 +325,7 @@ aclownerdefault(AclId ownerid) } Acl * -acldefault() +acldefault(void) { Acl *acl; AclItem *aip; diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index 5f175df0319..fce0b0ddd57 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.2 1996/11/06 06:49:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.3 1996/11/10 03:03:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,8 @@ #include "postgres.h" +#include "utils/array.h" + int GetOffset(int n, int dim[], int lb[], int indx[]) { diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 20a3aeeddb8..80dbae8dd0a 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.3 1996/11/06 10:30:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.4 1996/11/10 03:03:05 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -852,7 +852,7 @@ static int istinterval(char *i_string, * time with precision up to microsecs.) - ay 3/95 */ text * -timeofday() +timeofday(void) { #ifndef WIN32 diff --git a/src/backend/utils/adt/datetimes.c b/src/backend/utils/adt/datetimes.c index 06f2e373d72..f38b2c1171a 100644 --- a/src/backend/utils/adt/datetimes.c +++ b/src/backend/utils/adt/datetimes.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.5 1996/11/06 06:49:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.6 1996/11/10 03:03:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,22 +15,8 @@ #include <string.h> #include <postgres.h> -#include <utils/palloc.h> - -/* these things look like structs, but we pass them by value so be careful - For example, passing an int -> DateADT is not portable! */ -typedef struct DateADT { - char day; - char month; - short year; -} DateADT; - -typedef struct TimeADT { - short hr; - short min; - float sec; -} TimeADT; - +#include <utils/builtins.h> +#include <utils/datetime.h> static int day_tab[2][12] = { {31,28,31,30,31,30,31,31,30,31,30,31}, diff --git a/src/backend/utils/adt/geo-selfuncs.c b/src/backend/utils/adt/geo-selfuncs.c index a816e738f53..77454064cd6 100644 --- a/src/backend/utils/adt/geo-selfuncs.c +++ b/src/backend/utils/adt/geo-selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.2 1996/11/10 03:03:13 momjian Exp $ * * XXX These are totally bogus. * @@ -19,6 +19,7 @@ #include "access/attnum.h" #include "utils/geo-decls.h" /* where function declarations go */ #include "utils/palloc.h" +#include "utils/builtins.h" float64 areasel(Oid opid, diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 127d59a2812..2e279317b95 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -22,8 +22,6 @@ #include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ -int like(char *text, char *p); - /* * interface routines called by the function manager */ @@ -142,7 +140,7 @@ bool textnlike(struct varlena *s, struct varlena *p) } -/* $Revision: 1.3 $ +/* $Revision: 1.4 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 5c5531882ed..4a86ced5a08 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -1,20 +1,20 @@ /*------------------------------------------------------------------------- * - * char.c-- + * varchar.c-- * Functions for the built-in type char() and varchar(). * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.5 1996/11/06 06:50:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.6 1996/11/10 03:03:20 momjian Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include <string.h> #include "postgres.h" -#include "utils/palloc.h" +#include "utils/builtins.h" /* * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR() diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c index f4c5ef3e907..1d86364abda 100644 --- a/src/backend/utils/cache/fcache.c +++ b/src/backend/utils/cache/fcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.3 1996/11/06 10:31:22 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.4 1996/11/10 03:03:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "parser/parsetree.h" /* for getrelname() */ #include "utils/builtins.h" #include "utils/fcache.h" +#include "utils/fcache2.h" #include "nodes/primnodes.h" #include "nodes/execnodes.h" #ifndef HAVE_MEMMOVE diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index b72cc02cf50..6918cada212 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.4 1996/11/06 10:31:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.5 1996/11/10 03:03:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1447,7 +1447,7 @@ RelationPurgeLocalRelation(bool xactCommitted) #define INITRELCACHESIZE 400 void -RelationInitialize() +RelationInitialize(void) { MemoryContext oldcxt; HASHCTL ctl; @@ -1536,7 +1536,7 @@ RelationInitialize() #define Num_indices_bootstrap 3 void -init_irels() +init_irels(void) { Size len; int nread; @@ -1676,7 +1676,7 @@ init_irels() } void -write_irels() +write_irels(void) { int len; int nwritten; diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index fca7ee329f0..f35c5d7d8d0 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.9 1996/11/08 05:59:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.10 1996/11/10 03:03:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -196,7 +196,7 @@ elog(int lev, const char *fmt, ... ) #ifndef PG_STANDALONE int -DebugFileOpen() +DebugFileOpen(void) { int fd, istty; diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c index 59ec7b00866..3cc3f01f508 100644 --- a/src/backend/utils/error/exc.c +++ b/src/backend/utils/error/exc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.5 1996/11/03 06:53:26 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.6 1996/11/10 03:03:31 momjian Exp $ * * NOTE * XXX this code needs improvement--check for state violations and @@ -135,7 +135,7 @@ ExcPrint(Exception *excP, } ExcProc * -ExcGetUnCaught() +ExcGetUnCaught(void) { return (ExcUnCaughtP); } diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index af835d279ac..f2cab230cf5 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.5 1996/11/08 20:46:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.6 1996/11/10 03:03:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -122,9 +122,9 @@ DynaHashFree(Pointer ptr) * ---------------- */ -static int expand_table(); -static int hdefault(); -static int init_htab(); +static int expand_table(HTAB *hashp); +static int hdefault(HTAB *hashp); +static int init_htab(HTAB *hashp, int nelem); /* diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 5e6b4094836..41908232065 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.3 1996/11/08 06:00:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.4 1996/11/10 03:03:45 momjian Exp $ * * NOTE * XXX This is a preliminary implementation which lacks fail-fast @@ -128,6 +128,7 @@ AllocSetReset(AllocSet set) } } +#ifdef NOT_USED void AllocSetReset_debug(char *file, int line, AllocSet set) { @@ -139,6 +140,7 @@ AllocSetReset_debug(char *file, int line, AllocSet set) AllocSetFree(set, pointer); } } +#endif /* * AllocSetContains -- |