Insert additional compiler placation into objectaddress.c.

robertmhaas · robertmhaas · commit 462583be1ce7 · 2010-08-27T21:31:19.000Z
Peter Eisentraut reports that some bits of the "address" variable
in get_object_address() give "may be used uninitialized" warnings;
this likes the only excuse his compiler could have for thinking
that's possible.
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/objectaddress.c,v 1.1 2010/08/27 11:47:41 rhaas Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/objectaddress.c,v 1.2 2010/08/27 21:31:19 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -215,6 +215,10 @@ get_object_address(ObjectType objtype, List *objname, List *objargs,
 			break;
 		default:
 			elog(ERROR, "unrecognized objtype: %d", (int) objtype);
+			/* placate compiler, in case it things elog might return */
+			address.classId = InvalidOid;
+			address.objectId = InvalidOid;
+			address.objectSubId = 0;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/objectaddress.c,v 1.1 2010/08/27 11:47:41 rhaas Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/objectaddress.c,v 1.2 2010/08/27 21:31:19 rhaas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -215,6 +215,10 @@ get_object_address(ObjectType objtype, List objname, List objargs,`
`215`	`215`	`break;`
`216`	`216`	`default:`
`217`	`217`	`elog(ERROR, "unrecognized objtype: %d", (int) objtype);`
	`218`	`+ /* placate compiler, in case it things elog might return */`
	`219`	`+ address.classId = InvalidOid;`
	`220`	`+ address.objectId = InvalidOid;`
	`221`	`+ address.objectSubId = 0;`
`218`	`222`	`}`
`219`	`223`
`220`	`224`	`/*`