Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit aabdd30

Browse files
committed
Remove un-needed references to Name.
1 parent a6ca652 commit aabdd30

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

src/backend/parser/gram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
*
219219
*
220220
* IDENTIFICATION
221-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.17 1998/07/19 05:49:18 momjian Exp $
221+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.18 1998/07/20 11:17:10 momjian Exp $
222222
*
223223
* HISTORY
224224
* AUTHOR DATE MAJOR EVENT

src/backend/parser/parse_func.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.21 1998/07/12 21:29:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.22 1998/07/20 11:17:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1286,7 +1286,6 @@ ParseComplexProjection(ParseState *pstate,
12861286
{
12871287
Oid argtype;
12881288
Oid argrelid;
1289-
Name relname;
12901289
Relation rd;
12911290
Oid relid;
12921291
int attnum;
@@ -1317,7 +1316,6 @@ ParseComplexProjection(ParseState *pstate,
13171316
if (RelationIsValid(rd))
13181317
{
13191318
relid = RelationGetRelationId(rd);
1320-
relname = RelationGetRelationName(rd);
13211319
heap_close(rd);
13221320
}
13231321
if (RelationIsValid(rd))
@@ -1376,7 +1374,6 @@ ParseComplexProjection(ParseState *pstate,
13761374
if (RelationIsValid(rd))
13771375
{
13781376
relid = RelationGetRelationId(rd);
1379-
relname = RelationGetRelationName(rd);
13801377
heap_close(rd);
13811378
}
13821379
if (RelationIsValid(rd))
@@ -1414,17 +1411,14 @@ ParseComplexProjection(ParseState *pstate,
14141411
if (RelationIsValid(rd))
14151412
{
14161413
relid = RelationGetRelationId(rd);
1417-
relname = RelationGetRelationName(rd);
14181414
heap_close(rd);
1419-
}
1420-
if (RelationIsValid(rd) &&
1421-
(attnum = get_attnum(relid, funcname))
1422-
!= InvalidAttrNumber)
1423-
{
1424-
1425-
param->paramtype = attnumTypeId(rd, attnum);
1426-
param->param_tlist = setup_tlist(funcname, relid);
1427-
return ((Node *) param);
1415+
if ((attnum = get_attnum(relid, funcname))
1416+
!= InvalidAttrNumber)
1417+
{
1418+
param->paramtype = attnumTypeId(rd, attnum);
1419+
param->param_tlist = setup_tlist(funcname, relid);
1420+
return ((Node *) param);
1421+
}
14281422
}
14291423
break;
14301424
}

src/backend/parser/parse_node.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/parser/parse_node.c,v 1.17 1998/07/12 21:29:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.18 1998/07/20 11:17:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -280,7 +280,7 @@ make_array_ref(Node *expr,
280280

281281
if (type_struct_array->typelem == InvalidOid)
282282
elog(ERROR, "make_array_ref: type %s is not an array",
283-
(Name) &(type_struct_array->typname.data[0]));
283+
type_struct_array->typname);
284284

285285
/* get the type tuple for the element type */
286286
type_tuple = SearchSysCacheTuple(TYPOID,
@@ -362,7 +362,7 @@ make_array_set(Expr *target_expr,
362362

363363
if (type_struct_array->typelem == InvalidOid)
364364
elog(ERROR, "make_array_ref: type %s is not an array",
365-
(Name) &(type_struct_array->typname.data[0]));
365+
type_struct_array->typname);
366366
/* get the type tuple for the element type */
367367
type_tuple = SearchSysCacheTuple(TYPOID,
368368
ObjectIdGetDatum(type_struct_array->typelem),

src/backend/parser/parse_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/parser/parse_type.c,v 1.12 1998/07/12 21:29:21 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.13 1998/07/20 11:17:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -234,7 +234,7 @@ GetArrayElementType(Oid typearray)
234234
if (type_struct_array->typelem == InvalidOid)
235235
{
236236
elog(ERROR, "GetArrayElementType: type %s is not an array",
237-
(Name) &(type_struct_array->typname.data[0]));
237+
type_struct_array->typname);
238238
}
239239

240240
return (type_struct_array->typelem);

0 commit comments

Comments
 (0)