Cleanup: autoconf 'dirfd' detection

[lttng-tools.git] / src / common / compat / directory-handle.c

diff --git a/src/common/compat/directory-handle.c b/src/common/compat/directory-handle.c
index a790c5b79960d7933efe4221949070698b59eea9..356376ac0ed00a516fe9cadee59ac6a68b6835c5 100644 (file)
--- a/src/common/compat/directory-handle.c
+++ b/src/common/compat/directory-handle.c
@@ -78,7 +78,7 @@ void lttng_directory_handle_invalidate(struct lttng_directory_handle *handle);
 static
 void lttng_directory_handle_release(struct urcu_ref *ref);
 
-#ifdef COMPAT_DIRFD
+#ifdef HAVE_DIRFD
 
 /*
  * Special inode number reserved to represent the "current working directory".
@@ -355,7 +355,12 @@ static
 int lttng_directory_handle_rmdir(
                const struct lttng_directory_handle *handle, const char *name)
 {
-       return unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+       int ret = unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+       if (ret) {
+               PERROR("Failed to remove directory `%s`", name);
+       }
+
+       return ret;
 }
 
 static
@@ -373,7 +378,7 @@ int _run_as_rmdir_recursive(
        return run_as_rmdirat_recursive(handle->dirfd, name, uid, gid, flags);
 }
 
-#else /* COMPAT_DIRFD */
+#else /* HAVE_DIRFD */
 
 static
 int get_full_path(const struct lttng_directory_handle *handle,
@@ -886,7 +891,7 @@ end:
        return ret;
 }
 
-#endif /* COMPAT_DIRFD */
+#endif /* HAVE_DIRFD */
 
 /* Common implementation. */