drop "libc::" from largefile_fn patterns and invocations

The "::" is not accepted by newer versions of Rust.

Author: inglorion

src/fcntl.rs

@@ -200,7 +200,7 @@ pub fn open<P: ?Sized + NixPath>(
     mode: Mode,
 ) -> Result<RawFd> {
     let fd = path.with_nix_path(|cstr| unsafe {
-        largefile_fn![libc::open](cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint)
+        largefile_fn![open](cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint)
     })?;
 
     Errno::result(fd)
@@ -216,7 +216,7 @@ pub fn openat<P: ?Sized + NixPath>(
     mode: Mode,
 ) -> Result<RawFd> {
     let fd = path.with_nix_path(|cstr| unsafe {
-        largefile_fn![libc::openat](dirfd, cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint)
+        largefile_fn![openat](dirfd, cstr.as_ptr(), oflag.bits(), mode.bits() as c_uint)
     })?;
     Errno::result(fd)
 }
@@ -750,7 +750,7 @@ pub fn fallocate(
     offset: off_t,
     len: off_t,
 ) -> Result<()> {
-    let res = unsafe { largefile_fn![libc::fallocate](fd, mode.bits(), offset, len) };
+    let res = unsafe { largefile_fn![fallocate](fd, mode.bits(), offset, len) };
     Errno::result(res).map(drop)
 }
 
@@ -929,7 +929,7 @@ mod posix_fadvise {
         advice: PosixFadviseAdvice,
     ) -> Result<()> {
         let res = unsafe {
-            largefile_fn![libc::posix_fadvise](fd, offset, len, advice as libc::c_int)
+            largefile_fn![posix_fadvise](fd, offset, len, advice as libc::c_int)
         };
 
         if res == 0 {
@@ -955,7 +955,7 @@ pub fn posix_fallocate(
     offset: off_t,
     len: off_t,
 ) -> Result<()> {
-    let res = unsafe { largefile_fn![libc::posix_fallocate](fd, offset, len) };
+    let res = unsafe { largefile_fn![posix_fallocate](fd, offset, len) };
     match Errno::result(res) {
         Err(err) => Err(err),
         Ok(0) => Ok(()),

src/macros.rs

@@ -341,20 +341,20 @@ cfg_if! {
         /// identifier of the corresponding I/O function with large file
         /// support.
         macro_rules! largefile_fn {
-            [libc::fallocate] => (libc::fallocate64);
-            [libc::ftruncate] => (libc::ftruncate64);
-            [libc::lseek] => (libc::lseek64);
-            [libc::mmap] => (libc::mmap64);
-            [libc::open] => (libc::open64);
-            [libc::openat] => (libc::openat64);
-            [libc::posix_fadvise] => (libc::posix_fadvise64);
-            [libc::posix_fallocate] => (libc::posix_fallocate64);
-            [libc::pread] => (libc::pread64);
-            [libc::preadv] => (libc::preadv64);
-            [libc::pwrite] => (libc::pwrite64);
-            [libc::pwritev] => (libc::pwritev64);
-            [libc::sendfile] => (libc::sendfile64);
-            [libc::truncate] => (libc::truncate64);
+            [fallocate] => (libc::fallocate64);
+            [ftruncate] => (libc::ftruncate64);
+            [lseek] => (libc::lseek64);
+            [mmap] => (libc::mmap64);
+            [open] => (libc::open64);
+            [openat] => (libc::openat64);
+            [posix_fadvise] => (libc::posix_fadvise64);
+            [posix_fallocate] => (libc::posix_fallocate64);
+            [pread] => (libc::pread64);
+            [preadv] => (libc::preadv64);
+            [pwrite] => (libc::pwrite64);
+            [pwritev] => (libc::pwritev64);
+            [sendfile] => (libc::sendfile64);
+            [truncate] => (libc::truncate64);
         }
     } else {
         /// Function variant that supports large file positions.

src/sys/mman.rs

@@ -429,7 +429,7 @@ pub unsafe fn mmap<F: AsFd>(
         addr.map_or(std::ptr::null_mut(), |a| usize::from(a) as *mut c_void);
 
     let fd = f.map(|f| f.as_fd().as_raw_fd()).unwrap_or(-1);
-    let ret = largefile_fn![libc::mmap](
+    let ret = largefile_fn![mmap](
         ptr, length.into(),
         prot.bits(),
         flags.bits(),

src/sys/sendfile.rs

@@ -34,7 +34,7 @@ pub fn sendfile<F1: AsFd, F2: AsFd>(
         .map(|offset| offset as *mut _)
         .unwrap_or(ptr::null_mut());
     let ret = unsafe {
-        largefile_fn![libc::sendfile](
+        largefile_fn![sendfile](
             out_fd.as_fd().as_raw_fd(),
             in_fd.as_fd().as_raw_fd(),
             offset,

src/sys/uio.rs

@@ -51,7 +51,7 @@ pub fn pwritev<Fd: AsFd>(fd: Fd, iov: &[IoSlice<'_>], offset: off_t) -> Result<u
 
     // SAFETY: same as in writev()
     let res = unsafe {
-        largefile_fn![libc::pwritev](
+        largefile_fn![pwritev](
             fd.as_fd().as_raw_fd(),
             iov.as_ptr() as *const libc::iovec,
             iov.len() as c_int,
@@ -81,7 +81,7 @@ pub fn preadv<Fd: AsFd>(
 
     // SAFETY: same as in readv()
     let res = unsafe {
-        largefile_fn![libc::preadv](
+        largefile_fn![preadv](
             fd.as_fd().as_raw_fd(),
             iov.as_ptr() as *const libc::iovec,
             iov.len() as c_int,
@@ -98,7 +98,7 @@ pub fn preadv<Fd: AsFd>(
 // TODO: move to unistd
 pub fn pwrite<Fd: AsFd>(fd: Fd, buf: &[u8], offset: off_t) -> Result<usize> {
     let res = unsafe {
-        largefile_fn![libc::pwrite](
+        largefile_fn![pwrite](
             fd.as_fd().as_raw_fd(),
             buf.as_ptr() as *const c_void,
             buf.len() as size_t,
@@ -115,7 +115,7 @@ pub fn pwrite<Fd: AsFd>(fd: Fd, buf: &[u8], offset: off_t) -> Result<usize> {
 // TODO: move to unistd
 pub fn pread<Fd: AsFd>(fd: Fd, buf: &mut [u8], offset: off_t) -> Result<usize> {
     let res = unsafe {
-        largefile_fn![libc::pread](
+        largefile_fn![pread](
             fd.as_fd().as_raw_fd(),
             buf.as_mut_ptr() as *mut c_void,
             buf.len() as size_t,

src/unistd.rs

@@ -1169,7 +1169,7 @@ pub enum Whence {
 ///
 /// See also [lseek(2)](https://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html)
 pub fn lseek(fd: RawFd, offset: off_t, whence: Whence) -> Result<off_t> {
-    let res = unsafe { largefile_fn![libc::lseek](fd, offset, whence as i32) };
+    let res = unsafe { largefile_fn![lseek](fd, offset, whence as i32) };
 
     Errno::result(res).map(|r| r as off_t)
 }
@@ -1249,7 +1249,7 @@ pub fn pipe2(flags: OFlag) -> Result<(RawFd, RawFd)> {
 pub fn truncate<P: ?Sized + NixPath>(path: &P, len: off_t) -> Result<()> {
     let res = path
         .with_nix_path(|cstr| unsafe {
-            largefile_fn![libc::truncate](cstr.as_ptr(), len)
+            largefile_fn![truncate](cstr.as_ptr(), len)
         })?;
 
     Errno::result(res).map(drop)
@@ -1261,7 +1261,7 @@ pub fn truncate<P: ?Sized + NixPath>(path: &P, len: off_t) -> Result<()> {
 /// [ftruncate(2)](https://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html)
 pub fn ftruncate<Fd: AsFd>(fd: Fd, len: off_t) -> Result<()> {
     Errno::result(unsafe {
-        largefile_fn![libc::ftruncate](fd.as_fd().as_raw_fd(), len)
+        largefile_fn![ftruncate](fd.as_fd().as_raw_fd(), len)
     }).map(drop)
 }