From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 28 Sep 2016 22:31:58 +0000 (-0300)
Subject: Silence compiler warnings
X-Git-Tag: REL_10_BETA1~1654
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=b82d5a2c7c9dd1a01041feef2834db27a46fb2d3;p=postgresql.git

Silence compiler warnings

Reported by Peter Eisentraut.  Coding suggested by Tom Lane.
---

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 9aa81748ba7..d531d17cdbc 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -2290,23 +2290,18 @@ get_object_namespace(const ObjectAddress *address)
 int
 read_objtype_from_string(const char *objtype)
 {
-	ObjectType	type;
 	int			i;
 
 	for (i = 0; i < lengthof(ObjectTypeMap); i++)
 	{
 		if (strcmp(ObjectTypeMap[i].tm_name, objtype) == 0)
-		{
-			type = ObjectTypeMap[i].tm_type;
-			break;
-		}
+			return ObjectTypeMap[i].tm_type;
 	}
-	if (i >= lengthof(ObjectTypeMap))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("unrecognized object type \"%s\"", objtype)));
+	ereport(ERROR,
+			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+			 errmsg("unrecognized object type \"%s\"", objtype)));
 
-	return type;
+	return -1;					/* keep compiler quiet */
 }
 
 /*