mirror of
https://github.com/irssi/irssi.git
synced 2026-08-23 02:22:36 +02:00
Avoiding conditional directives that break statements.
A suggestion to compile entire statements and expressions, as suggested by code style guidelines from the Linux Kernel and practitioners.
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/CodingStyle#n892
https://www.cqse.eu/en/blog/living-in-the-ifdef-hell/
It might improve code understanding, maintainability and error-proneness.
This commit is contained in:
parent
b58be939d2
commit
9e88c65c44
1 changed files with 11 additions and 7 deletions
|
|
@ -209,6 +209,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
|
||||||
char *errmsg2;
|
char *errmsg2;
|
||||||
char ipaddr[MAX_IP_LEN];
|
char ipaddr[MAX_IP_LEN];
|
||||||
int port;
|
int port;
|
||||||
|
int failed_use_ssl = 1;
|
||||||
|
|
||||||
g_return_if_fail(ip != NULL || unix_socket != NULL);
|
g_return_if_fail(ip != NULL || unix_socket != NULL);
|
||||||
|
|
||||||
|
|
@ -248,15 +249,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
|
||||||
} else {
|
} else {
|
||||||
server->handle = net_sendbuffer_create(handle, 0);
|
server->handle = net_sendbuffer_create(handle, 0);
|
||||||
#ifdef HAVE_OPENSSL
|
#ifdef HAVE_OPENSSL
|
||||||
if (server->connrec->use_ssl)
|
if (server->connrec->use_ssl){
|
||||||
server_connect_callback_init_ssl(server, handle);
|
server_connect_callback_init_ssl(server, handle);
|
||||||
else
|
failed_use_ssl = 0;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
server->connect_tag =
|
if (failed_use_ssl)
|
||||||
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
|
server->connect_tag =
|
||||||
(GInputFunction)
|
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
|
||||||
server_connect_callback_init,
|
(GInputFunction)
|
||||||
server);
|
server_connect_callback_init,
|
||||||
|
server);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue