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
This commit is contained in:
zwelch 2009-06-09 02:23:35 +00:00
parent 9f185eef7d
commit 009034f56c
1 changed files with 6 additions and 13 deletions

View File

@ -299,21 +299,14 @@ jtag_tap_t *jtag_tap_by_string(const char *s)
return jtag_tap_by_abs_position(n); 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 = Jim_GetString(o, NULL);
const char *cp; jtag_tap_t *t = cp ? jtag_tap_by_string(cp) : NULL;
if (NULL == cp)
cp = Jim_GetString( o, NULL );
if(cp == NULL){
cp = "(unknown)"; cp = "(unknown)";
t = NULL; if (NULL == t)
} else { Jim_SetResult_sprintf(interp, "Tap '%s' could not be found", cp);
t = jtag_tap_by_string( cp );
}
if( t == NULL ){
Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp );
}
return t; return t;
} }