ash: more of -Wall fixes

author: Denis Vlasenko <vda.linux@googlemail.com> 2008-05-18 14:06:08 +0000
committer: Denis Vlasenko <vda.linux@googlemail.com> 2008-05-18 14:06:08 +0000
commit: 29eb3599e4014c225365f2c5539cf8a3ef46136e (patch)
tree: a5fb09418b4f67713fccd06b5e098e6cddcf7356 /shell/ash.c
parent: d04e1fc309f3df9e1be2dde7556fda47ac577c5a (diff)
download: busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.tar.gz
busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.tar.bz2
busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.zip
1 files changed, 16 insertions, 16 deletions
diff --git a/shell/ash.c b/shell/ash.c
index e14907073..b45229ba5 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1360,7 +1360,7 @@ growstackblock(void)
                INT_ON;
        } else {
                char *oldspace = g_stacknxt;
-                int oldlen = g_stacknleft;
+                size_t oldlen = g_stacknleft;
                char *p = stalloc(newlen);
                /* free the space we just allocated */
@@ -1403,7 +1403,7 @@ growstackstr(void)
                return stackblock();
        }
        growstackblock();
-        return stackblock() + len;
+        return (char *)stackblock() + len;
 }
 /*
@@ -1424,14 +1424,14 @@ makestrspace(size_t newlen, char *p)
                        break;
                growstackblock();
        }
-        return stackblock() + len;
+        return (char *)stackblock() + len;
 }
 static char *
 stack_nputstr(const char *s, size_t n, char *p)
 {
        p = makestrspace(n, p);
-        p = memcpy(p, s, n) + n;
+        p = (char *)memcpy(p, s, n) + n;
        return p;
 }
@@ -1536,7 +1536,7 @@ single_quote(const char *s)
                q = p = makestrspace(len + 3, p);
                *q++ = '\'';
-                q = memcpy(q, s, len) + len;
+                q = (char *)memcpy(q, s, len) + len;
                *q++ = '\'';
                s += len;
@@ -1549,7 +1549,7 @@ single_quote(const char *s)
                q = p = makestrspace(len + 3, p);
                *q++ = '"';
-                q = memcpy(q, s, len) + len;
+                q = (char *)memcpy(q, s, len) + len;
                *q++ = '"';
                s += len;
@@ -2079,10 +2079,10 @@ setvar(const char *name, const char *val, int flags)
        }
        INT_OFF;
        nameeq = ckmalloc(namelen + vallen + 2);
-        p = memcpy(nameeq, name, namelen) + namelen;
+        p = (char *)memcpy(nameeq, name, namelen) + namelen;
        if (val) {
                *p++ = '=';
-                p = memcpy(p, val, vallen) + vallen;
+                p = (char *)memcpy(p, val, vallen) + vallen;
        }
        *p = '\0';
        setvareq(nameeq, flags | VNOSAVE);
@@ -2364,7 +2364,7 @@ updatepwd(const char *dir)
                new = stack_putstr(curdir, new);
        }
        new = makestrspace(strlen(dir) + 2, new);
-        lim = stackblock() + 1;
+        lim = (char *)stackblock() + 1;
        if (*dir != '/') {
                if (new[-1] != '/')
                        USTPUTC('/', new);
@@ -5157,7 +5157,7 @@ _rmescapes(char *str, int flag)
                }
                q = r;
                if (len > 0) {
-                        q = memcpy(q, str, len) + len;
+                        q = (char *)memcpy(q, str, len) + len;
                }
        }
        inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
@@ -5426,7 +5426,7 @@ expbackq(union node *cmd, int quoted, int quotes)
        char *p;
        char *dest;
        int startloc;
-        int syntax = quoted? DQSYNTAX : BASESYNTAX;
+        int syntax = quoted ? DQSYNTAX : BASESYNTAX;
        struct stackmark smark;
        INT_OFF;
@@ -5910,7 +5910,7 @@ subevalvar(char *p, char *str, int strloc, int subtype,
        STPUTC('\0', expdest);
        herefd = saveherefd;
        argbackq = saveargbackq;
-        startp = stackblock() + startloc;
+        startp = (char *)stackblock() + startloc;
        switch (subtype) {
        case VSASSIGN:
@@ -5988,19 +5988,19 @@ subevalvar(char *p, char *str, int strloc, int subtype,
        amount = expdest - ((char *)stackblock() + resetloc);
        STADJUST(-amount, expdest);
-        startp = stackblock() + startloc;
+        startp = (char *)stackblock() + startloc;
        rmesc = startp;
-        rmescend = stackblock() + strloc;
+        rmescend = (char *)stackblock() + strloc;
        if (quotes) {
                rmesc = _rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW);
                if (rmesc != startp) {
                        rmescend = expdest;
-                        startp = stackblock() + startloc;
+                        startp = (char *)stackblock() + startloc;
                }
        }
        rmescend--;
-        str = stackblock() + strloc;
+        str = (char *)stackblock() + strloc;
        preglob(str, varflags & VSQUOTE, 0);
        workloc = expdest - (char *)stackblock();
author	Denis Vlasenko <vda.linux@googlemail.com>	2008-05-18 14:06:08 +0000
committer	Denis Vlasenko <vda.linux@googlemail.com>	2008-05-18 14:06:08 +0000
commit	29eb3599e4014c225365f2c5539cf8a3ef46136e (patch)
tree	a5fb09418b4f67713fccd06b5e098e6cddcf7356 /shell/ash.c
parent	d04e1fc309f3df9e1be2dde7556fda47ac577c5a (diff)
download	busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.tar.gz busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.tar.bz2 busybox-w32-29eb3599e4014c225365f2c5539cf8a3ef46136e.zip

diff --git a/shell/ash.c b/shell/ash.c index e14907073..b45229ba5 100644 --- a/shell/ash.c +++ b/shell/ash.c
@@ -1360,7 +1360,7 @@ growstackblock(void)
1360	INT_ON;	1360	INT_ON;
1361	} else {	1361	} else {
1362	char *oldspace = g_stacknxt;	1362	char *oldspace = g_stacknxt;
1363	int oldlen = g_stacknleft;	1363	size_t oldlen = g_stacknleft;
1364	char *p = stalloc(newlen);	1364	char *p = stalloc(newlen);
1365		1365
1366	/* free the space we just allocated */	1366	/* free the space we just allocated */
@@ -1403,7 +1403,7 @@ growstackstr(void)
1403	return stackblock();	1403	return stackblock();
1404	}	1404	}
1405	growstackblock();	1405	growstackblock();
1406	return stackblock() + len;	1406	return (char *)stackblock() + len;
1407	}	1407	}
1408		1408
1409	/*	1409	/*
@@ -1424,14 +1424,14 @@ makestrspace(size_t newlen, char *p)
1424	break;	1424	break;
1425	growstackblock();	1425	growstackblock();
1426	}	1426	}
1427	return stackblock() + len;	1427	return (char *)stackblock() + len;
1428	}	1428	}
1429		1429
1430	static char *	1430	static char *
1431	stack_nputstr(const char s, size_t n, char p)	1431	stack_nputstr(const char s, size_t n, char p)
1432	{	1432	{
1433	p = makestrspace(n, p);	1433	p = makestrspace(n, p);
1434	p = memcpy(p, s, n) + n;	1434	p = (char *)memcpy(p, s, n) + n;
1435	return p;	1435	return p;
1436	}	1436	}
1437		1437
@@ -1536,7 +1536,7 @@ single_quote(const char *s)
1536	q = p = makestrspace(len + 3, p);	1536	q = p = makestrspace(len + 3, p);
1537		1537
1538	*q++ = '\'';	1538	*q++ = '\'';
1539	q = memcpy(q, s, len) + len;	1539	q = (char *)memcpy(q, s, len) + len;
1540	*q++ = '\'';	1540	*q++ = '\'';
1541	s += len;	1541	s += len;
1542		1542
@@ -1549,7 +1549,7 @@ single_quote(const char *s)
1549	q = p = makestrspace(len + 3, p);	1549	q = p = makestrspace(len + 3, p);
1550		1550
1551	*q++ = '"';	1551	*q++ = '"';
1552	q = memcpy(q, s, len) + len;	1552	q = (char *)memcpy(q, s, len) + len;
1553	*q++ = '"';	1553	*q++ = '"';
1554	s += len;	1554	s += len;
1555		1555
@@ -2079,10 +2079,10 @@ setvar(const char name, const char val, int flags)
2079	}	2079	}
2080	INT_OFF;	2080	INT_OFF;
2081	nameeq = ckmalloc(namelen + vallen + 2);	2081	nameeq = ckmalloc(namelen + vallen + 2);
2082	p = memcpy(nameeq, name, namelen) + namelen;	2082	p = (char *)memcpy(nameeq, name, namelen) + namelen;
2083	if (val) {	2083	if (val) {
2084	*p++ = '=';	2084	*p++ = '=';
2085	p = memcpy(p, val, vallen) + vallen;	2085	p = (char *)memcpy(p, val, vallen) + vallen;
2086	}	2086	}
2087	*p = '\0';	2087	*p = '\0';
2088	setvareq(nameeq, flags \| VNOSAVE);	2088	setvareq(nameeq, flags \| VNOSAVE);
@@ -2364,7 +2364,7 @@ updatepwd(const char *dir)
2364	new = stack_putstr(curdir, new);	2364	new = stack_putstr(curdir, new);
2365	}	2365	}
2366	new = makestrspace(strlen(dir) + 2, new);	2366	new = makestrspace(strlen(dir) + 2, new);
2367	lim = stackblock() + 1;	2367	lim = (char *)stackblock() + 1;
2368	if (*dir != '/') {	2368	if (*dir != '/') {
2369	if (new[-1] != '/')	2369	if (new[-1] != '/')
2370	USTPUTC('/', new);	2370	USTPUTC('/', new);
@@ -5157,7 +5157,7 @@ _rmescapes(char *str, int flag)
5157	}	5157	}
5158	q = r;	5158	q = r;
5159	if (len > 0) {	5159	if (len > 0) {
5160	q = memcpy(q, str, len) + len;	5160	q = (char *)memcpy(q, str, len) + len;
5161	}	5161	}
5162	}	5162	}
5163	inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;	5163	inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
@@ -5426,7 +5426,7 @@ expbackq(union node *cmd, int quoted, int quotes)
5426	char *p;	5426	char *p;
5427	char *dest;	5427	char *dest;
5428	int startloc;	5428	int startloc;
5429	int syntax = quoted? DQSYNTAX : BASESYNTAX;	5429	int syntax = quoted ? DQSYNTAX : BASESYNTAX;
5430	struct stackmark smark;	5430	struct stackmark smark;
5431		5431
5432	INT_OFF;	5432	INT_OFF;
@@ -5910,7 +5910,7 @@ subevalvar(char p, char str, int strloc, int subtype,
5910	STPUTC('\0', expdest);	5910	STPUTC('\0', expdest);
5911	herefd = saveherefd;	5911	herefd = saveherefd;
5912	argbackq = saveargbackq;	5912	argbackq = saveargbackq;
5913	startp = stackblock() + startloc;	5913	startp = (char *)stackblock() + startloc;
5914		5914
5915	switch (subtype) {	5915	switch (subtype) {
5916	case VSASSIGN:	5916	case VSASSIGN:
@@ -5988,19 +5988,19 @@ subevalvar(char p, char str, int strloc, int subtype,
5988		5988
5989	amount = expdest - ((char *)stackblock() + resetloc);	5989	amount = expdest - ((char *)stackblock() + resetloc);
5990	STADJUST(-amount, expdest);	5990	STADJUST(-amount, expdest);
5991	startp = stackblock() + startloc;	5991	startp = (char *)stackblock() + startloc;
5992		5992
5993	rmesc = startp;	5993	rmesc = startp;
5994	rmescend = stackblock() + strloc;	5994	rmescend = (char *)stackblock() + strloc;
5995	if (quotes) {	5995	if (quotes) {
5996	rmesc = _rmescapes(startp, RMESCAPE_ALLOC \| RMESCAPE_GROW);	5996	rmesc = _rmescapes(startp, RMESCAPE_ALLOC \| RMESCAPE_GROW);
5997	if (rmesc != startp) {	5997	if (rmesc != startp) {
5998	rmescend = expdest;	5998	rmescend = expdest;
5999	startp = stackblock() + startloc;	5999	startp = (char *)stackblock() + startloc;
6000	}	6000	}
6001	}	6001	}
6002	rmescend--;	6002	rmescend--;
6003	str = stackblock() + strloc;	6003	str = (char *)stackblock() + strloc;
6004	preglob(str, varflags & VSQUOTE, 0);	6004	preglob(str, varflags & VSQUOTE, 0);
6005	workloc = expdest - (char *)stackblock();	6005	workloc = expdest - (char *)stackblock();
6006		6006