Make sure we pick up the right statement in any case.

briancylui · Nov 13, 2015 · ef88d09 · ef88d09
1 parent e073997
commit ef88d09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx
@@ -293,6  293,8 @@ struct TUtmpContent {
 #ifdef __has_feature
 #  if __has_feature(modules)
          if (ue->ut_user[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
 #  else
          if (ue->ut_name[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
 #  endif
 #elif
          if (ue->ut_name[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))

diff --git a/rootx/src/rootx.cxx b/rootx/src/rootx.cxx
@@ -206,12  206,14 @@ static STRUCT_UTMP *SearchEntry(int n, const char *tty)
       // (See https://llvm.org/bugs/show_bug.cgi?id=24533)
 #ifdef __has_feature
 #  if __has_feature(modules)
-      if (ue->ut_user[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
      if (ue->ut_user[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
 #  else
      if (ue->ut_name[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
 #  endif
 #elif
-         if (ue->ut_name[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
      if (ue->ut_name[0] && !strncmp(tty, ue->ut_line, sizeof(ue->ut_line)))
 #endif
-            return ue;
         return ue;
       ue  ;
    }
    return 0;