summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-10 12:55:16 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-10 12:55:16 +0000
commit3ac5d073dcb398d187934995d50133b03fedf495 (patch)
tree6f57909da1f07add0aa586101ab2d6b1058f6826 /src/helper
parent79d515c3473a48f0b5af34117312e086ad414dda (diff)
downloadopenocd+libswd-3ac5d073dcb398d187934995d50133b03fedf495.tar.gz
openocd+libswd-3ac5d073dcb398d187934995d50133b03fedf495.tar.bz2
openocd+libswd-3ac5d073dcb398d187934995d50133b03fedf495.tar.xz
openocd+libswd-3ac5d073dcb398d187934995d50133b03fedf495.zip
Michael Bruck <mbruck@digenius.de> use more const
git-svn-id: svn://svn.berlios.de/openocd/trunk@1687 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/fileio.c16
-rw-r--r--src/helper/fileio.h4
2 files changed, 9 insertions, 11 deletions
diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index d4cd75cd..c8d30da4 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -43,9 +43,7 @@
#include <errno.h>
#include <ctype.h>
-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];
@@ -112,7 +110,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;
@@ -125,7 +123,7 @@ 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)
@@ -169,7 +167,7 @@ int fileio_seek(fileio_t *fileio, u32 position)
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);
@@ -194,7 +192,7 @@ 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, u32 size, char *buffer)
{
if( fgets(buffer, size, fileio->file) == NULL)
return ERROR_FILEIO_OPERATION_FAILED;
@@ -207,14 +205,14 @@ 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;
diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 1dfff51e..41f3a788 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -62,12 +62,12 @@ typedef struct fileio_s
FILE *file;
} fileio_t;
-extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written);
+extern int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written);
extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);
extern int fileio_fgets(fileio_t *fileio, u32 size, char *buffer);
extern int fileio_seek(fileio_t *fileio, u32 position);
extern int fileio_close(fileio_t *fileio);
-extern int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type);
+extern int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type);
extern int fileio_read_u32(fileio_t *fileio, u32 *data);
extern int fileio_write_u32(fileio_t *fileio, u32 data);