move trim_whitespace() outside of CStr

Signed-off-by: qidu <[email protected]>
Rust-for-Linux · Oct 15, 2022 · 904b063 · 904b063
1 parent 4f6559f
commit 904b063
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
@@ -208,25 +208,6 @@ impl CStr {
     pub unsafe fn as_str_unchecked(&self) -> &str {
         unsafe { core::str::from_utf8_unchecked(self.as_bytes()) }
     }
-
-    #[inline]
-    fn trim_whitespace(mut data: &[u8]) -> &[u8] {
-        while !data.is_empty() 
-            && (data[0] == b' ' 
-                || data[0] == b'\t' 
-                || data[0] == b'\n') 
-        {
-            data = &data[1..];
-        }
-        while !data.is_empty()
-            && (data[data.len() - 1] == b' '
-                || data[data.len() - 1] == b'\t'
-                || data[data.len() - 1] == b'\n')
-        {
-            data = &data[..data.len() - 1];
-        }
-        data
-    }
 }
 
 impl fmt::Display for CStr {
@@ -400,9 +381,9 @@ mod tests {
 
     #[test]
     fn test_trim_whitespace() {
-        assert_eq!(CStr::trim_whitespace(b"foo    "), b"foo");
-        assert_eq!(CStr::trim_whitespace(b"    foo"), b"foo");
-        assert_eq!(CStr::trim_whitespace(b"  foo  "), b"foo");
+        assert_eq!(trim_whitespace(b"foo    "), b"foo");
+        assert_eq!(trim_whitespace(b"    foo"), b"foo");
+        assert_eq!(trim_whitespace(b"  foo  "), b"foo");
     }
 }
 
@@ -621,3 +602,22 @@ impl Deref for CString {
 macro_rules! fmt {
     ($($f:tt)*) => ( core::format_args!($($f)*) )
 }
+
+/// Trim the whitspaces
+pub fn trim_whitespace(mut data: &[u8]) -> &[u8] {
+    while !data.is_empty() 
+        && (data[0] == b' ' 
+            || data[0] == b'\t' 
+            || data[0] == b'\n') 
+    {
+        data = &data[1..];
+    }
+    while !data.is_empty()
+        && (data[data.len() - 1] == b' '
+            || data[data.len() - 1] == b'\t'
+            || data[data.len() - 1] == b'\n')
+    {
+        data = &data[..data.len() - 1];
+    }
+    data
+}
diff --git a/rust/kernel/sysctl.rs b/rust/kernel/sysctl.rs
@@ -16,7 +16,7 @@ use crate::{
     bindings,
     error::code::*,
     io_buffer::IoBufferWriter,
-    str::CStr,
+    str::*,
     types,
     user_ptr::{UserSlicePtr, UserSlicePtrWriter},
     Result,