picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rfkill: Lookup device in determine_state_file

Browse source 
None of the callers actually need the device itself. So it makes sense
to do the lookup inside determine_state_file instead.
This commit is contained in:
Benjamin Berg 2017-08-31 17:34:08 +02:00
parent 6c1f72f626
commit 8e70766313
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/rfkill/rfkill.c
View file

@ -162,18 +162,21 @@ static int wait_for_initialized(
static int determine_state_file(
struct udev *udev,
const struct rfkill_event *event,
struct udev_device *d,
char **ret) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
const char *path_id, *type;
char *state_file;
int r;
assert(event);
assert(d);
assert(ret);
r = find_device(udev, event, &d);
if (r < 0)
return r;
r = wait_for_initialized(udev, d, &device);
if (r < 0)
return r;
@ -204,7 +207,6 @@ static int load_state(
struct udev *udev,
const struct rfkill_event *event) {
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
_cleanup_free_ char *state_file = NULL, *value = NULL;
struct rfkill_event we;
ssize_t l;
@ -217,11 +219,7 @@ static int load_state(
if (shall_restore_state() == 0)
return 0;
r = find_device(udev, event, &device);
if (r < 0)
return r;
r = determine_state_file(udev, event, device, &state_file);
r = determine_state_file(udev, event, &state_file);
if (r < 0)
return r;
@ -266,7 +264,6 @@ static int save_state(
struct udev *udev,
const struct rfkill_event *event) {
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
_cleanup_free_ char *state_file = NULL;
int r;
@ -274,11 +271,7 @@ static int save_state(
assert(udev);
assert(event);
r = find_device(udev, event, &device);
if (r < 0)
return r;
r = determine_state_file(udev, event, device, &state_file);
r = determine_state_file(udev, event, &state_file);
if (r < 0)
return r;