smb: convert 'close' parser to function

diff --git a/rust/src/smb/smb1_records.rs b/rust/src/smb/smb1_records.rs
index 1d3b175b285c6fd72e777adff52dfc7a8a9ada5b..1a2388a8b06c27f0f2a606cc288c70b2733f4c36 100644 (file)
--- a/rust/src/smb/smb1_records.rs
+++ b/rust/src/smb/smb1_records.rs
@@ -772,14 +772,14 @@ pub struct SmbRequestCloseRecord<'a> {
     pub fid: &'a[u8],
 }
 
-named!(pub parse_smb1_close_request_record<SmbRequestCloseRecord>,
-    do_parse!(
-            take!(1)
-        >>  fid: take!(2)
-       >> (SmbRequestCloseRecord {
-                fid:fid,
-           }))
-);
+pub fn parse_smb1_close_request_record(i: &[u8]) -> IResult<&[u8], SmbRequestCloseRecord> {
+    let (i, _) = take(1_usize)(i)?;
+    let (i, fid) = take(2_usize)(i)?;
+    let record = SmbRequestCloseRecord {
+        fid,
+    };
+    Ok((i, record))
+}
 
 #[derive(Debug,PartialEq)]
 pub struct SmbVersion<> {