aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/adt')
-rw-r--r--src/backend/utils/adt/Makefile5
-rw-r--r--src/backend/utils/adt/acl.c5
-rw-r--r--src/backend/utils/adt/arrayfuncs.c15
-rw-r--r--src/backend/utils/adt/chunk.c11
-rw-r--r--src/backend/utils/adt/date.c8
-rw-r--r--src/backend/utils/adt/filename.c4
-rw-r--r--src/backend/utils/adt/int.c4
-rw-r--r--src/backend/utils/adt/numutils.c7
-rw-r--r--src/backend/utils/adt/oid.c6
-rw-r--r--src/backend/utils/adt/regexp.c6
10 files changed, 44 insertions, 27 deletions
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 2427f8417c1..0ac178249fe 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,14 +4,15 @@
# Makefile for utils/adt
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.2 1996/11/03 06:52:59 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.3 1996/11/06 10:30:35 scrappy Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../../port/$(PORTNAME) \
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
-I../../../include
CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 74e70285c07..e6494ea1349 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,17 +7,18 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.4 1996/11/06 06:49:34 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.5 1996/11/06 10:30:36 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
#include <string.h>
#include "postgres.h"
+
+#include <utils/memutils.h>
#include "utils/acl.h"
#include "catalog/pg_user.h"
#include "utils/syscache.h"
-#include "utils/palloc.h"
#include "miscadmin.h"
static char *getid(char *s, char *n);
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index fca9fe083ae..71431fd337a 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,13 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.8 1996/11/06 06:49:36 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.9 1996/11/06 10:30:38 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include "postgres.h"
@@ -21,7 +22,6 @@
#include "catalog/pg_type.h"
#include "utils/syscache.h"
-#include "utils/palloc.h"
#include "utils/memutils.h"
#include "storage/fd.h" /* for SEEK_ */
#include "fmgr.h"
@@ -783,7 +783,10 @@ array_clip(ArrayType *array,
mda_get_range(n, span, lowerIndx, upperIndx);
if (ARR_IS_LO(array)) {
- char * lo_name, * newname;
+#ifdef LOARRAY
+ char * lo_name;
+#endif
+ char * newname;
int fd, newfd, isDestLO = true, rsize;
if (len < 0)
@@ -906,12 +909,13 @@ array_set(ArrayType *array,
if (ARR_IS_LO(array)) {
int fd;
- char * lo_name;
struct varlena *v;
/* We are assuming fixed element lengths here */
offset *= elmlen;
#ifdef LOARRAY
+ char * lo_name;
+
lo_name = ARR_DATA_PTR(array);
if ((fd = LOopen(lo_name, ARR_IS_INV(array)?INV_WRITE:O_WRONLY)) < 0)
return((char *)array);
@@ -1013,10 +1017,11 @@ array_assgn(ArrayType *array,
elog(WARN, "lowerIndex larger than upperIndx");
if (ARR_IS_LO(array)) {
- char * lo_name;
int fd, newfd;
#ifdef LOARRAY
+ char * lo_name;
+
lo_name = (char *)ARR_DATA_PTR(array);
if ((fd = LOopen(lo_name, ARR_IS_INV(array)?INV_WRITE:O_WRONLY)) < 0)
return((char *)array);
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index f3ae8e996c3..f6d3952289b 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,12 +6,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.2 1996/11/06 06:49:43 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.3 1996/11/06 10:30:40 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
#include "postgres.h"
+
+#include <libpq/be-fsstubs.h>
#include "utils/memutils.h"
#include "libpq/libpq-fs.h"
@@ -19,11 +21,16 @@
#include "catalog/pg_type.h"
-#include "utils/palloc.h"
#include "fmgr.h"
#include "utils/array.h"
#include "optimizer/internal.h"
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
+
#define INFTY 500000000
#define MANY 10000
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 5ef0e723d83..20a3aeeddb8 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.2 1996/11/06 06:49:44 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.3 1996/11/06 10:30:44 scrappy Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -88,10 +88,6 @@
#define ABSTIMEMIN(t1, t2) abstimele((t1),(t2)) ? (t1) : (t2)
#define ABSTIMEMAX(t1, t2) abstimelt((t1),(t2)) ? (t2) : (t1)
-static char *month_name[] = {
- "Jan","Feb","Mar","Apr","May","Jun","Jul",
- "Aug","Sep","Oct","Nov","Dec" };
-
static char *unit_tab[] = {
"second", "seconds", "minute", "minutes",
"hour", "hours", "day", "days", "week", "weeks",
@@ -113,8 +109,6 @@ static int unit_max_quantity[] = {
struct timeb *TimeDifferenceFromGMT = NULL;
-static bool TimeDiffIsInited = false;
-static char *timezonename = NULL;
/*
* Function prototypes -- internal to this file only
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index c569041dd39..351a8e76935 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.3 1996/11/03 06:53:05 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.4 1996/11/06 10:30:51 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
#include <sys/param.h>
#include "postgres.h"
-#include "utils/palloc.h"
+#include <miscadmin.h>
#include "utils/builtins.h" /* where function declarations go */
char *
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 07cdce82e4b..5e32238d2dc 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.2 1996/11/06 06:49:49 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.3 1996/11/06 10:30:55 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,11 +28,11 @@
* XXX makes massive and possibly unwarranted type promotion assumptions.
* fix me when we figure out what we want to do about ANSIfication...
*/
+#include <stdio.h>
#include "postgres.h"
#include "fmgr.h"
#include "utils/builtins.h" /* where the declarations go */
-#include "utils/palloc.h"
/*****************************************************************************
* USER I/O ROUTINES *
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index c654c63d372..fafcc69273a 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.5 1996/11/06 06:49:54 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.6 1996/11/06 10:30:58 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,6 +19,11 @@
#include <math.h>
#include "postgres.h"
#include "utils/builtins.h" /* where the declarations go */
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
int32
pg_atoi(char *s, int size, int c)
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index d423853da15..04bf4690392 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,12 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2 1996/11/06 06:49:55 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.3 1996/11/06 10:31:01 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
+
+#include <stdio.h>
+
#include "postgres.h"
-#include "utils/palloc.h"
#include "utils/builtins.h" /* where function declarations go */
/*****************************************************************************
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 80da6e0f431..deec436c510 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.3 1996/11/06 06:49:58 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.4 1996/11/06 10:31:04 scrappy Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -29,7 +29,9 @@
*/
#include <string.h>
#include "postgres.h" /* postgres system include file */
-#include "utils/palloc.h"
+
+#include <regex/regex.h>
+
#include "utils/builtins.h" /* where the function declarations go */
#if defined(DISABLE_XOPEN_NLS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 21:30:38 +0000