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

Cast pointers to uintptr_t instead of unsigned {long,int}.

Browse Source 
On 64bit Windows, pointers are 64bit whereas both unsigned long and
unsigned int are 32bit. Using uintptr_t avoids truncation.
This commit is contained in:
Tim Kosse 2015-08-11 14:01:02 +02:00 committed by Simon Tatham
parent 9965cd8a53
commit f2e61275f2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc.c
View File

@ -853,7 +853,7 @@ void debug_memdump(const void *buf, int len, int L)
if (L) { if (L) {
int delta; int delta;
debug_printf("\t%d (0x%x) bytes:\n", len, len); debug_printf("\t%d (0x%x) bytes:\n", len, len);
delta = 15 & (unsigned long int) p; delta = 15 & (uintptr_t)p;
p -= delta; p -= delta;
len += delta; len += delta;
} }

8
windows/winhandl.c
View File

@ -411,9 +411,9 @@ static int handle_cmp_evtomain(void *av, void *bv)
struct handle *a = (struct handle *)av; struct handle *a = (struct handle *)av;
struct handle *b = (struct handle *)bv; struct handle *b = (struct handle *)bv;
if ((unsigned)a->u.g.ev_to_main < (unsigned)b->u.g.ev_to_main) if ((uintptr_t)a->u.g.ev_to_main < (uintptr_t)b->u.g.ev_to_main)
return -1; return -1;
else if ((unsigned)a->u.g.ev_to_main > (unsigned)b->u.g.ev_to_main) else if ((uintptr_t)a->u.g.ev_to_main > (uintptr_t)b->u.g.ev_to_main)
return +1; return +1;
else else
return 0; return 0;
@ -424,9 +424,9 @@ static int handle_find_evtomain(void *av, void *bv)
HANDLE *a = (HANDLE *)av; HANDLE *a = (HANDLE *)av;
struct handle *b = (struct handle *)bv; struct handle *b = (struct handle *)bv;
if ((unsigned)*a < (unsigned)b->u.g.ev_to_main) if ((uintptr_t)*a < (uintptr_t)b->u.g.ev_to_main)
return -1; return -1;
else if ((unsigned)*a > (unsigned)b->u.g.ev_to_main) else if ((uintptr_t)*a > (uintptr_t)b->u.g.ev_to_main)
return +1; return +1;
else else
return 0; return 0;

2
windows/winnet.c
View File

@ -138,7 +138,7 @@ static int cmpfortree(void *av, void *bv)
static int cmpforsearch(void *av, void *bv) static int cmpforsearch(void *av, void *bv)
{ {
Actual_Socket b = (Actual_Socket) bv; Actual_Socket b = (Actual_Socket) bv;
unsigned long as = (unsigned long) av, bs = (unsigned long) b->s; uintptr_t as = (uintptr_t) av, bs = (uintptr_t) b->s;
if (as < bs) if (as < bs)
return -1; return -1;
if (as > bs) if (as > bs)