tree-wide: add SD_ID128_MAKE_STR, remove LOG_MESSAGE_ID

[elogind.git] / src / basic / rm-rf.h

diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 40b5b527d57265e98f7994dbdbea8eae82ab5f78..f693a5bb7c52bbadbf8424f9edde4d8f65952b02 100644 (file)
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -32,10 +32,10 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev);
 int rm_rf(const char *path, RemoveFlags flags);
 
 /* Useful for usage with _cleanup_(), destroys a directory and frees the pointer */
-static inline void rm_rf_and_free(char *p) {
+static inline void rm_rf_physical_and_free(char *p) {
         if (!p)
                 return;
-        (void) rm_rf(p, REMOVE_ROOT);
+        (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL);
         free(p);
 }
-DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rm_rf_and_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rm_rf_physical_and_free);