From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 1 Feb 2022 23:23:59 +0000 (+0900)
Subject: network: tunnel: use "data" field to assign result
X-Git-Tag: v251-rc1~357^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=396dfe0a14afcf42ddbcddb938605f11cda4372d;p=thirdparty%2Fsystemd.git

network: tunnel: use "data" field to assign result
---

diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 389403f42c6..fe8bbea577a 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -809,15 +809,12 @@ int config_parse_tunnel_key(
                 void *data,
                 void *userdata) {
 
+        uint32_t *dest = ASSERT_PTR(data), k;
         union in_addr_union buffer;
-        Tunnel *t = userdata;
-        uint32_t k;
         int r;
 
         assert(filename);
-        assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = in_addr_from_string(AF_INET, rvalue, &buffer);
         if (r < 0) {
@@ -830,13 +827,7 @@ int config_parse_tunnel_key(
         } else
                 k = be32toh(buffer.in.s_addr);
 
-        if (streq(lvalue, "Key"))
-                t->key = k;
-        else if (streq(lvalue, "InputKey"))
-                t->ikey = k;
-        else
-                t->okey = k;
-
+        *dest = k;
         return 0;
 }