aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:04:04 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:04:04 +0000
commit85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50 (patch)
tree0b60f25ea0ebfbac5d9b3fa22f123aadaecd6663 /shell
parent081eb71ebd7954a67287816a9a6fff80e8c5319a (diff)
downloadbusybox-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.gz
busybox-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.bz2
*: fix fallout from -Wunused-parameter
function old new delta bbunpack 358 366 +8 passwd_main 1070 1072 +2 handle_incoming_and_exit 2651 2653 +2 getpty 88 86 -2 script_main 975 972 -3 inetd_main 2036 2033 -3 dname_enc 377 373 -4 make_new_session 474 462 -12 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/5 up/down: 12/-24) Total: -12 bytes text data bss dec hex filename 797429 658 7428 805515 c4a8b busybox_old 797417 658 7428 805503 c4a7f busybox_unstripped
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c20
-rw-r--r--shell/cttyhack.c2
2 files changed, 17 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 580918ceb..d9ce202fd 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3247,6 +3247,9 @@ static pid_t backgndpid; /* pid of last background process */
static smallint job_warning; /* user was warned about stopped jobs (can be 2, 1 or 0). */
static struct job *makejob(/*union node *,*/ int);
+#if !JOBS
+#define forkshell(job, node, mode) forkshell(job, mode)
+#endif
static int forkshell(struct job *, union node *, int);
static int waitforjob(struct job *);
@@ -3424,6 +3427,9 @@ jobno(const struct job *jp)
/*
* Convert a job name to a job structure.
*/
+#if !JOBS
+#define getjob(name, getctl) getjob(name)
+#endif
static struct job *
getjob(const char *name, int getctl)
{
@@ -4533,6 +4539,9 @@ forkchild(struct job *jp, /*union node *n,*/ int mode)
}
/* Called after fork(), in parent */
+#if !JOBS
+#define forkparent(jp, n, mode, pid) forkparent(jp, mode, pid)
+#endif
static void
forkparent(struct job *jp, union node *n, int mode, pid_t pid)
{
@@ -8674,8 +8683,8 @@ preadfd(void)
char *buf = parsefile->buf;
parsenextc = buf;
- retry:
#if ENABLE_FEATURE_EDITING
+ retry:
if (!iflag || parsefile->fd)
nr = nonblock_safe_read(parsefile->fd, buf, BUFSIZ - 1);
else {
@@ -8876,8 +8885,11 @@ pungetc(void)
* Push a string back onto the input at this current parsefile level.
* We handle aliases this way.
*/
+#if !ENABLE_ASH_ALIAS
+#define pushstring(s, ap) pushstring(s)
+#endif
static void
-pushstring(char *s, void *ap)
+pushstring(char *s, struct alias *ap)
{
struct strpush *sp;
size_t len;
@@ -8894,9 +8906,9 @@ pushstring(char *s, void *ap)
sp->prevstring = parsenextc;
sp->prevnleft = parsenleft;
#if ENABLE_ASH_ALIAS
- sp->ap = (struct alias *)ap;
+ sp->ap = ap;
if (ap) {
- ((struct alias *)ap)->flag |= ALIASINUSE;
+ ap->flag |= ALIASINUSE;
sp->string = s;
}
#endif
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 404181720..bbe514933 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -38,7 +38,7 @@ struct serial_struct {
};
int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cttyhack_main(int argc, char **argv)
+int cttyhack_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
int fd;
char console[sizeof(int)*3 + 16];