From bb19cb17076bbec942ad08f94d41ba36b28a5a13 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Tue, 26 Aug 2014 20:35:31 +0200

Subject: [PATCH] sd-bus: remove unused call bus_kernel_create_monitor()

Noticed by Djalal Harouni

---

 src/libsystemd/sd-bus/bus-kernel.c | 31 -------------------------------

 src/libsystemd/sd-bus/bus-kernel.h |  1 -

 2 files changed, 32 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c

index 3ca271c704..03c4165095 100644

--- a/src/libsystemd/sd-bus/bus-kernel.c

+++ b/src/libsystemd/sd-bus/bus-kernel.c

@@ -1535,37 +1535,6 @@ int bus_kernel_create_domain(const char *name, char **s) {

         return fd;

 }

-int bus_kernel_create_monitor(const char *bus) {

-        struct kdbus_cmd_hello *hello;

-        int fd;

-

-        assert(bus);

-

-        fd = bus_kernel_open_bus_fd(bus, NULL);

-        if (fd < 0)

-                return fd;

-

-        hello = alloca0(sizeof(struct kdbus_cmd_hello));

-        hello->size = sizeof(struct kdbus_cmd_hello);

-        hello->conn_flags = KDBUS_HELLO_ACTIVATOR;

-        hello->pool_size = KDBUS_POOL_SIZE;

-

-        if (ioctl(fd, KDBUS_CMD_HELLO, hello) < 0) {

-                safe_close(fd);

-                return -errno;

-        }

-

-        /* The higher 32bit of both flags fields are considered

-         * 'incompatible flags'. Refuse them all for now. */

-        if (hello->bus_flags > 0xFFFFFFFFULL ||

-            hello->conn_flags > 0xFFFFFFFFULL) {

-                safe_close(fd);

-                return -ENOTSUP;

-        }

-

-        return fd;

-}

-

 int bus_kernel_try_close(sd_bus *bus) {

         assert(bus);

         assert(bus->is_kernel);

diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h

index 87f98c58bf..448dd3a797 100644

--- a/src/libsystemd/sd-bus/bus-kernel.h

+++ b/src/libsystemd/sd-bus/bus-kernel.h

@@ -70,7 +70,6 @@ int bus_kernel_make_starter(int fd, const char *name, bool activating, bool acce

 int bus_kernel_create_bus(const char *name, bool world, char **s);

 int bus_kernel_create_domain(const char *name, char **s);

-int bus_kernel_create_monitor(const char *bus);

 int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *allocated);

 void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, size_t allocated);