From 75796893c95786dd792dae01b69c8b524b5fdc1c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 1 Dec 2004 07:30:05 +0000 Subject: [PATCH] Don't include , , ; not needed to establish interface. (errno): Remove decl. (HAVE_STRUCT_XTMP_UT_TYPE): Remove; no longer needed. (UT_TYPE_EQ, UT_TYPE_NOT_DEFINED, UT_TYPE_BOOT_TIME, UT_TYPE_USER_PROCESS, IS_USER_PROCESS): New macros. --- lib/readutmp.h | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/readutmp.h b/lib/readutmp.h index 100db19c5a..491a99b2ab 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -137,24 +137,10 @@ (HAVE_STRUCT_UTMP_UT_PID \ || HAVE_STRUCT_UTMPX_UT_PID) -# define HAVE_STRUCT_XTMP_UT_TYPE \ - (HAVE_STRUCT_UTMP_UT_TYPE \ - || HAVE_STRUCT_UTMPX_UT_TYPE) - typedef struct UTMP_STRUCT_NAME STRUCT_UTMP; enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) }; -# include -# ifdef HAVE_SYS_PARAM_H -# include -# endif - -# include -# ifndef errno -extern int errno; -# endif - # if !defined (UTMP_FILE) && defined (_PATH_UTMP) # define UTMP_FILE _PATH_UTMP # endif @@ -181,6 +167,31 @@ extern int errno; # define WTMP_FILE "/etc/wtmp" # endif +# if HAVE_STRUCT_UTMP_UT_TYPE || HAVE_STRUCT_UTMPX_UT_TYPE +# define UT_TYPE_EQ(U, V) ((U)->ut_type == (V)) +# define UT_TYPE_NOT_DEFINED 0 +# else +# define UT_TYPE_EQ(U, V) 0 +# define UT_TYPE_NOT_DEFINED 1 +# endif + +# ifdef BOOT_TIME +# define UT_TYPE_BOOT_TIME(U) UT_TYPE_EQ (U, BOOT_TIME) +# else +# define UT_TYPE_BOOT_TIME(U) 0 +# endif + +# ifdef USER_PROCESS +# define UT_TYPE_USER_PROCESS(U) UT_TYPE_EQ (U, USER_PROCESS) +# else +# define UT_TYPE_USER_PROCESS(U) 0 +# endif + +# define IS_USER_PROCESS(U) \ + (UT_USER (U)[0] \ + && (UT_TYPE_USER_PROCESS (U) \ + || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (U) != 0))) + char *extract_trimmed_name (const STRUCT_UTMP *ut); int read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf); -- 2.30.2