improve str_to_buf and buf_to_str helpers

[fw/openocd] / src / helper / fileio.c

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index e40e019a1e190f490287df3f2a3c81fe0f315e1f..71cae758150fb5a4d7bbe2d68a18766061fb03cc 100644 (file)
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -31,10 +31,10 @@
 #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];
-       
+
        switch (fileio->access)
        {
                case FILEIO_READ:
@@ -47,16 +47,16 @@ static inline int fileio_open_local(fileio_t *fileio)
                        strcpy(access, "w+");
                        break;
                case FILEIO_APPEND:
-                       strcpy(access, "a");    
+                       strcpy(access, "a");
                        break;
                case FILEIO_APPENDREAD:
-                       strcpy(access, "a+");   
+                       strcpy(access, "a+");
                        break;
                default:
                        LOG_ERROR("BUG: access neither read, write nor readwrite");
                        return ERROR_INVALID_ARGUMENTS;
        }
-       
+
        /* win32 always opens in binary mode */
 #ifndef _WIN32
        if (fileio->type == FILEIO_BINARY)
@@ -64,27 +64,27 @@ static inline int fileio_open_local(fileio_t *fileio)
        {
                strcat(access, "b");
        }
-       
+
        if (!(fileio->file = open_file_from_path (fileio->url, access)))
        {
                LOG_ERROR("couldn't open %s", fileio->url);
                return ERROR_FILEIO_OPERATION_FAILED;
        }
-       
+
        if ((fileio->access != FILEIO_WRITE) || (fileio->access == FILEIO_READWRITE))
        {
                /* NB! Here we use fseek() instead of stat(), since stat is a
                 * more advanced operation that might not apply to e.g. a disk path
                 * that refers to e.g. a tftp client */
                int result, result2;
-               
+
                result = fseek(fileio->file, 0, SEEK_END);
 
                fileio->size = ftell(fileio->file);
-               
-               result2 = fseek(fileio->file, 0, SEEK_SET); 
-                       
-               if ((fileio->size<0)||(result<0)||(result2<0))
+
+               result2 = fseek(fileio->file, 0, SEEK_SET);
+
+               if ((fileio->size < 0)||(result < 0)||(result2 < 0))
                {
                        fileio_close(fileio);
                        return ERROR_FILEIO_OPERATION_FAILED;
@@ -94,24 +94,24 @@ static inline int fileio_open_local(fileio_t *fileio)
        {
                fileio->size = 0x0;
        }
-       
+
        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;
 
        fileio->type = type;
        fileio->access = access;
        fileio->url = strdup(url);
-       
+
        retval = fileio_open_local(fileio);
 
        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)
@@ -127,23 +127,23 @@ static inline int fileio_close_local(fileio_t *fileio)
 
                return ERROR_FILEIO_OPERATION_FAILED;
        }
-       
+
        return ERROR_OK;
 }
 
-int fileio_close(fileio_t *fileio)
+int fileio_close(struct fileio *fileio)
 {
        int retval;
-       
+
        retval = fileio_close_local(fileio);
-       
+
        free(fileio->url);
        fileio->url = NULL;
-       
+
        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)
@@ -151,77 +151,77 @@ int fileio_seek(fileio_t *fileio, uint32_t position)
                LOG_ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
                return ERROR_FILEIO_OPERATION_FAILED;
        }
-       
+
        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;
        int retval;
-       
+
        if ((retval = fileio_local_read(fileio, 4, buf, &size_read)) != ERROR_OK)
                return retval;
        *data = be_to_h_u32(buf);
-       
+
        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)
+       if (fgets(buffer, size, fileio->file) == NULL)
                return ERROR_FILEIO_OPERATION_FAILED;
-       
+
        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;
-       
+
        retval = fileio_local_write(fileio, size, buffer, size_written);
-       
+
        if (retval == ERROR_OK)
                fileio->size += *size_written;
-       
+
        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;
        int retval;
-       
+
        h_u32_to_be(buf, data);
-       
+
        if ((retval = fileio_local_write(fileio, 4, buf, &size_written)) != ERROR_OK)
                return retval;
-       
+
        return ERROR_OK;
 }