remove ReadVersion command and other changes per review

Author: lzrd

hubedit/src/main.rs

@@ -47,8 +47,6 @@ pub enum Command {
         #[clap(short, long)]
         force: bool,
     },
-    /// Read version and epoch values from an image.
-    ReadVersion,
     /// Replaces the binary image within an archive with a different binary
     /// image, supplied on the command line as a raw (BIN) file.
     ///
@@ -167,28 +165,6 @@ fn main() -> Result<()> {
             archive.erase_caboose()?;
             archive.overwrite()?;
         }
-        Command::ReadVersion => {
-            // Some images are missing an ImageHeader (old bootleby images),
-            // or have no caboose, or have no caboose with an `EPOC` value.
-            // The default epoch value is zero.
-
-            let (version, epoch) = if let Ok(caboose) = archive.read_caboose() {
-                let version = match caboose.version() {
-                    Ok(vers) => {
-                        std::str::from_utf8(vers).unwrap_or("").to_string()
-                    }
-                    Err(_) => "".to_string(),
-                };
-                let epoch = caboose.epoch_u32().unwrap_or(0u32);
-                (version.clone(), epoch)
-            } else {
-                // No caboose
-                ("".to_string(), 0u32)
-            };
-
-            println!("Version: \"{version}\"");
-            println!("Epoch: {epoch}");
-        }
         Command::ReplaceImage { image } => {
             let contents = std::fs::read(&image).with_context(|| {
                 format!("reading image file {}", image.display())

hubtools/src/lib.rs

@@ -361,7 +361,7 @@ impl RawHubrisImage {
     }
 
     /// Return the image size up to but not including any signature block.
-    pub fn image_size(&self) -> Result<u32, Error> {
+    fn image_size(&self) -> Result<u32, Error> {
         let header = self.read_image_header()?;
         Ok(header.total_image_len)
     }