diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2016-08-07 16:17:42 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-08-07 16:17:42 +0200 |
| commit | 751769b49d7d09b21a563e3090132a7c58c4b9db (patch) | |
| tree | 86f147d44e1675aa9fac83266401442e9c61b8d3 /src | |
| parent | f695a79d9b7ab2bf2709bad5fea6cc2a2d0c50c3 (diff) | |
| download | weechat-751769b49d7d09b21a563e3090132a7c58c4b9db.zip | |
core: irc, xfer: do not check return code of res_init()
If the call to res_init() fails, the connection may be OK anyway
or in worst case it will fail (with an appropriate error) if the name
can not be resolved.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/wee-network.c | 10 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 4 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer.c | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/core/wee-network.c b/src/core/wee-network.c index dda11c046..a221ff134 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -313,8 +313,7 @@ network_resolve (const char *hostname, char *ip, int *version) res = NULL; - if (res_init() != 0) - return 0; + res_init (); if (getaddrinfo (hostname, NULL, NULL, &res) != 0) return 0; @@ -701,8 +700,7 @@ network_connect_to (const char *proxy, struct sockaddr *address, hints.ai_flags = AI_NUMERICSERV; snprintf (str_port, sizeof (str_port), "%d", CONFIG_INTEGER(ptr_proxy->options[PROXY_OPTION_PORT])); - if (res_init() != 0) - goto error; + res_init (); if (getaddrinfo (CONFIG_STRING(ptr_proxy->options[PROXY_OPTION_ADDRESS]), str_port, &hints, &proxy_addrinfo) != 0) { @@ -813,8 +811,8 @@ network_connect_child (struct t_hook *hook_connect) #ifdef AI_ADDRCONFIG hints.ai_flags = AI_ADDRCONFIG; #endif /* AI_ADDRCONFIG */ - rc = res_init(); - if (!rc && ptr_proxy) + res_init (); + if (ptr_proxy) { hints.ai_family = (CONFIG_BOOLEAN(ptr_proxy->options[PROXY_OPTION_IPV6])) ? AF_UNSPEC : AF_INET; diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 20e40f02f..aa09d47c9 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -5134,8 +5134,8 @@ irc_server_xfer_send_ready_cb (const void *pointer, void *data, "local_address"); if (local_address) { - if ((rc = res_init()) == 0) - rc = getaddrinfo (local_address, NULL, NULL, &ainfo); + res_init (); + rc = getaddrinfo (local_address, NULL, NULL, &ainfo); if ((rc == 0) && ainfo && ainfo->ai_addr) { if (ainfo->ai_family == AF_INET) diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index 7730fdf36..cef7a23e2 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -968,8 +968,7 @@ xfer_resolve_addr (const char *str_address, const char *str_port, hints.ai_addr = NULL; hints.ai_next = NULL; - if (res_init() != 0) - return 0; + res_init (); rc = getaddrinfo (str_address, str_port, &hints, &ainfo); if ((rc == 0) && ainfo && ainfo->ai_addr) { |