From: Sven Eden Date: Thu, 23 Aug 2018 06:27:14 +0000 (+0200) Subject: Prep v239: Unmask inotify_add_watch_fd() X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4c6d5bc38f16d11f19a847c9ff7453a7659ee876 Prep v239: Unmask inotify_add_watch_fd() --- diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index a82d3a14e..562fe8277 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -589,7 +589,6 @@ int unlink_or_warn(const char *filename) { return 0; } -#if 0 /// UNNEEDED by elogind int inotify_add_watch_fd(int fd, int what, uint32_t mask) { char path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int) + 1]; int r; @@ -603,7 +602,6 @@ int inotify_add_watch_fd(int fd, int what, uint32_t mask) { return r; } -#endif // 0 static bool safe_transition(const struct stat *a, const struct stat *b) { /* Returns true if the transition from a to b is safe, i.e. that we never transition from unprivileged to diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 940853f42..c7d831f50 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -76,9 +76,7 @@ union inotify_event_buffer { uint8_t raw[INOTIFY_EVENT_MAX]; }; -#if 0 /// UNNEEDED by elogind int inotify_add_watch_fd(int fd, int what, uint32_t mask); -#endif // 0 enum { CHASE_PREFIX_ROOT = 1 << 0, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */