X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=88aed38d417ec62af84ffae48770180044b508b5;hb=c532b2a8ef48d317a1bc348584c00880ea7c5ba6;hp=aec1fee449a0f6f7b0e06f4ad10693a93123d479;hpb=5db0c7e10ac53ae2a00e67cd345c2bcd6583ed1d;p=gnulib.git

diff --git a/lib/readutmp.c b/lib/readutmp.c
index aec1fee44..88aed38d4 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -3,10 +3,10 @@
    Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by jla; revised by djm */
 
@@ -69,11 +68,11 @@ extract_trimmed_name (const STRUCT_UTMP *ut)
 static inline bool
 desirable_utmp_entry (STRUCT_UTMP const *u, int options)
 {
-  int up = IS_USER_PROCESS (u);
-  if ((options & READ_UTMP_USER_PROCESS) && !up)
+  bool user_proc = IS_USER_PROCESS (u);
+  if ((options & READ_UTMP_USER_PROCESS) && !user_proc)
     return false;
   if ((options & READ_UTMP_CHECK_PIDS)
-      && up
+      && user_proc
       && (UT_PID (u) <= 0
 	  || (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
     return false;