chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] more Libsysfs updates
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 4486707f426a68f748cf23133fb1afd24c35232a..9b4d91f75cea26373c9aebc7688b0d992d0c3089 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-40,8
+40,8
@@
char **main_argv;
char **main_envp;
#ifdef LOG
char **main_envp;
#ifdef LOG
-unsigned char logname[
42
];
-void log_message
(int level, const char *format, ...)
+unsigned char logname[
LOGNAME_SIZE
];
+void log_message(int level, const char *format, ...)
{
va_list args;
{
va_list args;
@@
-73,10
+73,11
@@
static char *subsystem_blacklist[] = {
"scsi_device",
"usb_host",
"pci_bus",
"scsi_device",
"usb_host",
"pci_bus",
- "",
+ "pcmcia_socket",
+ ""
};
};
-static int udev_hotplug(
int argc, char **argv
)
+static int udev_hotplug(
void
)
{
char *action;
char *devpath;
{
char *action;
char *devpath;
@@
-106,7
+107,7
@@
static int udev_hotplug(int argc, char **argv)
}
/* skip blacklisted subsystems */
}
/* skip blacklisted subsystems */
- subsystem = get_subsystem(argv[1]);
+ subsystem = get_subsystem(
main_
argv[1]);
if (!subsystem) {
dbg("no subsystem?");
goto exit;
if (!subsystem) {
dbg("no subsystem?");
goto exit;
@@
-123,9
+124,6
@@
static int udev_hotplug(int argc, char **argv)
/* connect to the system message bus */
sysbus_connect();
/* connect to the system message bus */
sysbus_connect();
- /* initialize our configuration */
- udev_init_config();
-
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
@@
-166,13
+164,17
@@
exit:
return -retval;
}
return -retval;
}
-int main(int argc, char *
*argv, char **envp
)
+int main(int argc, char *
argv[], char *envp[]
)
{
main_argv = argv;
main_envp = envp;
init_logging("udev");
{
main_argv = argv;
main_envp = envp;
init_logging("udev");
+
+ /* initialize our configuration */
+ udev_init_config();
+
dbg("version %s", UDEV_VERSION);
dbg("version %s", UDEV_VERSION);
- return udev_hotplug(
argc, argv
);
+ return udev_hotplug();
}
}