nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 12:02:47 -05:00
Code Issues Projects Releases Wiki Activity

Colin's const-fixing Patch Of Death. Seems to build fine on Windows

Browse Source 
as well as Unix, so it can go in.

[originally from svn r3162]
This commit is contained in:
Simon Tatham
2003-05-04 14:18:18 +00:00
parent 0bfe876b57
commit 6bb121ecb9
31 changed files with 104 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy.c
View File

@ -173,7 +173,7 @@ static void sk_proxy_set_frozen (Socket s, int is_frozen)
sk_set_frozen(ps->sub_socket, is_frozen);
}
static char * sk_proxy_socket_error (Socket s)
static const char * sk_proxy_socket_error (Socket s)
{
Proxy_Socket ps = (Proxy_Socket) s;
if (ps->error != NULL || ps->sub_socket == NULL) {
@ -184,7 +184,7 @@ static char * sk_proxy_socket_error (Socket s)
/* basic proxy plug functions */
static int plug_proxy_closing (Plug p, char *error_msg,
static int plug_proxy_closing (Plug p, const char *error_msg,
int error_code, int calling_back)
{
Proxy_Plug pp = (Proxy_Plug) p;
@ -377,7 +377,7 @@ Socket new_connection(SockAddr addr, char *hostname,
Proxy_Socket ret;
Proxy_Plug pplug;
SockAddr proxy_addr;
char *proxy_canonical_name, *err;
char *proxy_canonical_name;
ret = snew(struct Socket_proxy_tag);
ret->fn = &socket_fn_table;
@ -421,7 +421,7 @@ Socket new_connection(SockAddr addr, char *hostname,
/* look-up proxy */
proxy_addr = sk_namelookup(cfg->proxy_host,
&proxy_canonical_name);
if ((err = sk_addr_error(proxy_addr)) != NULL) {
if (sk_addr_error(proxy_addr) != NULL) {
ret->error = "Proxy error: Unable to resolve proxy host name";
return (Socket)ret;
}