Free memory that won't be used in child.

MFC after:	1 week
This commit is contained in:
Pawel Jakub Dawidek 2012-01-22 11:20:42 +00:00
parent e0c980d95d
commit 4ed472a1cc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230457

View File

@ -99,10 +99,10 @@ g_gate_load(void)
void
descriptors_cleanup(struct hast_resource *res)
{
struct hast_resource *tres;
struct hast_resource *tres, *tmres;
struct hastd_listen *lst;
TAILQ_FOREACH(tres, &cfg->hc_resources, hr_next) {
TAILQ_FOREACH_SAFE(tres, &cfg->hc_resources, hr_next, tmres) {
if (tres == res) {
PJDLOG_VERIFY(res->hr_role == HAST_ROLE_SECONDARY ||
(res->hr_remotein == NULL &&
@ -119,13 +119,17 @@ descriptors_cleanup(struct hast_resource *res)
proto_close(tres->hr_event);
if (tres->hr_conn != NULL)
proto_close(tres->hr_conn);
TAILQ_REMOVE(&cfg->hc_resources, tres, hr_next);
free(tres);
}
if (cfg->hc_controlin != NULL)
proto_close(cfg->hc_controlin);
proto_close(cfg->hc_controlconn);
TAILQ_FOREACH(lst, &cfg->hc_listen, hl_next) {
while ((lst = TAILQ_FIRST(&cfg->hc_listen)) != NULL) {
TAILQ_REMOVE(&cfg->hc_listen, lst, hl_next);
if (lst->hl_conn != NULL)
proto_close(lst->hl_conn);
free(lst);
}
(void)pidfile_close(pfh);
hook_fini();