summaryrefslogtreecommitdiff
path: root/src/include/access
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-09-01 03:29:17 +0000
committerBruce Momjian <bruce@momjian.us>1998-09-01 03:29:17 +0000
commitaf74855a608da4cd7ef88ceb2241ec1c75537f39 (patch)
tree912ecaa0cdd84297ad886df5ed7c046c7c501411 /src/include/access
parent2aa080fc933cac47205bc79f026fc89dab0e5149 (diff)
downloadpostgresql-af74855a608da4cd7ef88ceb2241ec1c75537f39.tar.gz
Renaming cleanup, no pgindent yet.
Diffstat (limited to 'src/include/access')
-rw-r--r--src/include/access/genam.h4
-rw-r--r--src/include/access/hash.h4
-rw-r--r--src/include/access/heapam.h10
-rw-r--r--src/include/access/itup.h4
-rw-r--r--src/include/access/tupdesc.h6
-rw-r--r--src/include/access/tupmacs.h4
-rw-r--r--src/include/access/valid.h4
7 files changed, 18 insertions, 18 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 1494665b33..7885d1cd0d 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: genam.h,v 1.14 1998/08/19 02:03:35 momjian Exp $
+ * $Id: genam.h,v 1.15 1998/09/01 03:27:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@ index_getprocid(Relation irel, AttrNumber attnum,
uint16 procnum);
extern Datum
GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
- int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo,
+ int attOff, AttrNumber *attrNums, FuncIndexInfo *fInfo,
bool *attNull);
/* in genam.c */
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 4c21adde10..bbc34dbb81 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hash.h,v 1.17 1998/08/19 02:03:37 momjian Exp $
+ * $Id: hash.h,v 1.18 1998/09/01 03:27:31 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -271,7 +271,7 @@ extern uint32 hashint4(uint32 key);
extern uint32 hashfloat4(float32 keyp);
extern uint32 hashfloat8(float64 keyp);
extern uint32 hashoid(Oid key);
-extern uint32 hashoid8(Oid key[]);
+extern uint32 hashoid8(Oid *key);
extern uint32 hashchar(char key);
extern uint32 hashtext(struct varlena * key);
extern uint32 hashname(NameData *n);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 777f1acbe3..f8e05b60cf 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.35 1998/08/19 02:03:39 momjian Exp $
+ * $Id: heapam.h,v 1.36 1998/09/01 03:27:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -262,10 +262,10 @@ extern void heap_markpos(HeapScanDesc scan);
extern void heap_restrpos(HeapScanDesc scan);
/* in common/heaptuple.c */
-extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
+extern Size ComputeDataSize(TupleDesc tupleDesc, Datum *value, char *nulls);
extern void
DataFill(char *data, TupleDesc tupleDesc,
- Datum value[], char nulls[], uint16 *infomask,
+ Datum *value, char *nulls, uint16 *infomask,
bits8 *bit);
extern int heap_attisnull(HeapTuple tup, int attnum);
extern int heap_sysattrlen(AttrNumber attno);
@@ -277,10 +277,10 @@ nocachegetattr(HeapTuple tup, int attnum,
extern HeapTuple heap_copytuple(HeapTuple tuple);
extern HeapTuple
heap_formtuple(TupleDesc tupleDescriptor,
- Datum value[], char nulls[]);
+ Datum *value, char *nulls);
extern HeapTuple
heap_modifytuple(HeapTuple tuple,
- Relation relation, Datum replValue[], char replNull[], char repl[]);
+ Relation relation, Datum *replValue, char *replNull, char *repl);
HeapTuple heap_addheader(uint32 natts, int structlen, char *structure);
/* in common/heap/stats.c */
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 40d26f3feb..9b02b6a937 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: itup.h,v 1.14 1998/06/15 18:39:54 momjian Exp $
+ * $Id: itup.h,v 1.15 1998/09/01 03:27:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -162,7 +162,7 @@ typedef struct PredInfo
/* indextuple.h */
extern IndexTuple
index_formtuple(TupleDesc tupleDescriptor,
- Datum value[], char null[]);
+ Datum *value, char *null);
extern Datum
nocache_index_getattr(IndexTuple tup, int attnum,
TupleDesc tupleDesc, bool *isnull);
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 402bab9229..050fba81f5 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupdesc.h,v 1.18 1998/08/19 02:03:40 momjian Exp $
+ * $Id: tupdesc.h,v 1.19 1998/09/01 03:27:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,14 +50,14 @@ typedef struct tupleDesc
{
int natts;
/* Number of attributes in the tuple */
- AttributeTupleForm *attrs;
+ Form_pg_attribute *attrs;
/* attrs[N] is a pointer to the description of Attribute Number N+1. */
TupleConstr *constr;
} *TupleDesc;
extern TupleDesc CreateTemplateTupleDesc(int natts);
-extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm *attrs);
+extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs);
extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 173ac2cdcb..f81987f382 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupmacs.h,v 1.4 1998/02/26 04:40:31 momjian Exp $
+ * $Id: tupmacs.h,v 1.5 1998/09/01 03:27:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#define att_isnull(ATT, BITS) (!((BITS)[(ATT) >> 3] & (1 << ((ATT) & 0x07))))
/*
- * given a AttributeTupleForm and a pointer into a tuple's data
+ * given a Form_pg_attribute and a pointer into a tuple's data
* area, return the correct value or pointer.
*
* We return a 4 byte (char *) value in all cases. If the attribute has
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index fe87451269..2eeed643fb 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: valid.h,v 1.13 1998/01/31 04:39:24 momjian Exp $
+ * $Id: valid.h,v 1.14 1998/09/01 03:27:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -130,7 +130,7 @@ do \
_tuple = (HeapTuple) PageGetItem((Page) (disk_page), (itemId)); \
\
if ((key) != NULL) \
- HeapKeyTest(_tuple, RelationGetTupleDescriptor(relation), \
+ HeapKeyTest(_tuple, RelationGetDescr(relation), \
(nKeys), (key), _res); \
else \
_res = TRUE; \