Suppress compiler warning for get_am_type_string().

tglsfdc · tglsfdc · commit a376960c8f8e · 2016-03-24T17:22:24.000-04:00
Compilers that don't know that elog(ERROR) doesn't return complained
that this function might fail to return a value.  Per buildfarm.

While at it, const-ify the function's declaration, since the intent
is evidently to always return a constant string.
diff --git a/src/backend/commands/amcmds.c b/src/backend/commands/amcmds.c
@@ -30,7 +30,7 @@
 
 
 static Oid	lookup_index_am_handler_func(List *handler_name, char amtype);
-static char *get_am_type_string(char amtype);
+static const char *get_am_type_string(char amtype);
 
 
 /*
@@ -217,9 +217,9 @@ get_am_name(Oid amOid)
 }
 
 /*
- * Convert single charater access method type into string for error reporting.
+ * Convert single-character access method type into string for error reporting.
  */
-static char *
+static const char *
 get_am_type_string(char amtype)
 {
 	switch (amtype)
@@ -229,6 +229,7 @@ get_am_type_string(char amtype)
 		default:
 			/* shouldn't happen */
 			elog(ERROR, "invalid access method type '%c'", amtype);
+			return NULL;		/* keep compiler quiet */
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`
`32`	`32`	`static Oid lookup_index_am_handler_func(List *handler_name, char amtype);`
`33`		`-static char *get_am_type_string(char amtype);`
	`33`	`+static const char *get_am_type_string(char amtype);`
`34`	`34`
`35`	`35`
`36`	`36`	`/*`
`@@ -217,9 +217,9 @@ get_am_name(Oid amOid)`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/*`
`220`		`- * Convert single charater access method type into string for error reporting.`
	`220`	`+ * Convert single-character access method type into string for error reporting.`
`221`	`221`	`*/`
`222`		`-static char *`
	`222`	`+static const char *`
`223`	`223`	`get_am_type_string(char amtype)`
`224`	`224`	`{`
`225`	`225`	`switch (amtype)`
`@@ -229,6 +229,7 @@ get_am_type_string(char amtype)`
`229`	`229`	`default:`
`230`	`230`	`/* shouldn't happen */`
`231`	`231`	`elog(ERROR, "invalid access method type '%c'", amtype);`
	`232`	`+ return NULL; /* keep compiler quiet */`
`232`	`233`	`}`
`233`	`234`	`}`
`234`	`235`