Remove redundant sys/types.h #include directives (now in types.h).

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

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index bb10dbd1331f6c9d3b5400d40c50c208fd39f84f..070c0ac5e62fcd990fe55b41e954004d98916609 100644 (file)
--- 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     *
@@ -32,15 +38,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <ctype.h>
 
-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 +64,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 +78,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;
        }
        
@@ -107,7 +109,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 +122,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;
@@ -157,14 +159,14 @@ 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;
        }
        
        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, u32 size, u8 *buffer, u32 *size_read)
 {
        *size_read = fread(buffer, 1, size, fileio->file);
        
@@ -189,7 +191,7 @@ int fileio_read_u32(fileio_t *fileio, u32 *data)
        return ERROR_OK;
 }
 
-int fileio_local_fgets(fileio_t *fileio, u32 size, u8 *buffer)
+static inline int fileio_local_fgets(fileio_t *fileio, u32 size, char *buffer)
 {
        if( fgets(buffer, size, fileio->file) == NULL)
                return ERROR_FILEIO_OPERATION_FAILED;
@@ -197,19 +199,19 @@ 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);
 }
 
-int fileio_local_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written)
+static inline int fileio_local_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *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, u32 size, const u8 *buffer, u32 *size_written)
 {
        int retval;