From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 18 Dec 2020 04:17:49 +0000 (+0900)
Subject: netlink: drop unnecessary error handling
X-Git-Tag: v248-rc1~472^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a73f0807270a2c94c5a7974d34f5fe1be119d0e1;p=thirdparty%2Fsystemd.git

netlink: drop unnecessary error handling
---

diff --git a/src/libsystemd/sd-netlink/nfnl-message.c b/src/libsystemd/sd-netlink/nfnl-message.c
index d7bcbf8ba88..f02fc6788a2 100644
--- a/src/libsystemd/sd-netlink/nfnl-message.c
+++ b/src/libsystemd/sd-netlink/nfnl-message.c
@@ -122,21 +122,18 @@ int sd_nfnl_nft_message_new_basechain(sd_netlink *nfnl, sd_netlink_message **ret
 
         r = sd_netlink_message_append_u32(m, NFTA_HOOK_HOOKNUM, htobe32(hook));
         if (r < 0)
-                goto cancel;
+                return r;
 
         r = sd_netlink_message_append_u32(m, NFTA_HOOK_PRIORITY, htobe32(prio));
         if (r < 0)
-                goto cancel;
+                return r;
 
         r = sd_netlink_message_close_container(m);
         if (r < 0)
-                goto cancel;
+                return r;
 
         *ret = TAKE_PTR(m);
         return 0;
-cancel:
-        sd_netlink_message_cancel_array(m);
-        return r;
 }
 
 int sd_nfnl_nft_message_del_table(sd_netlink *nfnl, sd_netlink_message **ret,