nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-09 07:13:43 -05:00
Code Issues Projects Releases Wiki Activity

Make lots of 'int' length fields into size_t.

Browse Source 
This is a general cleanup which has been overdue for some time: lots
of length fields are now the machine word type rather than the (in
practice) fixed 'int'.
This commit is contained in:
Simon Tatham
2019-02-06 20:42:44 +00:00
parent f60fe670ad
commit 0cda34c6f8
52 changed files with 312 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
utils.c
View File

@ -642,7 +642,7 @@ void bufchain_clear(bufchain *ch)
ch->buffersize = 0;
}
int bufchain_size(bufchain *ch)
size_t bufchain_size(bufchain *ch)
{
return ch->buffersize;
}
@ -655,7 +655,7 @@ void bufchain_set_callback_inner(
ch->ic = ic;
}
void bufchain_add(bufchain *ch, const void *data, int len)
void bufchain_add(bufchain *ch, const void *data, size_t len)
{
const char *buf = (const char *)data;
@ -665,14 +665,14 @@ void bufchain_add(bufchain *ch, const void *data, int len)
while (len > 0) {
if (ch->tail && ch->tail->bufend < ch->tail->bufmax) {
int copylen = min(len, ch->tail->bufmax - ch->tail->bufend);
size_t copylen = min(len, ch->tail->bufmax - ch->tail->bufend);
memcpy(ch->tail->bufend, buf, copylen);
buf += copylen;
len -= copylen;
ch->tail->bufend += copylen;
}
if (len > 0) {
int grainlen =
size_t grainlen =
max(sizeof(struct bufchain_granule) + len, BUFFER_MIN_GRANULE);
struct bufchain_granule *newbuf;
newbuf = smalloc(grainlen);
@ -692,7 +692,7 @@ void bufchain_add(bufchain *ch, const void *data, int len)
ch->queue_idempotent_callback(ch->ic);
}
void bufchain_consume(bufchain *ch, int len)
void bufchain_consume(bufchain *ch, size_t len)
{
struct bufchain_granule *tmp;
@ -714,13 +714,13 @@ void bufchain_consume(bufchain *ch, int len)
}
}
void bufchain_prefix(bufchain *ch, void **data, int *len)
void bufchain_prefix(bufchain *ch, void **data, size_t *len)
{
*len = ch->head->bufend - ch->head->bufpos;
*data = ch->head->bufpos;
}
void bufchain_fetch(bufchain *ch, void *data, int len)
void bufchain_fetch(bufchain *ch, void *data, size_t len)
{
struct bufchain_granule *tmp;
char *data_c = (char *)data;
@ -742,13 +742,13 @@ void bufchain_fetch(bufchain *ch, void *data, int len)
}
}
void bufchain_fetch_consume(bufchain *ch, void *data, int len)
void bufchain_fetch_consume(bufchain *ch, void *data, size_t len)
{
bufchain_fetch(ch, data, len);
bufchain_consume(ch, len);
}
bool bufchain_try_fetch_consume(bufchain *ch, void *data, int len)
bool bufchain_try_fetch_consume(bufchain *ch, void *data, size_t len)
{
if (ch->buffersize >= len) {
bufchain_fetch_consume(ch, data, len);
@ -758,7 +758,7 @@ bool bufchain_try_fetch_consume(bufchain *ch, void *data, int len)
}
}
int bufchain_fetch_consume_up_to(bufchain *ch, void *data, int len)
size_t bufchain_fetch_consume_up_to(bufchain *ch, void *data, size_t len)
{
if (len > ch->buffersize)
len = ch->buffersize;
@ -774,10 +774,9 @@ int bufchain_fetch_consume_up_to(bufchain *ch, void *data, int len)
* sequences.
*/
void sanitise_term_data(bufchain *out, const void *vdata, int len)
void sanitise_term_data(bufchain *out, const void *vdata, size_t len)
{
const char *data = (const char *)vdata;
int i;
/*
* FIXME: this method of sanitisation is ASCII-centric. It would
@ -786,7 +785,7 @@ void sanitise_term_data(bufchain *out, const void *vdata, int len)
* (not to mention knowing what character set it should interpret
* the data as).
*/
for (i = 0; i < len; i++) {
for (size_t i = 0; i < len; i++) {
if (data[i] == '\n')
bufchain_add(out, "\r\n", 2);
else if (data[i] >= ' ' && data[i] < 0x7F)