nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-21 21:15:03 -05:00
Code Issues Projects Releases Wiki Activity

Fix some char * vs unsigned char * conversions, plus a stylistic nit, both

Browse Source 
courtesy of Apple's compilers.

[originally from svn r2448]
This commit is contained in:
Ben Harris 2003-01-04 16:56:33 +00:00
parent 1e158ceb91
commit 6796ffc082
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy.c
View File

@ -415,7 +415,7 @@ Socket new_connection(SockAddr addr, char *hostname,
/* look-up proxy */ /* look-up proxy */
proxy_addr = sk_namelookup(cfg.proxy_host, proxy_addr = sk_namelookup(cfg.proxy_host,
&proxy_canonical_name); &proxy_canonical_name);
if ((err = sk_addr_error(proxy_addr))) { if ((err = sk_addr_error(proxy_addr)) != NULL) {
ret->error = "Proxy error: Unable to resolve proxy host name"; ret->error = "Proxy error: Unable to resolve proxy host name";
return (Socket)ret; return (Socket)ret;
} }
@ -515,7 +515,8 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
len = strlen(buf); len = strlen(buf);
sprintf(buf2, "Proxy-Authorization: basic "); sprintf(buf2, "Proxy-Authorization: basic ");
for (i = 0, j = strlen(buf2); i < len; i += 3, j += 4) for (i = 0, j = strlen(buf2); i < len; i += 3, j += 4)
base64_encode_atom(buf+i, (len-i > 3 ? 3 : len-i), buf2+j); base64_encode_atom((unsigned char *)(buf+i),
(len-i > 3 ? 3 : len-i), buf2+j);
strcpy(buf2+j, "\r\n"); strcpy(buf2+j, "\r\n");
sk_write(p->sub_socket, buf2, strlen(buf2)); sk_write(p->sub_socket, buf2, strlen(buf2));
} }
@ -1247,7 +1248,7 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
/* we only extract two hex characters */ /* we only extract two hex characters */
if (i == 1) { if (i == 1) {
sk_write(p->sub_socket, &v, 1); sk_write(p->sub_socket, (char *)&v, 1);
eo++; eo++;
break; break;
} }