diff options
author | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 03:08:29 -0800 |
---|---|---|
committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 11:58:04 -0800 |
commit | 9f212b01be20da43ba534ad33b20419779c89335 (patch) | |
tree | 2c7fee0d42eb27047ba365fb603c663399566b94 /src/helper | |
parent | f59ec2043b840a4534fdd61502de59e2571988d5 (diff) | |
download | openocd_libswd-9f212b01be20da43ba534ad33b20419779c89335.tar.gz openocd_libswd-9f212b01be20da43ba534ad33b20419779c89335.tar.bz2 openocd_libswd-9f212b01be20da43ba534ad33b20419779c89335.tar.xz openocd_libswd-9f212b01be20da43ba534ad33b20419779c89335.zip |
fileio_t -> struct fileio
Remove useless structure typedef.
Diffstat (limited to 'src/helper')
-rw-r--r-- | src/helper/fileio.c | 26 | ||||
-rw-r--r-- | src/helper/fileio.h | 21 |
2 files changed, 23 insertions, 24 deletions
diff --git a/src/helper/fileio.c b/src/helper/fileio.c index 42dae06e..71cae758 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -31,7 +31,7 @@ #include "configuration.h" #include "fileio.h" -static inline int fileio_open_local(fileio_t *fileio) +static inline int fileio_open_local(struct fileio *fileio) { char access[4]; @@ -98,7 +98,7 @@ static inline int fileio_open_local(fileio_t *fileio) return ERROR_OK; } -int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type) +int fileio_open(struct fileio *fileio, const char *url, enum fileio_access access, enum fileio_type type) { int retval = ERROR_OK; @@ -111,7 +111,7 @@ int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, en return retval; } -static inline int fileio_close_local(fileio_t *fileio) +static inline int fileio_close_local(struct fileio *fileio) { int retval; if ((retval = fclose(fileio->file)) != 0) @@ -131,7 +131,7 @@ static inline int fileio_close_local(fileio_t *fileio) return ERROR_OK; } -int fileio_close(fileio_t *fileio) +int fileio_close(struct fileio *fileio) { int retval; @@ -143,7 +143,7 @@ int fileio_close(fileio_t *fileio) return retval; } -int fileio_seek(fileio_t *fileio, uint32_t position) +int fileio_seek(struct fileio *fileio, uint32_t position) { int retval; if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0) @@ -155,19 +155,19 @@ int fileio_seek(fileio_t *fileio, uint32_t position) return ERROR_OK; } -static inline int fileio_local_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read) +static inline int fileio_local_read(struct fileio *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, uint32_t size, uint8_t *buffer, uint32_t *size_read) +int fileio_read(struct fileio *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, uint32_t *data) +int fileio_read_u32(struct fileio *fileio, uint32_t *data) { uint8_t buf[4]; uint32_t size_read; @@ -180,7 +180,7 @@ int fileio_read_u32(fileio_t *fileio, uint32_t *data) return ERROR_OK; } -static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buffer) +static inline int fileio_local_fgets(struct fileio *fileio, uint32_t size, char *buffer) { if (fgets(buffer, size, fileio->file) == NULL) return ERROR_FILEIO_OPERATION_FAILED; @@ -188,19 +188,19 @@ static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buff return ERROR_OK; } -int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer) +int fileio_fgets(struct fileio *fileio, uint32_t size, char *buffer) { return fileio_local_fgets(fileio, size, buffer); } -static inline int fileio_local_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written) +static inline int fileio_local_write(struct fileio *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, uint32_t size, const uint8_t *buffer, uint32_t *size_written) +int fileio_write(struct fileio *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written) { int retval; @@ -212,7 +212,7 @@ int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_ return retval;; } -int fileio_write_u32(fileio_t *fileio, uint32_t data) +int fileio_write_u32(struct fileio *fileio, uint32_t data) { uint8_t buf[4]; uint32_t size_written; diff --git a/src/helper/fileio.h b/src/helper/fileio.h index 3f47cb9b..024ad083 100644 --- a/src/helper/fileio.h +++ b/src/helper/fileio.h @@ -45,29 +45,28 @@ enum fileio_access FILEIO_APPENDREAD, /* open for writing, position at end, allow reading */ }; -typedef struct fileio_s -{ +struct fileio { char *url; long long 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, uint32_t position); +int fileio_fgets(struct fileio *fileio, uint32_t size, char *buffer); -int fileio_read(fileio_t *fileio, +int fileio_read(struct fileio *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read); -int fileio_write(fileio_t *fileio, +int fileio_write(struct fileio *fileio, uint32_t size, const uint8_t *buffer, uint32_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) |