aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/byte_sink.h8
-rw-r--r--src/byte_source.c5
-rw-r--r--src/byte_source.h5
-rw-r--r--src/env.c8
-rw-r--r--src/n3.c12
-rw-r--r--src/node.c9
-rw-r--r--src/node.h4
-rw-r--r--src/reader.c15
-rw-r--r--src/reader.h9
-rw-r--r--src/serd_internal.h3
-rw-r--r--src/serdi.c15
-rw-r--r--src/stack.h4
-rw-r--r--src/string.c6
-rw-r--r--src/string_utils.h5
-rw-r--r--src/system.c1
-rw-r--r--src/uri.c6
-rw-r--r--src/uri_utils.h6
-rw-r--r--src/world.c5
-rw-r--r--src/world.h4
-rw-r--r--src/writer.c17
-rw-r--r--tests/serd_test.c3
21 files changed, 93 insertions, 57 deletions
diff --git a/src/byte_sink.h b/src/byte_sink.h
index 0d825020..4425f91f 100644
--- a/src/byte_sink.h
+++ b/src/byte_sink.h
@@ -17,12 +17,14 @@
#ifndef SERD_BYTE_SINK_H
#define SERD_BYTE_SINK_H
-#include <stddef.h>
-#include <string.h>
+#include "serd_internal.h"
+#include "system.h"
#include "serd/serd.h"
-#include "system.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
typedef struct SerdByteSinkImpl {
SerdWriteFunc sink;
diff --git a/src/byte_source.c b/src/byte_source.c
index 19e942a5..a3f50a14 100644
--- a/src/byte_source.c
+++ b/src/byte_source.c
@@ -15,10 +15,11 @@
*/
#include "byte_source.h"
-#include "system.h"
-#include "serd_internal.h"
+#include "system.h"
+#include "serd/serd.h"
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/byte_source.h b/src/byte_source.h
index b642c0a2..0edfd75c 100644
--- a/src/byte_source.h
+++ b/src/byte_source.h
@@ -17,11 +17,12 @@
#ifndef SERD_BYTE_SOURCE_H
#define SERD_BYTE_SOURCE_H
-#include "serd_internal.h"
+#include "serd/serd.h"
#include <assert.h>
+#include <stdbool.h>
#include <stddef.h>
-#include <stdio.h>
+#include <stdint.h>
typedef int (*SerdStreamCloseFunc)(void*);
diff --git a/src/env.c b/src/env.c
index a184b4a1..22165060 100644
--- a/src/env.c
+++ b/src/env.c
@@ -14,13 +14,15 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "serd_internal.h"
+#include "node.h"
+
+#include "serd/serd.h"
+#include <stdbool.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "node.h"
-
typedef struct {
SerdNode* name;
SerdNode* uri;
diff --git a/src/n3.c b/src/n3.c
index 2b9340c9..2c62dc15 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -14,19 +14,21 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "node.h"
+#include "reader.h"
#include "serd_internal.h"
+#include "string_utils.h"
+#include "uri_utils.h"
+
+#include "serd/serd.h"
#include <assert.h>
#include <ctype.h>
-#include <stdint.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "reader.h"
-#include "string_utils.h"
-#include "uri_utils.h"
-
#define TRY_THROW(exp) if (!(exp)) goto except;
#define TRY_RET(exp) if (!(exp)) return 0;
diff --git a/src/node.c b/src/node.c
index 985ed3e5..f2e725a8 100644
--- a/src/node.c
+++ b/src/node.c
@@ -14,17 +14,20 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "node.h"
+
#include "serd_internal.h"
+#include "string_utils.h"
#include <assert.h>
#include <float.h>
#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "node.h"
-#include "string_utils.h"
-
#ifdef _WIN32
# ifndef isnan
# define isnan(x) _isnan(x)
diff --git a/src/node.h b/src/node.h
index 090faf0c..e39702a5 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,7 +17,9 @@
#ifndef SERD_NODE_H
#define SERD_NODE_H
-#include "serd_internal.h"
+#include "serd/serd.h"
+
+#include <stddef.h>
struct SerdNodeImpl {
size_t n_bytes; /**< Size in bytes (not including null) */
diff --git a/src/reader.c b/src/reader.c
index c50b4865..a73135d7 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -14,20 +14,23 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "reader.h"
+
+#include "byte_source.h"
+#include "node.h"
+#include "serd/serd.h"
#include "serd_internal.h"
+#include "stack.h"
+#include "system.h"
+#include "world.h"
-#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
-#include <stdint.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "reader.h"
-#include "system.h"
-#include "world.h"
-
static SerdStatus serd_reader_prepare(SerdReader* reader);
int
diff --git a/src/reader.h b/src/reader.h
index 05a5de6a..c3ea2e77 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -17,12 +17,17 @@
#ifndef SERD_READER_H
#define SERD_READER_H
-#include "serd_internal.h"
-
#include "byte_source.h"
#include "node.h"
#include "stack.h"
+#include "serd/serd.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
#ifdef SERD_STACK_CHECK
# define SERD_STACK_ASSERT_TOP(reader, ref) \
assert(ref == reader->allocs[reader->n_allocs - 1]);
diff --git a/src/serd_internal.h b/src/serd_internal.h
index 911d296f..fda651ae 100644
--- a/src/serd_internal.h
+++ b/src/serd_internal.h
@@ -17,9 +17,6 @@
#ifndef SERD_INTERNAL_H
#define SERD_INTERNAL_H
-#include "serd/serd.h"
-#include "serd_config.h"
-
#define NS_XSD "http://www.w3.org/2001/XMLSchema#"
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/src/serdi.c b/src/serdi.c
index 239c01a1..9230f3c4 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -14,16 +14,15 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "serd_internal.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "serd_config.h"
#include "string_utils.h"
#include "system.h"
-#include "world.h"
+
+#include "serd/serd.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
#define SERDI_ERROR(msg) fprintf(stderr, "serdi: " msg);
#define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serdi: " fmt, __VA_ARGS__);
diff --git a/src/stack.h b/src/stack.h
index a8298c0d..9f112b6c 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -17,10 +17,10 @@
#ifndef SERD_STACK_H
#define SERD_STACK_H
-#include "serd_internal.h"
-
#include <assert.h>
+#include <stdbool.h>
#include <stddef.h>
+#include <stdint.h>
#include <stdlib.h>
/** An offset to start the stack at. Note 0 is reserved for NULL. */
diff --git a/src/string.c b/src/string.c
index 83f94fd9..58c52de7 100644
--- a/src/string.c
+++ b/src/string.c
@@ -14,10 +14,14 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "serd_internal.h"
+#include "string.h"
+
#include "string_utils.h"
+#include "serd/serd.h"
+
#include <math.h>
+#include <stddef.h>
#include <stdlib.h>
void
diff --git a/src/string_utils.h b/src/string_utils.h
index 0c5ae557..63dcddbc 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -17,7 +17,12 @@
#ifndef SERD_STRING_UTILS_H
#define SERD_STRING_UTILS_H
+#include "serd/serd.h"
+
#include <ctype.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
#include <string.h>
/** Unicode replacement character in UTF-8 */
diff --git a/src/system.c b/src/system.c
index e2f9af5f..d2aacd42 100644
--- a/src/system.c
+++ b/src/system.c
@@ -19,7 +19,6 @@
#include "system.h"
#include "serd_config.h"
-#include "serd_internal.h"
#include <stddef.h>
#include <stdlib.h>
diff --git a/src/uri.c b/src/uri.c
index a1333bd3..71cf3bcb 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -14,13 +14,13 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "serd_internal.h"
+#include "uri_utils.h"
+
+#include "serd/serd.h"
#include <stdlib.h>
#include <string.h>
-#include "uri_utils.h"
-
char*
serd_file_uri_parse(const char* uri, char** hostname)
{
diff --git a/src/uri_utils.h b/src/uri_utils.h
index 5c24afcb..f734c12e 100644
--- a/src/uri_utils.h
+++ b/src/uri_utils.h
@@ -19,6 +19,12 @@
#include "string_utils.h"
+#include "serd/serd.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
static inline bool
slice_equals(const SerdSlice* a, const SerdSlice* b)
{
diff --git a/src/world.c b/src/world.c
index 49a84d42..f95accf4 100644
--- a/src/world.c
+++ b/src/world.c
@@ -16,7 +16,8 @@
#define _POSIX_C_SOURCE 200809L /* for posix_fadvise */
-#include "serd_internal.h"
+#include "world.h"
+
#include "serd_config.h"
#include <errno.h>
@@ -28,8 +29,6 @@
# include <fcntl.h>
#endif
-#include "world.h"
-
FILE*
serd_world_fopen(SerdWorld* world, const char* path, const char* mode)
{
diff --git a/src/world.h b/src/world.h
index aeea70c2..85b676ee 100644
--- a/src/world.h
+++ b/src/world.h
@@ -17,7 +17,9 @@
#ifndef SERD_WORLD_H
#define SERD_WORLD_H
-#include "serd_internal.h"
+#include "serd/serd.h"
+
+#include <stdio.h>
struct SerdWorldImpl {
SerdErrorSink error_sink;
diff --git a/src/writer.c b/src/writer.c
index bdbebb57..9d29b71f 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -14,20 +14,23 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "serd_internal.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "byte_sink.h"
#include "node.h"
+#include "serd_internal.h"
#include "stack.h"
#include "string_utils.h"
+#include "system.h"
#include "uri_utils.h"
#include "world.h"
+#include "serd/serd.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
typedef struct {
SerdNode* graph;
SerdNode* subject;
diff --git a/tests/serd_test.c b/tests/serd_test.c
index 4278a089..e57b01d3 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -19,7 +19,8 @@
#include <assert.h>
#include <float.h>
#include <math.h>
-#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 01:52:56 +0000