X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=9edf764bad3b64935b6fbce09caed57af0e34291;hp=bb10dbd1331f6c9d3b5400d40c50c208fd39f84f;hb=d47e1b8f362379d8a2307f49e2b42115a3f40524;hpb=219b7f30b99c8af9f94fa1b10537bb0e2dc6209f

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index bb10dbd133..9edf764bad 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -62,7 +62,7 @@ int fileio_open_local(fileio_t *fileio)
 			strcpy(access, "a+");	
 			break;
 		default:
-			ERROR("BUG: access neither read, write nor readwrite");
+			LOG_ERROR("BUG: access neither read, write nor readwrite");
 			return ERROR_INVALID_ARGUMENTS;
 	}
 	
@@ -76,7 +76,7 @@ int fileio_open_local(fileio_t *fileio)
 	
 	if (!(fileio->file = open_file_from_path (fileio->url, access)))
 	{
-		ERROR("couldn't open %s", fileio->url);
+		LOG_ERROR("couldn't open %s", fileio->url);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	
@@ -127,11 +127,11 @@ int fileio_close_local(fileio_t *fileio)
 	{
 		if (retval == EBADF)
 		{
-			ERROR("BUG: fileio_local->file not a valid file descriptor");
+			LOG_ERROR("BUG: fileio_local->file not a valid file descriptor");
 		}
 		else
 		{
-			ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
+			LOG_ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
 		}
 
 		return ERROR_FILEIO_OPERATION_FAILED;
@@ -157,7 +157,7 @@ int fileio_seek(fileio_t *fileio, u32 position)
 	int retval;
 	if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
 	{
-		ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
+		LOG_ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 	
@@ -189,7 +189,7 @@ int fileio_read_u32(fileio_t *fileio, u32 *data)
 	return ERROR_OK;
 }
 
-int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+int fileio_local_fgets(fileio_t *fileio, u32 size, char *buffer)
 {
 	if( fgets(buffer, size, fileio->file) == NULL)
 		return ERROR_FILEIO_OPERATION_FAILED;
@@ -197,7 +197,7 @@ int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
 	return ERROR_OK;
 }
 
-int fileio_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+int fileio_fgets(fileio_t *fileio, u32 size, char *buffer)
 {
 	return fileio_local_fgets(fileio, size, buffer);
 }