- Fixes '+' whitespace

- Replace ')\(+\)(' with ') \1 ('.
- Replace ')\(+\)\(\w\)' with ') \1 \2'.
- Replace '\(\w\)\(+\)(' with '\1 \2 ('.
- Replace '\(\w\)\(+\)\(\w\)' with '\1 \2 \3'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2373 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/helper/binarybuffer.h

@@ -42,7 +42,7 @@ static inline void buf_set_u32(uint8_t* buffer, unsigned int first, unsigned int
 	{
 		unsigned int i;
 		
-		for (i = first; i<first+num; i++)
+		for (i = first; i<first + num; i++)
 		{
 			if (((value >> (i-first))&1) == 1)
 				buffer[i/8] |= 1 << (i%8);
@@ -61,7 +61,7 @@ static inline uint32_t buf_get_u32(const uint8_t* buffer, unsigned int first, un
 		uint32_t result = 0;
 		unsigned int i;
 		
-		for (i = first; i<first+num; i++)
+		for (i = first; i<first + num; i++)
 		{
 			if (((buffer[i/8]>>(i%8))&1) == 1)
 				result |= 1 << (i-first);

src/helper/command.c

@@ -495,14 +495,14 @@ int command_run_line(command_context_t *context, char *line)
 		if (reslen>0)
 		{
 			int i;
-			char buff[256+1];
+			char buff[256 + 1];
 			for (i = 0; i < reslen; i += 256)
 			{
 				int chunk;
 				chunk = reslen - i;
 				if (chunk > 256)
 					chunk = 256;
-				strncpy(buff, result+i, chunk);
+				strncpy(buff, result + i, chunk);
 				buff[chunk] = 0;
 				LOG_USER_N("%s", buff);
 			}
@@ -599,7 +599,7 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
 	}
 	/* GRR we must chunk - not null terminated */
 	while (nbytes) {
-		char chunk[128+1];
+		char chunk[128 + 1];
 		int x;
 
 		x = nbytes;

src/helper/configuration.c

@@ -37,7 +37,7 @@ static char** script_search_dirs;
 void add_script_search_dir (const char *dir)
 {
 	num_script_dirs++;
-	script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *));
+	script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs + 1) * sizeof (char *));
 
 	script_search_dirs[num_script_dirs-1] = strdup(dir);
 	script_search_dirs[num_script_dirs] = NULL;
@@ -46,7 +46,7 @@ void add_script_search_dir (const char *dir)
 void add_config_command (const char *cfg)
 {
 	num_config_files++;
-	config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
+	config_file_names = (char **)realloc(config_file_names, (num_config_files + 1) * sizeof (char *));
 
 	config_file_names[num_config_files-1] = strdup(cfg);
 	config_file_names[num_config_files] = NULL;

src/helper/ioutil.c

@@ -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)

src/helper/jim-eventloop.c

@@ -310,7 +310,7 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags)
 		// fprintf(stderr,"No Event\n");
         }
 
-        retval = select(maxfd+1, &rfds, &wfds, &efds, tvp);
+        retval = select(maxfd + 1, &rfds, &wfds, &efds, tvp);
         if (retval < 0) {
 	   switch (errno) {
 	       case EINTR:   fprintf(stderr,"select EINTR\n"); break;

src/helper/jim.h

@@ -563,7 +563,7 @@ typedef struct Jim_Interp {
 typedef struct Jim_Reference {
     Jim_Obj *objPtr;
     Jim_Obj *finalizerCmdNamePtr;
-    char tag[JIM_REFERENCE_TAGLEN+1];
+    char tag[JIM_REFERENCE_TAGLEN + 1];
 } Jim_Reference;
 
 /** Name Value Pairs, aka: NVP

src/helper/log.c

@@ -103,7 +103,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 #ifdef _DEBUG_FREE_SPACE_
 					" %d"
 #endif
-					": %s", log_strings[level+1], count, t, file, line, function,
+					": %s", log_strings[level + 1], count, t, file, line, function,
 #ifdef _DEBUG_FREE_SPACE_
 					info.fordblks,
 #endif
@@ -117,7 +117,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 			{
 				/* print human readable output - but skip empty lines */
 				fprintf(log_output, "%s%s",
-						(level > LOG_LVL_USER)?log_strings[level+1]:"", string);
+						(level > LOG_LVL_USER)?log_strings[level + 1]:"", string);
 			}
 		}
 	} else

src/helper/log.h

@@ -29,7 +29,7 @@
 #include "command.h"
 
 /* logging priorities 
- * LOG_LVL_SILENT - turn off all output. In lieu of try+catch this can be used as a 
+ * LOG_LVL_SILENT - turn off all output. In lieu of try + catch this can be used as a 
  *                  feeble ersatz.
  * LOG_LVL_USER - user messages. Could be anything from information 
  *                to progress messags. These messages do not represent

src/helper/replacements.c

@@ -218,7 +218,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 			tvslice.tv_sec = 0;
 			tvslice.tv_usec = 100000;
 
-			retcode = select(sock_max_fd+1, &aread, &awrite, &aexcept, &tvslice);
+			retcode = select(sock_max_fd + 1, &aread, &awrite, &aexcept, &tvslice);
 		}
 		if (n_handles > 0) {
 			/* check handles */