summaryrefslogtreecommitdiffstats
path: root/loader2/cdinstall.c
diff options
context:
space:
mode:
Diffstat (limited to 'loader2/cdinstall.c')
-rw-r--r--loader2/cdinstall.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
index 0a5600dda..8b69973c0 100644
--- a/loader2/cdinstall.c
+++ b/loader2/cdinstall.c
@@ -67,12 +67,10 @@ static void ejectCdrom(char *device) {
}
}
-/*
- * Given cd device cddriver, this function will attempt to check its internal
+/* Given cd device cddriver, this function will attempt to check its internal
* checksum.
- *
- * JKFIXME: this ignores "location", which should be fixed */
-static char * mediaCheckCdrom(char *cddriver) {
+ */
+static void mediaCheckCdrom(char *cddriver) {
int rc;
int first;
@@ -125,13 +123,11 @@ static char * mediaCheckCdrom(char *cddriver) {
_("Test"), _("Continue"));
if (rc == 2) {
- return NULL;
+ return;
} else {
continue;
}
} while (1);
-
- return NULL;
}
/* output an error message when CD in drive is not the correct one */