X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffs-util.h;h=3f47537de147fb2b0689cc89f238f3596ccf7f16;hb=e6f1cc1ecaf4cefa1c8a892aab6e136b1061c6a3;hp=e206a382ec7d94e6fce0f2fcaee18a2d93f80bc5;hpb=62383061a34dc8233b3e26c49271d5cb43fcb0f6;p=elogind.git

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index e206a382e..3f47537de 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -93,7 +93,14 @@ int inotify_add_watch_fd(int fd, int what, uint32_t mask);
 #endif // 0
 enum {
         CHASE_PREFIX_ROOT = 1,   /* If set, the specified path will be prefixed by the specified root before beginning the iteration */
-        CHASE_NON_EXISTING = 2,  /* If set, it's OK if the path doesn't actually exist. */
+        CHASE_NONEXISTENT = 2,   /* If set, it's OK if the path doesn't actually exist. */
 };
 
 int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);
+
+/* Useful for usage with _cleanup_(), removes a directory and frees the pointer */
+static inline void rmdir_and_free(char *p) {
+        (void) rmdir(p);
+        free(p);
+}
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rmdir_and_free);