Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit63df35e

Browse files
committed
This patch changes quite a few instances of references of Oid's
as ints and longs. Touches on quite a few function args aswell. Most other files look ok as far as Oids go...still checkingthough...Since Oids are type'd as unsigned ints, they should prolly be usedwith the %ud format string in elog and sprintf messages. Not surewhat kind of strangeness that could produce.Darren King
1 parentf0a9e64 commit63df35e

File tree

11 files changed

+103
-95
lines changed

11 files changed

+103
-95
lines changed

‎src/backend/catalog/index.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.9 1996/11/13 20:47:53 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.10 1996/11/30 18:05:57 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -288,7 +288,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
288288
0);
289289

290290
if (!HeapTupleIsValid(tuple))
291-
func_error("BuildFuncTupleDesc",funcname,nargs,(int*)argtypes);
291+
func_error("BuildFuncTupleDesc",funcname,nargs,argtypes);
292292

293293
retType= ((Form_pg_proc)GETSTRUCT(tuple))->prorettype;
294294

@@ -1097,7 +1097,7 @@ index_create(char *heapRelationName,
10971097
if (!HeapTupleIsValid(proc_tup)) {
10981098
func_error("index_create",FIgetname(funcInfo),
10991099
FIgetnArgs(funcInfo),
1100-
(int*)FIgetArglist(funcInfo));
1100+
FIgetArglist(funcInfo));
11011101
}
11021102
FIgetProcOid(funcInfo)=proc_tup->t_oid;
11031103
}

‎src/backend/catalog/pg_operator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.6 1996/11/08 00:44:33 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.7 1996/11/30 18:06:03 momjian Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -530,7 +530,7 @@ OperatorDef(char *operatorName,
530530
0);
531531

532532
if (!PointerIsValid(tup))
533-
func_error("OperatorDef",procedureName,nargs,(int*)typeId);
533+
func_error("OperatorDef",procedureName,nargs,typeId);
534534

535535
values[Anum_pg_operator_oprcode-1 ]=ObjectIdGetDatum(tup->t_oid);
536536
values[Anum_pg_operator_oprresult-1 ]=
@@ -554,7 +554,7 @@ OperatorDef(char *operatorName,
554554
ObjectIdGetDatum(typeId),
555555
0);
556556
if (!HeapTupleIsValid(tup))
557-
func_error("OperatorDef",restrictionName,5,(int*)typeId);
557+
func_error("OperatorDef",restrictionName,5,typeId);
558558

559559
values[Anum_pg_operator_oprrest-1 ]=ObjectIdGetDatum(tup->t_oid);
560560
}else
@@ -578,7 +578,7 @@ OperatorDef(char *operatorName,
578578
Int32GetDatum(typeId),
579579
0);
580580
if (!HeapTupleIsValid(tup))
581-
func_error("OperatorDef",joinName,5,(int*)typeId);
581+
func_error("OperatorDef",joinName,5,typeId);
582582

583583
values[Anum_pg_operator_oprjoin-1]=ObjectIdGetDatum(tup->t_oid);
584584
}else

‎src/backend/catalog/pg_type.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.4 1996/11/06 07:31:26 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.5 1996/11/30 18:06:06 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -417,7 +417,7 @@ TypeCreate(char *typeName,
417417
0);
418418
}
419419
if (!HeapTupleIsValid(tup)) {
420-
func_error("TypeCreate",procname,1,(int*)argList);
420+
func_error("TypeCreate",procname,1,argList);
421421
}
422422
}
423423

‎src/backend/commands/remove.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.6 1996/11/06 08:21:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.7 1996/11/30 18:06:10 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -350,7 +350,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
350350
Int32GetDatum(nargs),
351351
PointerGetDatum(argList),0);
352352
if (!HeapTupleIsValid(tup))
353-
func_error("RemoveFunction",functionName,nargs,(int*)argList);
353+
func_error("RemoveFunction",functionName,nargs,argList);
354354

355355
#ifndefNO_SECURITY
356356
userName=GetPgUserName();
@@ -387,7 +387,7 @@ RemoveFunction(char *functionName, /* function name to be removed */
387387
{
388388
heap_endscan(scan);
389389
heap_close(relation);
390-
func_error("RemoveFunction",functionName,nargs,(int*)argList);
390+
func_error("RemoveFunction",functionName,nargs,argList);
391391
}
392392

393393
/* ok, function has been found */

‎src/backend/parser/analyze.c

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.17 1996/11/29 15:56:16 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.18 1996/11/30 18:06:20 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1233,7 +1233,8 @@ make_targetlist_expr(ParseState *pstate,
12331233
Node*expr,
12341234
List*arrayRef)
12351235
{
1236-
inttype_id,type_len,attrtype,attrlen;
1236+
Oidtype_id,attrtype;
1237+
inttype_len,attrlen;
12371238
intresdomno;
12381239
Relationrd;
12391240
boolattrisset;
@@ -1244,7 +1245,7 @@ make_targetlist_expr(ParseState *pstate,
12441245
elog(WARN,"make_targetlist_expr: invalid use of NULL expression");
12451246

12461247
type_id=exprType(expr);
1247-
if (!type_id) {
1248+
if (type_id==InvalidOid) {
12481249
type_len=0;
12491250
}else
12501251
type_len=tlen(get_id_type(type_id));
@@ -1297,7 +1298,7 @@ make_targetlist_expr(ParseState *pstate,
12971298
}
12981299
}elseif((Typecast_ok)&& (attrtype!=type_id)){
12991300
lnext(expr)=
1300-
parser_typecast2(expr,get_id_type((long)attrtype));
1301+
parser_typecast2(expr,get_id_type(attrtype));
13011302
}else
13021303
if (attrtype!=type_id) {
13031304
if ((attrtype==INT2OID)&& (type_id==INT4OID))
@@ -1322,12 +1323,12 @@ make_targetlist_expr(ParseState *pstate,
13221323
Oidtypelem=get_typelem(attrtype);
13231324
expr= (Node*)parser_typecast2(expr,
13241325
type_id,
1325-
get_id_type((long)typelem),
1326+
get_id_type(typelem),
13261327
attrlen);
13271328
}else
13281329
expr= (Node*)parser_typecast2(expr,
13291330
type_id,
1330-
get_id_type((long)attrtype),
1331+
get_id_type(attrtype),
13311332
attrlen);
13321333
}else {
13331334
/* currently, we can't handle casting of expressions */
@@ -1466,7 +1467,7 @@ any_ordering_op(int restype)
14661467
Oidorder_opid;
14671468

14681469
order_op=oper("<",restype,restype);
1469-
order_opid=(Oid)oprid(order_op);
1470+
order_opid=oprid(order_op);
14701471

14711472
returnorder_opid;
14721473
}
@@ -1660,7 +1661,7 @@ make_arguments(int nargs,
16601661
i<nargs;
16611662
i++,current_fargs=lnext(current_fargs)) {
16621663

1663-
if (input_typeids[i]==UNKNOWNOID&&function_typeids[i]!=0) {
1664+
if (input_typeids[i]==UNKNOWNOID&&function_typeids[i]!=InvalidOid) {
16641665
lfirst(current_fargs)=
16651666
parser_typecast2(lfirst(current_fargs),
16661667
input_typeids[i],
@@ -1877,7 +1878,8 @@ ParseComplexProjection(ParseState *pstate,
18771878
returnNULL;
18781879
}
18791880

1880-
staticboolis_lowercase(char*string)
1881+
static
1882+
boolis_lowercase(char*string)
18811883
{
18821884
inti;
18831885

@@ -1890,7 +1892,8 @@ static bool is_lowercase(char *string)
18901892
return true;
18911893
}
18921894

1893-
staticvoidmake_lowercase(char*string)
1895+
static
1896+
voidmake_lowercase(char*string)
18941897
{
18951898
inti;
18961899

@@ -1957,7 +1960,7 @@ ParseFunc(ParseState *pstate, char *funcname, List *fargs, int *curr_resno)
19571960
* it is a set, treat it like a function and drop through.
19581961
*/
19591962
if (get_attnum(relid,funcname)!=InvalidAttrNumber) {
1960-
intdummyTypeId;
1963+
OiddummyTypeId;
19611964

19621965
return
19631966
((Node*)make_var(pstate,
@@ -2022,7 +2025,7 @@ ParseFunc(ParseState *pstate, char *funcname, List *fargs, int *curr_resno)
20222025
}else {
20232026
/* try one more time with lowercase --djm 8/17/96 */
20242027
if(!is_lowercase(funcname)) {
2025-
char*lowercase_funcname=strdup(funcname);
2028+
char*lowercase_funcname=pstrdup(funcname);
20262029

20272030
make_lowercase(lowercase_funcname);
20282031
if (strcmp(lowercase_funcname,"count")==0)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp