X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.c;h=484d87df649e52c5c444c71e24318bc9735dafda;hp=eaf8e0db3a6e757c16389b9472778d10443496e5;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=d3f3f6149867c6ccd5d10ac469df1d7af95cbf19 diff --git a/src/helper/fileio.c b/src/helper/fileio.c index eaf8e0db3a..484d87df64 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -2,6 +2,12 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,26 +27,11 @@ #include "config.h" #endif -#include "types.h" -#include "replacements.h" #include "log.h" #include "configuration.h" - #include "fileio.h" -#include -#include -#include -#include -#include -#include -#include -#include - -int fileio_close(fileio_t *fileio); -int fileio_dispatch_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read); - -int fileio_open_local(fileio_t *fileio) +static inline int fileio_open_local(fileio_t *fileio) { char access[4]; @@ -62,7 +53,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 +67,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; } @@ -93,7 +84,7 @@ 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; @@ -107,7 +98,7 @@ int fileio_open_local(fileio_t *fileio) return ERROR_OK; } -int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type) +int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type) { int retval = ERROR_OK; @@ -120,18 +111,18 @@ int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fil return retval; } -int fileio_close_local(fileio_t *fileio) +static inline int fileio_close_local(fileio_t *fileio) { int retval; if ((retval = fclose(fileio->file)) != 0) { 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; @@ -152,34 +143,34 @@ 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) { - 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; } return ERROR_OK; } -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) @@ -189,27 +180,27 @@ int fileio_read_u32(fileio_t *fileio, u32 *data) return ERROR_OK; } -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); } -int fileio_local_write(fileio_t *fileio, u32 size, 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, u8 *buffer, u32 *size_written) +int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written) { int retval; @@ -221,10 +212,10 @@ int fileio_write(fileio_t *fileio, u32 size, 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);