From ff41a5de0995f01a98b6fbc3a0c774b9a53e609a Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 20 Jul 2013 06:38:31 -0400 Subject: Clean up new JSON API typedefs The new JSON API uses a bit of an unusual typedef scheme, where for example OkeysState is a pointer to okeysState. And that's not applied consistently either. Change that to the more usual PostgreSQL style where struct typedefs are upper case, and use pointers explicitly. --- src/include/utils/jsonapi.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/include/utils/jsonapi.h') diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h index f5ec90427a8..e25a0d93d89 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/utils/jsonapi.h @@ -74,7 +74,7 @@ typedef void (*json_scalar_action) (void *state, char *token, JsonTokenType toke * to doing a pure parse with no side-effects, and is therefore exactly * what the json input routines do. */ -typedef struct jsonSemAction +typedef struct JsonSemAction { void *semstate; json_struct_action object_start; @@ -86,8 +86,7 @@ typedef struct jsonSemAction json_aelem_action array_element_start; json_aelem_action array_element_end; json_scalar_action scalar; -} jsonSemAction, - *JsonSemAction; +} JsonSemAction; /* * parse_json will parse the string in the lex calling the @@ -98,7 +97,7 @@ typedef struct jsonSemAction * points to. If the action pointers are NULL the parser * does nothing and just continues. */ -extern void pg_parse_json(JsonLexContext *lex, JsonSemAction sem); +extern void pg_parse_json(JsonLexContext *lex, JsonSemAction *sem); /* * constructor for JsonLexContext, with or without strval element. -- cgit v1.2.3