Silence minor compiler warnings.

tglsfdc · tglsfdc · commit 9c679a08f0cd · 2020-01-19T16:04:36.000-05:00
Ensure that ClassifyUtilityCommandAsReadOnly() has defined behavior
even if TransactionStmt.kind has a value that's not one of the
declared values for its enum.

Suppress warnings from compilers that don't know that elog(ERROR)
doesn't return, in ClassifyUtilityCommandAsReadOnly() and
jsonb_set_lax().

Per Coverity and buildfarm.
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -129,7 +129,7 @@ CommandIsReadOnly(PlannedStmt *pstmt)
  *
  * Note the definitions of the relevant flags in src/include/utility/tcop.h.
  */
-int
+static int
 ClassifyUtilityCommandAsReadOnly(Node *parsetree)
 {
 	switch (nodeTag(parsetree))
@@ -359,7 +359,7 @@ ClassifyUtilityCommandAsReadOnly(Node *parsetree)
 				TransactionStmt *stmt = (TransactionStmt *) parsetree;
 
 				/*
-				 * PREPARE, COMMIT PREPARED, and ROLLBACK PREPARED all change
+				 * PREPARE, COMMIT PREPARED, and ROLLBACK PREPARED all
 				 * write WAL, so they're not read-only in the strict sense;
 				 * but the first and third do not change pg_dump output, so
 				 * they're OK in a read-only transactions.
@@ -383,12 +383,15 @@ ClassifyUtilityCommandAsReadOnly(Node *parsetree)
 					case TRANS_STMT_ROLLBACK_PREPARED:
 						return COMMAND_OK_IN_READ_ONLY_TXN;
 				}
+				elog(ERROR, "unrecognized TransactionStmtKind: %d",
+					 (int) stmt->kind);
+				return 0;		/* silence stupider compilers */
 			}
 
 		default:
 			elog(ERROR, "unrecognized node type: %d",
 				 (int) nodeTag(parsetree));
-			break;
+			return 0;			/* silence stupider compilers */
 	}
 }
 
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -4456,6 +4456,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("need delete_key, return_target, use_json_null, or raise_exception")));
+		return (Datum) 0;		/* silence stupider compilers */
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ CommandIsReadOnly(PlannedStmt *pstmt)`
`129`	`129`	`*`
`130`	`130`	`* Note the definitions of the relevant flags in src/include/utility/tcop.h.`
`131`	`131`	`*/`
`132`		`-int`
	`132`	`+static int`
`133`	`133`	`ClassifyUtilityCommandAsReadOnly(Node *parsetree)`
`134`	`134`	`{`
`135`	`135`	`switch (nodeTag(parsetree))`
`@@ -359,7 +359,7 @@ ClassifyUtilityCommandAsReadOnly(Node *parsetree)`
`359`	`359`	`TransactionStmt stmt = (TransactionStmt ) parsetree;`
`360`	`360`
`361`	`361`	`/*`
`362`		`- * PREPARE, COMMIT PREPARED, and ROLLBACK PREPARED all change`
	`362`	`+ * PREPARE, COMMIT PREPARED, and ROLLBACK PREPARED all`
`363`	`363`	`* write WAL, so they're not read-only in the strict sense;`
`364`	`364`	`* but the first and third do not change pg_dump output, so`
`365`	`365`	`* they're OK in a read-only transactions.`
`@@ -383,12 +383,15 @@ ClassifyUtilityCommandAsReadOnly(Node *parsetree)`
`383`	`383`	`case TRANS_STMT_ROLLBACK_PREPARED:`
`384`	`384`	`return COMMAND_OK_IN_READ_ONLY_TXN;`
`385`	`385`	`}`
	`386`	`+ elog(ERROR, "unrecognized TransactionStmtKind: %d",`
	`387`	`+ (int) stmt->kind);`
	`388`	`+ return 0; /* silence stupider compilers */`
`386`	`389`	`}`
`387`	`390`
`388`	`391`	`default:`
`389`	`392`	`elog(ERROR, "unrecognized node type: %d",`
`390`	`393`	`(int) nodeTag(parsetree));`
`391`		`- break;`
	`394`	`+ return 0; /* silence stupider compilers */`
`392`	`395`	`}`
`393`	`396`	`}`
`394`	`397`
Original file line number	Diff line number	Diff line change
`@@ -4456,6 +4456,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)`
`4456`	`4456`	`ereport(ERROR,`
`4457`	`4457`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`4458`	`4458`	`errmsg("need delete_key, return_target, use_json_null, or raise_exception")));`
	`4459`	`+ return (Datum) 0; /* silence stupider compilers */`
`4459`	`4460`	`}`
`4460`	`4461`	`}`
`4461`	`4462`