Skip to content

Commit cbdf75b

Browse files
peterepetere
committed
Remove useless casts
Casting the argument of strVal() to (Value *) is useless, since strVal() already does that. Most code didn't do that anyway; this was apparently just a style that snuck into certain files. Reviewed-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/5ba6bc5b-3f95-04f2-2419-f8ddb4c046fb@enterprisedb.com
1 parent 3b23159 commit cbdf75b

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎src/backend/catalog/objectaddress.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,7 +2386,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
23862386
case OBJECT_DATABASE:
23872387
if (!pg_database_ownercheck(address.objectId, roleid))
23882388
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2389-
strVal((Value *) object));
2389+
strVal(object));
23902390
break;
23912391
case OBJECT_TYPE:
23922392
case OBJECT_DOMAIN:
@@ -2433,7 +2433,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
24332433
case OBJECT_SCHEMA:
24342434
if (!pg_namespace_ownercheck(address.objectId, roleid))
24352435
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2436-
strVal((Value *) object));
2436+
strVal(object));
24372437
break;
24382438
case OBJECT_COLLATION:
24392439
if (!pg_collation_ownercheck(address.objectId, roleid))
@@ -2448,27 +2448,27 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
24482448
case OBJECT_EXTENSION:
24492449
if (!pg_extension_ownercheck(address.objectId, roleid))
24502450
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2451-
strVal((Value *) object));
2451+
strVal(object));
24522452
break;
24532453
case OBJECT_FDW:
24542454
if (!pg_foreign_data_wrapper_ownercheck(address.objectId, roleid))
24552455
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2456-
strVal((Value *) object));
2456+
strVal(object));
24572457
break;
24582458
case OBJECT_FOREIGN_SERVER:
24592459
if (!pg_foreign_server_ownercheck(address.objectId, roleid))
24602460
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2461-
strVal((Value *) object));
2461+
strVal(object));
24622462
break;
24632463
case OBJECT_EVENT_TRIGGER:
24642464
if (!pg_event_trigger_ownercheck(address.objectId, roleid))
24652465
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2466-
strVal((Value *) object));
2466+
strVal(object));
24672467
break;
24682468
case OBJECT_LANGUAGE:
24692469
if (!pg_language_ownercheck(address.objectId, roleid))
24702470
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2471-
strVal((Value *) object));
2471+
strVal(object));
24722472
break;
24732473
case OBJECT_OPCLASS:
24742474
if (!pg_opclass_ownercheck(address.objectId, roleid))
@@ -2508,12 +2508,12 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
25082508
case OBJECT_PUBLICATION:
25092509
if (!pg_publication_ownercheck(address.objectId, roleid))
25102510
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2511-
strVal((Value *) object));
2511+
strVal(object));
25122512
break;
25132513
case OBJECT_SUBSCRIPTION:
25142514
if (!pg_subscription_ownercheck(address.objectId, roleid))
25152515
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2516-
strVal((Value *) object));
2516+
strVal(object));
25172517
break;
25182518
case OBJECT_TRANSFORM:
25192519
{
@@ -2527,7 +2527,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
25272527
case OBJECT_TABLESPACE:
25282528
if (!pg_tablespace_ownercheck(address.objectId, roleid))
25292529
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
2530-
strVal((Value *) object));
2530+
strVal(object));
25312531
break;
25322532
case OBJECT_TSDICTIONARY:
25332533
if (!pg_ts_dict_ownercheck(address.objectId, roleid))

‎src/backend/commands/alter.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt,
501501
switch (stmt->objectType)
502502
{
503503
case OBJECT_EXTENSION:
504-
address = AlterExtensionNamespace(strVal((Value *) stmt->object), stmt->newschema,
504+
address = AlterExtensionNamespace(strVal(stmt->object), stmt->newschema,
505505
oldSchemaAddr ? &oldNspOid : NULL);
506506
break;
507507

@@ -837,34 +837,34 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
837837
switch (stmt->objectType)
838838
{
839839
case OBJECT_DATABASE:
840-
return AlterDatabaseOwner(strVal((Value *) stmt->object), newowner);
840+
return AlterDatabaseOwner(strVal(stmt->object), newowner);
841841

842842
case OBJECT_SCHEMA:
843-
return AlterSchemaOwner(strVal((Value *) stmt->object), newowner);
843+
return AlterSchemaOwner(strVal(stmt->object), newowner);
844844

845845
case OBJECT_TYPE:
846846
case OBJECT_DOMAIN: /* same as TYPE */
847847
return AlterTypeOwner(castNode(List, stmt->object), newowner, stmt->objectType);
848848
break;
849849

850850
case OBJECT_FDW:
851-
return AlterForeignDataWrapperOwner(strVal((Value *) stmt->object),
851+
return AlterForeignDataWrapperOwner(strVal(stmt->object),
852852
newowner);
853853

854854
case OBJECT_FOREIGN_SERVER:
855-
return AlterForeignServerOwner(strVal((Value *) stmt->object),
855+
return AlterForeignServerOwner(strVal(stmt->object),
856856
newowner);
857857

858858
case OBJECT_EVENT_TRIGGER:
859-
return AlterEventTriggerOwner(strVal((Value *) stmt->object),
859+
return AlterEventTriggerOwner(strVal(stmt->object),
860860
newowner);
861861

862862
case OBJECT_PUBLICATION:
863-
return AlterPublicationOwner(strVal((Value *) stmt->object),
863+
return AlterPublicationOwner(strVal(stmt->object),
864864
newowner);
865865

866866
case OBJECT_SUBSCRIPTION:
867-
return AlterSubscriptionOwner(strVal((Value *) stmt->object),
867+
return AlterSubscriptionOwner(strVal(stmt->object),
868868
newowner);
869869

870870
/* Generic cases */

‎src/backend/commands/comment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CommentObject(CommentStmt *stmt)
5252
*/
5353
if (stmt->objtype == OBJECT_DATABASE)
5454
{
55-
char *database = strVal((Value *) stmt->object);
55+
char *database = strVal(stmt->object);
5656

5757
if (!OidIsValid(get_database_oid(database, true)))
5858
{

‎src/backend/commands/dropcmds.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
255255
{
256256
case OBJECT_ACCESS_METHOD:
257257
msg = gettext_noop("access method \"%s\" does not exist, skipping");
258-
name = strVal((Value *) object);
258+
name = strVal(object);
259259
break;
260260
case OBJECT_TYPE:
261261
case OBJECT_DOMAIN:
@@ -285,7 +285,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
285285
break;
286286
case OBJECT_SCHEMA:
287287
msg = gettext_noop("schema \"%s\" does not exist, skipping");
288-
name = strVal((Value *) object);
288+
name = strVal(object);
289289
break;
290290
case OBJECT_STATISTIC_EXT:
291291
if (!schema_does_not_exist_skipping(castNode(List, object), &msg, &name))
@@ -324,7 +324,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
324324
break;
325325
case OBJECT_EXTENSION:
326326
msg = gettext_noop("extension \"%s\" does not exist, skipping");
327-
name = strVal((Value *) object);
327+
name = strVal(object);
328328
break;
329329
case OBJECT_FUNCTION:
330330
{
@@ -392,7 +392,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
392392
}
393393
case OBJECT_LANGUAGE:
394394
msg = gettext_noop("language \"%s\" does not exist, skipping");
395-
name = strVal((Value *) object);
395+
name = strVal(object);
396396
break;
397397
case OBJECT_CAST:
398398
{
@@ -434,7 +434,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
434434
break;
435435
case OBJECT_EVENT_TRIGGER:
436436
msg = gettext_noop("event trigger \"%s\" does not exist, skipping");
437-
name = strVal((Value *) object);
437+
name = strVal(object);
438438
break;
439439
case OBJECT_RULE:
440440
if (!owningrel_does_not_exist_skipping(castNode(List, object), &msg, &name))
@@ -447,11 +447,11 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
447447
break;
448448
case OBJECT_FDW:
449449
msg = gettext_noop("foreign-data wrapper \"%s\" does not exist, skipping");
450-
name = strVal((Value *) object);
450+
name = strVal(object);
451451
break;
452452
case OBJECT_FOREIGN_SERVER:
453453
msg = gettext_noop("server \"%s\" does not exist, skipping");
454-
name = strVal((Value *) object);
454+
name = strVal(object);
455455
break;
456456
case OBJECT_OPCLASS:
457457
{
@@ -479,7 +479,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
479479
break;
480480
case OBJECT_PUBLICATION:
481481
msg = gettext_noop("publication \"%s\" does not exist, skipping");
482-
name = strVal((Value *) object);
482+
name = strVal(object);
483483
break;
484484
default:
485485
elog(ERROR, "unrecognized object type: %d", (int) objtype);

‎src/backend/commands/statscmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ CreateStatistics(CreateStatsStmt *stmt)
335335
build_mcv = false;
336336
foreach(cell, stmt->stat_types)
337337
{
338-
char *type = strVal((Value *) lfirst(cell));
338+
char *type = strVal(lfirst(cell));
339339

340340
if (strcmp(type, "ndistinct") == 0)
341341
{

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy