From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 18 Aug 2022 12:24:14 +0000 (+0200)
Subject: sd-netlink: delete sd_netlink_new_from_fd()
X-Git-Tag: v252-rc1~394^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3310e0647ced0e8175e55e44e47f245b90d8cba1;p=thirdparty%2Fsystemd.git

sd-netlink: delete sd_netlink_new_from_fd()

It was somewhat similar to sd_netlink_open_fd(), and unused.
---

diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 5da9294ebe5..3510beea5be 100644
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -792,7 +792,6 @@ global:
 
         sd_hwdb_new_from_path;
 
-        sd_netlink_new_from_fd;
         sd_netlink_open;
         sd_netlink_open_fd;
         sd_netlink_increase_rxbuf;
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index d1e5e689962..965235862cd 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -69,31 +69,6 @@ static int netlink_new(sd_netlink **ret) {
         return 0;
 }
 
-_public_ int sd_netlink_new_from_fd(sd_netlink **ret, int fd) {
-        _cleanup_(sd_netlink_unrefp) sd_netlink *nl = NULL;
-        socklen_t addrlen;
-        int r;
-
-        assert_return(ret, -EINVAL);
-
-        r = netlink_new(&nl);
-        if (r < 0)
-                return r;
-
-        addrlen = sizeof(nl->sockaddr);
-
-        if (getsockname(fd, &nl->sockaddr.sa, &addrlen) < 0)
-                return -errno;
-
-        if (nl->sockaddr.nl.nl_family != AF_NETLINK)
-                return -EINVAL;
-
-        nl->fd = fd;
-
-        *ret = TAKE_PTR(nl);
-        return 0;
-}
-
 _public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *nl = NULL;
         int r, protocol;
diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h
index 45c2ffb47eb..51b553a6f8a 100644
--- a/src/systemd/sd-netlink.h
+++ b/src/systemd/sd-netlink.h
@@ -40,7 +40,6 @@ typedef int (*sd_netlink_message_handler_t)(sd_netlink *nl, sd_netlink_message *
 typedef _sd_destroy_t sd_netlink_destroy_t;
 
 /* bus */
-int sd_netlink_new_from_fd(sd_netlink **ret, int fd);
 int sd_netlink_open(sd_netlink **ret);
 int sd_netlink_open_fd(sd_netlink **ret, int fd);
 int sd_netlink_increase_rxbuf(sd_netlink *nl, const size_t size);