aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-11-13 10:52:56 +0100
committerDavid Robillard <d@drobilla.net>2023-12-02 18:49:07 -0500
commit1a95f759fe3d642e8520e41e691e63f22a2f3b99 (patch)
treea4a0543b251cf0b0523bfcf2da06c9d92a066d74 /src
parenta14effc37415540b7b8a1dc6238b350566f273e1 (diff)
downloadserd-1a95f759fe3d642e8520e41e691e63f22a2f3b99.tar.gz
serd-1a95f759fe3d642e8520e41e691e63f22a2f3b99.tar.bz2
serd-1a95f759fe3d642e8520e41e691e63f22a2f3b99.zip
Move fopen wrapper to world
Diffstat (limited to 'src')
-rw-r--r--src/reader.c2
-rw-r--r--src/system.c21
-rw-r--r--src/system.h4
-rw-r--r--src/world.c28
-rw-r--r--src/world.h6
5 files changed, 34 insertions, 27 deletions
diff --git a/src/reader.c b/src/reader.c
index 83f13e8c..90fee2db 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -260,7 +260,7 @@ serd_reader_start_file(SerdReader* reader, const char* uri, bool bulk)
return SERD_BAD_ARG;
}
- FILE* fd = serd_fopen(path, "rb");
+ FILE* fd = serd_world_fopen(reader->world, path, "rb");
free(path);
if (!fd) {
return SERD_BAD_STREAM;
diff --git a/src/system.c b/src/system.c
index efd9c7ae..ae9e11bc 100644
--- a/src/system.c
+++ b/src/system.c
@@ -6,35 +6,14 @@
#include "serd_config.h"
#include "serd_internal.h"
-#if USE_POSIX_FADVISE && USE_FILENO
-# include <fcntl.h>
-#endif
-
#ifdef _WIN32
# include <malloc.h>
#endif
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-FILE*
-serd_fopen(const char* const path, const char* const mode)
-{
- FILE* fd = fopen(path, mode);
- if (!fd) {
- fprintf(
- stderr, "error: failed to open file %s (%s)\n", path, strerror(errno));
- return NULL;
- }
-
-#if USE_POSIX_FADVISE && USE_FILENO
- (void)posix_fadvise(fileno(fd), 0, 0, POSIX_FADV_SEQUENTIAL);
-#endif
- return fd;
-}
-
void*
serd_malloc_aligned(const size_t alignment, const size_t size)
{
diff --git a/src/system.h b/src/system.h
index 315ea681..d8737dae 100644
--- a/src/system.h
+++ b/src/system.h
@@ -9,10 +9,6 @@
#include <stdint.h>
#include <stdio.h>
-/// Open a file configured for fast sequential reading
-FILE*
-serd_fopen(const char* path, const char* mode);
-
/// Allocate a buffer aligned to `alignment` bytes
SERD_MALLOC_FUNC void*
serd_malloc_aligned(size_t alignment, size_t size);
diff --git a/src/world.c b/src/world.c
index 4d2e175a..916aa869 100644
--- a/src/world.c
+++ b/src/world.c
@@ -3,9 +3,37 @@
#include "world.h"
+#include "serd_config.h"
+
+#if defined(USE_POSIX_FADVISE)
+# include <fcntl.h>
+#endif
+
+#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+
+FILE*
+serd_world_fopen(SerdWorld* world, const char* path, const char* mode)
+{
+ FILE* fd = fopen(path, mode);
+ if (!fd) {
+ serd_world_errorf(world,
+ SERD_BAD_STREAM,
+ "failed to open file %s (%s)\n",
+ path,
+ strerror(errno));
+ return NULL;
+ }
+
+#if USE_POSIX_FADVISE && USE_FILENO
+ (void)posix_fadvise(fileno(fd), 0, 0, POSIX_FADV_SEQUENTIAL);
+#endif
+
+ return fd;
+}
SerdStatus
serd_world_error(const SerdWorld* const world, const SerdError* const e)
diff --git a/src/world.h b/src/world.h
index 8281bb5e..dd3d4043 100644
--- a/src/world.h
+++ b/src/world.h
@@ -8,13 +8,17 @@
#include "serd/status.h"
#include "serd/world.h"
-#include <stdarg.h>
+#include <stdio.h>
struct SerdWorldImpl {
SerdErrorFunc error_func;
void* error_handle;
};
+/// Open a file configured for fast sequential reading
+FILE*
+serd_world_fopen(SerdWorld* world, const char* path, const char* mode);
+
SerdStatus
serd_world_error(const SerdWorld* world, const SerdError* e);