From 63df35e24943477ad04e4cde6186687c42aa48bb Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 30 Nov 1996 18:07:02 +0000 Subject: This patch changes quite a few instances of references of Oid's as ints and longs. Touches on quite a few function args as well. Most other files look ok as far as Oids go...still checking though... Since Oids are type'd as unsigned ints, they should prolly be used with the %ud format string in elog and sprintf messages. Not sure what kind of strangeness that could produce. Darren King --- src/backend/parser/parser.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/backend/parser/parser.c') diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index a77007c6f4c..b93fe94ec4a 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.13 1996/11/30 17:49:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.14 1996/11/30 18:06:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -294,7 +294,7 @@ parser_typecast(Value *expr, TypeName *typename, int typlen) } Node * -parser_typecast2(Node *expr, int exprType, Type tp, int typlen) +parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen) { /* check for passing non-ints */ Const *adt; @@ -357,11 +357,11 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen) const_string = (char *) textout((struct varlena *)const_string); break; default: - elog(WARN,"unknown type%d ",exprType); + elog(WARN,"unknown type %ud ",exprType); } if (!exprType) { - adt = makeConst((Oid)typeid(tp), + adt = makeConst(typeid(tp), (Size) 0, (Datum) NULL, true, /* isnull */ @@ -398,14 +398,14 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen) } } - adt = makeConst((Oid)typeid(tp), + adt = makeConst(typeid(tp), (Size)len, (Datum)lcp, 0, 0 /*was omitted*/, 0 /* not a set */); /* - printf("adt %s : %d %d %d\n",CString(expr),typeid(tp) , + printf("adt %s : %ud %d %d\n",CString(expr),typeid(tp) , len,cp); */ if (string_palloced) pfree(const_string); @@ -466,5 +466,3 @@ ParseAgg(char *aggname, Oid basetype, Node *target) return aggreg; } - - -- cgit v1.2.3