emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: improve readability of the code. No real code changes.

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-23 13:06:34 +00:00
parent ef527f50e6
commit 2b75a94118
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/ash.c
View File

@ -11146,7 +11146,8 @@ xxreadtoken(void)
} }
} }
} }
return lasttoken = xxreadtoken_tokens[p - xxreadtoken_chars]; lasttoken = xxreadtoken_tokens[p - xxreadtoken_chars];
return lasttoken;
} }
} }
} /* for */ } /* for */
@ -12997,21 +12998,19 @@ arith(const char *expr, int *perrcode)
char arithval; /* Current character under analysis */ char arithval; /* Current character under analysis */
operator lasttok, op; operator lasttok, op;
operator prec; operator prec;
operator *stack, *stackptr;
const char *p = endexpression; const char *p = endexpression;
int errcode; int errcode;
v_n_t *numstack, *numstackptr;
size_t datasizes = strlen(expr) + 2; unsigned datasizes = strlen(expr) + 2;
/* Stack of integers */ /* Stack of integers */
/* The proof that there can be no more than strlen(startbuf)/2+1 integers /* The proof that there can be no more than strlen(startbuf)/2+1 integers
* in any given correct or incorrect expression is left as an exercise to * in any given correct or incorrect expression is left as an exercise to
* the reader. */ * the reader. */
v_n_t *numstack = alloca(((datasizes)/2)*sizeof(v_n_t)), numstackptr = numstack = alloca((datasizes / 2) * sizeof(numstack[0]));
*numstackptr = numstack;
/* Stack of operator tokens */ /* Stack of operator tokens */
operator *stack = alloca((datasizes) * sizeof(operator)), stackptr = stack = alloca(datasizes * sizeof(stack[0]));
*stackptr = stack;
*stackptr++ = lasttok = TOK_LPAREN; /* start off with a left paren */ *stackptr++ = lasttok = TOK_LPAREN; /* start off with a left paren */
*perrcode = errcode = 0; *perrcode = errcode = 0;
@ -13040,7 +13039,8 @@ arith(const char *expr, int *perrcode)
if (numstackptr != numstack+1) { if (numstackptr != numstack+1) {
/* ... but if there isn't, it's bad */ /* ... but if there isn't, it's bad */
err: err:
return (*perrcode = -1); *perrcode = -1;
return *perrcode;
} }
if (numstack->var) { if (numstack->var) {
/* expression is $((var)) only, lookup now */ /* expression is $((var)) only, lookup now */