From b0c9067d7b93d240363167e0778a86eae939eb4d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 2 Jan 2003 20:32:33 +0000 Subject: Update. 2003-01-02 Art Haas * login/tst-utmp.c: Convert GCC extension initializer syntax to C99. 2003-01-02 Ulrich Drepper * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * nscd/nscd_nischeck.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Use union type to avoid strict aliasing problem. (_nss_dns_gethostbyname2_r): Likewise. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. (_nss_dns_getnetbyname_r): Likewise. --- login/tst-utmp.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'login') diff --git a/login/tst-utmp.c b/login/tst-utmp.c index e008bcb320..12a2088558 100644 --- a/login/tst-utmp.c +++ b/login/tst-utmp.c @@ -1,5 +1,5 @@ /* Tests for UTMP functions. - Copyright (C) 1998, 2001-2002 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis , 1998. @@ -77,23 +77,23 @@ do_prepare (int argc, char *argv[]) struct utmp entry[] = { #if _HAVE_UT_TV || defined UTMPX -#define UT(a) ut_tv:{tv_sec:(a)} +#define UT(a) .ut_tv = { .tv_sec = (a)} #else -#define UT(a) ut_time:(a) +#define UT(a) .ut_time = (a) #endif - { ut_type: BOOT_TIME, ut_pid: 1, UT(1000) }, - { ut_type: RUN_LVL, ut_pid: 1, UT(2000) }, - { ut_type: INIT_PROCESS, ut_pid: 5, ut_id: "si", UT(3000) }, - { ut_type: LOGIN_PROCESS, ut_pid: 23, ut_line: "tty1", ut_id: "1", - ut_user: "LOGIN", UT(4000) }, - { ut_type: USER_PROCESS, ut_pid: 24, ut_line: "tty2", ut_id: "2", - ut_user: "albert", UT(8000) }, - { ut_type: USER_PROCESS, ut_pid: 196, ut_line: "ttyp0", ut_id: "p0", - ut_user: "niels", UT(10000) }, - { ut_type: DEAD_PROCESS, ut_line: "ttyp1", ut_id: "p1", UT(16000) }, - { ut_type: EMPTY }, - { ut_type: EMPTY } + { .ut_type = BOOT_TIME, .ut_pid = 1, UT(1000) }, + { .ut_type = RUN_LVL, .ut_pid = 1, UT(2000) }, + { .ut_type = INIT_PROCESS, .ut_pid = 5, .ut_id = "si", UT(3000) }, + { .ut_type = LOGIN_PROCESS, .ut_pid = 23, .ut_line = "tty1", .ut_id = "1", + .ut_user = "LOGIN", UT(4000) }, + { .ut_type = USER_PROCESS, .ut_pid = 24, .ut_line = "tty2", .ut_id = "2", + .ut_user = "albert", UT(8000) }, + { .ut_type = USER_PROCESS, .ut_pid = 196, .ut_line = "ttyp0", .ut_id = "p0", + .ut_user = "niels", UT(10000) }, + { .ut_type = DEAD_PROCESS, .ut_line = "ttyp1", .ut_id = "p1", UT(16000) }, + { .ut_type = EMPTY }, + { .ut_type = EMPTY } }; int num_entries = sizeof entry / sizeof (struct utmp); -- cgit v1.2.3