summaryrefslogtreecommitdiffstats
path: root/pciusb.c
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-27 17:43:36 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-27 17:43:36 +0000
commit491fa9b96402a0eb079e848cbb676edd95116291 (patch)
tree4b0368583068b3975cd0a0d8a4acd5e203410687 /pciusb.c
parentcefe9181dff96302535ec6dedd94248b1aac570e (diff)
downloadldetect-491fa9b96402a0eb079e848cbb676edd95116291.tar
ldetect-491fa9b96402a0eb079e848cbb676edd95116291.tar.gz
ldetect-491fa9b96402a0eb079e848cbb676edd95116291.tar.bz2
ldetect-491fa9b96402a0eb079e848cbb676edd95116291.tar.xz
ldetect-491fa9b96402a0eb079e848cbb676edd95116291.zip
move libmodprobe variables declaration
Diffstat (limited to 'pciusb.c')
-rw-r--r--pciusb.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/pciusb.c b/pciusb.c
index 0d21d94..07a6c66 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -10,12 +10,6 @@
#include <modprobe.h>
#include "common.h"
-static struct module_command *commands = NULL;
-static struct module_options *modoptions = NULL;
-static struct module_alias *aliases = NULL;
-static struct module_blacklist *blacklist = NULL;
-static const char *config = NULL;
-
static char *aliasdefault = NULL;
static void set_default_alias_file(void) {
@@ -42,6 +36,12 @@ static void set_default_alias_file(void) {
}
static void set_modules_from_modalias(struct pciusb_entry *e, char *modalias) {
+ struct module_command *commands = NULL;
+ struct module_options *modoptions = NULL;
+ struct module_alias *aliases = NULL;
+ struct module_blacklist *blacklist = NULL;
+ const char *config = NULL;
+
/* Returns the resolved alias, options */
read_toplevel_config(config, modalias, 0,
0, &modoptions, &commands, &aliases, &blacklist);
@@ -69,7 +69,6 @@ static void set_modules_from_modalias(struct pciusb_entry *e, char *modalias) {
aliases = aliases->next;
ifree(e->module);
e->module = strdup(aliases->module);
- aliases = NULL;
}
}