From 449e4a66fe53221c459ef9471b5d1a8ec4b82808 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 19 Jul 2020 19:42:13 +0200 Subject: [PATCH] tools/xattr: a char from C is not universally a rust i8 Make it actually do the correct cast by using `libc::c_char`. Fixes issues when building on other platforms, e.g., the aarch64 client only build on Arch Linux ARM I tested in my free time. Signed-off-by: Thomas Lamprecht --- src/tools/xattr.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/xattr.rs b/src/tools/xattr.rs index 97102363..6b712d14 100644 --- a/src/tools/xattr.rs +++ b/src/tools/xattr.rs @@ -82,7 +82,7 @@ pub fn flistxattr(fd: RawFd) -> Result { let mut size = 256; let mut buffer = vec::undefined(size); let mut bytes = unsafe { - libc::flistxattr(fd, buffer.as_mut_ptr() as *mut i8, buffer.len()) + libc::flistxattr(fd, buffer.as_mut_ptr() as *mut libc::c_char, buffer.len()) }; while bytes < 0 { let err = Errno::last(); @@ -96,7 +96,7 @@ pub fn flistxattr(fd: RawFd) -> Result { // Retry to read the list with new buffer buffer.resize(size, 0); bytes = unsafe { - libc::flistxattr(fd, buffer.as_mut_ptr() as *mut i8, buffer.len()) + libc::flistxattr(fd, buffer.as_mut_ptr() as *mut libc::c_char, buffer.len()) }; } buffer.truncate(bytes as usize); @@ -125,7 +125,7 @@ pub fn fgetxattr(fd: RawFd, name: &CStr) -> Result, nix::errno::Errno> { } buffer.resize(size, 0); bytes = unsafe { - libc::fgetxattr(fd, name.as_ptr() as *const i8, buffer.as_mut_ptr() as *mut core::ffi::c_void, buffer.len()) + libc::fgetxattr(fd, name.as_ptr() as *const libc::c_char, buffer.as_mut_ptr() as *mut core::ffi::c_void, buffer.len()) }; } buffer.resize(bytes as usize, 0);