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
This commit is contained in:
parent
3b231596cc
commit
cbdf75bf80
@ -2386,7 +2386,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
|
||||
case OBJECT_DATABASE:
|
||||
if (!pg_database_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_TYPE:
|
||||
case OBJECT_DOMAIN:
|
||||
@ -2433,7 +2433,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
|
||||
case OBJECT_SCHEMA:
|
||||
if (!pg_namespace_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_COLLATION:
|
||||
if (!pg_collation_ownercheck(address.objectId, roleid))
|
||||
@ -2448,27 +2448,27 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
|
||||
case OBJECT_EXTENSION:
|
||||
if (!pg_extension_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_FDW:
|
||||
if (!pg_foreign_data_wrapper_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_FOREIGN_SERVER:
|
||||
if (!pg_foreign_server_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_EVENT_TRIGGER:
|
||||
if (!pg_event_trigger_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_LANGUAGE:
|
||||
if (!pg_language_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_OPCLASS:
|
||||
if (!pg_opclass_ownercheck(address.objectId, roleid))
|
||||
@ -2508,12 +2508,12 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
|
||||
case OBJECT_PUBLICATION:
|
||||
if (!pg_publication_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_SUBSCRIPTION:
|
||||
if (!pg_subscription_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_TRANSFORM:
|
||||
{
|
||||
@ -2527,7 +2527,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
|
||||
case OBJECT_TABLESPACE:
|
||||
if (!pg_tablespace_ownercheck(address.objectId, roleid))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
|
||||
strVal((Value *) object));
|
||||
strVal(object));
|
||||
break;
|
||||
case OBJECT_TSDICTIONARY:
|
||||
if (!pg_ts_dict_ownercheck(address.objectId, roleid))
|
||||
|
@ -501,7 +501,7 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt,
|
||||
switch (stmt->objectType)
|
||||
{
|
||||
case OBJECT_EXTENSION:
|
||||
address = AlterExtensionNamespace(strVal((Value *) stmt->object), stmt->newschema,
|
||||
address = AlterExtensionNamespace(strVal(stmt->object), stmt->newschema,
|
||||
oldSchemaAddr ? &oldNspOid : NULL);
|
||||
break;
|
||||
|
||||
@ -837,10 +837,10 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
|
||||
switch (stmt->objectType)
|
||||
{
|
||||
case OBJECT_DATABASE:
|
||||
return AlterDatabaseOwner(strVal((Value *) stmt->object), newowner);
|
||||
return AlterDatabaseOwner(strVal(stmt->object), newowner);
|
||||
|
||||
case OBJECT_SCHEMA:
|
||||
return AlterSchemaOwner(strVal((Value *) stmt->object), newowner);
|
||||
return AlterSchemaOwner(strVal(stmt->object), newowner);
|
||||
|
||||
case OBJECT_TYPE:
|
||||
case OBJECT_DOMAIN: /* same as TYPE */
|
||||
@ -848,23 +848,23 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
|
||||
break;
|
||||
|
||||
case OBJECT_FDW:
|
||||
return AlterForeignDataWrapperOwner(strVal((Value *) stmt->object),
|
||||
return AlterForeignDataWrapperOwner(strVal(stmt->object),
|
||||
newowner);
|
||||
|
||||
case OBJECT_FOREIGN_SERVER:
|
||||
return AlterForeignServerOwner(strVal((Value *) stmt->object),
|
||||
return AlterForeignServerOwner(strVal(stmt->object),
|
||||
newowner);
|
||||
|
||||
case OBJECT_EVENT_TRIGGER:
|
||||
return AlterEventTriggerOwner(strVal((Value *) stmt->object),
|
||||
return AlterEventTriggerOwner(strVal(stmt->object),
|
||||
newowner);
|
||||
|
||||
case OBJECT_PUBLICATION:
|
||||
return AlterPublicationOwner(strVal((Value *) stmt->object),
|
||||
return AlterPublicationOwner(strVal(stmt->object),
|
||||
newowner);
|
||||
|
||||
case OBJECT_SUBSCRIPTION:
|
||||
return AlterSubscriptionOwner(strVal((Value *) stmt->object),
|
||||
return AlterSubscriptionOwner(strVal(stmt->object),
|
||||
newowner);
|
||||
|
||||
/* Generic cases */
|
||||
|
@ -52,7 +52,7 @@ CommentObject(CommentStmt *stmt)
|
||||
*/
|
||||
if (stmt->objtype == OBJECT_DATABASE)
|
||||
{
|
||||
char *database = strVal((Value *) stmt->object);
|
||||
char *database = strVal(stmt->object);
|
||||
|
||||
if (!OidIsValid(get_database_oid(database, true)))
|
||||
{
|
||||
|
@ -255,7 +255,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
{
|
||||
case OBJECT_ACCESS_METHOD:
|
||||
msg = gettext_noop("access method \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_TYPE:
|
||||
case OBJECT_DOMAIN:
|
||||
@ -285,7 +285,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
break;
|
||||
case OBJECT_SCHEMA:
|
||||
msg = gettext_noop("schema \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_STATISTIC_EXT:
|
||||
if (!schema_does_not_exist_skipping(castNode(List, object), &msg, &name))
|
||||
@ -324,7 +324,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
break;
|
||||
case OBJECT_EXTENSION:
|
||||
msg = gettext_noop("extension \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_FUNCTION:
|
||||
{
|
||||
@ -392,7 +392,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
}
|
||||
case OBJECT_LANGUAGE:
|
||||
msg = gettext_noop("language \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_CAST:
|
||||
{
|
||||
@ -434,7 +434,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
break;
|
||||
case OBJECT_EVENT_TRIGGER:
|
||||
msg = gettext_noop("event trigger \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_RULE:
|
||||
if (!owningrel_does_not_exist_skipping(castNode(List, object), &msg, &name))
|
||||
@ -447,11 +447,11 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
break;
|
||||
case OBJECT_FDW:
|
||||
msg = gettext_noop("foreign-data wrapper \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_FOREIGN_SERVER:
|
||||
msg = gettext_noop("server \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
case OBJECT_OPCLASS:
|
||||
{
|
||||
@ -479,7 +479,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
|
||||
break;
|
||||
case OBJECT_PUBLICATION:
|
||||
msg = gettext_noop("publication \"%s\" does not exist, skipping");
|
||||
name = strVal((Value *) object);
|
||||
name = strVal(object);
|
||||
break;
|
||||
default:
|
||||
elog(ERROR, "unrecognized object type: %d", (int) objtype);
|
||||
|
@ -335,7 +335,7 @@ CreateStatistics(CreateStatsStmt *stmt)
|
||||
build_mcv = false;
|
||||
foreach(cell, stmt->stat_types)
|
||||
{
|
||||
char *type = strVal((Value *) lfirst(cell));
|
||||
char *type = strVal(lfirst(cell));
|
||||
|
||||
if (strcmp(type, "ndistinct") == 0)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user