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

Remove sk_{get,set}_private_ptr completely!

Browse Source 
It was only actually used in X11 and port forwarding, to find internal
state structures given only the Socket that ssh.c held. So now that
that lookup has been reworked to be the sensible way round,
private_ptr is no longer used for anything and can be removed.

[originally from svn r10075]
This commit is contained in:
Simon Tatham
2013-11-17 14:04:48 +00:00
parent 9cbcd17651
commit 8be6fbaa09
8 changed files with 0 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
unix/uxnet.c
View File

@ -75,7 +75,6 @@ struct Socket_tag {
const char *error;
int s;
Plug plug;
void *private_ptr;
bufchain output_data;
int connected; /* irrelevant for listening sockets */
int writable;
@ -469,8 +468,6 @@ static void sk_tcp_close(Socket s);
static int sk_tcp_write(Socket s, const char *data, int len);
static int sk_tcp_write_oob(Socket s, const char *data, int len);
static void sk_tcp_write_eof(Socket s);
static void sk_tcp_set_private_ptr(Socket s, void *ptr);
static void *sk_tcp_get_private_ptr(Socket s);
static void sk_tcp_set_frozen(Socket s, int is_frozen);
static const char *sk_tcp_socket_error(Socket s);
@ -481,8 +478,6 @@ static struct socket_function_table tcp_fn_table = {
sk_tcp_write_oob,
sk_tcp_write_eof,
sk_tcp_flush,
sk_tcp_set_private_ptr,
sk_tcp_get_private_ptr,
sk_tcp_set_frozen,
sk_tcp_socket_error
};
@ -1374,22 +1369,6 @@ static int net_select_result(int fd, int event)
return 1;
}
/*
* Each socket abstraction contains a `void *' private field in
* which the client can keep state.
*/
static void sk_tcp_set_private_ptr(Socket sock, void *ptr)
{
Actual_Socket s = (Actual_Socket) sock;
s->private_ptr = ptr;
}
static void *sk_tcp_get_private_ptr(Socket sock)
{
Actual_Socket s = (Actual_Socket) sock;
return s->private_ptr;
}
/*
* Special error values are returned from sk_namelookup and sk_new
* if there's a problem. These functions extract an error message,

16
unix/uxproxy.c
View File

@ -30,8 +30,6 @@ struct Socket_localproxy_tag {
bufchain pending_output_data;
bufchain pending_input_data;
enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
void *privptr;
};
static int localproxy_select_result(int fd, int event);
@ -186,18 +184,6 @@ static void sk_localproxy_flush (Socket s)
/* do nothing */
}
static void sk_localproxy_set_private_ptr (Socket s, void *ptr)
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
ps->privptr = ptr;
}
static void * sk_localproxy_get_private_ptr (Socket s)
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
return ps->privptr;
}
static void sk_localproxy_set_frozen (Socket s, int is_frozen)
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
@ -258,8 +244,6 @@ Socket platform_new_connection(SockAddr addr, char *hostname,
sk_localproxy_write_oob,
sk_localproxy_write_eof,
sk_localproxy_flush,
sk_localproxy_set_private_ptr,
sk_localproxy_get_private_ptr,
sk_localproxy_set_frozen,
sk_localproxy_socket_error
};