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

Rename the handle-type enumeration values.

Browse Source 
Mike Edenfield points out that modern versions of the Windows SDK have
decided that 'INPUT' is a sensible name for an OS data structure
(sigh), and provided a patch to add a disambiguating prefix to
winhandl.c's enum values INPUT, OUTPUT and FOREIGN.

[originally from svn r10109]
This commit is contained in:
Simon Tatham 2014-01-07 23:26:10 +00:00
parent 16e834a98a
commit c0f7178f63
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
windows/winhandl.c
View File

@ -65,7 +65,7 @@ struct handle_generic {
void *privdata; /* for client to remember who they are */ void *privdata; /* for client to remember who they are */
}; };
typedef enum { INPUT, OUTPUT, FOREIGN } HandleType; typedef enum { HT_INPUT, HT_OUTPUT, HT_FOREIGN } HandleType;
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* Input threads. * Input threads.
@ -406,7 +406,7 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata,
struct handle *h = snew(struct handle); struct handle *h = snew(struct handle);
DWORD in_threadid; /* required for Win9x */ DWORD in_threadid; /* required for Win9x */
h->type = INPUT; h->type = HT_INPUT;
h->u.i.h = handle; h->u.i.h = handle;
h->u.i.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL); h->u.i.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL);
h->u.i.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL); h->u.i.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL);
@ -434,7 +434,7 @@ struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata,
struct handle *h = snew(struct handle); struct handle *h = snew(struct handle);
DWORD out_threadid; /* required for Win9x */ DWORD out_threadid; /* required for Win9x */
h->type = OUTPUT; h->type = HT_OUTPUT;
h->u.o.h = handle; h->u.o.h = handle;
h->u.o.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL); h->u.o.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL);
h->u.o.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL); h->u.o.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL);
@ -463,7 +463,7 @@ struct handle *handle_add_foreign_event(HANDLE event,
{ {
struct handle *h = snew(struct handle); struct handle *h = snew(struct handle);
h->type = FOREIGN; h->type = HT_FOREIGN;
h->u.f.h = INVALID_HANDLE_VALUE; h->u.f.h = INVALID_HANDLE_VALUE;
h->u.f.ev_to_main = event; h->u.f.ev_to_main = event;
h->u.f.ev_from_main = INVALID_HANDLE_VALUE; h->u.f.ev_from_main = INVALID_HANDLE_VALUE;
@ -484,7 +484,7 @@ struct handle *handle_add_foreign_event(HANDLE event,
int handle_write(struct handle *h, const void *data, int len) int handle_write(struct handle *h, const void *data, int len)
{ {
assert(h->type == OUTPUT); assert(h->type == HT_OUTPUT);
assert(h->u.o.outgoingeof == EOF_NO); assert(h->u.o.outgoingeof == EOF_NO);
bufchain_add(&h->u.o.queued_data, data, len); bufchain_add(&h->u.o.queued_data, data, len);
handle_try_output(&h->u.o); handle_try_output(&h->u.o);
@ -500,7 +500,7 @@ void handle_write_eof(struct handle *h)
* bidirectional handle if we're still interested in its incoming * bidirectional handle if we're still interested in its incoming
* direction! * direction!
*/ */
assert(h->type == OUTPUT); assert(h->type == HT_OUTPUT);
if (!h->u.o.outgoingeof == EOF_NO) { if (!h->u.o.outgoingeof == EOF_NO) {
h->u.o.outgoingeof = EOF_PENDING; h->u.o.outgoingeof = EOF_PENDING;
handle_try_output(&h->u.o); handle_try_output(&h->u.o);
@ -537,7 +537,7 @@ HANDLE *handle_get_events(int *nevents)
static void handle_destroy(struct handle *h) static void handle_destroy(struct handle *h)
{ {
if (h->type == OUTPUT) if (h->type == HT_OUTPUT)
bufchain_clear(&h->u.o.queued_data); bufchain_clear(&h->u.o.queued_data);
CloseHandle(h->u.g.ev_from_main); CloseHandle(h->u.g.ev_from_main);
CloseHandle(h->u.g.ev_to_main); CloseHandle(h->u.g.ev_to_main);
@ -617,7 +617,7 @@ void handle_got_event(HANDLE event)
switch (h->type) { switch (h->type) {
int backlog; int backlog;
case INPUT: case HT_INPUT:
h->u.i.busy = FALSE; h->u.i.busy = FALSE;
/* /*
@ -635,7 +635,7 @@ void handle_got_event(HANDLE event)
} }
break; break;
case OUTPUT: case HT_OUTPUT:
h->u.o.busy = FALSE; h->u.o.busy = FALSE;
/* /*
@ -658,7 +658,7 @@ void handle_got_event(HANDLE event)
} }
break; break;
case FOREIGN: case HT_FOREIGN:
/* Just call the callback. */ /* Just call the callback. */
h->u.f.callback(h->u.f.ctx); h->u.f.callback(h->u.f.ctx);
break; break;
@ -667,13 +667,13 @@ void handle_got_event(HANDLE event)
void handle_unthrottle(struct handle *h, int backlog) void handle_unthrottle(struct handle *h, int backlog)
{ {
assert(h->type == INPUT); assert(h->type == HT_INPUT);
handle_throttle(&h->u.i, backlog); handle_throttle(&h->u.i, backlog);
} }
int handle_backlog(struct handle *h) int handle_backlog(struct handle *h)
{ {
assert(h->type == OUTPUT); assert(h->type == HT_OUTPUT);
return bufchain_size(&h->u.o.queued_data); return bufchain_size(&h->u.o.queued_data);
} }