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

sd-device: get rid of device_enumerator_clear_match_parent

Browse Source 
This helper wasn't helping all that much. It seems better to verify args
first, and only then start modifying the state.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-05-06 17:02:10 +02:00
parent 2204f018cd
commit 476a63e9c0
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-enumerator.c
+7 -10
View File
@@ -172,19 +172,12 @@ _public_ int sd_device_enumerator_add_match_tag(sd_device_enumerator *enumerator
return 1;
}
static void device_enumerator_clear_match_parent(sd_device_enumerator *enumerator) {
if (!enumerator)
return;
set_clear(enumerator->match_parent);
}
int device_enumerator_add_match_parent_incremental(sd_device_enumerator *enumerator, sd_device *parent) {
const char *path;
int r;
assert_return(enumerator, -EINVAL);
assert_return(parent, -EINVAL);
assert(enumerator);
assert(parent);
r = sd_device_get_syspath(parent, &path);
if (r < 0)
@@ -200,7 +193,11 @@ int device_enumerator_add_match_parent_incremental(sd_device_enumerator *enumera
}
_public_ int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumerator, sd_device *parent) {
device_enumerator_clear_match_parent(enumerator);
assert_return(enumerator, -EINVAL);
assert_return(parent, -EINVAL);
set_clear(enumerator->match_parent);
return device_enumerator_add_match_parent_incremental(enumerator, parent);
}