8000 Make ParseKeyringJSONOptions return void · percona/postgres@da52b54 · GitHub
[go: up one dir, main page]
Skip to content

Commit da52b54

Browse files
AndersAstrandAndersAstrand
committed
Make ParseKeyringJSONOptions return void
This always returned true or did a longjump using ereport(ERROR, ...).
1 parent aaa80c4 commit da52b54

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

‎contrib/pg_tde/src/catalog/tde_keyring.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -835,11 +835,7 @@ load_file_keyring_provider_options(char *keyring_options)
835835

836836
file_keyring->keyring.type = FILE_KEY_PROVIDER;
837837

838-
if (!ParseKeyringJSONOptions(FILE_KEY_PROVIDER, file_keyring,
839-
keyring_options, strlen(keyring_options)))
840-
{
841-
return NULL;
842-
}
838+
ParseKeyringJSONOptions(FILE_KEY_PROVIDER, file_keyring, keyring_options, strlen(keyring_options));
843839

844840
if (file_keyring->file_name == NULL || file_keyring->file_name[0] == '\0')
845841
{
@@ -859,11 +855,7 @@ load_vaultV2_keyring_provider_options(char *keyring_options)
859855

860856
vaultV2_keyring->keyring.type = VAULT_V2_KEY_PROVIDER;
861857

862-
if (!ParseKeyringJSONOptions(VAULT_V2_KEY_PROVIDER, vaultV2_keyring,
863-
keyring_options, strlen(keyring_options)))
864-
{
865-
return NULL;
866-
}
858+
ParseKeyringJSONOptions(VAULT_V2_KEY_PROVIDER, vaultV2_keyring, keyring_options, strlen(keyring_options));
867859

868860
if (vaultV2_keyring->vault_token == NULL || vaultV2_keyring->vault_token[0] == '\0' ||
869861
vaultV2_keyring->vault_url == NULL || vaultV2_keyring->vault_url[0] == '\0' ||
@@ -888,11 +880,7 @@ load_kmip_keyring_provider_options(char *keyring_options)
888880

889881
kmip_keyring->keyring.type = KMIP_KEY_PROVIDER;
890882

891-
if (!ParseKeyringJSONOptions(KMIP_KEY_PROVIDER, kmip_keyring,
892-
keyring_options, strlen(keyring_options)))
893-
{
894-
return NULL;
895-
}
883+
ParseKeyringJSONOptions(KMIP_KEY_PROVIDER, kmip_keyring, keyring_options, strlen(keyring_options));
896884

897885
if (strlen(kmip_keyring->kmip_host) == 0 ||
898886
strlen(kmip_keyring->kmip_port) == 0 ||

‎contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@ static char *get_file_kring_value(const char *path, const char *field_name);
141141
* Parses json input for the given provider type and sets the provided options
142142
* out_opts should be a palloc'd `VaultV2Keyring` or `FileKeyring` struct as the
143143
* respective option values will be mem copied into it.
144-
* Returns `true` if parsing succeded and `false` otherwise.
145-
*/
146-
bool
144+
*/
145+
void
147146
ParseKeyringJSONOptions(ProviderType provider_type, void *out_opts, char *in_buf, int buf_len)
148147
{
149148
JsonLexContext *jlex;
@@ -191,8 +190,6 @@ ParseKeyringJSONOptions(ProviderType provider_type, void *out_opts, char *in_buf
191190
#if PG_VERSION_NUM >= 170000
192191
freeJsonLexContext(jlex);
193192
#endif
194-
195-
return jerr == JSON_SUCCESS;
196193
}
197194

198195
/*

‎contrib/pg_tde/src/include/catalog/tde_keyring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern void delete_key_provider_info(char *provider_name,
4343
Oid databaseId, bool write_xlog);
4444
extern void redo_key_provider_info(KeyringProviderRecordInFile *xlrec);
4545

46-
extern bool ParseKeyringJSONOptions(ProviderType provider_type, void *out_opts,
46+
extern void ParseKeyringJSONOptions(ProviderType provider_type, void *out_opts,
4747
char *in_buf, int buf_len);
4848

4949
#endif /* TDE_KEYRING_H */

0 commit comments

Comments
 (0)
0