From d47e1b8f362379d8a2307f49e2b42115a3f40524 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Tue, 25 Mar 2008 15:45:17 +0000 Subject: - rename log functions to stop conflicts under win32 (wingdi) git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/fileio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/helper/fileio.c') diff --git a/src/helper/fileio.c b/src/helper/fileio.c index eaf8e0db..9edf764b 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; } -- cgit v1.2.3