linux_like: communize some structs

farao · tgross35 · commit 1034d7076bdc · 2025-12-04T19:26:42.000Z
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -22,7 +22,6 @@ pub type off_t = c_long;
 pub type blkcnt_t = c_ulong;
 pub type blksize_t = c_ulong;
 pub type nlink_t = u32;
-pub type useconds_t = u32;
 pub type pthread_t = c_long;
 pub type pthread_mutexattr_t = c_long;
 pub type pthread_rwlockattr_t = c_long;
@@ -496,11 +495,6 @@ s! {
         pub ifr6_ifindex: c_int,
     }
 
-    pub struct if_nameindex {
-        pub if_index: c_uint,
-        pub if_name: *mut c_char,
-    }
-
     pub struct sockaddr_nl {
         pub nl_family: crate::sa_family_t,
         nl_pad: Padding<c_ushort>,
@@ -3601,20 +3595,6 @@ extern "C" {
     pub fn getgrnam(name: *const c_char) -> *mut crate::group;
     pub fn sem_unlink(name: *const c_char) -> c_int;
     pub fn daemon(nochdir: c_int, noclose: c_int) -> c_int;
-    pub fn getpwnam_r(
-        name: *const c_char,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
-    pub fn getpwuid_r(
-        uid: crate::uid_t,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
@@ -3734,9 +3714,6 @@ extern "C" {
         newpath: *const c_char,
         flags: c_uint,
     ) -> c_int;
-
-    pub fn if_nameindex() -> *mut if_nameindex;
-    pub fn if_freenameindex(ptr: *mut if_nameindex);
 }
 
 cfg_if! {
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
@@ -1,7 +1,6 @@
 use crate::prelude::*;
 
 pub type wchar_t = i32;
-pub type useconds_t = u32;
 pub type dev_t = u32;
 pub type socklen_t = u32;
 pub type pthread_t = c_ulong;
@@ -130,11 +129,6 @@ s! {
         bits: [u32; 32],
     }
 
-    pub struct if_nameindex {
-        pub if_index: c_uint,
-        pub if_name: *mut c_char,
-    }
-
     // System V IPC
     pub struct msginfo {
         pub msgpool: c_int,
@@ -1378,8 +1372,6 @@ extern "C" {
     pub fn getloadavg(loadavg: *mut c_double, nelem: c_int) -> c_int;
 
     pub fn mkfifoat(dirfd: c_int, pathname: *const c_char, mode: mode_t) -> c_int;
-    pub fn if_nameindex() -> *mut if_nameindex;
-    pub fn if_freenameindex(ptr: *mut if_nameindex);
 
     pub fn mremap(
         addr: *mut c_void,
@@ -1439,21 +1431,6 @@ extern "C" {
 
     pub fn getentropy(buf: *mut c_void, buflen: size_t) -> c_int;
 
-    pub fn getpwnam_r(
-        name: *const c_char,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
-    pub fn getpwuid_r(
-        uid: crate::uid_t,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
-
     // grp.h
     pub fn getgrgid(gid: crate::gid_t) -> *mut crate::group;
     pub fn getgrnam(name: *const c_char) -> *mut crate::group;
diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -645,7 +645,6 @@ pub const BUFSIZ: c_uint = 8192;
 pub const TMP_MAX: c_uint = 238328;
 pub const FOPEN_MAX: c_uint = 16;
 pub const FILENAME_MAX: c_uint = 4096;
-pub const POSIX_MADV_DONTNEED: c_int = 4;
 pub const _CS_GNU_LIBC_VERSION: c_int = 2;
 pub const _CS_GNU_LIBPTHREAD_VERSION: c_int = 3;
 pub const _CS_V6_ENV: c_int = 1148;
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -108,11 +108,6 @@ s! {
         pub spkt_protocol: c_ushort,
     }
 
-    pub struct if_nameindex {
-        pub if_index: c_uint,
-        pub if_name: *mut c_char,
-    }
-
     pub struct tpacket_auxdata {
         pub tp_status: __u32,
         pub tp_len: __u32,
@@ -4365,20 +4360,6 @@ extern "C" {
     pub fn sendfile(out_fd: c_int, in_fd: c_int, offset: *mut off_t, count: size_t) -> ssize_t;
     pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> c_int;
     pub fn getdtablesize() -> c_int;
-    pub fn getpwnam_r(
-        name: *const c_char,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
-    pub fn getpwuid_r(
-        uid: crate::uid_t,
-        pwd: *mut passwd,
-        buf: *mut c_char,
-        buflen: size_t,
-        result: *mut *mut passwd,
-    ) -> c_int;
     pub fn getgrouplist(
         user: *const c_char,
         group: crate::gid_t,
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
@@ -564,8 +564,6 @@ pub const O_NDELAY: c_int = O_NONBLOCK;
 pub const NI_MAXHOST: crate::socklen_t = 255;
 pub const PTHREAD_STACK_MIN: size_t = 2048;
 
-pub const POSIX_MADV_DONTNEED: c_int = 4;
-
 pub const MAP_ANONYMOUS: c_int = MAP_ANON;
 
 pub const SOCK_SEQPACKET: c_int = 5;
diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs
@@ -404,7 +404,6 @@ pub const O_TMPFILE: c_int = 0o20000000 | O_DIRECTORY;
 pub const PACKET_MR_UNICAST: c_int = 3;
 pub const PF_NFC: c_int = 39;
 pub const PF_VSOCK: c_int = 40;
-pub const POSIX_MADV_DONTNEED: c_int = 4;
 pub const PTRACE_EVENT_STOP: c_int = 128;
 pub const PTRACE_GETSIGMASK: c_uint = 0x420a;
 pub const PTRACE_PEEKSIGINFO: c_int = 0x4209;
diff --git a/src/unix/linux_like/linux_l4re_shared.rs b/src/unix/linux_like/linux_l4re_shared.rs
@@ -903,6 +903,7 @@ pub const POSIX_MADV_NORMAL: c_int = 0;
 pub const POSIX_MADV_RANDOM: c_int = 1;
 pub const POSIX_MADV_SEQUENTIAL: c_int = 2;
 pub const POSIX_MADV_WILLNEED: c_int = 3;
+pub const POSIX_MADV_DONTNEED: c_int = 4;
 
 pub const S_IEXEC: crate::mode_t = 0o0100;
 pub const S_IWRITE: crate::mode_t = 0o0200;
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -5,6 +5,7 @@ pub type speed_t = c_uint;
 pub type tcflag_t = c_uint;
 pub type clockid_t = c_int;
 pub type timer_t = *mut c_void;
+pub type useconds_t = u32;
 pub type key_t = c_int;
 pub type id_t = c_uint;
 
@@ -234,6 +235,11 @@ s! {
         pub machine: [c_char; 65],
         pub domainname: [c_char; 65],
     }
+
+    pub struct if_nameindex {
+        pub if_index: c_uint,
+        pub if_name: *mut c_char,
+    }
 }
 
 cfg_if! {
@@ -2057,6 +2063,24 @@ extern "C" {
     pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;
     #[cfg(not(target_os = "l4re"))]
     pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;
+
+    pub fn if_nameindex() -> *mut if_nameindex;
+    pub fn if_freenameindex(ptr: *mut if_nameindex);
+
+    pub fn getpwnam_r(
+        name: *const c_char,
+        pwd: *mut passwd,
+        buf: *mut c_char,
+        buflen: size_t,
+        result: *mut *mut passwd,
+    ) -> c_int;
+    pub fn getpwuid_r(
+        uid: crate::uid_t,
+        pwd: *mut passwd,
+        buf: *mut c_char,
+        buflen: size_t,
+        result: *mut *mut passwd,
+    ) -> c_int;
 }
 
 // LFS64 extensions
