From 7713ddd380e82f367a9bcd477ce18dab4648f5d2 Mon Sep 17 00:00:00 2001 From: MIHIRA Sanpei Yoshiro Date: Fri, 13 Oct 2000 09:51:18 +0000 Subject: [PATCH] Fix bug in ``the selection of pccard IRQs fully selectable'' in rev.1.12. card_irq is local variable, not global variable (variable_set2 and variable_get) Reviewed by: jkh --- release/sysinstall/pccard.c | 4 ++-- usr.sbin/sysinstall/pccard.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c index dbb69ce27f8..ba7a9bdb968 100644 --- a/release/sysinstall/pccard.c +++ b/release/sysinstall/pccard.c @@ -136,7 +136,7 @@ pccardInitialize(void) int pcic_mem = 0xd0000; int beep_newstat; char card_device[16]; - char *card_irq = ""; + char card_irq[256] = ""; char temp[256]; char *spcic_mem; char pccardd_cmd[256]; @@ -192,7 +192,7 @@ pccardInitialize(void) for (i = 0; i < IRQ_COUNT; i++) { if ((CardIrq & IrqTable[i].my_bit) != 0) { sprintf(temp, "%s %s", card_irq, IrqTable[i].my_flag); - variable_set2("card_irq", temp, 1); + strcpy(card_irq, temp); } } } diff --git a/usr.sbin/sysinstall/pccard.c b/usr.sbin/sysinstall/pccard.c index dbb69ce27f8..ba7a9bdb968 100644 --- a/usr.sbin/sysinstall/pccard.c +++ b/usr.sbin/sysinstall/pccard.c @@ -136,7 +136,7 @@ pccardInitialize(void) int pcic_mem = 0xd0000; int beep_newstat; char card_device[16]; - char *card_irq = ""; + char card_irq[256] = ""; char temp[256]; char *spcic_mem; char pccardd_cmd[256]; @@ -192,7 +192,7 @@ pccardInitialize(void) for (i = 0; i < IRQ_COUNT; i++) { if ((CardIrq & IrqTable[i].my_bit) != 0) { sprintf(temp, "%s %s", card_irq, IrqTable[i].my_flag); - variable_set2("card_irq", temp, 1); + strcpy(card_irq, temp); } } }