From: Bruno Haible Date: Mon, 31 Jul 2023 14:29:46 +0000 (+0200) Subject: readutmp: Make argument names consistent. X-Git-Tag: v1.0~987 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=0e7af0cff0011f25f5f842af5216325923017b34;p=gnulib.git readutmp: Make argument names consistent. * lib/readutmp.h (UT_TIME_MEMBER, UT_EXIT_E_TERMINATION, UT_EXIT_E_EXIT, UT_USER, UT_PID, UT_TYPE_EQ, UT_TYPE_BOOT_TIME, UT_TYPE_USER_PROCESS, IS_USER_PROCESS): Rename parameter to 'UT'. * lib/readutmp.c (desirable_utmp_entry, read_utmp): Rename local variable 'u' to 'ut'. --- diff --git a/ChangeLog b/ChangeLog index d3bc0c13ae..a26958d8b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2023-07-31 Bruno Haible + + readutmp: Make argument names consistent. + * lib/readutmp.h (UT_TIME_MEMBER, UT_EXIT_E_TERMINATION, UT_EXIT_E_EXIT, + UT_USER, UT_PID, UT_TYPE_EQ, UT_TYPE_BOOT_TIME, UT_TYPE_USER_PROCESS, + IS_USER_PROCESS): Rename parameter to 'UT'. + * lib/readutmp.c (desirable_utmp_entry, read_utmp): Rename local + variable 'u' to 'ut'. + 2023-07-31 Bruno Haible readutmp: Make the header file and function usable on all platforms. diff --git a/lib/readutmp.c b/lib/readutmp.c index af43d1ad6b..82dbe69506 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -63,18 +63,18 @@ extract_trimmed_name (const STRUCT_UTMP *ut) #if READ_UTMP_SUPPORTED -/* Is the utmp entry U desired by the user who asked for OPTIONS? */ +/* Is the utmp entry UT desired by the user who asked for OPTIONS? */ static bool -desirable_utmp_entry (STRUCT_UTMP const *u, int options) +desirable_utmp_entry (STRUCT_UTMP const *ut, int options) { - bool user_proc = IS_USER_PROCESS (u); + bool user_proc = IS_USER_PROCESS (ut); if ((options & READ_UTMP_USER_PROCESS) && !user_proc) return false; if ((options & READ_UTMP_CHECK_PIDS) && user_proc - && 0 < UT_PID (u) - && (kill (UT_PID (u), 0) < 0 && errno == ESRCH)) + && 0 < UT_PID (ut) + && (kill (UT_PID (ut), 0) < 0 && errno == ESRCH)) return false; return true; } @@ -133,7 +133,7 @@ read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf, idx_t n_read = 0; idx_t n_alloc = 0; STRUCT_UTMP *utmp = NULL; - STRUCT_UTMP *u; + STRUCT_UTMP *ut; /* Ignore the return value for now. Solaris' utmpname returns 1 upon success -- which is contrary @@ -143,13 +143,13 @@ read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf, SET_UTMP_ENT (); - while ((u = GET_UTMP_ENT ()) != NULL) - if (desirable_utmp_entry (u, options)) + while ((ut = GET_UTMP_ENT ()) != NULL) + if (desirable_utmp_entry (ut, options)) { if (n_read == n_alloc) utmp = xpalloc (utmp, &n_alloc, 1, -1, sizeof *utmp); - copy_utmp_entry (&utmp[n_read++], u); + copy_utmp_entry (&utmp[n_read++], ut); } END_UTMP_ENT (); diff --git a/lib/readutmp.h b/lib/readutmp.h index d710699525..0ddd724c22 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -50,7 +50,7 @@ # endif # include # define UTMP_STRUCT_NAME utmpx -# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec) +# define UT_TIME_MEMBER(UT) ((UT)->ut_tv.tv_sec) # define SET_UTMP_ENT setutxent # define GET_UTMP_ENT getutxent # define END_UTMP_ENT endutxent @@ -61,22 +61,22 @@ # endif # if HAVE_STRUCT_UTMPX_UT_EXIT_E_TERMINATION -# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.e_termination) # else # if HAVE_STRUCT_UTMPX_UT_EXIT_UT_TERMINATION -# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.ut_termination) # else -# define UT_EXIT_E_TERMINATION(U) 0 +# define UT_EXIT_E_TERMINATION(UT) 0 # endif # endif # if HAVE_STRUCT_UTMPX_UT_EXIT_E_EXIT -# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.e_exit) # else # if HAVE_STRUCT_UTMPX_UT_EXIT_UT_EXIT -# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.ut_exit) # else -# define UT_EXIT_E_EXIT(U) 0 +# define UT_EXIT_E_EXIT(UT) 0 # endif # endif @@ -87,7 +87,7 @@ struct utmp *getutent (void); # endif # define UTMP_STRUCT_NAME utmp -# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_time) +# define UT_TIME_MEMBER(UT) ((UT)->ut_time) # define SET_UTMP_ENT setutent # define GET_UTMP_ENT getutent # define END_UTMP_ENT endutent @@ -96,22 +96,22 @@ # endif # if HAVE_STRUCT_UTMP_UT_EXIT_E_TERMINATION -# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.e_termination) # else # if HAVE_STRUCT_UTMP_UT_EXIT_UT_TERMINATION -# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# define UT_EXIT_E_TERMINATION(UT) ((UT)->ut_exit.ut_termination) # else -# define UT_EXIT_E_TERMINATION(U) 0 +# define UT_EXIT_E_TERMINATION(UT) 0 # endif # endif # if HAVE_STRUCT_UTMP_UT_EXIT_E_EXIT -# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.e_exit) # else # if HAVE_STRUCT_UTMP_UT_EXIT_UT_EXIT -# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# define UT_EXIT_E_EXIT(UT) ((UT)->ut_exit.ut_exit) # else -# define UT_EXIT_E_EXIT(U) 0 +# define UT_EXIT_E_EXIT(UT) 0 # endif # endif @@ -129,9 +129,9 @@ struct gl_utmp struct timeval ut_tv; }; # define UTMP_STRUCT_NAME gl_utmp -# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec) -# define UT_EXIT_E_TERMINATION(U) 0 -# define UT_EXIT_E_EXIT(U) 0 +# define UT_TIME_MEMBER(UT) ((UT)->ut_tv.tv_sec) +# define UT_EXIT_E_TERMINATION(UT) 0 +# define UT_EXIT_E_EXIT(UT) 0 # endif @@ -139,26 +139,26 @@ struct gl_utmp # if HAVE_UTMPX_H # if HAVE_STRUCT_UTMPX_UT_USER -# define UT_USER(Utmp) ((Utmp)->ut_user) +# define UT_USER(UT) ((UT)->ut_user) # endif # if HAVE_STRUCT_UTMPX_UT_NAME # undef UT_USER -# define UT_USER(Utmp) ((Utmp)->ut_name) +# define UT_USER(UT) ((UT)->ut_name) # endif # elif HAVE_UTMP_H # if HAVE_STRUCT_UTMP_UT_USER -# define UT_USER(Utmp) ((Utmp)->ut_user) +# define UT_USER(UT) ((UT)->ut_user) # endif # if HAVE_STRUCT_UTMP_UT_NAME # undef UT_USER -# define UT_USER(Utmp) ((Utmp)->ut_name) +# define UT_USER(UT) ((UT)->ut_name) # endif # else /* dummy fallback */ -# define UT_USER(Utmp) ((Utmp)->ut_user) +# define UT_USER(UT) ((UT)->ut_user) # endif @@ -210,38 +210,38 @@ enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) }; /* Accessor macro for the member named ut_pid. */ # if HAVE_STRUCT_XTMP_UT_PID -# define UT_PID(U) ((U)->ut_pid) +# define UT_PID(UT) ((UT)->ut_pid) # else -# define UT_PID(U) 0 +# define UT_PID(UT) 0 # endif /* Accessor macros for the member named ut_type. */ # if HAVE_STRUCT_UTMP_UT_TYPE || HAVE_STRUCT_UTMPX_UT_TYPE -# define UT_TYPE_EQ(U, V) ((U)->ut_type == (V)) +# define UT_TYPE_EQ(UT, V) ((UT)->ut_type == (V)) # define UT_TYPE_NOT_DEFINED 0 # else -# define UT_TYPE_EQ(U, V) 0 +# define UT_TYPE_EQ(UT, V) 0 # define UT_TYPE_NOT_DEFINED 1 # endif # ifdef BOOT_TIME -# define UT_TYPE_BOOT_TIME(U) UT_TYPE_EQ (U, BOOT_TIME) +# define UT_TYPE_BOOT_TIME(UT) UT_TYPE_EQ (UT, BOOT_TIME) # else -# define UT_TYPE_BOOT_TIME(U) 0 +# define UT_TYPE_BOOT_TIME(UT) 0 # endif # ifdef USER_PROCESS -# define UT_TYPE_USER_PROCESS(U) UT_TYPE_EQ (U, USER_PROCESS) +# define UT_TYPE_USER_PROCESS(UT) UT_TYPE_EQ (UT, USER_PROCESS) # else -# define UT_TYPE_USER_PROCESS(U) 0 +# define UT_TYPE_USER_PROCESS(UT) 0 # endif -/* Determines whether an entry *U corresponds to a user process. */ -# define IS_USER_PROCESS(U) \ - (UT_USER (U)[0] \ - && (UT_TYPE_USER_PROCESS (U) \ - || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (U) != 0))) +/* Determines whether an entry *UT corresponds to a user process. */ +# define IS_USER_PROCESS(UT) \ + (UT_USER (UT)[0] \ + && (UT_TYPE_USER_PROCESS (UT) \ + || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (UT) != 0))) /* Define if read_utmp is not just a dummy. */ # if HAVE_UTMPX_H || HAVE_UTMP_H