Commit 09d1110c authored by Neil Conway's avatar Neil Conway

Trivial dead code removal: in CreateSchemaCommand(), 'owner_name' is

only used in one branch of an if statement, so we can move its
declaration to that block. This also avoids an unnecessary syscache
lookup.

Per Coverity static analysis performed by EnterpriseDB.
parent 2d4b9736
......@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.29 2005/04/14 20:03:24 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.30 2005/06/21 00:58:15 neilc Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -42,7 +42,6 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
Oid namespaceId;
List *parsetree_list;
ListCell *parsetree_item;
const char *owner_name;
AclId owner_userid;
AclId saved_userid;
AclResult aclresult;
......@@ -56,13 +55,11 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
if (!authId)
{
owner_userid = saved_userid;
owner_name = GetUserNameFromId(owner_userid);
}
else if (superuser())
{
owner_name = authId;
/* The following will error out if user does not exist */
owner_userid = get_usesysid(owner_name);
owner_userid = get_usesysid(authId);
/*
* Set the current user to the requested authorization so that
......@@ -74,6 +71,8 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
}
else
{
const char *owner_name;
/* not superuser */
owner_userid = saved_userid;
owner_name = GetUserNameFromId(owner_userid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment