From fca80df9e638a7d68147d91cbffda95aed96ab5c Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Thu, 23 Feb 2023 20:07:59 +0100
Subject: build: don't -Isrc/ in user code
---
src/shared/container/ring.c | 60 --------------------------------------
src/shared/container/ring.h | 23 ---------------
src/shared/include/shared/mem.h | 18 ++++++++++++
src/shared/include/shared/printf.h | 6 ++++
src/shared/include/shared/ring.h | 23 +++++++++++++++
src/shared/mem.h | 18 ------------
src/shared/printf.h | 6 ----
src/shared/ring.c | 60 ++++++++++++++++++++++++++++++++++++++
8 files changed, 107 insertions(+), 107 deletions(-)
delete mode 100644 src/shared/container/ring.c
delete mode 100644 src/shared/container/ring.h
create mode 100644 src/shared/include/shared/mem.h
create mode 100644 src/shared/include/shared/printf.h
create mode 100644 src/shared/include/shared/ring.h
delete mode 100644 src/shared/mem.h
delete mode 100644 src/shared/printf.h
create mode 100644 src/shared/ring.c
(limited to 'src/shared')
diff --git a/src/shared/container/ring.c b/src/shared/container/ring.c
deleted file mode 100644
index 9bf8d61..0000000
--- a/src/shared/container/ring.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <shared/container/ring.h>
-#include <shared/mem.h>
-#include <stdbool.h>
-
-static bool at_end(ring_t *r) {
- return r->_head + 1 == r->_tail
- || (r->_head + 1 == r->capacity && r->_tail == 0);
-}
-
-size_t ring_used(ring_t *r) {
- if (r->_head >= r->_tail)
- return r->_head - r->_tail;
- else
- return r->_head + r->capacity - r->_tail;
-}
-
-size_t ring_avail(ring_t *r) {
- return r->capacity - ring_used(r);
-}
-
-void ring_put(ring_t *r, const void *buf, size_t len) {
- // TODO do something similar to ring_get
- for (size_t i = 0; i < len; i++)
- ring_put1b(r, ((uint8_t*)buf)[i]);
-}
-
-void ring_put1b(ring_t *r, uint8_t byte) {
- if (at_end(r)) return;
- r->buf[r->_head++] = byte;
- if (r->_head >= r->capacity) r->_head = 0;
-}
-
-size_t ring_get(ring_t *r, void *buf, size_t len) {
- size_t read = 0;
- size_t plen;
- void *pbuf;
- for (size_t i = 0; i < 2; i++) {
- plen = len - read;
- pbuf = ring_contig(r, &plen);
- if (buf) memcpy(buf + read, pbuf, plen);
- read += plen;
- }
- return read;
-}
-
-void *ring_contig(ring_t *r, size_t *len) {
- void *ret = &r->buf[r->_tail];
- size_t avail;
- if (r->_head >= r->_tail)
- avail = r->_head - r->_tail;
- else
- avail = r->capacity - r->_tail;
-
- if (*len > avail)
- *len = avail;
-
- r->_tail += *len;
- if (r->_tail >= r->capacity) r->_tail = 0;
- return ret;
-}
diff --git a/src/shared/container/ring.h b/src/shared/container/ring.h
deleted file mode 100644
index dbaf331..0000000
--- a/src/shared/container/ring.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct {
- char *buf;
- size_t capacity;
- size_t _head, _tail;
-} ring_t;
-
-/** Returns amount of bytes stored in the buffer. */
-size_t ring_used(ring_t*);
-/** Returns amount of space left in the buffer. */
-size_t ring_avail(ring_t*);
-
-void ring_put(ring_t*, const void*, size_t);
-void ring_put1b(ring_t*, uint8_t);
-
-size_t ring_get(ring_t*, void*, size_t);
-
-/** Consumes up to `len` bytes, and returns a pointer to the buffer where it's stored.
- * Not thread-safe. */
-void* ring_contig(ring_t*, size_t *len);
diff --git a/src/shared/include/shared/mem.h b/src/shared/include/shared/mem.h
new file mode 100644
index 0000000..3597edf
--- /dev/null
+++ b/src/shared/include/shared/mem.h
@@ -0,0 +1,18 @@
+#pragma once
+#include <stdarg.h>
+#include <stddef.h>
+
+/* note: (partially) tested in the userland tests */
+
+void *memchr(const void *s, int c, size_t n);
+int memcmp(const void *s1, const void *s2, size_t n);
+
+void *memcpy(void *dest, const void *src, size_t n);
+void *memmove(void *dest, const void *src, size_t n);
+void *memset(void *s, int c, size_t n);
+
+int strcmp(const char *s1, const char *s2);
+size_t strlen(const char *s);
+
+int snprintf(char *restrict str, size_t len, const char *restrict fmt, ...);
+int vsnprintf(char *restrict str, size_t len, const char *restrict fmt, va_list ap);
diff --git a/src/shared/include/shared/printf.h b/src/shared/include/shared/printf.h
new file mode 100644
index 0000000..45fd358
--- /dev/null
+++ b/src/shared/include/shared/printf.h
@@ -0,0 +1,6 @@
+#pragma once
+#include <stdarg.h>
+#include <stddef.h>
+
+int __printf_internal(const char *fmt, va_list argp,
+ void (*back)(void*, const char*, size_t), void *back_arg);
diff --git a/src/shared/include/shared/ring.h b/src/shared/include/shared/ring.h
new file mode 100644
index 0000000..dbaf331
--- /dev/null
+++ b/src/shared/include/shared/ring.h
@@ -0,0 +1,23 @@
+#pragma once
+#include <stddef.h>
+#include <stdint.h>
+
+typedef struct {
+ char *buf;
+ size_t capacity;
+ size_t _head, _tail;
+} ring_t;
+
+/** Returns amount of bytes stored in the buffer. */
+size_t ring_used(ring_t*);
+/** Returns amount of space left in the buffer. */
+size_t ring_avail(ring_t*);
+
+void ring_put(ring_t*, const void*, size_t);
+void ring_put1b(ring_t*, uint8_t);
+
+size_t ring_get(ring_t*, void*, size_t);
+
+/** Consumes up to `len` bytes, and returns a pointer to the buffer where it's stored.
+ * Not thread-safe. */
+void* ring_contig(ring_t*, size_t *len);
diff --git a/src/shared/mem.h b/src/shared/mem.h
deleted file mode 100644
index 3597edf..0000000
--- a/src/shared/mem.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <stdarg.h>
-#include <stddef.h>
-
-/* note: (partially) tested in the userland tests */
-
-void *memchr(const void *s, int c, size_t n);
-int memcmp(const void *s1, const void *s2, size_t n);
-
-void *memcpy(void *dest, const void *src, size_t n);
-void *memmove(void *dest, const void *src, size_t n);
-void *memset(void *s, int c, size_t n);
-
-int strcmp(const char *s1, const char *s2);
-size_t strlen(const char *s);
-
-int snprintf(char *restrict str, size_t len, const char *restrict fmt, ...);
-int vsnprintf(char *restrict str, size_t len, const char *restrict fmt, va_list ap);
diff --git a/src/shared/printf.h b/src/shared/printf.h
deleted file mode 100644
index 45fd358..0000000
--- a/src/shared/printf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-#include <stdarg.h>
-#include <stddef.h>
-
-int __printf_internal(const char *fmt, va_list argp,
- void (*back)(void*, const char*, size_t), void *back_arg);
diff --git a/src/shared/ring.c b/src/shared/ring.c
new file mode 100644
index 0000000..44c73f6
--- /dev/null
+++ b/src/shared/ring.c
@@ -0,0 +1,60 @@
+#include <shared/ring.h>
+#include <shared/mem.h>
+#include <stdbool.h>
+
+static bool at_end(ring_t *r) {
+ return r->_head + 1 == r->_tail
+ || (r->_head + 1 == r->capacity && r->_tail == 0);
+}
+
+size_t ring_used(ring_t *r) {
+ if (r->_head >= r->_tail)
+ return r->_head - r->_tail;
+ else
+ return r->_head + r->capacity - r->_tail;
+}
+
+size_t ring_avail(ring_t *r) {
+ return r->capacity - ring_used(r);
+}
+
+void ring_put(ring_t *r, const void *buf, size_t len) {
+ // TODO do something similar to ring_get
+ for (size_t i = 0; i < len; i++)
+ ring_put1b(r, ((uint8_t*)buf)[i]);
+}
+
+void ring_put1b(ring_t *r, uint8_t byte) {
+ if (at_end(r)) return;
+ r->buf[r->_head++] = byte;
+ if (r->_head >= r->capacity) r->_head = 0;
+}
+
+size_t ring_get(ring_t *r, void *buf, size_t len) {
+ size_t read = 0;
+ size_t plen;
+ void *pbuf;
+ for (size_t i = 0; i < 2; i++) {
+ plen = len - read;
+ pbuf = ring_contig(r, &plen);
+ if (buf) memcpy(buf + read, pbuf, plen);
+ read += plen;
+ }
+ return read;
+}
+
+void *ring_contig(ring_t *r, size_t *len) {
+ void *ret = &r->buf[r->_tail];
+ size_t avail;
+ if (r->_head >= r->_tail)
+ avail = r->_head - r->_tail;
+ else
+ avail = r->capacity - r->_tail;
+
+ if (*len > avail)
+ *len = avail;
+
+ r->_tail += *len;
+ if (r->_tail >= r->capacity) r->_tail = 0;
+ return ret;
+}
--
cgit v1.2.3