aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFenrir <[email protected]>2016-09-30 00:06:01 -0700
committerFenrir <[email protected]>2016-09-30 00:06:01 -0700
commitc3da19784f631c0492a1d61f1bb0b1353cdd1e5d (patch)
tree30a41817d463f87590c1f7e613e6c6e0d058be6b /src
parentAdd append and truncate modes to OpenOptions (diff)
downloadctru-rs-c3da19784f631c0492a1d61f1bb0b1353cdd1e5d.tar.xz
ctru-rs-c3da19784f631c0492a1d61f1bb0b1353cdd1e5d.zip
Remove unwrap from append logic
Diffstat (limited to 'src')
-rw-r--r--src/services/fs.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/services/fs.rs b/src/services/fs.rs
index ef4949a..6bca22a 100644
--- a/src/services/fs.rs
+++ b/src/services/fs.rs
@@ -520,22 +520,17 @@ impl OpenOptions {
let mut file = File { handle: file_handle, offset: 0 };
- // We have write access if append is true, so we *should* be
- // fine unwrapping here
if self.append {
- file.offset = file.metadata().unwrap().len();
+ let metadata = try!(file.metadata());
+ file.offset = metadata.len();
}
- // we might not have write access even if truncate is true,
- // so let's use try!
- //
- // But let's also set the offset to 0 just in case both
- // append and truncate are true
+ // set the offset to 0 just in case both append and truncate were
+ // set to true
if self.truncate {
try!(file.set_len(0));
file.offset = 0;
}
-
Ok(file)
}
}