From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Jan 2019 17:13:45 +0000 (+0100)
Subject: udev-rule: drop unnecessary assignments
X-Git-Tag: v242-rc1~326^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f362ff1852d6a8ebae972a9de4f0cc5375d2a8f;p=thirdparty%2Fsystemd.git

udev-rule: drop unnecessary assignments
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 4d5d0a1fe65..1b6dcff6f7c 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -483,10 +483,8 @@ static uid_t add_uid(UdevRules *rules, const char *owner) {
         /* lookup, if we know it already */
         for (i = 0; i < rules->uids_cur; i++) {
                 off = rules->uids[i].name_off;
-                if (streq(rules_str(rules, off), owner)) {
-                        uid = rules->uids[i].uid;
-                        return uid;
-                }
+                if (streq(rules_str(rules, off), owner))
+                        return rules->uids[i].uid;
         }
         r = get_user_creds(&owner, &uid, NULL, NULL, NULL, USER_CREDS_ALLOW_MISSING);
         if (r < 0)
@@ -526,10 +524,8 @@ static gid_t add_gid(UdevRules *rules, const char *group) {
         /* lookup, if we know it already */
         for (i = 0; i < rules->gids_cur; i++) {
                 off = rules->gids[i].name_off;
-                if (streq(rules_str(rules, off), group)) {
-                        gid = rules->gids[i].gid;
-                        return gid;
-                }
+                if (streq(rules_str(rules, off), group))
+                        return rules->gids[i].gid;
         }
         r = get_group_creds(&group, &gid, USER_CREDS_ALLOW_MISSING);
         if (r < 0)