зеркало из https://github.com/microsoft/git.git
Merge branch 'jh/strbuf-read-use-read-in-full' into maint
strbuf_read() used to have one extra iteration (and an unnecessary strbuf_grow() of 8kB), which was eliminated. * jh/strbuf-read-use-read-in-full: strbuf_read(): skip unnecessary strbuf_grow() at eof
This commit is contained in:
Коммит
8b2707101a
10
strbuf.c
10
strbuf.c
|
@ -364,19 +364,19 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
|
|||
|
||||
strbuf_grow(sb, hint ? hint : 8192);
|
||||
for (;;) {
|
||||
ssize_t cnt;
|
||||
ssize_t want = sb->alloc - sb->len - 1;
|
||||
ssize_t got = read_in_full(fd, sb->buf + sb->len, want);
|
||||
|
||||
cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
|
||||
if (cnt < 0) {
|
||||
if (got < 0) {
|
||||
if (oldalloc == 0)
|
||||
strbuf_release(sb);
|
||||
else
|
||||
strbuf_setlen(sb, oldlen);
|
||||
return -1;
|
||||
}
|
||||
if (!cnt)
|
||||
sb->len += got;
|
||||
if (got < want)
|
||||
break;
|
||||
sb->len += cnt;
|
||||
strbuf_grow(sb, 8192);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче