aboutsummaryrefslogtreecommitdiff
path: root/src/include/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/utils')
-rw-r--r--src/include/utils/array.h38
-rw-r--r--src/include/utils/builtins.h22
-rw-r--r--src/include/utils/catcache.h4
-rw-r--r--src/include/utils/dt.h10
-rw-r--r--src/include/utils/rel.h19
5 files changed, 42 insertions, 51 deletions
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index c5b8804151d..fb7beef36a7 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: array.h,v 1.12 1998/07/12 21:29:38 momjian Exp $
+ * $Id: array.h,v 1.13 1998/09/01 03:28:26 momjian Exp $
*
* NOTES
* XXX the data array should be LONGALIGN'd -- notice that the array
@@ -118,17 +118,17 @@ extern char *array_in(char *string, Oid element_type, int32 typmod);
extern char *array_out(ArrayType *v, Oid element_type);
extern char *array_dims(ArrayType *v, bool *isNull);
extern Datum
-array_ref(ArrayType *array, int n, int indx[], int reftype,
+array_ref(ArrayType *array, int n, int *indx, int reftype,
int elmlen, int arraylen, bool *isNull);
extern Datum
-array_clip(ArrayType *array, int n, int upperIndx[],
- int lowerIndx[], int reftype, int len, bool *isNull);
+array_clip(ArrayType *array, int n, int *upperIndx,
+ int *lowerIndx, int reftype, int len, bool *isNull);
extern char *
-array_set(ArrayType *array, int n, int indx[], char *dataPtr,
+array_set(ArrayType *array, int n, int *indx, char *dataPtr,
int reftype, int elmlen, int arraylen, bool *isNull);
extern char *
-array_assgn(ArrayType *array, int n, int upperIndx[],
- int lowerIndx[], ArrayType *newArr, int reftype,
+array_assgn(ArrayType *array, int n, int *upperIndx,
+ int *lowerIndx, ArrayType *newArr, int reftype,
int len, bool *isNull);
extern int array_eq(ArrayType *array1, ArrayType *array2);
extern int
@@ -143,27 +143,27 @@ extern char *_array_newLO(int *fd, int flag);
* [these names seem to be too generic. Add prefix for arrays? -- AY]
*/
-extern int GetOffset(int n, int dim[], int lb[], int indx[]);
-extern int getNitems(int n, int a[]);
-extern int compute_size(int st[], int endp[], int n, int base);
-extern void mda_get_offset_values(int n, int dist[], int PC[], int span[]);
-extern void mda_get_range(int n, int span[], int st[], int endp[]);
-extern void mda_get_prod(int n, int range[], int P[]);
-extern int tuple2linear(int n, int tup[], int scale[]);
-extern void array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]);
-extern int next_tuple(int n, int curr[], int span[]);
+extern int GetOffset(int n, int *dim, int *lb, int *indx);
+extern int getNitems(int n, int *a);
+extern int compute_size(int *st, int *endp, int n, int base);
+extern void mda_get_offset_values(int n, int *dist, int *PC, int *span);
+extern void mda_get_range(int n, int *span, int *st, int *endp);
+extern void mda_get_prod(int n, int *range, int *P);
+extern int tuple2linear(int n, int *tup, int *scale);
+extern void array2chunk_coord(int n, int *C, int *a_coord, int *c_coord);
+extern int next_tuple(int n, int *curr, int *span);
/*
* prototypes for functions defined in chunk.c
*/
extern char *
-_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
+_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize,
int *nbytes, char *chunkfile);
extern int
-_ReadChunkArray(int st[], int endp[], int bsize, int fp,
+_ReadChunkArray(int *st, int *endp, int bsize, int fp,
char *destfp, ArrayType *array, int isDestLO, bool *isNull);
extern struct varlena *
-_ReadChunkArray1El(int st[], int bsize, int fp,
+_ReadChunkArray1El(int *st, int bsize, int fp,
ArrayType *array, bool *isNull);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 53cda4a9a0f..931e17f2bd7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.49 1998/08/31 07:55:50 momjian Exp $
+ * $Id: builtins.h,v 1.50 1998/09/01 03:28:28 momjian Exp $
*
* NOTES
* This should normally only be included by fmgr.h.
@@ -64,9 +64,9 @@ extern bool cideq(int8 arg1, int8 arg2);
extern int32 int2in(char *num);
extern char *int2out(int16 sh);
extern int16 *int28in(char *shs);
-extern char *int28out(int16 (*shs)[]);
+extern char *int28out(int16 **shs);
extern int32 *int44in(char *input_string);
-extern char *int44out(int32 an_array[]);
+extern char *int44out(int32 *an_array);
extern int32 int4in(char *num);
extern char *int4out(int32 l);
extern int32 i2toi4(int16 arg1);
@@ -165,7 +165,7 @@ extern int32 btint42cmp(int32 a, int16 b);
extern int32 btfloat4cmp(float32 a, float32 b);
extern int32 btfloat8cmp(float64 a, float64 b);
extern int32 btoidcmp(Oid a, Oid b);
-extern int32 btoid8cmp(Oid a[], Oid b[]);
+extern int32 btoid8cmp(Oid *a, Oid *b);
extern int32 btabstimecmp(AbsoluteTime a, AbsoluteTime b);
extern int32 btcharcmp(char a, char b);
extern int32 btnamecmp(NameData *a, NameData *b);
@@ -329,16 +329,16 @@ extern bool oidnotin(Oid the_oid, char *compare);
/* oid.c */
extern Oid *oid8in(char *oidString);
-extern char *oid8out(Oid (*oidArray)[]);
+extern char *oid8out(Oid **oidArray);
extern Oid oidin(char *s);
extern char *oidout(Oid o);
extern bool oideq(Oid arg1, Oid arg2);
extern bool oidne(Oid arg1, Oid arg2);
-extern bool oid8eq(Oid arg1[], Oid arg2[]);
-extern bool oid8lt(Oid arg1[], Oid arg2[]);
-extern bool oid8le(Oid arg1[], Oid arg2[]);
-extern bool oid8ge(Oid arg1[], Oid arg2[]);
-extern bool oid8gt(Oid arg1[], Oid arg2[]);
+extern bool oid8eq(Oid *arg1, Oid *arg2);
+extern bool oid8lt(Oid *arg1, Oid *arg2);
+extern bool oid8le(Oid *arg1, Oid *arg2);
+extern bool oid8ge(Oid *arg1, Oid *arg2);
+extern bool oid8gt(Oid *arg1, Oid *arg2);
extern bool oideqint4(Oid arg1, int32 arg2);
extern bool int4eqoid(int32 arg1, Oid arg2);
extern text *oid_text(Oid arg1);
@@ -358,7 +358,7 @@ extern bool texticregexne(struct varlena * s, struct varlena * p);
/* regproc.c */
extern int32 regprocin(char *pro_name_and_oid);
extern char *regprocout(RegProcedure proid);
-extern text *oid8types(Oid (*oidArray)[]);
+extern text *oid8types(Oid **oidArray);
extern Oid regproctooid(RegProcedure rp);
/* define macro to replace mixed-case function call - tgl 97/04/27 */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index c759416ab09..e955c29f3df 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: catcache.h,v 1.11 1998/02/26 04:43:53 momjian Exp $
+ * $Id: catcache.h,v 1.12 1998/09/01 03:28:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -70,7 +70,7 @@ extern void ResetSystemCache(void);
extern void SystemCacheRelationFlushed(Oid relId);
extern CatCache *
InitSysCache(char *relname, char *indname, int id, int nkeys,
- int key[], HeapTuple (*iScanfuncP) ());
+ int *key, HeapTuple (*iScanfuncP) ());
extern HeapTuple
SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
Datum v3, Datum v4);
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index b3ccab76968..0e947d63932 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dt.h,v 1.30 1998/05/31 17:08:35 thomas Exp $
+ * $Id: dt.h,v 1.31 1998/09/01 03:28:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -325,17 +325,17 @@ extern double time2t(const int hour, const int min, const double sec);
extern int
ParseDateTime(char *timestr, char *lowstr,
- char *field[], int ftype[], int maxfields, int *numfields);
+ char **field, int *ftype, int maxfields, int *numfields);
extern int
-DecodeDateTime(char *field[], int ftype[],
+DecodeDateTime(char **field, int *ftype,
int nf, int *dtype, struct tm * tm, double *fsec, int *tzp);
extern int
-DecodeTimeOnly(char *field[], int ftype[], int nf,
+DecodeTimeOnly(char **field, int *ftype, int nf,
int *dtype, struct tm * tm, double *fsec);
extern int
-DecodeDateDelta(char *field[], int ftype[],
+DecodeDateDelta(char **field, int *ftype,
int nf, int *dtype, struct tm * tm, double *fsec);
extern int EncodeDateOnly(struct tm * tm, int style, char *str);
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index edfd5d47b8e..206c011ba2c 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rel.h,v 1.18 1998/08/19 02:04:07 momjian Exp $
+ * $Id: rel.h,v 1.19 1998/09/01 03:28:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -127,22 +127,13 @@ typedef Relation *RelationPtr;
#define RelationDecrementReferenceCount(relation) ((relation)->rd_refcnt -= 1)
/*
- * RelationGetAccessMethodTupleForm --
- * Returns access method attribute values for a relation.
- *
- * Note:
- * Assumes relation descriptor is valid.
- */
-#define RelationGetAccessMethodTupleForm(relation) ((relation)->rd_am)
-
-/*
- * RelationGetRelationTupleForm --
+ * RelationGetForm --
* Returns relation attribute values for a relation.
*
* Note:
* Assumes relation descriptor is valid.
*/
-#define RelationGetRelationTupleForm(relation) ((relation)->rd_rel)
+#define RelationGetForm(relation) ((relation)->rd_rel)
/*
@@ -176,13 +167,13 @@ typedef Relation *RelationPtr;
#define RelationGetNumberOfAttributes(relation) ((relation)->rd_rel->relnatts)
/*
- * RelationGetTupleDescriptor --
+ * RelationGetDescr --
* Returns tuple descriptor for a relation.
*
* Note:
* Assumes relation descriptor is valid.
*/
-#define RelationGetTupleDescriptor(relation) ((relation)->rd_att)
+#define RelationGetDescr(relation) ((relation)->rd_att)
extern IndexStrategy RelationGetIndexStrategy(Relation relation);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 21:34:08 +0000