From 684c9a33ccd11bf9332b3f54e47e74aeb6061c79 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 1 Feb 2018 11:42:33 +0900 Subject: [PATCH] code refactoring Change-Id: Ibe5c6059b5c9edbb48a4d402eb9f0d4237e066ea --- ism/src/scim_utility.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ism/src/scim_utility.cpp b/ism/src/scim_utility.cpp index 441f274..ea076c0 100644 --- a/ism/src/scim_utility.cpp +++ b/ism/src/scim_utility.cpp @@ -656,18 +656,15 @@ scim_get_home_dir () int ret = getpwuid_r (getuid (), &pw, buf, sizeof (buf), &result); endpwent (); - if (ret != 0 || !result) - return String (""); - - if (result && pw.pw_dir) { - home_dir = pw.pw_dir; - } else { + if (ret != 0 || !result) { LOGE ("Fail to getpwuid_r"); + return String (""); } - if (!home_dir) { + if (pw.pw_dir) + home_dir = pw.pw_dir; + else home_dir = getenv ("HOME"); - } if (home_dir) return String (home_dir); -- 2.7.4