database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Apply project best practices to switches over enum values.

Browse Source 
In the wake of 1f3a02173, assorted buildfarm members were warning about
"control reaches end of non-void function" or the like.  Do what we've
done elsewhere: in place of a "default" switch case that will prevent
the compiler from warning about unhandled enum values, put a catchall
elog() after the switch.  And return a dummy value to satisfy compilers
that don't know elog() doesn't return.
This commit is contained in:
Tom Lane 2020-01-27 18:46:30 -05:00
parent 73ce2a03f3
commit 4589c6a2a3
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/jsonapi.c
View File

@ -1003,9 +1003,15 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
return JSON_EXPECTED_OBJECT_NEXT; return JSON_EXPECTED_OBJECT_NEXT;
case JSON_PARSE_OBJECT_COMMA: case JSON_PARSE_OBJECT_COMMA:
return JSON_EXPECTED_STRING; return JSON_EXPECTED_STRING;
default:
elog(ERROR, "unexpected json parse state: %d", ctx);
} }
/*
* We don't use a default: case, so that the compiler will warn about
* unhandled enum values. But this needs to be here anyway to cover the
* possibility of an incorrect input.
*/
elog(ERROR, "unexpected json parse state: %d", (int) ctx);
return JSON_SUCCESS; /* silence stupider compilers */
} }
/* /*
@ -1017,7 +1023,7 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
switch (error) switch (error)
{ {
case JSON_SUCCESS: case JSON_SUCCESS:
elog(ERROR, "internal error in json parser"); /* fall through to the error code after switch */
break; break;
case JSON_ESCAPING_INVALID: case JSON_ESCAPING_INVALID:
return psprintf(_("Escape sequence \"\\%s\" is invalid."), return psprintf(_("Escape sequence \"\\%s\" is invalid."),
@ -1065,6 +1071,14 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
case JSON_UNICODE_LOW_SURROGATE: case JSON_UNICODE_LOW_SURROGATE:
return _("Unicode low surrogate must follow a high surrogate."); return _("Unicode low surrogate must follow a high surrogate.");
} }
/*
* We don't use a default: case, so that the compiler will warn about
* unhandled enum values. But this needs to be here anyway to cover the
* possibility of an incorrect input.
*/
elog(ERROR, "unexpected json parse error type: %d", (int) error);
return NULL; /* silence stupider compilers */
} }
/* /*