[Openocd-svn] r1687 - trunk/src/helper

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-10 14:55:16 +0200 (Sun, 10 May 2009)
New Revision: 1687

Modified:
   trunk/src/helper/fileio.c
   trunk/src/helper/fileio.h
Log:
Michael Bruck <mb...@di...> use more const

Modified: trunk/src/helper/fileio.c
===================================================================
--- trunk/src/helper/fileio.c	2009-05-09 09:30:00 UTC (rev 1686)
+++ trunk/src/helper/fileio.c	2009-05-10 12:55:16 UTC (rev 1687)
@@ -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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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;
 	

Modified: trunk/src/helper/fileio.h
===================================================================
--- trunk/src/helper/fileio.h	2009-05-09 09:30:00 UTC (rev 1686)
+++ trunk/src/helper/fileio.h	2009-05-10 12:55:16 UTC (rev 1687)
@@ -62,12 +62,12 @@
 	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);