SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: replace device_enumerator_scan_devices()+FOREACH_DEVICE_AND_SUBSYSTEM() by FOREACH_DEVICE()

Browse Source
This commit is contained in:
Yu Watanabe
2018-09-10 16:48:37 +09:00
parent e132a04392
commit 8437c0593f
9 changed files with 20 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backlight/backlight.c
+2 -6
View File
@@ -4,7 +4,7 @@
#include "alloc-util.h"
#include "def.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "escape.h"
#include "fileio.h"
#include "mkdir.h"
@@ -156,11 +156,7 @@ static int validate_device(sd_device *device) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(enumerate);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(enumerate, other) {
FOREACH_DEVICE(enumerate, other) {
const char *other_subsystem;
sd_device *other_parent;
src/core/device.c
+1 -8
View File
@@ -7,7 +7,6 @@
#include "bus-error.h"
#include "dbus-device.h"
#include "device-private.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "device.h"
#include "libudev-private.h"
@@ -831,13 +830,7 @@ static void device_enumerate(Manager *m) {
goto fail;
}
r = device_enumerator_scan_devices(e);
if (r < 0) {
log_error_errno(r, "Failed to enumerate devices: %m");
goto fail;
}
FOREACH_DEVICE_AND_SUBSYSTEM(e, dev) {
FOREACH_DEVICE(e, dev) {
const char *sysfs;
if (!device_is_ready(dev))
src/core/umount.c
+3 -11
View File
@@ -18,7 +18,7 @@
#include "alloc-util.h"
#include "blockdev-util.h"
#include "def.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "escape.h"
#include "fd-util.h"
#include "fstab-util.h"
@@ -255,11 +255,7 @@ static int loopback_list_get(MountPoint **head) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
_cleanup_free_ MountPoint *lb = NULL;
const char *dn;
@@ -304,11 +300,7 @@ static int dm_list_get(MountPoint **head) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
_cleanup_free_ MountPoint *m = NULL;
const char *dn;
dev_t devnum;
src/login/logind-acl.c
+2 -6
View File
@@ -7,7 +7,7 @@
#include "acl-util.h"
#include "alloc-util.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "dirent-util.h"
#include "escape.h"
#include "fd-util.h"
@@ -193,11 +193,7 @@ int devnode_acl_all(const char *seat,
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
const char *node, *sn;
if (sd_device_get_property_value(d, "ID_SEAT", &sn) < 0 || isempty(sn))
src/login/logind-core.c
+2 -6
View File
@@ -13,7 +13,7 @@
#include "bus-util.h"
#include "cgroup-util.h"
#include "conf-parser.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "fd-util.h"
#include "logind.h"
#include "parse-util.h"
@@ -571,11 +571,7 @@ static int manager_count_external_displays(Manager *m) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
sd_device *p;
const char *status, *enabled, *dash, *nn, *i, *subsys;
bool external = false;
src/login/logind-dbus.c
+2 -6
View File
@@ -14,7 +14,7 @@
#include "bus-error.h"
#include "bus-unit-util.h"
#include "bus-util.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "dirent-util.h"
#include "efivars.h"
#include "escape.h"
@@ -1210,11 +1210,7 @@ static int trigger_device(Manager *m, sd_device *d) {
return r;
}
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
_cleanup_free_ char *t = NULL;
const char *p;
src/login/logind.c
+3 -11
View File
@@ -13,7 +13,7 @@
#include "bus-util.h"
#include "cgroup-util.h"
#include "def.h"
#include "device-enumerator-private.h"
#include "device-util.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "format-util.h"
@@ -175,11 +175,7 @@ static int manager_enumerate_devices(Manager *m) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
int k;
k = manager_process_seat_device(m, d);
@@ -214,11 +210,7 @@ static int manager_enumerate_buttons(Manager *m) {
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
int k;
k = manager_process_button_device(m, d);
src/mount/mount-tool.c
+2 -6
View File
@@ -5,10 +5,10 @@
#include "sd-bus.h"
#include "sd-device.h"
#include "device-enumerator-private.h"
#include "bus-error.h"
#include "bus-unit-util.h"
#include "bus-util.h"
#include "device-util.h"
#include "dirent-util.h"
#include "escape.h"
#include "fd-util.h"
@@ -1420,11 +1420,7 @@ static int list_devices(void) {
if (r < 0)
return log_error_errno(r, "Failed to add property match: %m");
r = device_enumerator_scan_devices(e);
if (r < 0)
return log_error_errno(r, "Failed to enumerate devices: %m");
FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
FOREACH_DEVICE(e, d) {
struct item *j;
if (!GREEDY_REALLOC0(items, n_allocated, n+1)) {
src/shared/dissect-image.c
+3 -11
View File
@@ -14,8 +14,8 @@
#include "copy.h"
#include "crypt-util.h"
#include "def.h"
#include "device-enumerator-private.h"
#include "device-nodes.h"
#include "device-util.h"
#include "dissect-image.h"
#include "fd-util.h"
#include "fileio.h"
@@ -278,13 +278,9 @@ int dissect_image(
if (r < 0)
return r;
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
/* Count the partitions enumerated by the kernel */
n = 0;
FOREACH_DEVICE_AND_SUBSYSTEM(e, q) {
FOREACH_DEVICE(e, q) {
dev_t qn;
if (sd_device_get_devnum(q, &qn) < 0)
@@ -350,11 +346,7 @@ int dissect_image(
e = sd_device_enumerator_unref(e);
}
r = device_enumerator_scan_devices(e);
if (r < 0)
return r;
FOREACH_DEVICE_AND_SUBSYSTEM(e, q) {
FOREACH_DEVICE(e, q) {
unsigned long long pflags;
blkid_partition pp;
const char *node;