From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 29 Apr 2020 12:44:25 +0000 (+0200)
Subject: sd-device: get rid of device_enumerator_clear_match_parent
X-Git-Tag: v246-rc1~418^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=476a63e9c0b18c481697060a6be60f1f9655698c;p=thirdparty%2Fsystemd.git

sd-device: get rid of device_enumerator_clear_match_parent

This helper wasn't helping all that much. It seems better to verify args
first, and only then start modifying the state.
---

diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index 94352e129cc..95dfc2f0778 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -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);
 }