jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Change coding style

Browse Source
This commit is contained in:
hawken93 2014-10-03 23:41:57 +02:00
parent a35e5b4f9d
commit 714b0241cb
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/network-openssl.c
View File

@ -551,7 +551,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
return gchan; return gchan;
} }
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *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) IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
{ {
GIOChannel *handle, *ssl_handle; GIOChannel *handle, *ssl_handle;

8
src/core/network-proxy-http.c
View File

@ -58,9 +58,9 @@ static bool send_connect(struct _network_proxy_http *proxy, GIOChannel *ch,
sprintf(port_str, "%u", port); sprintf(port_str, "%u", port);
if (!_network_proxy_send_all(ch, "CONNECT ", -1) || if (!_network_proxy_send_all(ch, "CONNECT ", -1) ||
!_network_proxy_send_all(ch, address, -1) || !_network_proxy_send_all(ch, address, -1) ||
!_network_proxy_send_all(ch, ":", -1) || !_network_proxy_send_all(ch, ":", -1) ||
!_network_proxy_send_all(ch, port_str, -1) || !_network_proxy_send_all(ch, port_str, -1) ||
!_network_proxy_send_all(ch, " HTTP/1.0\r\n\r\n", -1) || !_network_proxy_send_all(ch, " HTTP/1.0\r\n\r\n", -1) ||
!_network_proxy_flush(ch)) !_network_proxy_flush(ch))
return false; return false;
@ -96,7 +96,7 @@ static int read_response(struct _network_proxy_http *proxy, GIOChannel *ch)
if (state==0) { if (state==0) {
if (g_str_has_prefix(line.str, "HTTP/1.0 ")) { if (g_str_has_prefix(line.str, "HTTP/1.0 ")) {
resp = g_strndup(line.str+9, line.len-9-2); resp = g_strndup(line.str+9, line.len-9-2);
rc = g_ascii_strtoull(resp, NULL, 10); rc = g_ascii_strtoull(resp, NULL, 10);
} else { } else {
g_warning("unexpected HTTP response: '%s'", line.str); g_warning("unexpected HTTP response: '%s'", line.str);
goto err; goto err;

4
src/core/network.c
View File

@ -228,8 +228,8 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
} }
/* Connect to socket */ /* Connect to socket */
GIOChannel *net_connect_proxy(struct network_proxy const *proxy, GIOChannel *net_connect_proxy(const struct network_proxy *proxy,
char const *host, int port, IPADDR *ip, IPADDR *my_ip) const char *host, int port, IPADDR *ip, IPADDR *my_ip)
{ {
if (proxy) if (proxy)
return proxy->connect(proxy, ip, host, port); return proxy->connect(proxy, ip, host, port);

4
src/core/network.h
View File

@ -50,12 +50,12 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
/* Connect to socket */ /* Connect to socket */
GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip); GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
/* Connect to socket with ip address and SSL*/ /* Connect to socket with ip address and SSL*/
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, GIOChannel *net_connect_proxy_ssl(const struct network_proxy *proxy, const char c*host, int port,
IPADDR *ip, IPADDR *my_ip, SERVER_REC *server); IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
int irssi_ssl_handshake(GIOChannel *handle); int irssi_ssl_handshake(GIOChannel *handle);
/* Connect to socket with ip address */ /* Connect to socket with ip address */
GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip); GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, GIOChannel *net_connect_proxy(const struct network_proxy *proxy, const char *host, int port,
IPADDR *ip, IPADDR *my_ip); IPADDR *ip, IPADDR *my_ip);
/* Connect to named UNIX socket */ /* Connect to named UNIX socket */
GIOChannel *net_connect_unix(const char *path); GIOChannel *net_connect_unix(const char *path);

10
src/irc/core/irc-servers.c
View File

@ -196,11 +196,11 @@ static void server_init(IRC_SERVER_REC *server)
IRC_SERVER_CONNECT_REC *conn; IRC_SERVER_CONNECT_REC *conn;
char *address, *ptr, *username, *cmd; char *address, *ptr, *username, *cmd;
GTimeVal now; GTimeVal now;
struct network_proxy_send_string_info const send_info = { const struct network_proxy_send_string_info send_info = {
.host = server->connrec->address, .host = server->connrec->address,
.port = server->connrec->port, .port = server->connrec->port,
.func = irc_send_cmd_now_wrapper, .func = irc_send_cmd_now_wrapper,
.obj = server .obj = server
}; };
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);

1
src/irc/core/irc-servers.h
View File

@ -109,7 +109,6 @@ struct _IRC_SERVER_REC {
SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn); SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn);
void irc_server_connect(SERVER_REC *server); void irc_server_connect(SERVER_REC *server);
/* Purge server output, either all or for specified target */ /* Purge server output, either all or for specified target */
void irc_server_purge_output(IRC_SERVER_REC *server, const char *target); void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);