diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-08-25 11:06:34 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-08-25 11:06:34 -0400 |
| commit | 373e08a9f771e724efd3bd29f78c39515792dcf3 (patch) | |
| tree | 2d1f1632559b15004f42c26c2fcbda5abb7d64e1 /src/backend/utils/adt/jsonfuncs.c | |
| parent | a780b2fcce6cf45462946fffcd84021a4d1429c8 (diff) | |
| download | postgresql-373e08a9f771e724efd3bd29f78c39515792dcf3.tar.gz postgresql-373e08a9f771e724efd3bd29f78c39515792dcf3.zip | |
Remove redundant test.
The condition "context_start < context_end" is strictly weaker
than "context_end - context_start >= 50", so we don't need both.
Oversight in commit ffd3944ab, noted by tanghy.fnst.
In passing, line-wrap a nearby test to make it more readable.
Discussion: https://postgr.es/m/OS0PR01MB61137C4054774F44E3A9DC89FBC69@OS0PR01MB6113.jpnprd01.prod.outlook.com
Diffstat (limited to 'src/backend/utils/adt/jsonfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/jsonfuncs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index 09fcff67299..5fd54b64b56 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -652,7 +652,7 @@ report_json_context(JsonLexContext *lex) context_end = lex->token_terminator; /* Advance until we are close enough to context_end */ - while (context_end - context_start >= 50 && context_start < context_end) + while (context_end - context_start >= 50) { /* Advance to next multibyte character */ if (IS_HIGHBIT_SET(*context_start)) @@ -680,7 +680,9 @@ report_json_context(JsonLexContext *lex) * suffixing "..." if not ending at end of line. */ prefix = (context_start > line_start) ? "..." : ""; - suffix = (lex->token_type != JSON_TOKEN_END && context_end - lex->input < lex->input_length && *context_end != '\n' && *context_end != '\r') ? "..." : ""; + suffix = (lex->token_type != JSON_TOKEN_END && + context_end - lex->input < lex->input_length && + *context_end != '\n' && *context_end != '\r') ? "..." : ""; return errcontext("JSON data, line %d: %s%s%s", lex->line_number, prefix, ctxt, suffix); |