mirror of
https://github.com/git/git.git
synced 2024-11-18 16:13:54 +01:00
896e4bfcec
buffer_read_binary is a thin wrapper around fread, but its signature is wrong: - fread can fill an arbitrary in-memory buffer. buffer_read_binary is limited to buffers whose size is representable by a 32-bit integer. - The result from fread is the number of bytes actually read. buffer_read_binary only reports the number of bytes read by incrementing sb->len by that amount and returns void. Fix both: let buffer_read_binary accept a size_t instead of uint32_t for the number of bytes to read and as a convenience return the number of bytes actually read. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
32 lines
1.0 KiB
C
32 lines
1.0 KiB
C
#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];
|
|
FILE *infile;
|
|
};
|
|
#define LINE_BUFFER_INIT { "", NULL }
|
|
|
|
int buffer_init(struct line_buffer *buf, const char *filename);
|
|
int buffer_fdinit(struct line_buffer *buf, int fd);
|
|
int buffer_deinit(struct line_buffer *buf);
|
|
void buffer_reset(struct line_buffer *buf);
|
|
|
|
int buffer_tmpfile_init(struct line_buffer *buf);
|
|
FILE *buffer_tmpfile_rewind(struct line_buffer *buf); /* prepare to write. */
|
|
long buffer_tmpfile_prepare_to_read(struct line_buffer *buf);
|
|
|
|
int buffer_ferror(struct line_buffer *buf);
|
|
char *buffer_read_line(struct line_buffer *buf);
|
|
int buffer_read_char(struct line_buffer *buf);
|
|
size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len);
|
|
/* Returns number of bytes read (not necessarily written). */
|
|
off_t buffer_copy_bytes(struct line_buffer *buf, off_t len);
|
|
off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
|
|
|
|
#endif
|