vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update orbutils, fix warnings

Browse source
This commit is contained in:
Jeremy Soller 2016-11-17 14:23:41 -07:00
parent 1f28ec72b7
commit 35e9253365
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/syscall/process.rs
View file

@ -250,7 +250,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> {
// If not cloning files, dup to get a new number from scheme // If not cloning files, dup to get a new number from scheme
// This has to be done outside the context lock to prevent deadlocks // This has to be done outside the context lock to prevent deadlocks
if flags & CLONE_FILES == 0 { if flags & CLONE_FILES == 0 {
for (fd, mut file_option) in files.lock().iter_mut().enumerate() { for (_fd, mut file_option) in files.lock().iter_mut().enumerate() {
let new_file_option = if let Some(file) = *file_option { let new_file_option = if let Some(file) = *file_option {
let result = { let result = {
let scheme = { let scheme = {
@ -269,8 +269,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> {
event: None, event: None,
}) })
}, },
Err(err) => { Err(_err) => {
println!("clone: failed to dup {}: {:?}", fd, err);
None None
} }
} }
@ -709,8 +708,7 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result<usize> {
event: None, event: None,
}) })
}, },
Err(err) => { Err(_err) => {
println!("exec: failed to dup {}: {:?}", fd, err);
None None
} }
} }

2
programs/orbutils

@ -1 +1 @@
Subproject commit 6d183f68e2519a86e4f69efaacf80d7fc78a59bc Subproject commit 8187b2aa0bfb202fd52a4bac5adae4217c254e7e