summaryrefslogtreecommitdiff
path: root/src/libelogind/sd-daemon/sd-daemon.c
diff options
context:
space:
mode:
authorMark Hindley <mark@hindley.org.uk>2018-11-01 05:04:52 +0000
committerMark Hindley <mark@hindley.org.uk>2018-11-01 05:07:51 +0000
commit75c790ef2972088a9e8462a521dced806b5de6ec (patch)
tree31054c69a2900dbf64ab0195d93e0672eb4502c6 /src/libelogind/sd-daemon/sd-daemon.c
parent6d97c489b9675603a45eb1ce7940d0a4e416fb71 (diff)
Revert in-tree changes to upstream src.
Diffstat (limited to 'src/libelogind/sd-daemon/sd-daemon.c')
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index b9815ebaa..cd1ed6fc3 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -305,7 +305,6 @@ _public_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint
return 1;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_is_socket_sockaddr(int fd, int type, const struct sockaddr* addr, unsigned addr_len, int listening) {
union sockaddr_union sockaddr = {};
socklen_t l = sizeof(sockaddr);
@@ -363,7 +362,6 @@ _public_ int sd_is_socket_sockaddr(int fd, int type, const struct sockaddr* addr
sizeof(in->sin6_addr.s6_addr)) == 0;
}
}
-#endif // 0
_public_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
union sockaddr_union sockaddr = {};
@@ -622,7 +620,6 @@ _public_ int sd_notifyf(int unset_environment, const char *format, ...) {
}
_public_ int sd_booted(void) {
-#if 0 /// With elogind, the system is (should never be) booted by systemd
/* We test whether the runtime unit file directory has been
* created. This takes place in mount-setup.c, so is
* guaranteed to happen very early during boot. */