diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-03-27 18:32:40 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-03-27 18:32:40 -0400 |
| commit | cc7401d5ca498a84d9b47fd2e01cebd8e830e558 (patch) | |
| tree | dcca4c360a059350363db35a99a0017d0f5a6e74 /src/backend/utils/adt/ruleutils.c | |
| parent | f4fb45d15c59d7add2e1b81a9d477d0119a9691a (diff) | |
| download | postgresql-cc7401d5ca498a84d9b47fd2e01cebd8e830e558.tar.gz postgresql-cc7401d5ca498a84d9b47fd2e01cebd8e830e558.zip | |
Fix up compiler warnings/errors from f4fb45d15.
Per early buildfarm returns.
Diffstat (limited to 'src/backend/utils/adt/ruleutils.c')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 6db6c008dde..df5c4865014 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -9907,9 +9907,11 @@ get_json_constructor(JsonConstructorExpr *ctor, deparse_context *context, funcname = "JSON_ARRAY"; break; case JSCTOR_JSON_OBJECTAGG: - return get_json_agg_constructor(ctor, context, "JSON_OBJECTAGG", true); + get_json_agg_constructor(ctor, context, "JSON_OBJECTAGG", true); + return; case JSCTOR_JSON_ARRAYAGG: - return get_json_agg_constructor(ctor, context, "JSON_ARRAYAGG", false); + get_json_agg_constructor(ctor, context, "JSON_ARRAYAGG", false); + return; default: elog(ERROR, "invalid JsonConstructorExprType %d", ctor->type); } @@ -10064,8 +10066,8 @@ get_agg_expr_helper(Aggref *aggref, deparse_context *context, static void get_agg_expr(Aggref *aggref, deparse_context *context, Aggref *original_aggref) { - return get_agg_expr_helper(aggref, context, original_aggref, NULL, NULL, - false); + get_agg_expr_helper(aggref, context, original_aggref, NULL, NULL, + false); } /* @@ -10182,7 +10184,7 @@ get_windowfunc_expr_helper(WindowFunc *wfunc, deparse_context *context, static void get_windowfunc_expr(WindowFunc *wfunc, deparse_context *context) { - return get_windowfunc_expr_helper(wfunc, context, NULL, NULL, false); + get_windowfunc_expr_helper(wfunc, context, NULL, NULL, false); } /* @@ -10438,13 +10440,13 @@ get_json_agg_constructor(JsonConstructorExpr *ctor, deparse_context *context, get_json_constructor_options(ctor, &options); if (IsA(ctor->func, Aggref)) - return get_agg_expr_helper((Aggref *) ctor->func, context, - (Aggref *) ctor->func, - funcname, options.data, is_json_objectagg); + get_agg_expr_helper((Aggref *) ctor->func, context, + (Aggref *) ctor->func, + funcname, options.data, is_json_objectagg); else if (IsA(ctor->func, WindowFunc)) - return get_windowfunc_expr_helper((WindowFunc *) ctor->func, context, - funcname, options.data, - is_json_objectagg); + get_windowfunc_expr_helper((WindowFunc *) ctor->func, context, + funcname, options.data, + is_json_objectagg); else elog(ERROR, "invalid JsonConstructorExpr underlying node type: %d", nodeTag(ctor->func)); |