Make function that can only return one value void

This function could only ever return JSON_SUCCESS.
pull/230/head
Anders Åstrand 4 months ago committed by AndersAstrand
parent 3aabe35b9d
commit 2bacec90b2
  1. 19
      contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c

@ -135,7 +135,7 @@ static JsonParseErrorType json_kring_object_field_start(void *state, char *fname
static JsonParseErrorType json_kring_object_start(void *state);
static JsonParseErrorType json_kring_object_end(void *state);
static JsonParseErrorType json_kring_assign_scalar(JsonKeyringState *parse, JsonKeyringField field, char *value);
static void json_kring_assign_scalar(JsonKeyringState *parse, JsonKeyringField field, char *value);
static char *get_remote_kring_value(const char *url, const char *field_name);
static char *get_file_kring_value(const char *path, const char *field_name);
@ -273,7 +273,6 @@ json_kring_object_end(void *state)
break;
case JK_EXPECT_EXTERN_VAL:
{
JsonParseErrorType ret;
char *value = NULL;
if (!parse->field_type)
@ -312,13 +311,7 @@ json_kring_object_end(void *state)
return JSON_INCOMPLETE;
}
ret = json_kring_assign_scalar(parse, parse->top_level_field, value);
if (ret != JSON_SUCCESS)
{
return ret;
}
json_kring_assign_scalar(parse, parse->top_level_field, value);
parse->state = JK_EXPECT_TOP_FIELD;
break;
}
@ -465,10 +458,12 @@ json_kring_scalar(void *state, char *token, JsonTokenType tokentype)
break;
}
return json_kring_assign_scalar(parse, *field, value);
json_kring_assign_scalar(parse, *field, value);
return JSON_SUCCESS;
}
static JsonParseErrorType
static void
json_kring_assign_scalar(JsonKeyringState *parse, JsonKeyringField field, char *value)
{
VaultV2Keyring *vault = (VaultV2Keyring *) parse->provider_opts;
@ -523,8 +518,6 @@ json_kring_assign_scalar(JsonKeyringState *parse, JsonKeyringField field, char *
default:
elog(ERROR, "json keyring: unexpected scalar field %d", field);
}
return JSON_SUCCESS;
}
static char *

Loading…
Cancel
Save