Prep v233: Unmask now needed functions in src/basic

[elogind.git] / src / basic / fs-util.h

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index d925cc2d054086ec70e34d363060d52cf036acd5..65d57797314c3158bcf4f5907b6e803c64a36261 100644 (file)
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -72,8 +72,8 @@ int mkfifo_atomic(const char *path, mode_t mode);
 
 int get_files_in_directory(const char *path, char ***list);
 
-#if 0 /// UNNEEDED by elogind
 int tmp_dir(const char **ret);
+#if 0 /// UNNEEDED by elogind
 int var_tmp_dir(const char **ret);
 
 #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)
@@ -97,3 +97,16 @@ enum {
 };
 
 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);
+
+static inline void unlink_and_free(char *p) {
+        (void) unlink(p);
+        free(p);
+}
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, unlink_and_free);