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

awk: code shrink

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-03-11 12:44:25 +01:00
parent 6ebdf7aa7b
commit b0a57abb79
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editors/awk.c
View File

@ -658,10 +658,8 @@ static void hash_remove(xhash *hash, const char *name)
/* ------ some useful functions ------ */ /* ------ some useful functions ------ */
static void skip_spaces(char **s) static char *skip_spaces(char *p)
{ {
char *p = *s;
while (1) { while (1) {
if (*p == '\\' && p[1] == '\n') { if (*p == '\\' && p[1] == '\n') {
p++; p++;
@ -671,7 +669,7 @@ static void skip_spaces(char **s)
} }
p++; p++;
} }
*s = p; return p;
} }
/* returns old *s, advances *s past word and terminating NUL */ /* returns old *s, advances *s past word and terminating NUL */
@ -822,7 +820,7 @@ static double getvar_i(var *v)
if (s && *s) { if (s && *s) {
v->number = my_strtod(&s); v->number = my_strtod(&s);
if (v->type & VF_USER) { if (v->type & VF_USER) {
skip_spaces(&s); s = skip_spaces(s);
if (*s != '\0') if (*s != '\0')
v->type &= ~VF_USER; v->type &= ~VF_USER;
} }
@ -981,7 +979,7 @@ static uint32_t next_token(uint32_t expected)
} else { } else {
p = g_pos; p = g_pos;
readnext: readnext:
skip_spaces(&p); p = skip_spaces(p);
g_lineno = t_lineno; g_lineno = t_lineno;
if (*p == '#') if (*p == '#')
while (*p != '\n' && *p != '\0') while (*p != '\n' && *p != '\0')
@ -1080,7 +1078,7 @@ static uint32_t next_token(uint32_t expected)
tc = TC_VARIABLE; tc = TC_VARIABLE;
/* also consume whitespace between functionname and bracket */ /* also consume whitespace between functionname and bracket */
if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY)) if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY))
skip_spaces(&p); p = skip_spaces(p);
if (*p == '(') { if (*p == '(') {
tc = TC_FUNCTION; tc = TC_FUNCTION;
} else { } else {