X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=597bafc0124ae5c53934bb9f866d61f9f6b57284;hb=3c8a0e72f38e47bfc78dc7ab44ce2ec16cfac53b;hp=3f47cb9ba61bfa8cfb42bfd9de606a8e20d0f14d;hpb=1712d7835e0fbba60d578b52b21b95b046805757;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 3f47cb9ba6..597bafc012 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -26,7 +26,7 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include "types.h"
+#include <helper/types.h>
 
 #define FILEIO_MAX_ERROR_STRING		(128)
 
@@ -38,6 +38,7 @@ enum fileio_type
 
 enum fileio_access
 {
+	FILEIO_NONE,		/* open without any access (invalid mode) */
 	FILEIO_READ,		/* open for reading, position at beginning */
 	FILEIO_WRITE,		/* open for writing, position at beginning */
 	FILEIO_READWRITE,	/* open for writing, position at beginning, allow reading */
@@ -45,29 +46,28 @@ enum fileio_access
 	FILEIO_APPENDREAD,	/* open for writing, position at end, allow reading */
 };
 
-typedef struct fileio_s
-{
-	char *url;
-	long long size;
+struct fileio {
+	const char *url;
+	ssize_t size;
 	enum fileio_type type;
 	enum fileio_access access;
 	FILE *file;
-} fileio_t;
+};
 
-int fileio_open(fileio_t *fileio,
+int fileio_open(struct fileio *fileio,
 	const char *url, enum fileio_access access, enum fileio_type type);
-int fileio_close(fileio_t *fileio);
+int fileio_close(struct fileio *fileio);
 
-int fileio_seek(fileio_t *fileio, uint32_t position);
-int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer);
+int fileio_seek(struct fileio *fileio, size_t position);
+int fileio_fgets(struct fileio *fileio, size_t size, void *buffer);
 
-int fileio_read(fileio_t *fileio,
-		uint32_t size, uint8_t *buffer, uint32_t *size_read);
-int fileio_write(fileio_t *fileio,
-		uint32_t size, const uint8_t *buffer, uint32_t *size_written);
+int fileio_read(struct fileio *fileio,
+		size_t size, void *buffer, size_t *size_read);
+int fileio_write(struct fileio *fileio,
+		size_t size, const void *buffer, size_t *size_written);
 
-int fileio_read_u32(fileio_t *fileio, uint32_t *data);
-int fileio_write_u32(fileio_t *fileio, uint32_t data);
+int fileio_read_u32(struct fileio *fileio, uint32_t *data);
+int fileio_write_u32(struct fileio *fileio, uint32_t data);
 
 #define ERROR_FILEIO_LOCATION_UNKNOWN	(-1200)
 #define ERROR_FILEIO_NOT_FOUND			(-1201)