aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

change ternary operator to if/else statements, add default ssl port support

Browse Source
This commit is contained in:
Jari Matilainen 2017-06-04 17:41:38 +02:00
parent 0c26aeb9fc
commit e84adeca15
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.h
View File

@ -9,6 +9,7 @@
#define IRSSI_ABI_VERSION 9
#define DEFAULT_SERVER_ADD_PORT 6667
#define DEFAULT_SERVER_ADD_TLS_PORT 6697
#ifdef HAVE_CONFIG_H
#include "irssi-config.h"

13
src/fe-common/core/fe-server.c
View File

@ -119,10 +119,15 @@ static void cmd_server_add_modify(const char *data, gboolean add)
if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
value = g_hash_table_lookup(optlist, "port");
port = *portstr == '\0' ?
(value != NULL && *value != '\0' ?
atoi(value) : DEFAULT_SERVER_ADD_PORT)
: atoi(portstr);
if (*portstr != '\0')
port = atoi(portstr);
else if (value != NULL && *value != '\0')
port = atoi(value);
else if (g_hash_table_lookup(optlist, "tls"))
port = DEFAULT_SERVER_ADD_TLS_PORT;
else
port = DEFAULT_SERVER_ADD_PORT;
chatnet = g_hash_table_lookup(optlist, "network");