From 35e9253365339d7fd5e2d81e7a5fc11dba9a8e0f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 17 Nov 2016 14:23:41 -0700
Subject: [PATCH] Update orbutils, fix warnings
---
kernel/syscall/process.rs | 8 +++-----
programs/orbutils | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/kernel/syscall/process.rs b/kernel/syscall/process.rs
index 2a4b9caf1..376334194 100644
--- a/kernel/syscall/process.rs
+++ b/kernel/syscall/process.rs
@@ -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
// This has to be done outside the context lock to prevent deadlocks
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 result = {
let scheme = {
@@ -269,8 +269,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> {
event: None,
})
},
- Err(err) => {
- println!("clone: failed to dup {}: {:?}", fd, err);
+ Err(_err) => {
None
}
}
@@ -709,8 +708,7 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result<usize> {
event: None,
})
},
- Err(err) => {
- println!("exec: failed to dup {}: {:?}", fd, err);
+ Err(_err) => {
None
}
}
diff --git a/programs/orbutils b/programs/orbutils
index 6d183f68e..8187b2aa0 160000
--- a/programs/orbutils
+++ b/programs/orbutils
@@ -1 +1 @@
-Subproject commit 6d183f68e2519a86e4f69efaacf80d7fc78a59bc
+Subproject commit 8187b2aa0bfb202fd52a4bac5adae4217c254e7e
--
GitLab