projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More readable code.
[apps/pfixtools.git]
/
common
/
buffer.h
diff --git
a/common/buffer.h
b/common/buffer.h
index
d044114
..
c3e1adf
100644
(file)
--- a/
common/buffer.h
+++ b/
common/buffer.h
@@
-41,7
+41,7
@@
#include "str.h"
#include "array.h"
#include "str.h"
#include "array.h"
-typedef
char_array_t
buffer_t;
+typedef
A(char)
buffer_t;
#define BUFFER_INIT {NULL, 0, 0}
#define BUFFER_INIT {NULL, 0, 0}
@@
-63,20
+63,21
@@
static inline char *buffer_unwrap(buffer_t **buf) {
return res;
}
return res;
}
+#define buffer_resize(buffer, newsize) \
+ array_ensure_exact_capacity(*(buffer), (newsize) + 1)
-void buffer_resize(buffer_t *, ssize_t newsize);
-static inline void buffer_ensure(buffer_t *buf, ssize_t extra) {
+static inline void buffer_ensure(buffer_t *buf, int extra) {
assert (extra >= 0);
if (buf->len + extra >= buf->size) {
buffer_resize(buf, buf->len + extra);
}
}
assert (extra >= 0);
if (buf->len + extra >= buf->size) {
buffer_resize(buf, buf->len + extra);
}
}
-static inline void buffer_extend(buffer_t *buf,
ssize_
t extra) {
+static inline void buffer_extend(buffer_t *buf,
in
t extra) {
buffer_ensure(buf, extra);
buf->len += extra;
buf->data[buf->len] = '\0';
}
buffer_ensure(buf, extra);
buf->len += extra;
buf->data[buf->len] = '\0';
}
-static inline void buffer_extendch(buffer_t *buf,
ssize_
t extra, int c) {
+static inline void buffer_extendch(buffer_t *buf,
in
t extra, int c) {
buffer_ensure(buf, extra);
memset(buf->data + buf->len, c, extra);
buf->len += extra;
buffer_ensure(buf, extra);
memset(buf->data + buf->len, c, extra);
buf->len += extra;
@@
-84,7
+85,7
@@
static inline void buffer_extendch(buffer_t *buf, ssize_t extra, int c) {
}
}
-static inline void buffer_add(buffer_t *buf, const void *data,
ssize_
t len) {
+static inline void buffer_add(buffer_t *buf, const void *data,
in
t len) {
buffer_ensure(buf, len);
memcpy(buf->data + buf->len, data, len);
buf->len += len;
buffer_ensure(buf, len);
memcpy(buf->data + buf->len, data, len);
buf->len += len;
@@
-101,12
+102,12
@@
static inline void buffer_addch(buffer_t *buf, int c) {
}
__attribute__((format(printf,2,0)))
}
__attribute__((format(printf,2,0)))
-
ssize_
t buffer_addvf(buffer_t *, const char *fmt, va_list);
+
in
t buffer_addvf(buffer_t *, const char *fmt, va_list);
static inline __attribute__((format(printf,2,3)))
static inline __attribute__((format(printf,2,3)))
-
ssize_
t buffer_addf(buffer_t *buf, const char *fmt, ...)
+
in
t buffer_addf(buffer_t *buf, const char *fmt, ...)
{
{
-
ssize_
t res;
+
in
t res;
va_list args;
va_start(args, fmt);
res = buffer_addvf(buf, fmt, args);
va_list args;
va_start(args, fmt);
res = buffer_addvf(buf, fmt, args);
@@
-114,9
+115,9
@@
ssize_t buffer_addf(buffer_t *buf, const char *fmt, ...)
return res;
}
return res;
}
-void buffer_consume(buffer_t *buf,
ssize_
t len);
+void buffer_consume(buffer_t *buf,
in
t len);
-
ssize_t buffer_read(buffer_t *buf, int fd, ssize_
t count);
-
ssize_
t buffer_write(buffer_t *buf, int fd);
+
int buffer_read(buffer_t *buf, int fd, in
t count);
+
in
t buffer_write(buffer_t *buf, int fd);
#endif /* PFIXTOOLS_BUFFER_H */
#endif /* PFIXTOOLS_BUFFER_H */