From 3af2b0c0ac1fc2536c8fca7b86d5f7455d82c763 Mon Sep 17 00:00:00 2001 From: Richard Nyberg Date: Sun, 11 Jan 2009 00:34:46 +0100 Subject: Make iobuf more useful for io and use better names in its api. --- misc/iobuf.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'misc/iobuf.h') diff --git a/misc/iobuf.h b/misc/iobuf.h index ccd2028..fb14835 100644 --- a/misc/iobuf.h +++ b/misc/iobuf.h @@ -1,20 +1,23 @@ #ifndef BTPD_IOBUF_H #define BTPD_IOBUF_H -struct io_buffer { +struct iobuf { + uint8_t *buf; + size_t size; size_t off; - size_t len; - char *buf; + size_t skip; int error; }; -struct io_buffer buf_init(size_t size); -void buf_free(struct io_buffer *iob); -int buf_grow(struct io_buffer *iob, size_t size); -int buf_write(struct io_buffer *iob, const void *data, size_t size); +struct iobuf iobuf_init(size_t size); +void iobuf_free(struct iobuf *iob); +int iobuf_accommodate(struct iobuf *iob, size_t size); +int iobuf_write(struct iobuf *iob, const void *data, size_t size); __attribute__((format (printf, 2, 3))) -int buf_print(struct io_buffer *iob, const char *fmt, ...); +int iobuf_print(struct iobuf *iob, const char *fmt, ...); +void *iobuf_find(struct iobuf *iob, const void *p, size_t plen); +void iobuf_consumed(struct iobuf *iob, size_t count); -#define buf_swrite(iob, s) buf_write(iob, s, sizeof(s) - 1) +#define iobuf_swrite(iob, s) iobuf_write(iob, s, sizeof(s) - 1) #endif -- cgit 1.4.1