chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make struct udev_rules opaque
[elogind.git]
/
udev
/
test-udev.c
diff --git
a/udev/test-udev.c
b/udev/test-udev.c
index 43c97aeb345b0872c68d6d57a03d52a745f1f800..4f8a7e4f66a2cbf4105ab058206532142080da14 100644
(file)
--- a/
udev/test-udev.c
+++ b/
udev/test-udev.c
@@
-29,7
+29,6
@@
#include <grp.h>
#include "udev.h"
#include <grp.h>
#include "udev.h"
-#include "udev-rules.h"
static void asmlinkage sig_handler(int signum)
{
static void asmlinkage sig_handler(int signum)
{
@@
-47,7
+46,7
@@
int main(int argc, char *argv[])
struct udev *udev;
struct udev_event *event;
struct udev_device *dev;
struct udev *udev;
struct udev_event *event;
struct udev_device *dev;
- struct udev_rules rules;
+ struct udev_rules
*
rules;
char syspath[UTIL_PATH_SIZE];
const char *devpath;
const char *action;
char syspath[UTIL_PATH_SIZE];
const char *devpath;
const char *action;
@@
-82,7
+81,7
@@
int main(int argc, char *argv[])
goto exit;
}
goto exit;
}
-
udev_rules_init(udev, &rules
, 0);
+
rules = udev_rules_new(udev
, 0);
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));
@@
-98,7
+97,7
@@
int main(int argc, char *argv[])
udev_device_set_action(dev, action);
event = udev_event_new(dev);
udev_device_set_action(dev, action);
event = udev_event_new(dev);
- err = udev_event_run(event,
&
rules);
+ err = udev_event_run(event, rules);
/* rules may change/disable the timeout */
if (udev_device_get_event_timeout(dev) >= 0)
/* rules may change/disable the timeout */
if (udev_device_get_event_timeout(dev) >= 0)
@@
-110,7
+109,7
@@
int main(int argc, char *argv[])
udev_event_unref(event);
udev_device_unref(dev);
fail:
udev_event_unref(event);
udev_device_unref(dev);
fail:
- udev_rules_
cleanup(&
rules);
+ udev_rules_
unref(
rules);
exit:
selinux_exit(udev);
udev_unref(udev);
exit:
selinux_exit(udev);
udev_unref(udev);