aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/arrayfuncs.c8
-rw-r--r--src/backend/utils/adt/varchar.c6
-rw-r--r--src/backend/utils/cache/lsyscache.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 3b60534278f..b3c898cbcf4 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.30 1998/06/15 19:29:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.31 1998/07/12 21:29:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@
static int _ArrayCount(char *str, int dim[], int typdelim);
static char *
_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[],
- FmgrInfo *inputproc, Oid typelem, int16 typmod,
+ FmgrInfo *inputproc, Oid typelem, int32 typmod,
char typdelim, int typlen, bool typbyval,
char typalign, int *nbytes);
@@ -94,7 +94,7 @@ static char *array_seek(char *ptr, int eltsize, int nitems);
char *
array_in(char *string, /* input array in external form */
Oid element_type, /* type OID of an array element */
- int16 typmod)
+ int32 typmod)
{
int typlen;
bool typbyval,
@@ -360,7 +360,7 @@ _ReadArrayStr(char *arrayStr,
FmgrInfo *inputproc, /* function used for the
* conversion */
Oid typelem,
- int16 typmod,
+ int32 typmod,
char typdelim,
int typlen,
bool typbyval,
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index be7130896ef..29ffacd014f 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.34 1998/06/16 06:41:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.35 1998/07/12 21:29:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,7 +57,7 @@ char *convertstr(char *, int, int);
* because we pass typelem as the second argument for array_in.)
*/
char *
-bpcharin(char *s, int dummy, int16 atttypmod)
+bpcharin(char *s, int dummy, int32 atttypmod)
{
char *result,
*r;
@@ -291,7 +291,7 @@ printf("bpchar- convert string length %d (%d) ->%d\n",
* because we pass typelem as the second argument for array_in.)
*/
char *
-varcharin(char *s, int dummy, int16 atttypmod)
+varcharin(char *s, int dummy, int32 atttypmod)
{
char *result;
int len;
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 08ee8ea2dd8..97b739195e6 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.14 1998/06/15 19:29:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.15 1998/07/12 21:29:24 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -161,7 +161,7 @@ get_attisset(Oid relid, char *attname)
* return the "atttypmod" field from the attribute relation.
*
*/
-int16
+int32
get_atttypmod(Oid relid, AttrNumber attnum)
{
FormData_pg_attribute att_tup;
@@ -169,7 +169,7 @@ get_atttypmod(Oid relid, AttrNumber attnum)
if (SearchSysCacheStruct(ATTNUM,
(char *) &att_tup,
ObjectIdGetDatum(relid),
- UInt16GetDatum(attnum),
+ Int32GetDatum(attnum),
0, 0))
return att_tup.atttypmod;
else