- Fixes '!=' whitespace
- 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@2363 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
@@ -226,7 +226,7 @@ command_t* register_command(command_context_t *context, command_t *parent, char
|
||||
const char *t2="";
|
||||
const char *t3="";
|
||||
/* maximum of two levels :-) */
|
||||
if (c->parent!=NULL)
|
||||
if (c->parent != NULL)
|
||||
{
|
||||
t1=c->parent->name;
|
||||
t2="_";
|
||||
@@ -250,7 +250,7 @@ command_t* register_command(command_context_t *context, command_t *parent, char
|
||||
Jim_Obj *cmd_list=Jim_NewListObj(interp, NULL, 0);
|
||||
|
||||
/* maximum of two levels :-) */
|
||||
if (c->parent!=NULL)
|
||||
if (c->parent != NULL)
|
||||
{
|
||||
Jim_ListAppendElement(interp, cmd_list, Jim_NewStringObj(interp, c->parent->name, -1));
|
||||
}
|
||||
@@ -420,7 +420,7 @@ int run_command(command_context_t *context, command_t *c, char *words[], int num
|
||||
const char *t2="";
|
||||
const char *t3="";
|
||||
/* maximum of two levels :-) */
|
||||
if (c->parent!=NULL)
|
||||
if (c->parent != NULL)
|
||||
{
|
||||
t1=c->parent->name;
|
||||
t2=" ";
|
||||
@@ -473,7 +473,7 @@ int command_run_line(command_context_t *context, char *line)
|
||||
Jim_DeleteAssocData(interp, "context");
|
||||
}
|
||||
if (retcode == JIM_ERR) {
|
||||
if (retval!=ERROR_COMMAND_CLOSE_CONNECTION)
|
||||
if (retval != ERROR_COMMAND_CLOSE_CONNECTION)
|
||||
{
|
||||
/* We do not print the connection closed error message */
|
||||
Jim_PrintErrorMessage(interp);
|
||||
@@ -520,7 +520,7 @@ int command_run_linef(command_context_t *context, const char *format, ...)
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
string = alloc_vprintf(format, ap);
|
||||
if (string!=NULL)
|
||||
if (string != NULL)
|
||||
{
|
||||
retval=command_run_line(context, string);
|
||||
}
|
||||
@@ -809,7 +809,7 @@ int handle_sleep_command(struct command_context_s *cmd_ctx,
|
||||
|
||||
int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
|
||||
{
|
||||
if (argc!=1)
|
||||
if (argc != 1)
|
||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||
|
||||
fast_and_dangerous = strcmp("enable", args[0])==0;
|
||||
|
||||
@@ -116,7 +116,7 @@ int parse_config_file(struct command_context_s *cmd_ctx)
|
||||
while (*cfg)
|
||||
{
|
||||
retval=command_run_line(cmd_ctx, *cfg);
|
||||
if (retval!=ERROR_OK)
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
cfg++;
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ int loadFile(const char *fileName, void **data, size_t *len)
|
||||
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,7 +104,7 @@ 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);
|
||||
@@ -225,11 +225,11 @@ 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;
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
|
||||
@@ -503,7 +503,7 @@ int Jim_StringToDouble(const char *str, double *doublePtr)
|
||||
static jim_wide JimPowWide(jim_wide b, jim_wide e)
|
||||
{
|
||||
jim_wide i, res = 1;
|
||||
if ((b==0 && e!=0) || (e<0)) return 0;
|
||||
if ((b==0 && e != 0) || (e<0)) return 0;
|
||||
for (i=0; i<e; i++) {res *= b;}
|
||||
return res;
|
||||
}
|
||||
@@ -6960,7 +6960,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr,
|
||||
case JIM_EXPROP_LSHIFT: wC = wA<<wB; break;
|
||||
case JIM_EXPROP_RSHIFT: wC = wA>>wB; break;
|
||||
case JIM_EXPROP_NUMEQ: wC = wA==wB; break;
|
||||
case JIM_EXPROP_NUMNE: wC = wA!=wB; break;
|
||||
case JIM_EXPROP_NUMNE: wC = wA != wB; break;
|
||||
case JIM_EXPROP_BITAND: wC = wA&wB; break;
|
||||
case JIM_EXPROP_BITXOR: wC = wA^wB; break;
|
||||
case JIM_EXPROP_BITOR: wC = wA|wB; break;
|
||||
@@ -7063,7 +7063,7 @@ trydouble:
|
||||
case JIM_EXPROP_LTE: dC = dA<=dB; break;
|
||||
case JIM_EXPROP_GTE: dC = dA>=dB; break;
|
||||
case JIM_EXPROP_NUMEQ: dC = dA==dB; break;
|
||||
case JIM_EXPROP_NUMNE: dC = dA!=dB; break;
|
||||
case JIM_EXPROP_NUMNE: dC = dA != dB; break;
|
||||
case JIM_EXPROP_LOGICAND_LEFT:
|
||||
if (dA == 0) {
|
||||
i += (int)dB;
|
||||
|
||||
@@ -89,7 +89,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
|
||||
if (f != NULL)
|
||||
file = f + 1;
|
||||
|
||||
if (strchr(string, '\n')!=NULL)
|
||||
if (strchr(string, '\n') != NULL)
|
||||
{
|
||||
if (debug_level >= LOG_LVL_DEBUG)
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
void *clear_malloc(size_t size)
|
||||
{
|
||||
void *t = malloc(size);
|
||||
if (t!=NULL)
|
||||
if (t != NULL)
|
||||
{
|
||||
memset(t, 0x00, size);
|
||||
}
|
||||
@@ -45,7 +45,7 @@ void *clear_malloc(size_t size)
|
||||
void *fill_malloc(size_t size)
|
||||
{
|
||||
void *t = malloc(size);
|
||||
if (t!=NULL)
|
||||
if (t != NULL)
|
||||
{
|
||||
/* We want to initialize memory to some known bad state. */
|
||||
/* 0 and 0xff yields 0 and -1 as integers, which often */
|
||||
|
||||
Reference in New Issue
Block a user