Simplify jtag_tap_by_jim_object:
- Merge declarations of temporary variables with first use. - Restructure logic to simplify conditional logic. git-svn-id: svn://svn.berlios.de/openocd/trunk@2142 b42882b7-edfa-0310-969c-e2dbd0fdcd60__archive__
parent
9f185eef7d
commit
009034f56c
|
@ -299,21 +299,14 @@ jtag_tap_t *jtag_tap_by_string(const char *s)
|
|||
return jtag_tap_by_abs_position(n);
|
||||
}
|
||||
|
||||
jtag_tap_t * jtag_tap_by_jim_obj( Jim_Interp *interp, Jim_Obj *o )
|
||||
jtag_tap_t *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *o)
|
||||
{
|
||||
jtag_tap_t *t;
|
||||
const char *cp;
|
||||
|
||||
cp = Jim_GetString( o, NULL );
|
||||
if(cp == NULL){
|
||||
const char *cp = Jim_GetString(o, NULL);
|
||||
jtag_tap_t *t = cp ? jtag_tap_by_string(cp) : NULL;
|
||||
if (NULL == cp)
|
||||
cp = "(unknown)";
|
||||
t = NULL;
|
||||
} else {
|
||||
t = jtag_tap_by_string( cp );
|
||||
}
|
||||
if( t == NULL ){
|
||||
Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp );
|
||||
}
|
||||
if (NULL == t)
|
||||
Jim_SetResult_sprintf(interp, "Tap '%s' could not be found", cp);
|
||||
return t;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue