From 286ae72fb7954ee51a6f4a1aeacbed6be4e6f37e Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Sat, 27 Aug 2016 21:01:27 +0200
Subject: [PATCH] Clean code a bit
---
src/libstd/sys/unix/os.rs | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
index e61804efd50f6..82606d2c728ea 100644
--- a/src/libstd/sys/unix/os.rs
+++ b/src/libstd/sys/unix/os.rs
@@ -584,18 +584,15 @@ pub fn home_dir() -> Option<PathBuf> {
n if n < 0 => 512 as usize,
n => n as usize,
};
- let me = libc::getuid();
- loop {
- let mut buf = Vec::with_capacity(amt);
- let mut passwd: libc::passwd = mem::zeroed();
-
- if getpwduid_r(me, &mut passwd, &mut buf).is_some() {
- let ptr = passwd.pw_dir as *const _;
- let bytes = CStr::from_ptr(ptr).to_bytes().to_vec();
- return Some(OsStringExt::from_vec(bytes))
- } else {
- return None;
- }
+ let mut buf = Vec::with_capacity(amt);
+ let mut passwd: libc::passwd = mem::zeroed();
+
+ if getpwduid_r(libc::getuid(), &mut passwd, &mut buf).is_some() {
+ let ptr = passwd.pw_dir as *const _;
+ let bytes = CStr::from_ptr(ptr).to_bytes().to_vec();
+ Some(OsStringExt::from_vec(bytes))
+ } else {
+ None
}
}
}