projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid macro redefinition warnings.
[gnulib.git]
/
lib
/
readutmp.c
diff --git
a/lib/readutmp.c
b/lib/readutmp.c
index
aec1fee
..
88aed38
100644
(file)
--- a/
lib/readutmp.c
+++ b/
lib/readutmp.c
@@
-3,10
+3,10
@@
Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
Foundation, Inc.
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
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
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
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 */
/* 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)
{
static inline bool
desirable_utmp_entry (STRUCT_UTMP const *u, int options)
{
-
int up
= IS_USER_PROCESS (u);
- if ((options & READ_UTMP_USER_PROCESS) && !u
p
)
+
bool user_proc
= IS_USER_PROCESS (u);
+ if ((options & READ_UTMP_USER_PROCESS) && !u
ser_proc
)
return false;
if ((options & READ_UTMP_CHECK_PIDS)
return false;
if ((options & READ_UTMP_CHECK_PIDS)
- && u
p
+ && u
ser_proc
&& (UT_PID (u) <= 0
|| (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
return false;
&& (UT_PID (u) <= 0
|| (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
return false;