chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove asmlinkage
[elogind.git]
/
udev
/
test-udev.c
diff --git
a/udev/test-udev.c
b/udev/test-udev.c
index d304a1cc159a96ea8ac5a7a1fb2f4708440c4ada..6ec91c174a20202f86d8471c04f18bbf06b139fd 100644
(file)
--- a/
udev/test-udev.c
+++ b/
udev/test-udev.c
@@
-30,14
+30,14
@@
#include "udev.h"
#include "udev.h"
-static void
asmlinkage
sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
{
switch (signum) {
case SIGALRM:
- exit(1);
+
_
exit(1);
case SIGINT:
case SIGTERM:
case SIGINT:
case SIGTERM:
- exit(20 + signum);
+
_
exit(20 + signum);
}
}
}
}
@@
-58,11
+58,11
@@
int main(int argc, char *argv[])
if (udev == NULL)
exit(1);
info(udev, "version %s\n", VERSION);
if (udev == NULL)
exit(1);
info(udev, "version %s\n", VERSION);
- selinux_init(udev);
+
udev_
selinux_init(udev);
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
- act.sa_handler =
(void (*)(int))
sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
@@
-81,7
+81,7
@@
int main(int argc, char *argv[])
goto exit;
}
goto exit;
}
- rules = udev_rules_new(udev,
0
);
+ rules = udev_rules_new(udev,
1
);
util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
util_strlcat(syspath, devpath, sizeof(syspath));
util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
util_strlcat(syspath, devpath, sizeof(syspath));
@@
-104,14
+104,14
@@
int main(int argc, char *argv[])
alarm(udev_device_get_event_timeout(dev));
if (err == 0 && !event->ignore_device && udev_get_run(udev))
alarm(udev_device_get_event_timeout(dev));
if (err == 0 && !event->ignore_device && udev_get_run(udev))
- udev_
rules
_run(event);
+ udev_
event_execute
_run(event);
udev_event_unref(event);
udev_device_unref(dev);
fail:
udev_rules_unref(rules);
exit:
udev_event_unref(event);
udev_device_unref(dev);
fail:
udev_rules_unref(rules);
exit:
- selinux_exit(udev);
+
udev_
selinux_exit(udev);
udev_unref(udev);
if (err != 0)
return 1;
udev_unref(udev);
if (err != 0)
return 1;