Use UT_USER in place of hard-coded `->ut_name' here, too.

diff --git a/src/uptime.c b/src/uptime.c
index 9d29128404d0bd61e30ee49f6d35be0f99021458..5a39ba6490fdb260cc7e2e6ca374ff553fc7a1a2 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -1,5 +1,5 @@
 /* GNU's uptime.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
      ones, also in the process possibly gleaning boottime. */
   while (n--)
     {
-      if (this->ut_name[0]
+      if (UT_USER (this) [0]
 #ifdef USER_PROCESS
          && this->ut_type == USER_PROCESS
 #endif

diff --git a/src/users.c b/src/users.c
index b0df3aaa1415d36cf13c2360e6b0e399468442ed..43fe68056b73f56829b06fd15d53c2aa2f2e3389 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -1,5 +1,5 @@
 /* GNU's users.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@ list_entries_users (int n, const STRUCT_UTMP *this)
   u = (char **) xmalloc (n * sizeof (u[0]));
   for (i = 0; i < n; i++)
     {
-      if (this->ut_name[0]
+      if (UT_USER (this) [0]
 #ifdef USER_PROCESS
          && this->ut_type == USER_PROCESS
 #endif