(print_uptime): Use IS_USER_PROCESS and

UT_TYPE_BOOT_TIME instead of by-hand code.

diff --git a/src/uptime.c b/src/uptime.c
index 9552a9be6b144ec60a2f5af0355582a1edf08543..9516f0f20d6636eeb9ec599275737eca015439b1 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -95,23 +95,9 @@ print_uptime (size_t n, const STRUCT_UTMP *this)
      ones, also in the process possibly gleaning boottime. */
   while (n--)
     {
-      if (UT_USER (this) [0]
-#ifdef USER_PROCESS
-         && this->ut_type == USER_PROCESS
-#endif
-         )
-       {
-         ++entries;
-       }
-      /* If BOOT_MSG is defined, we can get boottime from utmp.  This avoids
-        possibly needing special privs to read /dev/kmem. */
-#ifdef BOOT_MSG
-# if HAVE_PROC_UPTIME
-      if (uptime == 0)
-# endif /* HAVE_PROC_UPTIME */
-       if (strncmp (this->ut_line, BOOT_MSG, sizeof this->ut_line) == 0)
-         boot_time = UT_TIME_MEMBER (this);
-#endif /* BOOT_MSG */
+      entries += IS_USER_PROCESS (this);
+      if (UT_TYPE_BOOT_TIME (this))
+       boot_time = UT_TIME_MEMBER (this);
       ++this;
     }
   time_now = time (0);