sum: 40% size reduction (-300 bytes)

find: one_char -> LONE_CHAR
This commit is contained in:
Denis Vlasenko
2006-12-23 15:58:11 +00:00
parent e13a537795
commit 9ac9e55e3c
2 changed files with 52 additions and 116 deletions

View File

@@ -75,11 +75,6 @@ USE_DESKTOP( ACTS(prune))
static action ***actions;
static int need_print = 1;
static inline int one_char(const char* str, char c)
{
return (str[0] == c && str[1] == '\0');
}
static int count_subst(const char *str)
{
@@ -455,7 +450,7 @@ action*** parse_params(char **argv)
while (1) {
if (!*argv) /* did not see ';' till end */
bb_error_msg_and_die(bb_msg_requires_arg, arg);
if (one_char(argv[0], ';'))
if (LONE_CHAR(argv[0], ';'))
break;
argv++;
ap->exec_argc++;
@@ -469,7 +464,7 @@ action*** parse_params(char **argv)
}
#endif
#if ENABLE_DESKTOP
else if (one_char(arg, '(')) {
else if (LONE_CHAR(arg, '(')) {
action_paren *ap;
char **endarg;
int nested = 1;
@@ -478,9 +473,9 @@ action*** parse_params(char **argv)
while (1) {
if (!*++endarg)
bb_error_msg_and_die("unpaired '('");
if (one_char(*endarg, '('))
if (LONE_CHAR(*endarg, '('))
nested++;
else if (one_char(*endarg, ')') && !--nested) {
else if (LONE_CHAR(*endarg, ')') && !--nested) {
*endarg = NULL;
break;
}
@@ -522,7 +517,7 @@ int find_main(int argc, char **argv)
if (argv[firstopt][0] == '-')
break;
#if ENABLE_DESKTOP
if (one_char(argv[firstopt], '('))
if (LONE_CHAR(argv[firstopt], '('))
break;
#endif
}