X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=484d87df649e52c5c444c71e24318bc9735dafda;hp=c8d30da48197fa4be625c65be44861fee4a046c4;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=3ac5d073dcb398d187934995d50133b03fedf495

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index c8d30da481..484d87df64 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -27,22 +27,10 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "replacements.h"
 #include "log.h"
 #include "configuration.h"
-
 #include "fileio.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
 static inline int fileio_open_local(fileio_t *fileio)
 {
 	char access[4];
@@ -96,7 +84,7 @@ static inline int fileio_open_local(fileio_t *fileio)
 		
 		result2 = fseek(fileio->file, 0, SEEK_SET); 
 			
-		if ((fileio->size<0)||(result<0)||(result2<0))
+		if ((fileio->size < 0)||(result < 0)||(result2 < 0))
 		{
 			fileio_close(fileio);
 			return ERROR_FILEIO_OPERATION_FAILED;
@@ -155,7 +143,7 @@ int fileio_close(fileio_t *fileio)
 	return retval;
 }
 
-int fileio_seek(fileio_t *fileio, u32 position)
+int fileio_seek(fileio_t *fileio, uint32_t position)
 {
 	int retval;
 	if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
@@ -167,22 +155,22 @@ int fileio_seek(fileio_t *fileio, u32 position)
 	return ERROR_OK;
 }
 
-static inline int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+static inline int fileio_local_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read)
 {
 	*size_read = fread(buffer, 1, size, fileio->file);
 	
 	return ERROR_OK;
 }
 
-int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+int fileio_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read)
 {
 	return fileio_local_read(fileio, size, buffer, size_read);
 }
 
-int fileio_read_u32(fileio_t *fileio, u32 *data)
+int fileio_read_u32(fileio_t *fileio, uint32_t *data)
 {
-	u8 buf[4];
-	u32 size_read;
+	uint8_t buf[4];
+	uint32_t size_read;
 	int retval;
 	
 	if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
@@ -192,27 +180,27 @@ int fileio_read_u32(fileio_t *fileio, u32 *data)
 	return ERROR_OK;
 }
 
-static inline int fileio_local_fgets(fileio_t *fileio, u32 size, char *buffer)
+static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buffer)
 {
-	if( fgets(buffer, size, fileio->file) == NULL)
+	if ( fgets(buffer, size, fileio->file) == NULL)
 		return ERROR_FILEIO_OPERATION_FAILED;
 	
 	return ERROR_OK;
 }
 
-int fileio_fgets(fileio_t *fileio, u32 size, char *buffer)
+int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer)
 {
 	return fileio_local_fgets(fileio, size, buffer);
 }
 
-static inline int fileio_local_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written)
+static inline int fileio_local_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written)
 {
 	*size_written = fwrite(buffer, 1, size, fileio->file);
 	
 	return ERROR_OK;
 }
 
-int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written)
+int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written)
 {
 	int retval;
 	
@@ -224,10 +212,10 @@ int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written
 	return retval;;
 }
 
-int fileio_write_u32(fileio_t *fileio, u32 data)
+int fileio_write_u32(fileio_t *fileio, uint32_t data)
 {
-	u8 buf[4];
-	u32 size_written;
+	uint8_t buf[4];
+	uint32_t size_written;
 	int retval;
 	
 	h_u32_to_be(buf, data);