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

Introduce a typedef for frontend handles.

Browse Source 
This is another major source of unexplained 'void *' parameters
throughout the code.

In particular, the currently unused testback.c actually gave the wrong
pointer type to its internal store of the frontend handle - it cast
the input void * to a Terminal *, from which it got implicitly cast
back again when calling from_backend, and nobody noticed. Now it uses
the right type internally as well as externally.
This commit is contained in:
Simon Tatham
2018-09-12 09:10:51 +01:00
parent eefebaaa9e
commit 8dfb2a1186
40 changed files with 357 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
testback.c
View File

@ -32,9 +32,9 @@
#include "putty.h"
static const char *null_init(void *, Backend **, Conf *, const char *, int,
static const char *null_init(Frontend *, Backend **, Conf *, const char *, int,
char **, int, int);
static const char *loop_init(void *, Backend **, Conf *, const char *, int,
static const char *loop_init(Frontend *, Backend **, Conf *, const char *, int,
char **, int, int);
static void null_free(Backend *);
static void loop_free(Backend *);
@ -69,23 +69,23 @@ const struct Backend_vtable loop_backend = {
};
struct loop_state {
Terminal *term;
Frontend *frontend;
Backend backend;
};
static const char *null_init(void *frontend_handle, Backend **backend_handle,
static const char *null_init(Frontend *frontend, Backend **backend_handle,
Conf *conf, const char *host, int port,
char **realhost, int nodelay, int keepalive) {
*backend_handle = NULL;
return NULL;
}
static const char *loop_init(void *frontend_handle, Backend **backend_handle,
static const char *loop_init(Frontend *frontend, Backend **backend_handle,
Conf *conf, const char *host, int port,
char **realhost, int nodelay, int keepalive) {
struct loop_state *st = snew(struct loop_state);
st->term = frontend_handle;
st->frontend = frontend;
*backend_handle = &st->backend;
return NULL;
}
@ -114,7 +114,7 @@ static int null_send(Backend *be, const char *buf, int len) {
static int loop_send(Backend *be, const char *buf, int len) {
struct loop_state *st = FROMFIELD(be, struct loop_state, backend);
return from_backend(st->term, 0, buf, len);
return from_backend(st->frontend, 0, buf, len);
}
static int null_sendbuffer(Backend *be) {