summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-29 08:02:10 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-29 08:02:10 +0000
commit61df108c655f703ef246edbafc0eb302018b31e2 (patch)
tree013f041afdaafd434d13215c0fce1d4f7300f3ce
parent76ed625f39c906ccb82f2e509c717ee573996af5 (diff)
downloaddrakx-61df108c655f703ef246edbafc0eb302018b31e2.tar
drakx-61df108c655f703ef246edbafc0eb302018b31e2.tar.gz
drakx-61df108c655f703ef246edbafc0eb302018b31e2.tar.bz2
drakx-61df108c655f703ef246edbafc0eb302018b31e2.tar.xz
drakx-61df108c655f703ef246edbafc0eb302018b31e2.zip
variable declaration fixes (spotted by neofutur)
-rw-r--r--mdk-stage1/directory.c2
-rw-r--r--mdk-stage1/probing.c1
-rw-r--r--mdk-stage1/tools.c3
3 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c
index ac2a99937..30f3b29a5 100644
--- a/mdk-stage1/directory.c
+++ b/mdk-stage1/directory.c
@@ -163,6 +163,7 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me
#ifdef MANDRAKE_MOVE
if (access(IMAGE_LOCATION "/live_tree/etc/fstab", R_OK) && access(IMAGE_LOCATION "/live_tree.clp", R_OK)) {
#else
+ char p;
if (access(IMAGE_LOCATION LIVE_LOCATION, R_OK)) {
#endif
stg1_error_message("I can't find the " DISTRIB_NAME " Distribution in the specified directory. "
@@ -173,7 +174,6 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me
return RETURN_ERROR;
}
#ifndef MANDRAKE_MOVE
- char p;
if (readlink(IMAGE_LOCATION LIVE_LOCATION "/usr/bin/runinstall2", &p, 1) != 1) {
stg1_error_message("The " DISTRIB_NAME " Distribution seems to be copied on a Windows partition. "
"You need more memory to perform an installation from a Windows partition. "
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index aed9862c4..c7a951b7c 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -199,7 +199,6 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
#endif
#endif
#ifdef ENABLE_USB
- static int already_probed_usb_controllers = 0;
case USB_CONTROLLERS:
if (already_probed_usb_controllers || IS_NOAUTO)
goto end_pci_probe;
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index 2a5200aa7..245d9cda5 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -477,8 +477,9 @@ int kernel_version(void)
char * floppy_device(void)
{
char ** names, ** models;
+ int fd;
my_insmod("floppy", ANY_DRIVER_TYPE, NULL, 0);
- int fd = open("/dev/fd0", O_RDONLY|O_NONBLOCK);
+ fd = open("/dev/fd0", O_RDONLY|O_NONBLOCK);
if (fd != -1) {
char drivtyp[17];
if (!ioctl(fd, FDGETDRVTYP, (void *)drivtyp)) {