commit ee9f1af746de7385ad3eb4d1b6c2b9cf4a27f46f from: Tracey Emery date: Fri Apr 26 14:22:31 2019 UTC Clean up some frees. commit - eb3092104ea6587ce7d511aeb783866cee1a7844 commit + ee9f1af746de7385ad3eb4d1b6c2b9cf4a27f46f blob - 9799798752276fbd727a555a4a7619b8e80d049c blob + 19ea691bed03c5db59054ffaa6fdc29719bd0316 --- thingsd/client.c +++ thingsd/client.c @@ -102,13 +102,11 @@ clt_conn(int fd, short event, void *arg) return; err: log_debug("%s: client error", __func__); - if (clt_fd != -1) { + if (clt_fd != -1) close(clt_fd); - if (sock->tls) { - tls_free(clt->tls_ctx); - free(clt->ev); - } - } + if (sock->tls) + tls_free(clt->tls_ctx); + free(clt->ev); free(clt); } @@ -139,13 +137,11 @@ clt_add(struct thgsd *pthgsd, struct clt *pclt) return; err: log_debug("%s: client error", __func__); - if (clt->fd != -1) { + if (clt->fd != -1) close(clt->fd); - if (sock->tls) { - tls_free(clt->tls_ctx); - free(clt->ev); - } - } + if (sock->tls) + tls_free(clt->tls_ctx); + free(clt->ev); free(clt); } @@ -158,11 +154,10 @@ clt_del(struct thgsd *pthgsd, struct clt *pclt) TAILQ_FOREACH_SAFE(clt, &pthgsd->clts, entry, tclt) { if (clt == pclt) { - if (clt->tls) { - tls_free(clt->tls_ctx); - free(clt->ev); - } close(clt->fd); + if (clt->tls) + tls_free(clt->tls_ctx); + free(clt->ev); for (n = 0; n < clt->le; n++) TAILQ_FOREACH(thg, &pthgsd->thgs, entry) if (strcmp(clt->sub_names[n],