X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=2bde024e68fc05cdd0ea29e4a92226d4c8b4f025;hp=6e0fa4eb9e1a2c6f97e83807eefd4be340e5d4cc;hb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;hpb=ed5b5b834eb3d09ff1676ef60d25a629d9358a13

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 6e0fa4eb9e..2bde024e68 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -84,12 +84,12 @@ int loadFile(const char *fileName, void **data, size_t *len)
 
 	FILE * pFile;
 	pFile = fopen(fileName,"rb");
-	if (pFile==NULL)
+	if (pFile == NULL)
 	{
 		LOG_ERROR("Can't open %s\n", fileName);
 		return ERROR_FAIL;
 	}
-	if (fseek(pFile, 0, SEEK_END)!=0)
+	if (fseek(pFile, 0, SEEK_END) != 0)
 	{
 		LOG_ERROR("Can't open %s\n", fileName);
 		fclose(pFile);
@@ -104,14 +104,14 @@ int loadFile(const char *fileName, void **data, size_t *len)
 	}
 	*len = fsize;
 
-	if (fseek(pFile, 0, SEEK_SET)!=0)
+	if (fseek(pFile, 0, SEEK_SET) != 0)
 	{
 		LOG_ERROR("Can't open %s\n", fileName);
 		fclose(pFile);
 		return ERROR_FAIL;
 	}
 	*data = malloc(*len + 1);
-	if (*data==NULL)
+	if (*data == NULL)
 	{
 		LOG_ERROR("Can't open %s\n", fileName);
 		fclose(pFile);
@@ -215,7 +215,7 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
 		return ERROR_INVALID_ARGUMENTS;
 	}
 
-	int retval=ERROR_FAIL;
+	int retval = ERROR_FAIL;
 	FILE *config_file = NULL;
 	config_file = fopen(args[0], "a");
 	if (config_file != NULL)
@@ -225,17 +225,17 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
 
 		for (i = 1; i < argc; i++)
 		{
-			if (fwrite(args[i], 1, strlen(args[i]), config_file)!=strlen(args[i]))
+			if (fwrite(args[i], 1, strlen(args[i]), config_file) != strlen(args[i]))
 				break;
 			if (i != argc - 1)
 			{
-				if (fwrite(" ", 1, 1, config_file)!=1)
+				if (fwrite(" ", 1, 1, config_file) != 1)
 					break;
 			}
 		}
-		if ((i==argc)&&(fwrite("\n", 1, 1, config_file)==1))
+		if ((i == argc) && (fwrite("\n", 1, 1, config_file) == 1))
 		{
-			retval=ERROR_OK;
+			retval = ERROR_OK;
 		}
 		fclose(config_file);
 	}
@@ -274,7 +274,7 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
 			chunk = maxChunk;
 		}
 
-		if ((retval==ERROR_OK)&&(fwrite(((char *)data)+pos, 1, chunk, f)!=chunk))
+		if ((retval == ERROR_OK) && (fwrite(((char *)data) + pos, 1, chunk, f) != chunk))
 			retval = ERROR_INVALID_ARGUMENTS;
 
 		if (retval != ERROR_OK)
@@ -325,34 +325,34 @@ void copyfile(char *name2, char *name1)
 
 	fd1 = open(name1, O_WRONLY | O_CREAT, 0664);
 	if (fd1 < 0)
-		SHOW_RESULT( open, fd1 );
+		SHOW_RESULT(open, fd1 );
 
 	fd2 = open(name2, O_RDONLY);
 	if (fd2 < 0)
-		SHOW_RESULT( open, fd2 );
+		SHOW_RESULT(open, fd2 );
 
 	for (;;)
 	{
 		done = read(fd2, buf, IOSIZE );
 		if (done < 0)
 		{
-			SHOW_RESULT( read, done );
+			SHOW_RESULT(read, done );
 			break;
 		}
 
-        if( done == 0 ) break;
+        if (done == 0 ) break;
 
 		wrote = write(fd1, buf, done);
-        if( wrote != done ) SHOW_RESULT( write, wrote );
+        if (wrote != done ) SHOW_RESULT(write, wrote );
 
-        if( wrote != done ) break;
+        if (wrote != done ) break;
 	}
 
 	err = close(fd1);
-    if( err < 0 ) SHOW_RESULT( close, err );
+    if (err < 0 ) SHOW_RESULT(close, err );
 
 	err = close(fd2);
-    if( err < 0 ) SHOW_RESULT( close, err );
+    if (err < 0 ) SHOW_RESULT(close, err );
 
 }
 
@@ -363,7 +363,7 @@ void copydir(char *name, char *destdir)
 	DIR *dirp;
 
 	dirp = opendir(destdir);
-	if (dirp==NULL)
+	if (dirp == NULL)
 	{
 		mkdir(destdir, 0777);
 	} else
@@ -372,7 +372,7 @@ void copydir(char *name, char *destdir)
 	}
 
 	dirp = opendir(name);
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
+    if (dirp == NULL ) SHOW_RESULT(opendir, -1 );
 
 	for (;;)
 	{
@@ -421,7 +421,7 @@ void copydir(char *name, char *destdir)
 	}
 
 	err = closedir(dirp);
-    if( err < 0 ) SHOW_RESULT( stat, err );
+    if (err < 0 ) SHOW_RESULT(stat, err );
 }
 
 
@@ -477,7 +477,7 @@ zylinjtag_Jim_Command_ls(Jim_Interp *interp,
 		if (entry == NULL)
 			break;
 
-		if ((strcmp(".", entry->d_name)==0)||(strcmp("..", entry->d_name)==0))
+		if ((strcmp(".", entry->d_name) == 0)||(strcmp("..", entry->d_name) == 0))
 			continue;
 
         Jim_ListAppendElement(interp, objPtr, Jim_NewStringObj(interp, entry->d_name, strlen(entry->d_name)));
@@ -613,7 +613,7 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
 	{
 		//if (ifr->ifr_addr.sa_family == AF_INET)
 		{
-			if (strcmp("eth0", ifr->ifr_name)!=0)
+			if (strcmp("eth0", ifr->ifr_name) != 0)
 				continue;
 			strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
 			if (ioctl(SockFD, SIOCGIFHWADDR, &ifreq) < 0)