shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-20 18:04:03 +03:00
Code

udevadm-test-builtin: replace udev_device by sd_device

Browse Source
This commit is contained in:
Yu Watanabe 2018-10-14 02:01:58 +09:00
parent 981b8159e9
commit d277e33916
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/udev/udevadm-test-builtin.c
View File

@ -6,7 +6,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "libudev-device-internal.h"
#include "libudev-private.h"
#include "path-util.h"
#include "string-util.h"
@ -74,7 +73,7 @@ static int parse_argv(int argc, char *argv[]) {
}
int builtin_main(int argc, char *argv[], void *userdata) {
_cleanup_(udev_device_unrefp) struct udev_device *dev = NULL;
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
enum udev_builtin_cmd cmd;
int r;
@ -93,13 +92,13 @@ int builtin_main(int argc, char *argv[], void *userdata) {
goto finish;
}
dev = udev_device_new_from_syspath(NULL, arg_syspath);
if (!dev) {
r = log_error_errno(errno, "Failed to open device '%s'", arg_syspath);
r = sd_device_new_from_syspath(&dev, arg_syspath);
if (r < 0) {
log_error_errno(r, "Failed to open device '%s': %m", arg_syspath);
goto finish;
}
r = udev_builtin_run(dev->device, cmd, arg_command, true);
r = udev_builtin_run(dev, cmd, arg_command, true);
if (r < 0)
log_debug("error executing '%s', exit code %i", arg_command, r);