aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:04:04 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:04:04 +0000
commit85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50 (patch)
tree0b60f25ea0ebfbac5d9b3fa22f123aadaecd6663 /shell
parent081eb71ebd7954a67287816a9a6fff80e8c5319a (diff)
downloadbusybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.gz
busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.bz2
busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.zip
*: 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 */
3247static smallint job_warning; /* user was warned about stopped jobs (can be 2, 1 or 0). */ 3247static smallint job_warning; /* user was warned about stopped jobs (can be 2, 1 or 0). */
3248 3248
3249static struct job *makejob(/*union node *,*/ int); 3249static struct job *makejob(/*union node *,*/ int);
3250#if !JOBS
3251#define forkshell(job, node, mode) forkshell(job, mode)
3252#endif
3250static int forkshell(struct job *, union node *, int); 3253static int forkshell(struct job *, union node *, int);
3251static int waitforjob(struct job *); 3254static int waitforjob(struct job *);
3252 3255
@@ -3424,6 +3427,9 @@ jobno(const struct job *jp)
3424/* 3427/*
3425 * Convert a job name to a job structure. 3428 * Convert a job name to a job structure.
3426 */ 3429 */
3430#if !JOBS
3431#define getjob(name, getctl) getjob(name)
3432#endif
3427static struct job * 3433static struct job *
3428getjob(const char *name, int getctl) 3434getjob(const char *name, int getctl)
3429{ 3435{
@@ -4533,6 +4539,9 @@ forkchild(struct job *jp, /*union node *n,*/ int mode)
4533} 4539}
4534 4540
4535/* Called after fork(), in parent */ 4541/* Called after fork(), in parent */
4542#if !JOBS
4543#define forkparent(jp, n, mode, pid) forkparent(jp, mode, pid)
4544#endif
4536static void 4545static void
4537forkparent(struct job *jp, union node *n, int mode, pid_t pid) 4546forkparent(struct job *jp, union node *n, int mode, pid_t pid)
4538{ 4547{
@@ -8674,8 +8683,8 @@ preadfd(void)
8674 char *buf = parsefile->buf; 8683 char *buf = parsefile->buf;
8675 parsenextc = buf; 8684 parsenextc = buf;
8676 8685
8677 retry:
8678#if ENABLE_FEATURE_EDITING 8686#if ENABLE_FEATURE_EDITING
8687 retry:
8679 if (!iflag || parsefile->fd) 8688 if (!iflag || parsefile->fd)
8680 nr = nonblock_safe_read(parsefile->fd, buf, BUFSIZ - 1); 8689 nr = nonblock_safe_read(parsefile->fd, buf, BUFSIZ - 1);
8681 else { 8690 else {
@@ -8876,8 +8885,11 @@ pungetc(void)
8876 * Push a string back onto the input at this current parsefile level. 8885 * Push a string back onto the input at this current parsefile level.
8877 * We handle aliases this way. 8886 * We handle aliases this way.
8878 */ 8887 */
8888#if !ENABLE_ASH_ALIAS
8889#define pushstring(s, ap) pushstring(s)
8890#endif
8879static void 8891static void
8880pushstring(char *s, void *ap) 8892pushstring(char *s, struct alias *ap)
8881{ 8893{
8882 struct strpush *sp; 8894 struct strpush *sp;
8883 size_t len; 8895 size_t len;
@@ -8894,9 +8906,9 @@ pushstring(char *s, void *ap)
8894 sp->prevstring = parsenextc; 8906 sp->prevstring = parsenextc;
8895 sp->prevnleft = parsenleft; 8907 sp->prevnleft = parsenleft;
8896#if ENABLE_ASH_ALIAS 8908#if ENABLE_ASH_ALIAS
8897 sp->ap = (struct alias *)ap; 8909 sp->ap = ap;
8898 if (ap) { 8910 if (ap) {
8899 ((struct alias *)ap)->flag |= ALIASINUSE; 8911 ap->flag |= ALIASINUSE;
8900 sp->string = s; 8912 sp->string = s;
8901 } 8913 }
8902#endif 8914#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 {
38}; 38};
39 39
40int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 40int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
41int cttyhack_main(int argc, char **argv) 41int cttyhack_main(int argc ATTRIBUTE_UNUSED, char **argv)
42{ 42{
43 int fd; 43 int fd;
44 char console[sizeof(int)*3 + 16]; 44 char console[sizeof(int)*3 + 16];