From 3d1f0c11b3261575db3a6395d717738000463a92 Mon Sep 17 00:00:00 2001 From: Flavio Medeiros Date: Tue, 3 Nov 2015 10:06:26 -0300 Subject: [PATCH] Removing conditional directives that split up parts of statements, which might influence code understanding, maintainability and error-proneness negatively. --- src/core/misc.c | 6 +++--- src/core/network.c | 6 +++--- src/fe-text/term-curses.c | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/misc.c b/src/core/misc.c index 88c27255..7a0bfb72 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -431,11 +431,11 @@ int mkpath(const char *path, int mode) dir = g_strndup(path, (int) (p-path)); if (stat(dir, &statbuf) != 0) { #ifndef WIN32 - if (mkdir(dir, mode) == -1) + gboolean failed = (mkdir(dir, mode) == -1); #else - if (_mkdir(dir) == -1) + gboolean failed = (_mkdir(dir) == -1); #endif - { + if (failed) { g_free(dir); return -1; } diff --git a/src/core/network.c b/src/core/network.c index bfaa47fb..b83f0634 100644 --- a/src/core/network.c +++ b/src/core/network.c @@ -212,11 +212,11 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip) ret = connect(handle, &so.sa, SIZEOF_SOCKADDR(so)); #ifndef WIN32 - if (ret < 0 && errno != EINPROGRESS) + gboolean failed = (ret < 0 && errno != EINPROGRESS); #else - if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) + gboolean failed = (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK); #endif - { + if (failed) { int old_errno = errno; close(handle); errno = old_errno; diff --git a/src/fe-text/term-curses.c b/src/fe-text/term-curses.c index 752edd7f..eb356038 100644 --- a/src/fe-text/term-curses.c +++ b/src/fe-text/term-curses.c @@ -398,10 +398,11 @@ void term_gets(GArray *buffer, int *line_count) for (;;) { #ifdef WIDEC_CURSES - if (get_wch(&key) == ERR) + gboolean failed = (get_wch(&key) == ERR); #else - if ((key = getch()) == ERR) + gboolean failed = ((key = getch()) == ERR); #endif + if (failed) break; #ifdef KEY_RESIZE if (key == KEY_RESIZE)