diff options
author | lafleur <lafleur@boum.org> | 2021-12-09 15:43:25 +0100 |
---|---|---|
committer | lafleur <lafleur@boum.org> | 2021-12-09 15:43:25 +0100 |
commit | dadc0707357bf9b57364a6004a23cdd416b8cdcc (patch) | |
tree | 202a3bd84df2d429d4e09fc84fae0ceb921b15a1 /src | |
parent | fb49b1116197817715130adda90950f7f6538a67 (diff) |
support c_char sizes of various architectures
Diffstat (limited to 'src')
-rw-r--r-- | src/chain.rs | 4 | ||||
-rw-r--r-- | src/expr/wrapper.rs | 5 | ||||
-rw-r--r-- | src/rule.rs | 4 | ||||
-rw-r--r-- | src/set.rs | 4 | ||||
-rw-r--r-- | src/table.rs | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/chain.rs b/src/chain.rs index a999b8d..a942a37 100644 --- a/src/chain.rs +++ b/src/chain.rs @@ -170,13 +170,13 @@ impl Chain { let mut descr_buf = vec![0i8; 4096]; unsafe { sys::nftnl_chain_snprintf( - descr_buf.as_mut_ptr(), + descr_buf.as_mut_ptr() as *mut c_char, (descr_buf.len() - 1) as u64, self.chain, sys::NFTNL_OUTPUT_DEFAULT, 0, ); - CStr::from_ptr(descr_buf.as_ptr()).to_owned() + CStr::from_ptr(descr_buf.as_ptr() as *mut c_char).to_owned() } } diff --git a/src/expr/wrapper.rs b/src/expr/wrapper.rs index 00c555c..12ef60b 100644 --- a/src/expr/wrapper.rs +++ b/src/expr/wrapper.rs @@ -2,6 +2,7 @@ use std::ffi::CStr; use std::ffi::CString; use std::fmt::Debug; use std::rc::Rc; +use std::os::raw::c_char; use super::{DeserializationError, Expression}; use crate::{sys, Rule}; @@ -25,13 +26,13 @@ impl ExpressionWrapper { let mut descr_buf = vec![0i8; 4096]; unsafe { sys::nftnl_expr_snprintf( - descr_buf.as_mut_ptr(), + descr_buf.as_mut_ptr() as *mut c_char, (descr_buf.len() - 1) as u64, self.expr, sys::NFTNL_OUTPUT_DEFAULT, 0, ); - CStr::from_ptr(descr_buf.as_ptr()).to_owned() + CStr::from_ptr(descr_buf.as_ptr() as *mut c_char).to_owned() } } diff --git a/src/rule.rs b/src/rule.rs index 8d9dfd5..2ee5308 100644 --- a/src/rule.rs +++ b/src/rule.rs @@ -103,13 +103,13 @@ impl Rule { let mut descr_buf = vec![0i8; 4096]; unsafe { sys::nftnl_rule_snprintf( - descr_buf.as_mut_ptr(), + descr_buf.as_mut_ptr() as *mut c_char, (descr_buf.len() - 1) as u64, self.rule, sys::NFTNL_OUTPUT_DEFAULT, 0, ); - CStr::from_ptr(descr_buf.as_ptr()).to_owned() + CStr::from_ptr(descr_buf.as_ptr() as *mut c_char).to_owned() } } @@ -120,13 +120,13 @@ impl<K> Set<K> { let mut descr_buf = vec![0i8; 4096]; unsafe { sys::nftnl_set_snprintf( - descr_buf.as_mut_ptr(), + descr_buf.as_mut_ptr() as *mut c_char, (descr_buf.len() - 1) as u64, self.set, sys::NFTNL_OUTPUT_DEFAULT, 0, ); - CStr::from_ptr(descr_buf.as_ptr()).to_owned() + CStr::from_ptr(descr_buf.as_ptr() as *mut c_char).to_owned() } } diff --git a/src/table.rs b/src/table.rs index e6b9559..593fffb 100644 --- a/src/table.rs +++ b/src/table.rs @@ -51,13 +51,13 @@ impl Table { let mut descr_buf = vec![0i8; 4096]; unsafe { sys::nftnl_table_snprintf( - descr_buf.as_mut_ptr(), + descr_buf.as_mut_ptr() as *mut c_char, (descr_buf.len() - 1) as u64, self.table, sys::NFTNL_OUTPUT_DEFAULT, 0, ); - CStr::from_ptr(descr_buf.as_ptr()).to_owned() + CStr::from_ptr(descr_buf.as_ptr() as *mut c_char).to_owned() } } |