From 5587d78cfd7b9b2645a423ac366c5b43bfe12e4b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 14 Apr 2016 14:13:50 +0100 Subject: [PATCH] Fixed stuff broken by the coding style cleanup From the original patch by hawken93 4th Oct 2014 --- src/core/network-proxy.h | 14 +++++++------- src/core/network.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/network-proxy.h b/src/core/network-proxy.h index 89b195bc..56365639 100644 --- a/src/core/network-proxy.h +++ b/src/core/network-proxy.h @@ -46,25 +46,25 @@ struct network_proxy { * \arg address the hostname where proxy shall connect to * \arg port port address where proxy shall connect to */ - GIOChannel *(*connect)(struct network_proxy const *, IPADDR const *hint_ip, - char const *address, int port); + GIOChannel *(*connect)(const struct network_proxy *, IPADDR const *hint_ip, + const char *address, int port); /* clones the given network_proxy object; this memberfunction is * mandatory */ - struct network_proxy * (*clone)(struct network_proxy const *); + struct network_proxy * (*clone)(const struct network_proxy *); /* sends a string after connection has been established but before IRC * authentication begins; this memberfunction is optional */ - void (*send_string)(struct network_proxy const *, - struct network_proxy_send_string_info const *); + void (*send_string)(const struct network_proxy *, + const struct network_proxy_send_string_info *); /* sends a string after connection IRC authentication suceeded; this * memberfunction is optional */ - void (*send_string_after)(struct network_proxy const *, - struct network_proxy_send_string_info const *); + void (*send_string_after)(const struct network_proxy *, + const struct network_proxy_send_string_info *); /* hostname of proxy host */ diff --git a/src/core/network.h b/src/core/network.h index ab37cd1d..5ca4dce5 100644 --- a/src/core/network.h +++ b/src/core/network.h @@ -40,7 +40,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2); /* Connect to socket */ GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip); /* Connect to socket with ip address and SSL*/ -GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char c*host, int port, +GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server); int irssi_ssl_handshake(GIOChannel *handle);