Skip to content
Snippets Groups Projects
Commit 243ee266 authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

Reindent json.c and jsonfuncs.c.

This will help in preparation of clean patches for upcoming
json work.
parent 6c36f383
No related branches found
No related tags found
No related merge requests found
...@@ -751,11 +751,12 @@ json_lex_string(JsonLexContext *lex) ...@@ -751,11 +751,12 @@ json_lex_string(JsonLexContext *lex)
report_json_context(lex))); report_json_context(lex)));
/* /*
* For UTF8, replace the escape sequence by the actual utf8 * For UTF8, replace the escape sequence by the actual
* character in lex->strval. Do this also for other encodings * utf8 character in lex->strval. Do this also for other
* if the escape designates an ASCII character, otherwise * encodings if the escape designates an ASCII character,
* raise an error. We don't ever unescape a \u0000, since that * otherwise raise an error. We don't ever unescape a
* would result in an impermissible nul byte. * \u0000, since that would result in an impermissible nul
* byte.
*/ */
if (ch == 0) if (ch == 0)
...@@ -771,8 +772,9 @@ json_lex_string(JsonLexContext *lex) ...@@ -771,8 +772,9 @@ json_lex_string(JsonLexContext *lex)
else if (ch <= 0x007f) else if (ch <= 0x007f)
{ {
/* /*
* This is the only way to designate things like a form feed * This is the only way to designate things like a
* character in JSON, so it's useful in all encodings. * form feed character in JSON, so it's useful in all
* encodings.
*/ */
appendStringInfoChar(lex->strval, (char) ch); appendStringInfoChar(lex->strval, (char) ch);
} }
...@@ -1246,6 +1248,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result, ...@@ -1246,6 +1248,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
break; break;
case TYPCATEGORY_NUMERIC: case TYPCATEGORY_NUMERIC:
outputstr = OidOutputFunctionCall(typoutputfunc, val); outputstr = OidOutputFunctionCall(typoutputfunc, val);
/* /*
* Don't call escape_json here if it's a valid JSON number. * Don't call escape_json here if it's a valid JSON number.
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment