summaryrefslogtreecommitdiffstats
path: root/loader2/driverselect.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /loader2/driverselect.c
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'loader2/driverselect.c')
-rw-r--r--loader2/driverselect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/loader2/driverselect.c b/loader2/driverselect.c
index f71d85618..ba9adaa3a 100644
--- a/loader2/driverselect.c
+++ b/loader2/driverselect.c
@@ -64,7 +64,7 @@ static int getManualModuleArgs(struct moduleInfo * mod, char *** moduleArgs) {
"options can be obtained by pressing the F1 key."),
mod->moduleName);
text = newtTextboxReflowed(-1, -1, buf, 60, 0, 10, 0);
- entry = newtEntry(-1, -1, argsEntry, 50, &argsEntry,
+ entry = newtEntry(-1, -1, argsEntry, 50, (const char **) &argsEntry,
NEWT_ENTRY_SCROLL);
newtFormAddHotKey(f, NEWT_KEY_F1);
@@ -220,7 +220,7 @@ int chooseManualDriver(int class, moduleList modLoaded,
for (i = 0; i < numSorted; i++) {
newtListboxAppendEntry(listbox, sdupprintf("%s (%s)",
modInfo->moduleList[sortedOrder[i].index].description,
- modInfo->moduleList[sortedOrder[i].index].moduleName), (void *) sortedOrder[i].index);
+ modInfo->moduleList[sortedOrder[i].index].moduleName), INT_TO_POINTER(sortedOrder[i].index));
}
grid = newtCreateGrid(1, 4);
@@ -238,7 +238,7 @@ int chooseManualDriver(int class, moduleList modLoaded,
do {
newtFormRun(f, &es);
- num = (int) newtListboxGetCurrent(listbox);
+ num = POINTER_TO_INT(newtListboxGetCurrent(listbox));
if (es.reason == NEWT_EXIT_COMPONENT && es.u.co == back) {
done = -1;