diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-10 21:39:21 -0500 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-02-26 04:57:58 -0600 |
commit | d350822fa7d14052713bea0ec62ff1246d8a2f7a (patch) | |
tree | 69c814ce03a8fe219de028f7b6459f700bfae437 /vcs-svn | |
parent | vcs-svn: replace buffer_read_string memory pool with a strbuf (diff) | |
download | tgif-d350822fa7d14052713bea0ec62ff1246d8a2f7a.tar.xz |
vcs-svn: collect line_buffer data in a struct
Prepare for the line_buffer lib to support input from multiple files,
by collecting global state in a struct that can be easily passed
around.
No API change yet.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'vcs-svn')
-rw-r--r-- | vcs-svn/line_buffer.c | 45 | ||||
-rw-r--r-- | vcs-svn/line_buffer.h | 11 |
2 files changed, 33 insertions, 23 deletions
diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c index 6f32f28e54..e7bc230fcb 100644 --- a/vcs-svn/line_buffer.c +++ b/vcs-svn/line_buffer.c @@ -7,17 +7,16 @@ #include "line_buffer.h" #include "strbuf.h" -#define LINE_BUFFER_LEN 10000 #define COPY_BUFFER_LEN 4096 - -static char line_buffer[LINE_BUFFER_LEN]; -static struct strbuf blob_buffer = STRBUF_INIT; -static FILE *infile; +static struct line_buffer buf_ = LINE_BUFFER_INIT; +static struct line_buffer *buf; int buffer_init(const char *filename) { - infile = filename ? fopen(filename, "r") : stdin; - if (!infile) + buf = &buf_; + + buf->infile = filename ? fopen(filename, "r") : stdin; + if (!buf->infile) return -1; return 0; } @@ -25,10 +24,10 @@ int buffer_init(const char *filename) int buffer_deinit(void) { int err; - if (infile == stdin) - return ferror(infile); - err = ferror(infile); - err |= fclose(infile); + if (buf->infile == stdin) + return ferror(buf->infile); + err = ferror(buf->infile); + err |= fclose(buf->infile); return err; } @@ -36,13 +35,13 @@ int buffer_deinit(void) char *buffer_read_line(void) { char *end; - if (!fgets(line_buffer, sizeof(line_buffer), infile)) + if (!fgets(buf->line_buffer, sizeof(buf->line_buffer), buf->infile)) /* Error or data exhausted. */ return NULL; - end = line_buffer + strlen(line_buffer); + end = buf->line_buffer + strlen(buf->line_buffer); if (end[-1] == '\n') end[-1] = '\0'; - else if (feof(infile)) + else if (feof(buf->infile)) ; /* No newline at end of file. That's fine. */ else /* @@ -51,23 +50,23 @@ char *buffer_read_line(void) * but for now let's return an error. */ return NULL; - return line_buffer; + return buf->line_buffer; } char *buffer_read_string(uint32_t len) { - strbuf_reset(&blob_buffer); - strbuf_fread(&blob_buffer, len, infile); - return ferror(infile) ? NULL : blob_buffer.buf; + strbuf_reset(&buf->blob_buffer); + strbuf_fread(&buf->blob_buffer, len, buf->infile); + return ferror(buf->infile) ? NULL : buf->blob_buffer.buf; } void buffer_copy_bytes(uint32_t len) { char byte_buffer[COPY_BUFFER_LEN]; uint32_t in; - while (len > 0 && !feof(infile) && !ferror(infile)) { + while (len > 0 && !feof(buf->infile) && !ferror(buf->infile)) { in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN; - in = fread(byte_buffer, 1, in, infile); + in = fread(byte_buffer, 1, in, buf->infile); len -= in; fwrite(byte_buffer, 1, in, stdout); if (ferror(stdout)) { @@ -81,14 +80,14 @@ void buffer_skip_bytes(uint32_t len) { char byte_buffer[COPY_BUFFER_LEN]; uint32_t in; - while (len > 0 && !feof(infile) && !ferror(infile)) { + while (len > 0 && !feof(buf->infile) && !ferror(buf->infile)) { in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN; - in = fread(byte_buffer, 1, in, infile); + in = fread(byte_buffer, 1, in, buf->infile); len -= in; } } void buffer_reset(void) { - strbuf_release(&blob_buffer); + strbuf_release(&buf->blob_buffer); } diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h index 9c78ae11a1..4ae1133a92 100644 --- a/vcs-svn/line_buffer.h +++ b/vcs-svn/line_buffer.h @@ -1,6 +1,17 @@ #ifndef LINE_BUFFER_H_ #define LINE_BUFFER_H_ +#include "strbuf.h" + +#define LINE_BUFFER_LEN 10000 + +struct line_buffer { + char line_buffer[LINE_BUFFER_LEN]; + struct strbuf blob_buffer; + FILE *infile; +}; +#define LINE_BUFFER_INIT {"", STRBUF_INIT, NULL} + int buffer_init(const char *filename); int buffer_deinit(void); char *buffer_read_line(void); |