SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-utmp: replace UT_LINESIZE/UT_NAMESIZE/UT_HOSTSIZE with sizeof_field()

Browse Source 
utmpx doesn't know these defines, hence fix them.
This commit is contained in:
Lennart Poettering
2024-09-06 13:54:15 +02:00
parent 983fee2e94
commit 98dc726902
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-utmp.c
+6 -12
View File
@@ -7,15 +7,9 @@
#include "utmp-wtmp.h"
#include "tests.h"
#ifndef UT_LINESIZE
# define UT_LINESIZE 32
#endif
#ifndef UT_NAMESIZE
# define UT_NAMESIZE 32
#endif
#ifndef UT_HOSTSIZE
# define UT_HOSTSIZE 256
#endif
#define UTX_LINESIZE sizeof_field(struct utmpx, ut_line)
#define UTX_NAMESIZE sizeof_field(struct utmpx, ut_user)
#define UTX_HOSTSIZE sizeof_field(struct utmpx, ut_host)
TEST(dump_run_utmp) {
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
@@ -46,11 +40,11 @@ TEST(dump_run_utmp) {
log_info("%14s %10"PID_PRI" line=%-7.*s id=%-4.4s name=%-8.*s session=%lu host=%.*s addr=%s",
type,
u->ut_pid,
UT_LINESIZE, u->ut_line,
(int) UTX_LINESIZE, u->ut_line,
u->ut_id,
UT_NAMESIZE, u->ut_user,
(int) UTX_NAMESIZE, u->ut_user,
(long unsigned) u->ut_session,
UT_HOSTSIZE, u->ut_host,
(int) UTX_HOSTSIZE, u->ut_host,
IN_ADDR_TO_STRING(is_ipv4 ? AF_INET : AF_INET6, &addr));
}
}