sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

hush: refactor file_get() 

Save indentation level by returning early.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-11-12 09:52:26 +01:00
parent 8875a39679
commit ad560a1797
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/hush.c
View File

@ -471,21 +471,23 @@ static int file_get(struct in_str *i)
int ch;
ch = 0;
/* If there is data waiting, eat it up */
if (i->p && *i->p) {
if (i->p && *i->p)
return *i->p++;
/* need to double check i->file because we might be doing something
* more complicated by now, like sourcing or substituting. */
while (!i->p || strlen(i->p) == 0 )
get_user_input(i);
i->promptmode = 2;
if (i->p && *i->p)
ch = *i->p++;
} else {
/* need to double check i->file because we might be doing something
* more complicated by now, like sourcing or substituting. */
while (!i->p || strlen(i->p) == 0 ) {
get_user_input(i);
}
i->promptmode = 2;
if (i->p && *i->p) {
ch = *i->p++;
}
debug("%s: got a %d\n", __func__, ch);
}
debug("%s: got a %d\n", __func__, ch);
return ch;
}