* (at your option) any later version.
*/
-#define _GNU_SOURCE
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include <unistd.h>
#include <errno.h>
struct zbuf *zb;
zb = XMALLOC(MTYPE_ZBUF_DATA, sizeof(*zb) + size);
- if (!zb)
- return NULL;
- zbuf_init(zb, zb+1, size, 0);
+ zbuf_init(zb, zb + 1, size, 0);
zb->allocated = 1;
return zb;
void zbuf_init(struct zbuf *zb, void *buf, size_t len, size_t datalen)
{
- *zb = (struct zbuf) {
+ *zb = (struct zbuf){
.buf = buf,
.end = (uint8_t *)buf + len,
.head = buf,
void zbuf_reset_head(struct zbuf *zb, void *ptr)
{
- zassert((void*)zb->buf <= ptr && ptr <= (void*)zb->tail);
+ zassert((void *)zb->buf <= ptr && ptr <= (void *)zb->tail);
zb->head = ptr;
}
maxlen = zbuf_tailroom(zb);
r = read(fd, zb->tail, maxlen);
- if (r > 0) zb->tail += r;
- else if (r == 0) r = -2;
- else if (r < 0 && ERRNO_IO_RETRY(errno)) r = 0;
+ if (r > 0)
+ zb->tail += r;
+ else if (r == 0)
+ r = -2;
+ else if (r < 0 && ERRNO_IO_RETRY(errno))
+ r = 0;
return r;
}
zb->head += r;
if (zb->head == zb->tail)
zbuf_reset(zb);
- }
- else if (r == 0) r = -2;
- else if (r < 0 && ERRNO_IO_RETRY(errno)) r = 0;
+ } else if (r == 0)
+ r = -2;
+ else if (r < 0 && ERRNO_IO_RETRY(errno))
+ r = 0;
return r;
}
zbuf_remove_headroom(zb);
r = recv(fd, zb->tail, zbuf_tailroom(zb), 0);
- if (r > 0) zb->tail += r;
- else if (r == 0) r = -2;
- else if (r < 0 && ERRNO_IO_RETRY(errno)) r = 0;
+ if (r > 0)
+ zb->tail += r;
+ else if (r == 0)
+ r = -2;
+ else if (r < 0 && ERRNO_IO_RETRY(errno))
+ r = 0;
return r;
}
uint8_t *ptr;
ptr = memmem(zb->head, zbuf_used(zb), sep, seplen);
- if (!ptr) return NULL;
+ if (!ptr)
+ return NULL;
len = ptr - zb->head + seplen;
zbuf_init(msg, zbuf_pulln(zb, len), len, len);
void zbufq_init(struct zbuf_queue *zbq)
{
- *zbq = (struct zbuf_queue) {
+ *zbq = (struct zbuf_queue){
.queue_head = LIST_INITIALIZER(zbq->queue_head),
};
}
{
struct zbuf *buf, *bufn;
- list_for_each_entry_safe(buf, bufn, &zbq->queue_head, queue_list) {
+ list_for_each_entry_safe(buf, bufn, &zbq->queue_head, queue_list)
+ {
list_del(&buf->queue_list);
zbuf_free(buf);
}
ssize_t r;
size_t iovcnt = 0;
- list_for_each_entry_safe(zb, zbn, &zbq->queue_head, queue_list) {
- iov[iovcnt++] = (struct iovec) {
- .iov_base = zb->head,
- .iov_len = zbuf_used(zb),
+ list_for_each_entry_safe(zb, zbn, &zbq->queue_head, queue_list)
+ {
+ iov[iovcnt++] = (struct iovec){
+ .iov_base = zb->head, .iov_len = zbuf_used(zb),
};
if (iovcnt >= ZEBRA_NUM_OF(iov))
break;
if (r < 0)
return r;
- list_for_each_entry_safe(zb, zbn, &zbq->queue_head, queue_list) {
+ list_for_each_entry_safe(zb, zbn, &zbq->queue_head, queue_list)
+ {
if (r < (ssize_t)zbuf_used(zb)) {
zb->head += r;
return 1;
dst = zbuf_pushn(zdst, len);
src = zbuf_pulln(zsrc, len);
- if (!dst || !src) return;
+ if (!dst || !src)
+ return;
memcpy(dst, src, len);
}