Clean-up: ust-consumer: fix -Wshadow issues in lttng_ustconsumer_recv_cmd

[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..a66d768e871f5eef5ae4be4556d3636c69c9fdca 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. */
 
@@ -1014,8 +1019,9 @@ int lttng_directory_handle_create_subdirectory_as_user(
                ret = create_directory_check_exists(handle,
                                subdirectory, mode);
        } else {
-               ret = _run_as_mkdir(handle, subdirectory,
-                               mode, creds->uid, creds->gid);
+               ret = _run_as_mkdir(handle, subdirectory, mode,
+                               lttng_credentials_get_uid(creds),
+                               lttng_credentials_get_gid(creds));
        }
 
        return ret;
@@ -1035,7 +1041,7 @@ int lttng_directory_handle_create_subdirectory_recursive_as_user(
                                subdirectory_path, mode);
        } else {
                ret = _run_as_mkdir_recursive(handle, subdirectory_path,
-                               mode, creds->uid, creds->gid);
+                               mode, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
        }
 
        return ret;
@@ -1076,7 +1082,7 @@ int lttng_directory_handle_open_file_as_user(
                                mode);
        } else {
                ret = _run_as_open(handle, filename, flags, mode,
-                               creds->uid, creds->gid);
+                               lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
        }
        return ret;
 }
@@ -1103,7 +1109,7 @@ int lttng_directory_handle_unlink_file_as_user(
                /* Run as current user. */
                ret = lttng_directory_handle_unlink(handle, filename);
        } else {
-               ret = _run_as_unlink(handle, filename, creds->uid, creds->gid);
+               ret = _run_as_unlink(handle, filename, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
        }
        return ret;
 }
@@ -1144,7 +1150,7 @@ int lttng_directory_handle_rename_as_user(
                                old_name, new_handle, new_name);
        } else {
                ret = _run_as_rename(old_handle, old_name, new_handle,
-                               new_name, creds->uid, creds->gid);
+                               new_name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
        }
        return ret;
 }
@@ -1170,7 +1176,7 @@ int lttng_directory_handle_remove_subdirectory_as_user(
                /* Run as current user. */
                ret = lttng_directory_handle_rmdir(handle, name);
        } else {
-               ret = _run_as_rmdir(handle, name, creds->uid, creds->gid);
+               ret = _run_as_rmdir(handle, name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
        }
        return ret;
 }
@@ -1404,8 +1410,8 @@ int lttng_directory_handle_remove_subdirectory_recursive_as_user(
                /* Run as current user. */
                ret = remove_directory_recursive(handle, name, flags);
        } else {
-               ret = _run_as_rmdir_recursive(handle, name, creds->uid,
-                               creds->gid, flags);
+               ret = _run_as_rmdir_recursive(handle, name, lttng_credentials_get_uid(creds),
+                               lttng_credentials_get_gid(creds), flags);
        }
        return ret;
 }