diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2011-06-15 08:39:19 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2011-06-15 08:39:19 +0000 |
| commit | a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1 (patch) | |
| tree | fd2da2948fbe1c907281939a5fa67416d495bfe6 | |
| parent | 915dd4836890db9fdd86bfc38621b243abd7360e (diff) | |
| download | drakx-backup-do-not-use-a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1.tar drakx-backup-do-not-use-a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1.tar.gz drakx-backup-do-not-use-a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1.tar.bz2 drakx-backup-do-not-use-a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1.tar.xz drakx-backup-do-not-use-a5ac6412f92bed3652ed1aee5a6e42dea98ff2f1.zip | |
fix unused-but-set-variabledistro/mes6
| -rw-r--r-- | mdk-stage1/init.c | 3 | ||||
| -rw-r--r-- | mdk-stage1/nfsmount.c | 7 | ||||
| -rw-r--r-- | mdk-stage1/stdio-frontend.c | 3 |
3 files changed, 1 insertions, 12 deletions
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index a74a703d2..5b1778b9b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -310,7 +310,6 @@ void unmount_filesystems(void) struct filesystem fs[500]; int numfs = 0; int i, nb; - int disallow_eject = 0; printf("unmounting filesystems...\n"); @@ -340,8 +339,6 @@ void unmount_filesystems(void) *p++ = '\0'; while (*p != '\n') p++; p++; - if (!strcmp(fs[numfs].fs, "nfs")) - disallow_eject = 1; if (strcmp(fs[numfs].name, "/") && !strstr(fs[numfs].dev, "ram") && strcmp(fs[numfs].name, "/dev") diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c index 85ffb25c1..3d508e95f 100644 --- a/mdk-stage1/nfsmount.c +++ b/mdk-stage1/nfsmount.c @@ -284,7 +284,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts) enum clnt_stat clnt_stat; static struct nfs_mount_data data; int nfs_mount_version; - int val; struct sockaddr_in server_addr; struct sockaddr_in mount_server_addr; struct pmap *pm_mnt; @@ -297,12 +296,11 @@ int nfsmount_prepare(const char *spec, char **mount_opts) char *s; int port, mountport, proto, soft, intr; int posix, nocto, noac, broken_suid, nolock; - int retry, tcp; + int tcp; int mountprog, mountvers, nfsprog, nfsvers; int retval; time_t t; time_t prevt; - time_t timeout; nfs_mount_version = find_kernel_nfs_mount_version(); @@ -361,7 +359,6 @@ int nfsmount_prepare(const char *spec, char **mount_opts) nolock = 1; broken_suid = 0; noac = 0; - retry = 10000; /* 10000 minutes ~ 1 week */ tcp = 0; mountprog = MOUNTPROG; @@ -469,10 +466,8 @@ retry_mount: retry_timeout.tv_usec = 0; total_timeout.tv_sec = 20; total_timeout.tv_usec = 0; - timeout = time(NULL) + 60 * retry; prevt = 0; t = 30; - val = 1; /* be careful not to use too many CPU cycles */ diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c index f99575bed..a2f090e8d 100644 --- a/mdk-stage1/stdio-frontend.c +++ b/mdk-stage1/stdio-frontend.c @@ -76,7 +76,6 @@ static char * get_string_response(char * initial_string) /* I won't use a scanf/%s since I also want the null string to be accepted -- also, I want the initial_string */ char s[500]; int i = 0; - char buf[10]; int b_index = 0; char b; @@ -108,7 +107,6 @@ static char * get_string_response(char * initial_string) if (read(0, &b, 1) > 0) { if (b_index == 1) { if (b == 91) { - buf[b_index] = b; b_index++; continue; } @@ -146,7 +144,6 @@ static char * get_string_response(char * initial_string) i--; } } else if (b == 27) { - buf[b_index] = b; b_index++; } else { printf("%c", b); |