builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.

diff --git a/strbuf.c b/strbuf.c
index ff551ac9ff6f8122e698be1f72c763c99bd790e5..59383ac7763dd58ba8da1c1daea6906740affea0 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,5 +1,4 @@
 #include "cache.h"
-#include "strbuf.h"
 
 void strbuf_init(struct strbuf *sb, size_t hint)
 {
@@ -18,7 +17,6 @@ void strbuf_reset(struct strbuf *sb)
 {
        if (sb->len)
                strbuf_setlen(sb, 0);
-       sb->eof = 0;
 }
 
 char *strbuf_detach(struct strbuf *sb)
@@ -146,14 +144,13 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
        return sb->len - oldlen;
 }
 
-void read_line(struct strbuf *sb, FILE *fp, int term)
+int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
 {
        int ch;
-       if (feof(fp)) {
-               strbuf_release(sb);
-               sb->eof = 1;
-               return;
-       }
+
+       strbuf_grow(sb, 0);
+       if (feof(fp))
+               return EOF;
 
        strbuf_reset(sb);
        while ((ch = fgetc(fp)) != EOF) {
@@ -162,11 +159,9 @@ void read_line(struct strbuf *sb, FILE *fp, int term)
                strbuf_grow(sb, 1);
                sb->buf[sb->len++] = ch;
        }
-       if (ch == EOF && sb->len == 0) {
-               strbuf_release(sb);
-               sb->eof = 1;
-       }
+       if (ch == EOF && sb->len == 0)
+               return EOF;
 
-       strbuf_grow(sb, 1);
        sb->buf[sb->len] = '\0';
+       return 0;
 }