diff options
author | David Robillard <d@drobilla.net> | 2018-05-11 11:14:32 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
commit | 732f2a6cb961949a63b82fb30d9b84e74786a33a (patch) | |
tree | 0e4654b05769772f3fb3f5299cba7b09b69164fa /src | |
parent | 583af959cc8b804914c887b9dc2b1c821bdf41ab (diff) | |
download | serd-732f2a6cb961949a63b82fb30d9b84e74786a33a.tar.gz serd-732f2a6cb961949a63b82fb30d9b84e74786a33a.tar.bz2 serd-732f2a6cb961949a63b82fb30d9b84e74786a33a.zip |
Clean up includes and improve source file separation
Diffstat (limited to 'src')
-rw-r--r-- | src/byte_sink.h | 8 | ||||
-rw-r--r-- | src/byte_source.c | 4 | ||||
-rw-r--r-- | src/byte_source.h | 5 | ||||
-rw-r--r-- | src/env.c | 8 | ||||
-rw-r--r-- | src/n3.c | 13 | ||||
-rw-r--r-- | src/node.c | 9 | ||||
-rw-r--r-- | src/node.h | 4 | ||||
-rw-r--r-- | src/reader.c | 15 | ||||
-rw-r--r-- | src/reader.h | 9 | ||||
-rw-r--r-- | src/serd_internal.h | 3 | ||||
-rw-r--r-- | src/serdi.c | 14 | ||||
-rw-r--r-- | src/stack.h | 4 | ||||
-rw-r--r-- | src/string.c | 6 | ||||
-rw-r--r-- | src/string_utils.h | 5 | ||||
-rw-r--r-- | src/system.c | 1 | ||||
-rw-r--r-- | src/uri.c | 9 | ||||
-rw-r--r-- | src/uri_utils.h | 6 | ||||
-rw-r--r-- | src/world.c | 5 | ||||
-rw-r--r-- | src/world.h | 5 | ||||
-rw-r--r-- | src/writer.c | 18 |
20 files changed, 97 insertions, 54 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..9477b558 100644 --- a/src/byte_source.c +++ b/src/byte_source.c @@ -15,10 +15,12 @@ */ #include "byte_source.h" + #include "system.h" -#include "serd_internal.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*); @@ -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; @@ -14,19 +14,24 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "byte_source.h" +#include "node.h" +#include "reader.h" #include "serd_internal.h" +#include "stack.h" +#include "string_utils.h" +#include "uri_utils.h" + +#include "serd/serd.h" #include <assert.h> #include <ctype.h> +#include <stdbool.h> #include <stdint.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; @@ -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) @@ -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 1272a70b..6a1c6d29 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -14,22 +14,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "serd_internal.h" +#include "string_utils.h" +#include "system.h" + +#include "serd/serd.h" #ifdef _WIN32 #include <fcntl.h> #include <io.h> #endif -#include <assert.h> -#include <errno.h> -#include <stdlib.h> +#include <stdbool.h> +#include <stdio.h> #include <string.h> -#include "string_utils.h" -#include "system.h" -#include "world.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 cf26bb37..1af179f5 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 <stdlib.h> @@ -14,13 +14,16 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "serd_internal.h" +#include "string_utils.h" +#include "uri_utils.h" + +#include "serd/serd.h" +#include <stdbool.h> +#include <stdint.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 7c19081a..2b61ab22 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 SerdStringView* a, const SerdStringView* 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..0aaea8fc 100644 --- a/src/world.h +++ b/src/world.h @@ -17,7 +17,10 @@ #ifndef SERD_WORLD_H #define SERD_WORLD_H -#include "serd_internal.h" +#include "serd/serd.h" + +#include <stdint.h> +#include <stdio.h> struct SerdWorldImpl { SerdErrorSink error_sink; diff --git a/src/writer.c b/src/writer.c index 796780ee..b3a61761 100644 --- a/src/writer.c +++ b/src/writer.c @@ -14,20 +14,24 @@ 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 <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + typedef struct { SerdNode* graph; SerdNode* subject; |