X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=errsock.c;h=854fd8be83ef72ae32eb27eb2bf7bea2425b179e;hb=29d805a49eab70cd6144a343605874985db072c2;hp=b71aa541e65cd79479378c97751b8a67a06e13e0;hpb=a6139c1ad37a2a854e4bd4fae8e8d59bf1a1e83d;p=PuTTY.git diff --git a/errsock.c b/errsock.c index b71aa541..854fd8be 100644 --- a/errsock.c +++ b/errsock.c @@ -18,7 +18,6 @@ struct Socket_error_tag { char *error; Plug plug; - void *privptr; }; static Plug sk_error_plug(Socket s, Plug p) @@ -38,22 +37,15 @@ static void sk_error_close(Socket s) sfree(ps); } -static void sk_error_set_private_ptr(Socket s, void *ptr) -{ - Error_Socket ps = (Error_Socket) s; - ps->privptr = ptr; -} - -static void *sk_error_get_private_ptr(Socket s) +static const char *sk_error_socket_error(Socket s) { Error_Socket ps = (Error_Socket) s; - return ps->privptr; + return ps->error; } -static const char *sk_error_socket_error(Socket s) +static char *sk_error_peer_info(Socket s) { - Error_Socket ps = (Error_Socket) s; - return ps->error; + return NULL; } Socket new_error_socket(const char *errmsg, Plug plug) @@ -65,10 +57,9 @@ Socket new_error_socket(const char *errmsg, Plug plug) NULL /* write_oob */, NULL /* write_eof */, NULL /* flush */, - sk_error_set_private_ptr, - sk_error_get_private_ptr, NULL /* set_frozen */, - sk_error_socket_error + sk_error_socket_error, + sk_error_peer_info, }; Error_Socket ret;