From ea1936a594d7e4e656731223b76d355fc5431ef9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 11 Dec 2011 22:11:22 +0000 Subject: Move all #ifdef gunk to serd_internal.h. Centralise file open and buffer allocation to localize platform tweaks. git-svn-id: http://svn.drobilla.net/serd/trunk@244 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/serdi.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/serdi.c') diff --git a/src/serdi.c b/src/serdi.c index b3261eac..dca821bb 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -14,22 +14,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define _POSIX_C_SOURCE 201112L /* for posix_memalign */ +#include "serd_internal.h" #include #include #include #include -#if defined(HAVE_POSIX_FADVISE) && defined(HAVE_FILENO) -# include -#endif - -#include "serd/serd.h" - -#include "serd-config.h" -#include "serd_internal.h" - typedef struct { SerdEnv* env; SerdWriter* writer; @@ -176,15 +167,9 @@ main(int argc, char** argv) input += 5; } } - in_fd = fopen((const char*)input, "r"); - if (!in_fd) { - fprintf(stderr, "Error opening file %s (%s)\n", - input, strerror(errno)); + if (!(in_fd = serd_fopen((const char*)input, "r"))) { return 1; } -#if defined(HAVE_POSIX_FADVISE) && defined(HAVE_FILENO) - posix_fadvise(fileno(in_fd), 0, 0, POSIX_FADV_SEQUENTIAL); -#endif } } -- cgit v1.2.1