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.
This commit is contained in:
Neil Conway 2005-06-21 00:58:15 +00:00
parent 2d4b9736bb
commit 09d1110c2a
1 changed files with 4 additions and 5 deletions

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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; Oid namespaceId;
List *parsetree_list; List *parsetree_list;
ListCell *parsetree_item; ListCell *parsetree_item;
const char *owner_name;
AclId owner_userid; AclId owner_userid;
AclId saved_userid; AclId saved_userid;
AclResult aclresult; AclResult aclresult;
@ -56,13 +55,11 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
if (!authId) if (!authId)
{ {
owner_userid = saved_userid; owner_userid = saved_userid;
owner_name = GetUserNameFromId(owner_userid);
} }
else if (superuser()) else if (superuser())
{ {
owner_name = authId;
/* The following will error out if user does not exist */ /* 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 * Set the current user to the requested authorization so that
@ -74,6 +71,8 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
} }
else else
{ {
const char *owner_name;
/* not superuser */ /* not superuser */
owner_userid = saved_userid; owner_userid = saved_userid;
owner_name = GetUserNameFromId(owner_userid); owner_name = GetUserNameFromId(owner_userid);