build: cleanup src/helper directory

Change-Id: I71a312df783995e9083c345c25e73902d5aef59e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/415
Tested-by: jenkins

1 files changed, 21 insertions, 30 deletions

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index b97ebf4..4963d22 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -23,6 +23,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -44,8 +45,7 @@ static inline int fileio_open_local(struct fileio_internal *fileio)
 {
 	char file_access[4];
 
-	switch (fileio->access)
-	{
+	switch (fileio->access) {
 		case FILEIO_READ:
 			strcpy(file_access, "r");
 			break;
@@ -70,18 +70,15 @@ static inline int fileio_open_local(struct fileio_internal *fileio)
 #ifndef _WIN32
 	if (fileio->type == FILEIO_BINARY)
 #endif
-	{
 		strcat(file_access, "b");
-	}
 
-	if (!(fileio->file = open_file_from_path (fileio->url, file_access)))
-	{
+	fileio->file = open_file_from_path(fileio->url, file_access);
+	if (!fileio->file) {
 		LOG_ERROR("couldn't open %s", fileio->url);
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
 
-	if ((fileio->access != FILEIO_WRITE) || (fileio->access == FILEIO_READWRITE))
-	{
+	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 */
@@ -93,21 +90,20 @@ static inline int fileio_open_local(struct fileio_internal *fileio)
 
 		result2 = fseek(fileio->file, 0, SEEK_SET);
 
-		if ((fileio->size < 0)||(result < 0)||(result2 < 0))
-		{
+		if ((fileio->size < 0) || (result < 0) || (result2 < 0)) {
 			fileio_close_local(fileio);
 			return ERROR_FILEIO_OPERATION_FAILED;
 		}
-	}
-	else
-	{
+	} else
 		fileio->size = 0x0;
-	}
 
 	return ERROR_OK;
 }
 
-int fileio_open(struct fileio *fileio_p, const char *url, enum fileio_access access_type,	enum fileio_type type)
+int fileio_open(struct fileio *fileio_p,
+	const char *url,
+	enum fileio_access access_type,
+	enum fileio_type type)
 {
 	int retval = ERROR_OK;
 
@@ -125,17 +121,12 @@ int fileio_open(struct fileio *fileio_p, const char *url, enum fileio_access acc
 
 static inline int fileio_close_local(struct fileio_internal *fileio)
 {
-	int retval;
-	if ((retval = fclose(fileio->file)) != 0)
-	{
+	int retval = fclose(fileio->file);
+	if (retval != 0) {
 		if (retval == EBADF)
-		{
 			LOG_ERROR("BUG: fileio_local->file not a valid file descriptor");
-		}
 		else
-		{
 			LOG_ERROR("couldn't close %s: %s", fileio->url, strerror(errno));
-		}
 
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
@@ -150,7 +141,7 @@ int fileio_close(struct fileio *fileio_p)
 
 	retval = fileio_close_local(fileio);
 
-	free((void*)fileio->url);
+	free((void *)fileio->url);
 	fileio->url = NULL;
 
 	free(fileio);
@@ -163,8 +154,8 @@ int fileio_seek(struct fileio *fileio_p, size_t position)
 {
 	int retval;
 	struct fileio_internal *fileio = fileio_p->fp;
-	if ((retval = fseek(fileio->file, position, SEEK_SET)) != 0)
-	{
+	retval = fseek(fileio->file, position, SEEK_SET);
+	if (retval != 0) {
 		LOG_ERROR("couldn't seek file %s: %s", fileio->url, strerror(errno));
 		return ERROR_FILEIO_OPERATION_FAILED;
 	}
@@ -173,7 +164,7 @@ int fileio_seek(struct fileio *fileio_p, size_t position)
 }
 
 static int fileio_local_read(struct fileio_internal *fileio,
-		size_t size, void *buffer, size_t *size_read)
+	size_t size, void *buffer, size_t *size_read)
 {
 	ssize_t retval = fread(buffer, 1, size, fileio->file);
 	*size_read = (retval >= 0) ? retval : 0;
@@ -181,7 +172,7 @@ static int fileio_local_read(struct fileio_internal *fileio,
 }
 
 int fileio_read(struct fileio *fileio_p, size_t size, void *buffer,
-		size_t *size_read)
+	size_t *size_read)
 {
 	struct fileio_internal *fileio = fileio_p->fp;
 	return fileio_local_read(fileio, size, buffer, size_read);
@@ -201,7 +192,7 @@ int fileio_read_u32(struct fileio *fileio_p, uint32_t *data)
 }
 
 static int fileio_local_fgets(struct fileio_internal *fileio,
-		size_t size, void *buffer)
+	size_t size, void *buffer)
 {
 	if (fgets(buffer, size, fileio->file) == NULL)
 		return ERROR_FILEIO_OPERATION_FAILED;
@@ -216,7 +207,7 @@ int fileio_fgets(struct fileio *fileio_p, size_t size, void *buffer)
 }
 
 static int fileio_local_write(struct fileio_internal *fileio,
-		size_t size, const void *buffer, size_t *size_written)
+	size_t size, const void *buffer, size_t *size_written)
 {
 	ssize_t retval = fwrite(buffer, 1, size, fileio->file);
 	*size_written = (retval >= 0) ? retval : 0;
@@ -224,7 +215,7 @@ static int fileio_local_write(struct fileio_internal *fileio,
 }
 
 int fileio_write(struct fileio *fileio_p,
-		size_t size, const void *buffer, size_t *size_written)
+	size_t size, const void *buffer, size_t *size_written)
 {
 	struct fileio_internal *fileio = fileio_p->fp;
 	int retval = fileio_local_write(fileio, size, buffer, size_written);