From: William Dauchy Date: Mon, 11 May 2020 13:20:05 +0000 (+0200) Subject: CLEANUP: select: enhance readability in init X-Git-Tag: v2.2-dev8~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32fba0a6297e17498e50be8f5287cc6a5742a5ef;p=thirdparty%2Fhaproxy.git CLEANUP: select: enhance readability in init while reading the code, I thought it was clearer to put one instruction per line as it is mostly done elsewhere Signed-off-by: William Dauchy --- diff --git a/src/ev_select.c b/src/ev_select.c index acfdbb94a2..d02669f0f6 100644 --- a/src/ev_select.c +++ b/src/ev_select.c @@ -225,9 +225,11 @@ static int init_select_per_thread() int fd_set_bytes; fd_set_bytes = sizeof(fd_set) * (global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE; - if ((tmp_evts[DIR_RD] = (fd_set *)calloc(1, fd_set_bytes)) == NULL) + tmp_evts[DIR_RD] = (fd_set *)calloc(1, fd_set_bytes); + if (tmp_evts[DIR_RD] == NULL) goto fail; - if ((tmp_evts[DIR_WR] = (fd_set *)calloc(1, fd_set_bytes)) == NULL) + tmp_evts[DIR_WR] = (fd_set *)calloc(1, fd_set_bytes); + if (tmp_evts[DIR_WR] == NULL) goto fail; return 1; fail: @@ -238,8 +240,10 @@ static int init_select_per_thread() static void deinit_select_per_thread() { - free(tmp_evts[DIR_WR]); tmp_evts[DIR_WR] = NULL; - free(tmp_evts[DIR_RD]); tmp_evts[DIR_RD] = NULL; + free(tmp_evts[DIR_WR]); + tmp_evts[DIR_WR] = NULL; + free(tmp_evts[DIR_RD]); + tmp_evts[DIR_RD] = NULL; } /*