shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

sd-device-monitor: split passes_filter() into two parts

Browse Source
This commit is contained in:
Yu Watanabe 2021-02-21 07:53:31 +09:00
parent 8ab34a49db
commit 112e6dd106
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/libsystemd/sd-device/device-monitor.c
View File

@ -342,49 +342,62 @@ static sd_device_monitor *device_monitor_free(sd_device_monitor *m) {
DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_device_monitor, sd_device_monitor, device_monitor_free);
static int passes_filter(sd_device_monitor *m, sd_device *device) {
const char *tag, *subsystem, *devtype, *s, *d = NULL;
static int check_subsystem_filter(sd_device_monitor *m, sd_device *device) {
const char *s, *subsystem, *d, *devtype = NULL;
int r;
assert(m);
assert(device);
if (hashmap_isempty(m->subsystem_filter))
goto tag;
return true;
r = sd_device_get_subsystem(device, &s);
r = sd_device_get_subsystem(device, &subsystem);
if (r < 0)
return r;
r = sd_device_get_devtype(device, &d);
r = sd_device_get_devtype(device, &devtype);
if (r < 0 && r != -ENOENT)
return r;
HASHMAP_FOREACH_KEY(devtype, subsystem, m->subsystem_filter) {
HASHMAP_FOREACH_KEY(d, s, m->subsystem_filter) {
if (!streq(s, subsystem))
continue;
if (!devtype)
goto tag;
if (!d)
continue;
if (streq(d, devtype))
goto tag;
if (!d || streq_ptr(d, devtype))
return true;
}
return 0;
return false;
}
static bool check_tag_filter(sd_device_monitor *m, sd_device *device) {
const char *tag;
assert(m);
assert(device);
tag:
if (set_isempty(m->tag_filter))
return 1;
return true;
SET_FOREACH(tag, m->tag_filter)
if (sd_device_has_tag(device, tag) > 0)
return 1;
return true;
return 0;
return false;
}
static int passes_filter(sd_device_monitor *m, sd_device *device) {
int r;
assert(m);
assert(device);
r = check_subsystem_filter(m, device);
if (r <= 0)
return r;
return check_tag_filter(m, device);
}
int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) {