diff options
author | Adrien Nader <adrien@notk.org> | 2014-08-09 12:09:44 +0200 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-14 20:55:58 +0900 |
commit | 37780369266db89e968bf646ca76aa7605f00c78 (patch) | |
tree | 58cba614a3b6fe0e33e4f9a58e3c3c566e75acab | |
parent | 0fb9f5d5163fbeb5304684714f7e9aa41f1485a5 (diff) | |
download | efl-37780369266db89e968bf646ca76aa7605f00c78.tar.gz |
efreet: reverse if's condition and swap then/else blocks for readability
The reversal makes it possible to merge two #if and unspaghetti the code
a bit.
Since the diff is not very readable, here is the before/after to show
the spirit:
before:
#if cond
if (...)
#endif
do_foo();
#if cond
else
do_bar();
#endif
after:
#if cond
if ( ! ...)
do_bar();
else
#endif
do_foo();
-rw-r--r-- | src/lib/efreet/efreet_base.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c index dfc5a3aa9b..7a20a9c5a0 100644 --- a/src/lib/efreet/efreet_base.c +++ b/src/lib/efreet/efreet_base.c @@ -277,17 +277,16 @@ efreet_dirs_init(void) /* efreet_home_dir */ #if defined(HAVE_GETUID) && defined(HAVE_GETEUID) - if (getuid() == geteuid()) -#endif - efreet_home_dir = getenv("HOME"); -#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) - else + if (getuid() != geteuid()) { struct passwd *pw = getpwent(); if ((pw) && (pw->pw_dir)) efreet_home_dir = pw->pw_dir; } + else #endif + efreet_home_dir = getenv("HOME"); + #ifdef _WIN32 if (!efreet_home_dir || efreet_home_dir[0] == '\0') { |