Skip to content

Use simple_ptr_list_destroy() rather than reimplementing it #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeltz wants to merge 1 commit into from
Closed

Use simple_ptr_list_destroy() rather than reimplementing it #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions src/catalog/tde_keyring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ static char *get_file_value(const char *path, const char *field_name);
#ifdef FRONTEND

static SimplePtrList *scan_key_provider_file(ProviderScanType scanType, void *scanKey, Oid dbOid);
static void simple_list_free(SimplePtrList *list);

#else

Expand Down Expand Up @@ -711,28 +710,12 @@ GetKeyProviderByID(int provider_id, Oid dbOid)
if (providers != NULL)
{
keyring = (GenericKeyring *) providers->head->ptr;
simple_list_free(providers);
simple_ptr_list_destroy(providers);
pfree(providers);
}

return keyring;
}

static void
simple_list_free(SimplePtrList *list)
{
SimplePtrListCell *cell = list->head;

while (cell != NULL)
{
SimplePtrListCell *next;

next = cell->next;
pfree(cell);
cell = next;
}

pfree(list);
}
#endif /* FRONTEND */

/*
Expand Down Expand Up @@ -1089,7 +1072,8 @@ GetKeyProviderByName(const char *provider_name, Oid dbOid)
list_free(providers);
#else
keyring = (GenericKeyring *) providers->head->ptr;
simple_list_free(providers);
simple_ptr_list_destroy(providers);
pfree(providers);
#endif
}
else
Expand Down
Loading