Fixes example test and makes attach_with_loop_info consume the loop_i…

…nfo64 struct Even though it is passed by reference to the ioctl conceptually the it should be created and consumed once per call to a attach function.
mdaffin · Mar 30, 2021 · b063c2b · b063c2b
1 parent 7cbcf81
commit b063c2b
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -167,7 +167,7 @@ impl LoopDevice {
         info.lo_offset = offset;
         info.lo_sizelimit = sizelimit;
 
-        Self::attach_with_loop_info(self, backing_file, &mut info)
+        Self::attach_with_loop_info(self, backing_file, info)
     }
 
     /// Attach the loop device with automatic partition scanning.
@@ -180,35 +180,30 @@ impl LoopDevice {
     /// ld.attach_with_partscan("test.img").unwrap();
     /// # ld.detach().unwrap();
     /// ```
-    pub fn attach_with_partscan<P: AsRef<Path>>(
-        &self,
-        backing_file: P,
-    ) -> io::Result<()> {
+    pub fn attach_with_partscan<P: AsRef<Path>>(&self, backing_file: P) -> io::Result<()> {
         // Set lo_flags to LO_FLAGS_PARTSCAN value
         let mut info = loop_info64::default();
         info.lo_flags = 8;
 
-        Self::attach_with_loop_info(self, backing_file, &mut info)
+        Self::attach_with_loop_info(self, backing_file, info)
     }
 
-
-
     /// Attach the loop device to a file with loop_info.
     ///
     /// # Examples
     ///
     /// Attach the device with default loop_info values.
     ///
     /// ```rust
-    /// use loopdev::LoopDevice;
+    /// use loopdev::{LoopDevice, loop_info64};
     /// let ld = LoopDevice::open("/dev/loop5").unwrap();
     /// ld.attach_with_loop_info("test.img", loop_info64::default()).unwrap();
     /// # ld.detach().unwrap();
     /// ```
     pub fn attach_with_loop_info<P: AsRef<Path>>(
         &self,
         backing_file: P,
-        loop_info: &mut loop_info64,
+        loop_info: loop_info64,
     ) -> io::Result<()> {
         let bf = OpenOptions::new()
             .read(true)
@@ -228,7 +223,7 @@ impl LoopDevice {
             ioctl(
                 self.device.as_raw_fd() as c_int,
                 LOOP_SET_STATUS64.into(),
-                loop_info,
+                &loop_info,
             )
         }) {
             // Ignore the error to preserve the original error