X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-daemon.h;h=bb7f34e32d2785b9288766fb565ec0fed3b7fd8f;hb=2027bfc6205de5f5313609fe0ca7e0649640219b;hp=2d573fde982ed6e443355a5486e7c5227fa63ab4;hpb=2e694aaeec158dba9dc12d8eea1755e201830a81;p=elogind.git
diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h
index 2d573fde9..bb7f34e32 100644
--- a/src/systemd/sd-daemon.h
+++ b/src/systemd/sd-daemon.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosddaemonhfoo
#define foosddaemonhfoo
@@ -22,8 +20,8 @@
along with systemd; If not, see .
***/
-#include
#include
+#include
#include "_sd-common.h"
@@ -59,6 +57,7 @@ _SD_BEGIN_DECLARATIONS;
/* The first passed file descriptor is fd 3 */
#define SD_LISTEN_FDS_START 3
+#if 0 /// UNNEEDED by elogind
/*
Returns how many file descriptors have been passed, or a negative
errno code on failure. Optionally, removes the $LISTEN_FDS and
@@ -74,9 +73,9 @@ _SD_BEGIN_DECLARATIONS;
See sd_listen_fds(3) for more information.
*/
-// UNNEEDED int sd_listen_fds(int unset_environment);
+int sd_listen_fds(int unset_environment);
-// UNNEEDED int sd_listen_fds_with_names(int unset_environment, char ***names);
+int sd_listen_fds_with_names(int unset_environment, char ***names);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -88,7 +87,7 @@ _SD_BEGIN_DECLARATIONS;
See sd_is_fifo(3) for more information.
*/
-// UNNEEDED int sd_is_fifo(int fd, const char *path);
+int sd_is_fifo(int fd, const char *path);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -100,7 +99,8 @@ _SD_BEGIN_DECLARATIONS;
See sd_is_special(3) for more information.
*/
-// UNNEEDED int sd_is_special(int fd, const char *path);
+int sd_is_special(int fd, const char *path);
+#endif // 0
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -118,6 +118,7 @@ _SD_BEGIN_DECLARATIONS;
*/
int sd_is_socket(int fd, int family, int type, int listening);
+#if 0 /// UNNEEDED by elogind
/*
Helper call for identifying a passed file descriptor. Returns 1 if
the file descriptor is an Internet socket, of the specified family
@@ -130,7 +131,7 @@ int sd_is_socket(int fd, int family, int type, int listening);
See sd_is_socket_inet(3) for more information.
*/
-// UNNEEDED int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -146,7 +147,7 @@ int sd_is_socket(int fd, int family, int type, int listening);
See sd_is_socket_unix(3) for more information.
*/
-// UNNEEDED int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -156,7 +157,8 @@ int sd_is_socket(int fd, int family, int type, int listening);
See sd_is_mq(3) for more information.
*/
-// UNNEEDED int sd_is_mq(int fd, const char *path);
+int sd_is_mq(int fd, const char *path);
+#endif // 0
/*
Informs systemd about changed daemon state. This takes a number of
@@ -216,6 +218,7 @@ int sd_is_socket(int fd, int family, int type, int listening);
*/
int sd_notify(int unset_environment, const char *state);
+#if 0 /// UNNEEDED by elogind
/*
Similar to sd_notify() but takes a format string.
@@ -236,19 +239,20 @@ int sd_notify(int unset_environment, const char *state);
See sd_notifyf(3) for more information.
*/
-// UNNEEDED int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3);
+int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3);
/*
Similar to sd_notify(), but send the message on behalf of another
process, if the appropriate permissions are available.
*/
-// UNNEEDED int sd_pid_notify(pid_t pid, int unset_environment, const char *state);
+int sd_pid_notify(pid_t pid, int unset_environment, const char *state);
/*
Similar to sd_notifyf(), but send the message on behalf of another
process, if the appropriate permissions are available.
*/
-// UNNEEDED int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4);
+int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4);
+#endif // 0
/*
Similar to sd_pid_notify(), but also passes the specified fd array
@@ -257,6 +261,7 @@ int sd_notify(int unset_environment, const char *state);
*/
int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state, const int *fds, unsigned n_fds);
+#if 0 /// UNNEEDED by elogind
/*
Returns > 0 if the system was booted with systemd. Returns < 0 on
error. Returns 0 if the system was not booted with systemd. Note
@@ -268,7 +273,8 @@ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state,
See sd_booted(3) for more information.
*/
-// UNNEEDED int sd_booted(void);
+int sd_booted(void);
+#endif // 0
/*
Returns > 0 if the service manager expects watchdog keep-alive