raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=37780369266db89e968bf646ca76aa7605f00c78

commit 37780369266db89e968bf646ca76aa7605f00c78
Author: Adrien Nader <[email protected]>
Date:   Sat Aug 9 12:09:44 2014 +0200

    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();
---
 src/lib/efreet/efreet_base.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index dfc5a3a..7a20a9c 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')
       {

-- 


Reply via email to