Skip to content
GitLab
Commit c493543f authored by zwelch's avatar zwelch
Browse files

- Replace '){' with ') {'. 


git-svn-id: svn://svn.berlios.de/openocd/trunk@2378 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent dc575dc5
Expand all Hide whitespace changes
Inline Side-by-side
src/flash/str7x.c
View file @ c493543f
......@@ -273,7 +273,7 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last)
cmd = FLASH_SER | FLASH_WMS;
target_write_u32(target, str7x_get_flash_adr(bank, FLASH_CR0), cmd);
while (((retval = str7x_status(bank)) & str7x_info->busy_bits)){
while (((retval = str7x_status(bank)) & str7x_info->busy_bits)) {
alive_sleep(1);
}
......@@ -329,7 +329,7 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
cmd = FLASH_SPR | FLASH_WMS;
target_write_u32(target, str7x_get_flash_adr(bank, FLASH_CR0), cmd);
while (((retval = str7x_status(bank)) & str7x_info->busy_bits)){
while (((retval = str7x_status(bank)) & str7x_info->busy_bits)) {
alive_sleep(1);
}
......
src/flash/str9xpec.c
View file @ c493543f
......@@ -101,7 +101,7 @@ static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
{
if (tap == NULL){
if (tap == NULL) {
return ERROR_TARGET_INVALID;
}
......@@ -671,11 +671,11 @@ static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o
check_address = sec_end;
}
if ((offset >= sec_start) && (offset < sec_end)){
if ((offset >= sec_start) && (offset < sec_end)) {
first_sector = i;
}
if ((offset + count >= sec_start) && (offset + count < sec_end)){
if ((offset + count >= sec_start) && (offset + count < sec_end)) {
last_sector = i;
}
}
......
src/helper/command.c
View file @ c493543f
......@@ -348,7 +348,7 @@ int unregister_command(command_context_t *context, char *name)
void command_output_text(command_context_t *context, const char *data)
{
if (context && context->output_handler && data){
if (context && context->output_handler && data) {
context->output_handler(context, data);
}
}
......
src/helper/jim.c
View file @ c493543f
......@@ -544,7 +544,7 @@ void Jim_Panic(Jim_Interp *interp, const char *fmt, ...)
#endif
/* This may actually crash... we do it last */
if (interp && interp->cookie_stderr){
if (interp && interp->cookie_stderr) {
Jim_fprintf(interp, interp->cookie_stderr, JIM_NL "JIM INTERPRETER PANIC: ");
Jim_vfprintf(interp, interp->cookie_stderr, fmt, ap);
Jim_fprintf(interp, interp->cookie_stderr, JIM_NL JIM_NL);
......@@ -2064,7 +2064,7 @@ void Jim_AppendString_sprintf(Jim_Interp *interp, Jim_Obj *objPtr, const char *f
buf = jim_vasprintf(fmt, ap);
va_end(ap);
if (buf){
if (buf) {
Jim_AppendString(interp, objPtr, buf, -1);
jim_vasprintf_done(buf);
}
......@@ -2283,10 +2283,10 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
haveprec = 0;
prec = -1; /* not found yet */
next_fmt:
if (fmtLen <= 0){
if (fmtLen <= 0) {
break;
}
switch (*fmt){
switch (*fmt) {
/* terminals */
case 'b': /* binary - not all printfs() do this */
case 's': /* string */
......@@ -2341,11 +2341,11 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
case '8':
case '9':
accum = 0;
while (isdigit(*fmt) && (fmtLen > 0)){
while (isdigit(*fmt) && (fmtLen > 0)) {
accum = (accum * 10) + (*fmt - '0');
fmt++; fmtLen--;
}
if (inprec){
if (inprec) {
haveprec = 1;
prec = accum;
} else {
......@@ -2356,24 +2356,24 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
/* suck up the next item as an integer */
fmt++; fmtLen--;
objc--;
if (objc <= 0){
if (objc <= 0) {
goto not_enough_args;
}
if (Jim_GetWide(interp,objv[0],&wideValue)== JIM_ERR){
if (Jim_GetWide(interp,objv[0],&wideValue)== JIM_ERR) {
Jim_FreeNewObj(interp, resObjPtr);
return NULL;
}
if (inprec){
if (inprec) {
haveprec = 1;
prec = wideValue;
if (prec < 0){
if (prec < 0) {
/* man 3 printf says */
/* if prec is negative, it is zero */
prec = 0;
}
} else {
width = wideValue;
if (width < 0){
if (width < 0) {
ljust = 1;
width = -width;
}
......@@ -2402,32 +2402,32 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
*/
cp = fmt_str;
*cp++ = '%';
if (altfm){
if (altfm) {
*cp++ = '#';
}
if (forceplus){
if (forceplus) {
*cp++ = '+';
} else if (spad){
} else if (spad) {
/* PLUS overrides */
*cp++ = ' ';
}
if (ljust){
if (ljust) {
*cp++ = '-';
}
if (zpad){
if (zpad) {
*cp++ = '0';
}
if (width > 0){
if (width > 0) {
sprintf(cp, "%d", width);
/* skip ahead */
cp = strchr(cp,0);
}
/* did we find a period? */
if (inprec){
if (inprec) {
/* then add it */
*cp++ = '.';
/* did something occur after the period? */
if (haveprec){
if (haveprec) {
sprintf(cp, "%d", prec);
}
cp = strchr(cp,0);
......@@ -2461,7 +2461,7 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
case 'E':
*cp++ = *fmt;
*cp = 0;
if (Jim_GetDouble(interp, objv[0], &doubleValue) == JIM_ERR){
if (Jim_GetDouble(interp, objv[0], &doubleValue) == JIM_ERR) {
Jim_FreeNewObj(interp, resObjPtr);
return NULL;
}
......@@ -2475,7 +2475,7 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
case 'x':
case 'X':
/* jim widevaluse are 64bit */
if (sizeof(jim_wide) == sizeof(long long)){
if (sizeof(jim_wide) == sizeof(long long)) {
*cp++ = 'l';
*cp++ = 'l';
} else {
......@@ -2627,12 +2627,12 @@ int Jim_GetNvp(Jim_Interp *interp,
int e;
e = Jim_Nvp_name2value_obj(interp, nvp_table, objPtr, &n);
if (e == JIM_ERR){
if (e == JIM_ERR) {
return e;
}
/* Success? found? */
if (n->name){
if (n->name) {
/* remove const */
*result = (Jim_Nvp *)n;
return JIM_OK;
......@@ -8894,7 +8894,7 @@ int Jim_Eval_Named(Jim_Interp *interp, const char *script, const char *filename,
Jim_IncrRefCount(scriptObjPtr);
if (filename){
if (filename) {
JimSetSourceInfo(interp, scriptObjPtr, filename, lineno);
}
......@@ -12412,7 +12412,7 @@ int Jim_fprintf(Jim_Interp *interp, void *cookie, const char *fmt, ...)
int Jim_vfprintf(Jim_Interp *interp, void *cookie, const char *fmt, va_list ap)
{
if ((interp == NULL) || (interp->cb_vfprintf == NULL)){
if ((interp == NULL) || (interp->cb_vfprintf == NULL)) {
errno = ENOTSUP;
return -1;
}
......@@ -12421,7 +12421,7 @@ int Jim_vfprintf(Jim_Interp *interp, void *cookie, const char *fmt, va_list ap)
size_t Jim_fwrite(Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie)
{
if ((interp == NULL) || (interp->cb_fwrite == NULL)){
if ((interp == NULL) || (interp->cb_fwrite == NULL)) {
errno = ENOTSUP;
return 0;
}
......@@ -12430,7 +12430,7 @@ size_t Jim_fwrite(Jim_Interp *interp, const void *ptr, size_t size, size_t n, vo
size_t Jim_fread(Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie)
{
if ((interp == NULL) || (interp->cb_fread == NULL)){
if ((interp == NULL) || (interp->cb_fread == NULL)) {
errno = ENOTSUP;
return 0;
}
......@@ -12439,7 +12439,7 @@ size_t Jim_fread(Jim_Interp *interp, void *ptr, size_t size, size_t n, void *coo
int Jim_fflush(Jim_Interp *interp, void *cookie)
{
if ((interp == NULL) || (interp->cb_fflush == NULL)){
if ((interp == NULL) || (interp->cb_fflush == NULL)) {
/* pretend all is well */
return 0;
}
......@@ -12448,7 +12448,7 @@ int Jim_fflush(Jim_Interp *interp, void *cookie)
char* Jim_fgets(Jim_Interp *interp, char *s, int size, void *cookie)
{
if ((interp == NULL) || (interp->cb_fgets == NULL)){
if ((interp == NULL) || (interp->cb_fgets == NULL)) {
errno = ENOTSUP;
return NULL;
}
......@@ -12457,8 +12457,8 @@ char* Jim_fgets(Jim_Interp *interp, char *s, int size, void *cookie)
Jim_Nvp *
Jim_Nvp_name2value_simple(const Jim_Nvp *p, const char *name)
{
while (p->name){
if (0 == strcmp(name, p->name)){
while (p->name) {
if (0 == strcmp(name, p->name)) {
break;
}
p++;
......@@ -12469,8 +12469,8 @@ Jim_Nvp_name2value_simple(const Jim_Nvp *p, const char *name)
Jim_Nvp *
Jim_Nvp_name2value_nocase_simple(const Jim_Nvp *p, const char *name)
{
while (p->name){
if (0 == strcasecmp(name, p->name)){
while (p->name) {
if (0 == strcasecmp(name, p->name)) {
break;
}
p++;
......@@ -12499,12 +12499,12 @@ Jim_Nvp_name2value(Jim_Interp *interp,
p = Jim_Nvp_name2value_simple(_p, name);
/* result */
if (result){
if (result) {
*result = (Jim_Nvp *)(p);
}
/* found? */
if (p->name){
if (p->name) {
return JIM_OK;
} else {
return JIM_ERR;
......@@ -12524,11 +12524,11 @@ Jim_Nvp_name2value_nocase(Jim_Interp *interp, const Jim_Nvp *_p, const char *nam
p = Jim_Nvp_name2value_nocase_simple(_p, name);
if (puthere){
if (puthere) {
*puthere = (Jim_Nvp *)(p);
}
/* found */
if (p->name){
if (p->name) {
return JIM_OK;
} else {
return JIM_ERR;
......@@ -12543,7 +12543,7 @@ Jim_Nvp_value2name_obj(Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp
jim_wide w;
e = Jim_GetWide(interp, o, &w);
if (e != JIM_OK){
if (e != JIM_OK) {
return e;
}
......@@ -12553,8 +12553,8 @@ Jim_Nvp_value2name_obj(Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp
Jim_Nvp *
Jim_Nvp_value2name_simple(const Jim_Nvp *p, int value)
{
while (p->name){
if (value == p->value){
while (p->name) {
if (value == p->value) {
break;
}
p++;
......@@ -12570,11 +12570,11 @@ Jim_Nvp_value2name(Jim_Interp *interp, const Jim_Nvp *_p, int value, Jim_Nvp **r
p = Jim_Nvp_value2name_simple(_p, value);
if (result){
if (result) {
*result = (Jim_Nvp *)(p);
}
if (p->name){
if (p->name) {
return JIM_OK;
} else {
return JIM_ERR;
......@@ -12599,7 +12599,7 @@ Jim_GetOpt_Debug(Jim_GetOptInfo *p)
int x;
Jim_fprintf(p->interp, p->interp->cookie_stderr, "---args---\n");
for (x = 0 ; x < p->argc ; x++){
for (x = 0 ; x < p->argc ; x++) {
Jim_fprintf(p->interp, p->interp->cookie_stderr,
"%2d) %s\n",
x,
......@@ -12615,16 +12615,16 @@ Jim_GetOpt_Obj(Jim_GetOptInfo *goi, Jim_Obj **puthere)
Jim_Obj *o;
o = NULL; // failure
if (goi->argc){
if (goi->argc) {
// success
o = goi->argv[0];
goi->argc -= 1;
goi->argv += 1;
}
if (puthere){
if (puthere) {
*puthere = o;
}
if (o != NULL){
if (o != NULL) {
return JIM_OK;
} else {
return JIM_ERR;
......@@ -12640,9 +12640,9 @@ Jim_GetOpt_String(Jim_GetOptInfo *goi, char **puthere, int *len)
r = Jim_GetOpt_Obj(goi, &o);
if (r == JIM_OK){
if (r == JIM_OK) {
cp = Jim_GetString(o, len);
if (puthere){
if (puthere) {
/* remove const */
*puthere = (char *)(cp);
}
......@@ -12657,14 +12657,14 @@ Jim_GetOpt_Double(Jim_GetOptInfo *goi, double *puthere)
Jim_Obj *o;
double _safe;
if (puthere == NULL){
if (puthere == NULL) {
puthere = &_safe;
}
r = Jim_GetOpt_Obj(goi, &o);
if (r == JIM_OK){
if (r == JIM_OK) {
r = Jim_GetDouble(goi->interp, o, puthere);
if (r != JIM_OK){
if (r != JIM_OK) {
Jim_SetResult_sprintf(goi->interp,
"not a number: %s",
Jim_GetString(o, NULL));
......@@ -12680,12 +12680,12 @@ Jim_GetOpt_Wide(Jim_GetOptInfo *goi, jim_wide *puthere)
Jim_Obj *o;
jim_wide _safe;
if (puthere == NULL){
if (puthere == NULL) {
puthere = &_safe;
}
r = Jim_GetOpt_Obj(goi, &o);
if (r == JIM_OK){
if (r == JIM_OK) {
r = Jim_GetWide(goi->interp, o, puthere);
}
return r;
......@@ -12699,12 +12699,12 @@ int Jim_GetOpt_Nvp(Jim_GetOptInfo *goi,
Jim_Obj *o;
int e;
if (puthere == NULL){
if (puthere == NULL) {
puthere = &_safe;
}
e = Jim_GetOpt_Obj(goi, &o);
if (e == JIM_OK){
if (e == JIM_OK) {
e = Jim_Nvp_name2value_obj(goi->interp,
nvp,
o,
......@@ -12719,7 +12719,7 @@ Jim_GetOpt_NvpUnknown(Jim_GetOptInfo *goi,
const Jim_Nvp *nvptable,
int hadprefix)
{
if (hadprefix){
if (hadprefix) {
Jim_SetResult_NvpUnknown(goi->interp,
goi->argv[-2],
goi->argv[-1],
......@@ -12742,11 +12742,11 @@ Jim_GetOpt_Enum(Jim_GetOptInfo *goi,
Jim_Obj *o;
int e;
if (puthere == NULL){
if (puthere == NULL) {
puthere = &_safe;
}
e = Jim_GetOpt_Obj(goi, &o);
if (e == JIM_OK){
if (e == JIM_OK) {
e = Jim_GetEnum(goi->interp,
o,
lookup,
......@@ -12768,7 +12768,7 @@ Jim_SetResult_sprintf(Jim_Interp *interp, const char *fmt,...)
va_start(ap,fmt);
buf = jim_vasprintf(fmt, ap);
va_end(ap);
if (buf){
if (buf) {
Jim_SetResultString(interp, buf, -1);
jim_vasprintf_done(buf);
}
......@@ -12782,7 +12782,7 @@ Jim_SetResult_NvpUnknown(Jim_Interp *interp,
Jim_Obj *param_value,
const Jim_Nvp *nvp)
{
if (param_name){
if (param_name) {
Jim_SetResult_sprintf(interp,
"%s: Unknown: %s, try one of: ",
Jim_GetString(param_name, NULL),
......@@ -12792,11 +12792,11 @@ Jim_SetResult_NvpUnknown(Jim_Interp *interp,
"Unknown param: %s, try one of: ",
Jim_GetString(param_value, NULL));
}
while (nvp->name){
while (nvp->name) {
const char *a;
const char *b;
if ((nvp + 1)->name){
if ((nvp + 1)->name) {
a = nvp->name;
b = ", ";
} else {
......@@ -12818,12 +12818,12 @@ Jim_Debug_ArgvString(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
int x;
if (debug_string_obj){
if (debug_string_obj) {
Jim_FreeObj(interp, debug_string_obj);
}
debug_string_obj = Jim_NewEmptyStringObj(interp);
for (x = 0 ; x < argc ; x++){
for (x = 0 ; x < argc ; x++) {
Jim_AppendStrings(interp,
debug_string_obj,
Jim_GetString(argv[x], NULL),
......
src/helper/jim.h
View file @ c493543f
......@@ -985,19 +985,19 @@ typedef struct jim_getopt {
*
* Jim_GetOpt_Setup(&goi, interp, argc, argv);
*
* while (goi.argc){
* while (goi.argc) {
* e = Jim_GetOpt_Nvp(&goi, nvp_options, &n);
* if (e != JIM_OK){
* if (e != JIM_OK) {
* Jim_GetOpt_NvpUnknown(&goi, nvp_options, 0);
* return e;
* }
*
* switch (n->value){
* switch (n->value) {
* case ALIVE:
* printf("Option ALIVE specified\n");
* break;
* case FIRST:
* if (goi.argc < 1){
* if (goi.argc < 1) {
* .. not enough args error ..
* }
* Jim_GetOpt_String(&goi, &cp, NULL);
......@@ -1008,7 +1008,7 @@ typedef struct jim_getopt {
* break;
* case POLITICS:
* e = Jim_GetOpt_Nvp(&goi, nvp_politics, &n);
* if (e != JIM_OK){
* if (e != JIM_OK) {
* Jim_GetOpt_NvpUnknown(&goi, nvp_politics, 1);
* return e;
* }
......@@ -1102,21 +1102,21 @@ JIM_STATIC int JIM_API(Jim_GetOpt_Nvp)(Jim_GetOptInfo *goi, const Jim_Nvp *looku
* Example:
* \code
*
* while (goi.argc){
* while (goi.argc) {
* // Get the next option
* e = Jim_GetOpt_Nvp(&goi, cmd_options, &n);
* if (e != JIM_OK){
* if (e != JIM_OK) {
* // option was not recognized
* // pass 'hadprefix = 0' because there is no prefix
* Jim_GetOpt_NvpUnknown(&goi, cmd_options, 0);
* return e;
* }
*
* switch (n->value){
* switch (n->value) {
* case OPT_SEX:
* // handle: --sex male | female | lots | needmore
* e = Jim_GetOpt_Nvp(&goi, &nvp_sex, &n);
* if (e != JIM_OK){
* if (e != JIM_OK) {
* Jim_GetOpt_NvpUnknown(&ogi, nvp_sex, 1);
* return e;
* }
......
src/jtag/core.c
View file @ c493543f
......@@ -704,7 +704,7 @@ int jtag_check_value_inner(uint8_t *captured, uint8_t *in_check_value, uint8_t *
else
compare_failed = buf_cmp(captured, in_check_value, num_bits);
if (compare_failed){
if (compare_failed) {
/* An error handler could have caught the failing check
* only report a problem when there wasn't a handler, or if the handler
* acknowledged the error
......@@ -1024,9 +1024,9 @@ int jtag_validate_chain(void)
tap = NULL;
total_ir_length = 0;
for (;;){
for (;;) {
tap = jtag_tap_next_enabled(tap);
if (tap == NULL){
if (tap == NULL) {
break;
}
total_ir_length += tap->ir_length;
......@@ -1048,9 +1048,9 @@ int jtag_validate_chain(void)
tap = NULL;
chain_pos = 0;
int val;
for (;;){
for (;;) {
tap = jtag_tap_next_enabled(tap);
if (tap == NULL){
if (tap == NULL) {
break;
}
......@@ -1151,7 +1151,7 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
LOG_DEBUG("Init JTAG chain");
tap = jtag_tap_next_enabled(NULL);
if (tap == NULL){
if (tap == NULL) {
LOG_ERROR("There are no enabled taps?");
return ERROR_JTAG_INIT_FAILED;
}
......
src/jtag/interface.c
View file @ c493543f
......@@ -359,9 +359,9 @@ tap_state_t tap_state_by_name(const char *name)
{
tap_state_t x;
for (x = 0 ; x < TAP_NUM_STATES ; x++){
for (x = 0 ; x < TAP_NUM_STATES ; x++) {
/* be nice to the human */
if (0 == strcasecmp(name, tap_state_name(x))){
if (0 == strcasecmp(name, tap_state_name(x))) {
return x;
}
}
......
src/jtag/tcl.c
View file @ c493543f
......@@ -340,7 +340,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
/*
* we expect CHIP + TAP + OPTIONS
* */
if (goi->argc < 3){
if (goi->argc < 3) {
Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
return JIM_ERR;
}
......@@ -367,14 +367,14 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
/* clear them as we find them */
reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK);
while (goi->argc){
while (goi->argc) {
e = Jim_GetOpt_Nvp(goi, opts, &n);
if (e != JIM_OK){
if (e != JIM_OK) {
Jim_GetOpt_NvpUnknown(goi, opts, 0);
return e;
}
LOG_DEBUG("Processing option: %s", n->name);
switch (n->value){
switch (n->value) {
case NTAP_OPT_ENABLED:
pTap->disabled_after_reset = false;
break;
......@@ -410,11 +410,11 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
case NTAP_OPT_IRMASK:
case NTAP_OPT_IRCAPTURE:
e = Jim_GetOpt_Wide(goi, &w);
if (e != JIM_OK){
if (e != JIM_OK) {
Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
return e;
}
switch (n->value){
switch (n->value) {
case NTAP_OPT_IRLEN:
if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value)))
LOG_WARNING("huge IR length %d", (int) w);
......@@ -535,29 +535,29 @@ static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n);
if (e != JIM_OK){
if (e != JIM_OK) {
Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0);
return e;
}
Jim_SetEmptyResult(goi.interp);
switch (n->value){
switch (n->value) {
case JTAG_CMD_INTERFACE:
/* return the name of the interface */
/* TCL code might need to know the exact type... */
/* FUTURE: we allow this as a means to "set" the interface. */
if (goi.argc != 0){