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

Replace more ad-hoc growing char buffers with strbuf.

Browse Source 
I've fixed a handful of these where I found them in passing, but when
I went systematically looking, there were a lot more that I hadn't
found!

A particular highlight of this collection is the code that formats
Windows clipboard data in RTF, which was absolutely crying out for
strbuf_catf, and now it's got it.
This commit is contained in:
Simon Tatham
2019-02-11 06:58:07 +00:00
parent e3e4315033
commit d07d7d66f6
13 changed files with 194 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
logging.c
View File

@ -450,14 +450,11 @@ static Filename *xlatlognam(Filename *src, char *hostname, int port,
{
char buf[32], *bufp;
int size;
char *buffer;
int buflen, bufsize;
strbuf *buffer;
const char *s;
Filename *ret;
bufsize = FILENAME_MAX;
buffer = snewn(bufsize, char);
buflen = 0;
buffer = strbuf_new();
s = filename_to_str(src);
while (*s) {
@ -504,20 +501,15 @@ static Filename *xlatlognam(Filename *src, char *hostname, int port,
buf[0] = *s++;
size = 1;
}
if (bufsize <= buflen + size) {
bufsize = (buflen + size) * 5 / 4 + 512;
buffer = sresize(buffer, bufsize, char);
}
while (size-- > 0) {
char c = *bufp++;
if (sanitise)
c = filename_char_sanitise(c);
buffer[buflen++] = c;
put_byte(buffer, c);
}
}
buffer[buflen] = '\0';
ret = filename_from_str(buffer);
sfree(buffer);
ret = filename_from_str(buffer->s);
strbuf_free(buffer);
return ret;
}