Merge pull request #25 from andrewdavidmackenzie/update_libc_types

Updated to newer version of libc and removed warnings due to deprecated types

Author: andrewdavidmackenzie

Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 errno = "^0.1.8"
-libc = "^0.2.15"
+libc = "^0.2.62"
 
 [lib]
 name = "libproc"

src/libproc/bsd_info.rs

@@ -1,6 +1,6 @@
 extern crate libc;
 
-use self::libc::{uint32_t, int32_t, uint64_t, c_char, uid_t, gid_t};
+use self::libc::{c_char, uid_t, gid_t};
 
 use crate::libproc::proc_pid::{PIDInfo, PidInfoFlavor};
 
@@ -10,28 +10,28 @@ const MAXCOMLEN	: usize = 16;
 #[repr(C)]
 #[derive(Default)]
 pub struct BSDInfo {
-    pub pbi_flags               : uint32_t,                 // 64bit; emulated etc
-    pub pbi_status              : uint32_t,
-    pub pbi_xstatus             : uint32_t,
-    pub pbi_pid                 : uint32_t,
-    pub pbi_ppid                : uint32_t,
+    pub pbi_flags               : u32,                 // 64bit; emulated etc
+    pub pbi_status              : u32,
+    pub pbi_xstatus             : u32,
+    pub pbi_pid                 : u32,
+    pub pbi_ppid                : u32,
     pub pbi_uid                 : uid_t,
     pub pbi_gid                 : gid_t,
     pub pbi_ruid                : uid_t,
     pub pbi_rgid                : gid_t,
     pub pbi_svuid               : uid_t,
     pub pbi_svgid               : gid_t,
-    pub rfu_1                   : uint32_t,                 // reserved
+    pub rfu_1                   : u32,                 // reserved
     pub pbi_comm                : [c_char; MAXCOMLEN],
     pub pbi_name                : [c_char; 2 * MAXCOMLEN],  // empty if no name is registered
-    pub pbi_nfiles              : uint32_t,
-    pub pbi_pgid                : uint32_t,
-    pub pbi_pjobc               : uint32_t,
-    pub e_tdev                  : uint32_t,                 // controlling tty dev
-    pub e_tpgid                 : uint32_t,                 // tty process group id
-    pub pbi_nice                : int32_t,
-    pub pbi_start_tvsec         : uint64_t,
-    pub pbi_start_tvusec        : uint64_t
+    pub pbi_nfiles              : u32,
+    pub pbi_pgid                : u32,
+    pub pbi_pjobc               : u32,
+    pub e_tdev                  : u32,                 // controlling tty dev
+    pub e_tpgid                 : u32,                 // tty process group id
+    pub pbi_nice                : u32,
+    pub pbi_start_tvsec         : u64,
+    pub pbi_start_tvusec        : u64
 }
 
 impl PIDInfo for BSDInfo {

src/libproc/file_info.rs

@@ -5,7 +5,7 @@ use std::mem;
 use crate::libproc::helpers;
 use crate::libproc::proc_pid::{ListPIDInfo, PidInfoFlavor};
 
-use self::libc::{c_int, c_void, int32_t, uint32_t};
+use self::libc::{c_int, c_void};
 
 // this extern block links to the libproc library
 // Original signatures of functions can be found at http://opensource.apple.com/source/Libc/Libc-594.9.4/darwin/libproc.c
@@ -34,8 +34,8 @@ impl ListPIDInfo for ListFDs {
 
 #[repr(C)]
 pub struct ProcFDInfo {
-    pub proc_fd: int32_t,
-    pub proc_fdtype: uint32_t,
+    pub proc_fd: i32,
+    pub proc_fdtype: u32,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -60,8 +60,8 @@ pub enum ProcFDType {
     Unknown,
 }
 
-impl From<uint32_t> for ProcFDType {
-    fn from(value: uint32_t) -> ProcFDType {
+impl From<u32> for ProcFDType {
+    fn from(value: u32) -> ProcFDType {
         match value {
             0 => ProcFDType::ATalk   ,
             1 => ProcFDType::VNode   ,
@@ -139,7 +139,7 @@ pub trait PIDFDInfo: Default {
 /// }
 /// ```
 ///
-pub fn pidfdinfo<T: PIDFDInfo>(pid : i32, fd: int32_t) -> Result<T, String> {
+pub fn pidfdinfo<T: PIDFDInfo>(pid : i32, fd: i32) -> Result<T, String> {
     let flavor = T::flavor() as i32;
     let buffer_size = mem::size_of::<T>() as i32;
     let mut pidinfo = T::default();

src/libproc/kmesg_buffer.rs

@@ -1,7 +1,7 @@
 extern crate libc;
 extern crate errno;
 
-use self::libc::{uint32_t, c_int};
+use self::libc::{c_int};
 
 use std::{ptr, mem};
 use std::fmt;
@@ -49,7 +49,7 @@ impl fmt::Debug for MessageBuffer {
 // Original signatures of functions can be found at http://opensource.apple.com/source/Libc/Libc-594.9.4/darwin/libproc.c
 #[link(name = "proc", kind = "dylib")]
 extern {
-    fn proc_kmsgbuf(buffer : *mut MessageBuffer, buffersize : uint32_t) -> c_int;
+    fn proc_kmsgbuf(buffer : *mut MessageBuffer, buffersize : u32) -> c_int;
 }
 
 /// Get upto buffersize bytes from the the kernel message buffer - as used by dmesg

src/libproc/net_info.rs

@@ -3,8 +3,7 @@ extern crate libc;
 use crate::libproc::file_info::{PIDFDInfo, PIDFDInfoFlavor};
 
 use self::libc::{c_char, c_int, c_short, c_uchar, c_ushort, gid_t, IF_NAMESIZE, in6_addr, in_addr,
-                 int32_t, int64_t, off_t, SOCK_MAXADDRLEN, sockaddr_un, uid_t, uint16_t, uint32_t,
-                 uint64_t, uint8_t};
+                 off_t, SOCK_MAXADDRLEN, sockaddr_un, uid_t};
 
 #[repr(C)]
 #[derive(Default)]
@@ -16,11 +15,11 @@ pub struct SocketFDInfo {
 #[repr(C)]
 #[derive(Default)]
 pub struct ProcFileInfo {
-    pub fi_openflags: uint32_t,
-    pub fi_status   : uint32_t,
+    pub fi_openflags: u32,
+    pub fi_status   : u32,
     pub fi_offset   : off_t,
-    pub fi_type     : int32_t,
-    pub rfu_1       : int32_t,
+    pub fi_type     : i32,
+    pub rfu_1       : i32,
 }
 
 impl PIDFDInfo for SocketFDInfo {
@@ -65,8 +64,8 @@ impl From<c_int> for SocketInfoKind {
 #[derive(Default)]
 pub struct SocketInfo {
     pub soi_stat: VInfoStat,
-    pub soi_so: uint64_t,
-    pub soi_pcb: uint64_t,
+    pub soi_so: u64,
+    pub soi_pcb: u64,
     pub soi_type: c_int,
     pub soi_protocol: c_int,
     pub soi_family: c_int,
@@ -78,48 +77,48 @@ pub struct SocketInfo {
     pub soi_qlimit: c_short,
     pub soi_timeo: c_short,
     pub soi_error: c_ushort,
-    pub soi_oobmark: uint32_t,
+    pub soi_oobmark: u32,
     pub soi_rcv: SockBufInfo,
     pub soi_snd: SockBufInfo,
     pub soi_kind: c_int,
-    pub rfu_1: uint32_t,
+    pub rfu_1: u32,
     pub soi_proto: SocketInfoProto,
 }
 
 #[repr(C)]
 #[derive(Default)]
 pub struct VInfoStat {
-    pub vst_dev: uint32_t,
-    pub vst_mode: uint16_t,
-    pub vst_nlink: uint16_t,
-    pub vst_ino: uint64_t,
+    pub vst_dev: u32,
+    pub vst_mode: u16,
+    pub vst_nlink: u16,
+    pub vst_ino: u64,
     pub vst_uid: uid_t,
     pub vst_gid: gid_t,
-    pub vst_atime: int64_t,
-    pub vst_atimensec: int64_t,
-    pub vst_mtime: int64_t,
-    pub vst_mtimensec: int64_t,
-    pub vst_ctime: int64_t,
-    pub vst_ctimensec: int64_t,
-    pub vst_birthtime: int64_t,
-    pub vst_birthtimensec: int64_t,
+    pub vst_atime: i64,
+    pub vst_atimensec: i64,
+    pub vst_mtime: i64,
+    pub vst_mtimensec: i64,
+    pub vst_ctime: i64,
+    pub vst_ctimensec: i64,
+    pub vst_birthtime: i64,
+    pub vst_birthtimensec: i64,
     pub vst_size: off_t,
-    pub vst_blocks: int64_t,
-    pub vst_blksize: int32_t,
-    pub vst_flags: uint32_t,
-    pub vst_gen: uint32_t,
-    pub vst_rdev: uint32_t,
-    pub vst_qspare: [int64_t; 2],
+    pub vst_blocks: i64,
+    pub vst_blksize: i32,
+    pub vst_flags: u32,
+    pub vst_gen: u32,
+    pub vst_rdev: u32,
+    pub vst_qspare: [i64; 2],
 }
 
 #[repr(C)]
 #[derive(Default)]
 pub struct SockBufInfo {
-    pub sbi_cc: uint32_t,
-    pub sbi_hiwat: uint32_t,
-    pub sbi_mbcnt: uint32_t,
-    pub sbi_mbmax: uint32_t,
-    pub sbi_lowat: uint32_t,
+    pub sbi_cc: u32,
+    pub sbi_hiwat: u32,
+    pub sbi_mbcnt: u32,
+    pub sbi_mbmax: u32,
+    pub sbi_lowat: u32,
     pub sbi_flags: c_short,
     pub sbi_timeo: c_short,
 }
@@ -145,7 +144,7 @@ impl Default for SocketInfoProto {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct In4In6Addr {
-    pub i46a_pad32: [uint32_t; 3],
+    pub i46a_pad32: [u32; 3],
     pub i46a_addr4: in_addr,
 }
 
@@ -163,12 +162,12 @@ impl Default for In4In6Addr {
 pub struct InSockInfo {
     pub insi_fport: c_int,
     pub insi_lport: c_int,
-    pub insi_gencnt: uint64_t,
-    pub insi_flags: uint32_t,
-    pub insi_flow: uint32_t,
-    pub insi_vflag: uint8_t,
-    pub insi_ip_ttl: uint8_t,
-    pub rfu_1: uint32_t,
+    pub insi_gencnt: u64,
+    pub insi_flags: u32,
+    pub insi_flow: u32,
+    pub insi_vflag: u8,
+    pub insi_ip_ttl: u8,
+    pub rfu_1: u32,
     pub insi_faddr: InSIAddr,
     pub insi_laddr: InSIAddr,
     pub insi_v4: InSIV4,
@@ -184,7 +183,7 @@ pub struct InSIV4 {
 #[repr(C)]
 #[derive(Copy, Clone, Default)]
 pub struct InSIV6 {
-    pub in6_hlim: uint8_t,
+    pub in6_hlim: u8,
     pub in6_cksum: c_int,
     pub in6_ifindex: c_ushort,
     pub in6_hops: c_short,
@@ -264,16 +263,16 @@ pub struct TcpSockInfo {
     pub tcpsi_state: c_int,
     pub tcpsi_timer: [c_int; TSI_T_NTIMERS],
     pub tcpsi_mss: c_int,
-    pub tcpsi_flags: uint32_t,
-    pub rfu_1: uint32_t,
-    pub tcpsi_tp: uint64_t,
+    pub tcpsi_flags: u32,
+    pub rfu_1: u32,
+    pub tcpsi_tp: u64,
 }
 
 #[repr(C)]
 #[derive(Copy, Clone, Default)]
 pub struct UnSockInfo {
-    pub unsi_conn_so: uint64_t,
-    pub unsi_conn_pcb: uint64_t,
+    pub unsi_conn_so: u64,
+    pub unsi_conn_pcb: u64,
     pub unsi_addr: UnSIAddr,
     pub unsi_caddr: UnSIAddr,
 }
@@ -296,30 +295,30 @@ impl Default for UnSIAddr {
 #[repr(C)]
 #[derive(Copy, Clone, Default)]
 pub struct NdrvInfo {
-    pub ndrvsi_if_family: uint32_t,
-    pub ndrvsi_if_unit: uint32_t,
+    pub ndrvsi_if_family: u32,
+    pub ndrvsi_if_unit: u32,
     pub ndrvsi_if_name: [c_char; IF_NAMESIZE],
 }
 
 #[repr(C)]
 #[derive(Copy, Clone, Default)]
 pub struct KernEventInfo {
-    pub kesi_vendor_code_filter: uint32_t,
-    pub kesi_class_filter: uint32_t,
-    pub kesi_subclass_filter: uint32_t,
+    pub kesi_vendor_code_filter: u32,
+    pub kesi_class_filter: u32,
+    pub kesi_subclass_filter: u32,
 }
 
 const MAX_KCTL_NAME: usize = 96;
 
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct KernCtlInfo {
-    pub kcsi_id: uint32_t,
-    pub kcsi_reg_unit: uint32_t,
-    pub kcsi_flags: uint32_t,
-    pub kcsi_recvbufsize: uint32_t,
-    pub kcsi_sendbufsize: uint32_t,
-    pub kcsi_unit: uint32_t,
+    pub kcsi_id: u32,
+    pub kcsi_reg_unit: u32,
+    pub kcsi_flags: u32,
+    pub kcsi_recvbufsize: u32,
+    pub kcsi_sendbufsize: u32,
+    pub kcsi_unit: u32,
     pub kcsi_name: [c_char; MAX_KCTL_NAME],
 }