From a1ab2a2550ed444828a8c76aaa8861268faeca33 Mon Sep 17 00:00:00 2001
From: Edward Barnard
Date: Sat, 6 Oct 2018 20:01:40 +0100
Subject: Use Error in fewer places.

---
 src/events/binary_reader.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/events/binary_reader.rs')

diff --git a/src/events/binary_reader.rs b/src/events/binary_reader.rs
index 81af922..6068545 100644
--- a/src/events/binary_reader.rs
+++ b/src/events/binary_reader.rs
@@ -165,7 +165,7 @@ impl<R: Read + Seek> BinaryReader<R> {
     }
 
     fn seek_to_object(&mut self, object_ref: u64) -> Result<u64, Error> {
-        let object_ref = u64_to_usize(object_ref)?;
+        let object_ref = u64_to_usize(object_ref).ok_or(Error::InvalidData)?;
         let offset = *self
             .object_offsets
             .get(object_ref)
@@ -232,9 +232,9 @@ impl<R: Read + Seek> BinaryReader<R> {
             (0x3, 3) => {
                 // Date. Seconds since 1/1/2001 00:00:00.
                 let secs = self.reader.read_f64::<BigEndian>()?;
-                Some(Event::DateValue(Date::from_seconds_since_plist_epoch(
-                    secs,
-                )?))
+                Some(Event::DateValue(
+                    Date::from_seconds_since_plist_epoch(secs).map_err(|()| Error::InvalidData)?,
+                ))
             }
             (0x4, n) => {
                 // Data
-- 
cgit v1.2.3