diff options
| author | Eric Andersen | 2006-01-30 22:48:39 +0000 |
|---|---|---|
| committer | Eric Andersen | 2006-01-30 22:48:39 +0000 |
| commit | a68ea1cb93c29125bc4f30ddd415fca02249e010 (patch) | |
| tree | 5741be315758b807145c24da9ff3a1dbf8fce4e8 /shell/ash.c | |
| parent | 9a58b02ec75caafb7214f1ad0317f9a4830cbd2a (diff) | |
| download | busybox-a68ea1cb93c29125bc4f30ddd415fca02249e010.zip busybox-a68ea1cb93c29125bc4f30ddd415fca02249e010.tar.gz | |
fix up yet more annoying signed/unsigned and mixed type errors
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/shell/ash.c b/shell/ash.c index 3564d85..e9e6def 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -1402,8 +1402,10 @@ static void unsetfunc(const char *); #ifdef CONFIG_ASH_MATH_SUPPORT_64 typedef int64_t arith_t; +#define arith_t_type (long long) #else typedef long arith_t; +#define arith_t_type (long) #endif #ifdef CONFIG_ASH_MATH_SUPPORT @@ -10132,15 +10134,15 @@ readtoken1(int firstc, int syntax, char *eofmark, int striptabs) char *out; int len; char line[EOFMARKLEN + 1]; - struct nodelist *bqlist; - int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - int dqvarnest; /* levels of variables expansion within double quotes */ - int oldstyle; - int prevsyntax; /* syntax before arithmetic */ + struct nodelist *bqlist = 0; + int quotef = 0; + int dblquote = 0; + int varnest = 0; /* levels of variables expansion */ + int arinest = 0; /* levels of arithmetic expansion */ + int parenlevel = 0; /* levels of parens in arithmetic */ + int dqvarnest = 0; /* levels of variables expansion within double quotes */ + int oldstyle = 0; + int prevsyntax = 0; /* syntax before arithmetic */ #if __GNUC__ /* Avoid longjmp clobbering */ (void) &out; @@ -10563,7 +10565,7 @@ parsebackq: { struct jmploc jmploc; struct jmploc *volatile savehandler; size_t savelen; - int saveprompt; + int saveprompt = 0; #ifdef __GNUC__ (void) &saveprompt; #endif @@ -13380,9 +13382,9 @@ arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr) } /* save to shell variable */ #ifdef CONFIG_ASH_MATH_SUPPORT_64 - snprintf(buf, sizeof(buf), "%lld", rez); + snprintf(buf, sizeof(buf), "%lld", arith_t_type rez); #else - snprintf(buf, sizeof(buf), "%ld", rez); + snprintf(buf, sizeof(buf), "%ld", arith_t_type rez); #endif setvar(numptr_m1->var, buf, 0); /* after saving, make previous value for v++ or v-- */ |