From 95317cdba6d5b393db2e68f44487456ea0d99664 Mon Sep 17 00:00:00 2001 From: Jann Horn Date: Sat, 27 Jul 2013 12:21:37 +0200 Subject: [PATCH] fix file IO: void* instead of char* --- io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io.c b/io.c index ac685fb..d2b3197 100644 --- a/io.c +++ b/io.c @@ -67,7 +67,7 @@ PUBLIC_FN ssize_t write_nointr(int fd, void *buf, size_t count, int *last_res) { PUBLIC_CONST JH_SLURP_NO_STAT 1 PUBLIC_CONST JH_SLURP_REALLOC 2 /* realloc result block if it saves RAM */ PUBLIC_CONST JH_SLURP_8BYTE_PAD 4 /* pad buffer with eight nullbytes, not one */ -PUBLIC_FN char *slurp_fd(int fd, size_t *len_out, int flags) { +PUBLIC_FN void *slurp_fd(int fd, size_t *len_out, int flags) { int errno_; // Let's just guess that the file is 1023 bytes. Will become 1024 with @@ -120,7 +120,7 @@ PUBLIC_FN char *slurp_fd(int fd, size_t *len_out, int flags) { } } -PUBLIC_FN char *slurp_file(char *path, size_t *len_out, int flags) { +PUBLIC_FN void *slurp_file(char *path, size_t *len_out, int flags) { int fd = open(path, O_RDONLY|O_CLOEXEC); if (fd == -1) return NULL; char *res = slurp_fd(fd, len_out, flags); @@ -132,7 +132,7 @@ PUBLIC_FN char *slurp_file(char *path, size_t *len_out, int flags) { // Write data into a file. len can be -1; that means that // the real length is strlen(buf). -PUBLIC_FN int write_file(char *path, char *buf, ssize_t len, int open_flags) { +PUBLIC_FN int write_file(char *path, void *buf, ssize_t len, int open_flags) { if (len == -1) len = strlen(buf); int fd = open(path, open_flags|O_CLOEXEC|O_WRONLY, 0777); -- 2.20.1