Skip to content

Commit 58a8c92

Browse files
t-8cht-8ch
committed
libsmartcols: don't include hidden headers in column width calculation
Fixes util-linux#2380 Signed-off-by: Thomas Weißschuh <[email protected]>
1 parent baef265 commit 58a8c92

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+214
-200
lines changed

‎libsmartcols/src/calculate.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ static int count_column_width(struct libscols_table *tb,
175175
}
176176

177177
/* set minimal width according to header width */
178-
data = scols_cell_get_data(&cl->header);
179-
if (data) {
178+
if (!scols_table_is_noheadings(tb) &&
179+
(data = scols_cell_get_data(&cl->header))) {
180+
180181
size_t len = scols_table_is_noencoding(tb) ?
181182
mbs_width(data) : mbs_safe_width(data);
182183

‎tests/expected/column/table-noheaders

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
AAA BBBB C DDDD
2+
A BBB CCCC DDD
3+
AA BB CCC DD
4+
AAAA B CC D
5+
AA BB CC DD
6+
AAAAA BBB CCC DDDD

‎tests/expected/fincore/count.4096

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
[ NO EXCITING FILE ]
22
return value: 1
3-
0 0 i_EMPTY_FILE
3+
0 0 i_EMPTY_FILE
44
return value: 0
5-
1 4095 i_PAGESIZE_-1__incore_
5+
1 4095 i_PAGESIZE_-1__incore_
66
return value: 0
7-
1 4096 i_JUST_PAGESIZE_incore_
7+
1 4096 i_JUST_PAGESIZE_incore_
88
return value: 0
9-
0 4096 i_JUST_PAGESIZE_directio_
9+
0 4096 i_JUST_PAGESIZE_directio_
1010
return value: 0
11-
2 8192 i_TWO_PAGES_incore_
11+
2 8192 i_TWO_PAGES_incore_
1212
return value: 0
13-
0 8192 i_TWO_PAGES_directio_
13+
0 8192 i_TWO_PAGES_directio_
1414
return value: 0
15-
1 8192 i_TWO_PAGES_mixed_directio_incore_
15+
1 8192 i_TWO_PAGES_mixed_directio_incore_
1616
return value: 0
17-
1 8192 i_TWO_PAGES_mixed_incore_directio_
17+
1 8192 i_TWO_PAGES_mixed_incore_directio_
1818
return value: 0
19-
2 134213632 i_WINDOW_SIZE_incore-sparse-incore_
19+
2 134213632 i_WINDOW_SIZE_incore-sparse-incore_
2020
return value: 0
21-
0 134213632 i_WINDOW_SIZE_directio-sparse-directio_
21+
0 134213632 i_WINDOW_SIZE_directio-sparse-directio_
2222
return value: 0
23-
1 134213632 i_WINDOW_SIZE_incore-sparse-directio_
23+
1 134213632 i_WINDOW_SIZE_incore-sparse-directio_
2424
return value: 0
25-
1 134213632 i_WINDOW_SIZE_directio-sparse-incore_
25+
1 134213632 i_WINDOW_SIZE_directio-sparse-incore_
2626
return value: 0
27-
2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
27+
2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_
2828
return value: 0
29-
0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
29+
0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_
3030
return value: 0
31-
1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
31+
1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_
3232
return value: 0
33-
1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
33+
1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_
3434
return value: 0
3535
[ MULTIPLE FILES ]
3636
PAGES SIZE FILE

‎tests/expected/lsfd/column-ainodeclass-inotify

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 UNKN inotify
1+
3 UNKN inotify
22
inotify:ASSOC,STTYPE,AINODECLASS: 0

‎tests/expected/lsfd/column-ainodeclass-pidfd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 UNKN pidfd
1+
3 UNKN pidfd
22
pidfd:ASSOC,STTYPE,AINODECLASS: 0

‎tests/expected/lsfd/column-deleted-make-regular-file

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1
1+
1
22
make-regular-file: DELETED: 0

‎tests/expected/lsfd/column-deleted-ro-regular-file

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
0
1+
0
22
ro-regular-file: DELETED: 0

‎tests/expected/lsfd/column-name-pidfd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 anon_inode:[pidfd] pid=1 comm= nspid=1
1+
3 anon_inode:[pidfd] pid=1 comm= nspid=1
22
pidfd:ASSOC,KNAME,NAME: 0

‎tests/expected/lsfd/column-name-ro-regular-file

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 /etc/passwd /etc/passwd
1+
3 /etc/passwd /etc/passwd
22
ro-regular-file:ASSOC,KNAME,NAME: 0

‎tests/expected/lsfd/column-name-socketpair

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 socket:[INODENUM] state=connected type=dgram
1+
3 socket:[INODENUM] state=connected type=dgram
22
socketpair:ASSOC,KNAME,NAME: 0

‎tests/expected/lsfd/column-source-namespace-ASSOC

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ipc nsfs
2-
mnt nsfs
3-
net nsfs
4-
pid nsfs
5-
pid4c nsfs
6-
user nsfs
7-
uts nsfs
1+
ipc nsfs
2+
mnt nsfs
3+
net nsfs
4+
pid nsfs
5+
pid4c nsfs
6+
user nsfs
7+
uts nsfs

‎tests/expected/lsfd/column-source-with-root-SysVIPC-shmem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
shm tmpfs
1+
shm tmpfs
22
ASSOC,SOURCE: 0

‎tests/expected/lsfd/column-type-inotify

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 UNKN inotify
1+
3 UNKN inotify
22
inotify:ASSOC,STTYPE,TYPE: 0

‎tests/expected/lsfd/column-type-pidfd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 UNKN pidfd
1+
3 UNKN pidfd
22
pidfd:ASSOC,STTYPE,TYPE: 0

‎tests/expected/lsfd/column-type-ro-regular-file

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 REG REG
1+
3 REG REG
22
ro-regular-file:ASSOC,STTYPE,TYPE: 0

‎tests/expected/lsfd/column-type-socketpair

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 SOCK UNIX
1+
3 SOCK UNIX
22
socketpair:ASSOC,STTYPE,TYPE: 0

‎tests/expected/lsfd/column-xmode-MODE-r-bit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
r--
1+
r--
22
MODE(r-bit): 0

‎tests/expected/lsfd/column-xmode-MODE-w-bit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
-w-
1+
-w-
22
MODE(w-bit): 0

‎tests/expected/lsfd/column-xmode-MODE-x-bit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
r-x
1+
r-x
22
MODE(x-bit): 0

‎tests/expected/lsfd/filter-floating-point-nums

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
pid in a range: 0
22
coparing pids: 0
3-
3 10.000050000
3+
3 10.000050000
44
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10.000051) and (TIMERFD.INTERVAL > 10): 0
55
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL <= 10) and (TIMERFD.INTERVAL > 9.99): 0
6-
3 10.000050000
6+
3 10.000050000
77
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10): 0
8-
3 10.000050000
8+
3 10.000050000
99
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10.0): 0
1010
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0 < TIMERFD.INTERVAL): 0
1111
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0.0 < TIMERFD.INTERVAL): 0
1212
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL > 11): 0
13-
3 10.000050000
13+
3 10.000050000
1414
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.00005): 0
1515
FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.000051): 0

‎tests/expected/lsfd/mkfds-cdev-tun

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 rw- CHR misc:tun
1+
3 rw- CHR misc:tun
22
ASSOC,MODE,TYPE,SOURCE: 0
33
NAME: 0
44
TUN.IFACE: 0

‎tests/expected/lsfd/mkfds-directory

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 r-- DIR directory /
1+
3 r-- DIR directory /
22
ASSOC,MODE,TYPE,FLAGS,NAME: 0
33
PID[RUN]: 0
44
PID[STR]: 0

‎tests/expected/lsfd/mkfds-eventfd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
3 rw- eventfd anon_inodefs
1+
3 rw- eventfd anon_inodefs
22
parent: ASSOC,MODE,TYPE,SOURCE: 0
33
parent: NAME: 0
44
parent: ID: 0
5-
4 rw- eventfd anon_inodefs
5+
4 rw- eventfd anon_inodefs
66
child: ASSOC,MODE,TYPE,SOURCE: 0
77
child: NAME: 0
88
child: ID: 0

‎tests/expected/lsfd/mkfds-eventpoll

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
3 eventpoll tfds=5,7 5
2-
7
1+
3 eventpoll tfds=5,7 5
2+
7
33
ASSOC,TYPE,NAME,EVENTPOLL.TFDS: 0
44
{
55
"lsfd": [

‎tests/expected/lsfd/mkfds-mapped-packet-socket

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
PACKET
1+
PACKET
22
SOCK.PROTONAME: 0
3-
type=raw protocol=all iface=lo raw PACKET lo all
3+
type=raw protocol=all iface=lo raw PACKET lo all
44
NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0
5-
PACKET
5+
PACKET
66
SOCK.PROTONAME: 0
7-
type=dgram protocol=all iface=lo dgram PACKET lo all
7+
type=dgram protocol=all iface=lo dgram PACKET lo all
88
NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0

‎tests/expected/lsfd/mkfds-mqueue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
3 r-- mqueue mqueue /mkfds-mqueue
1+
3 r-- mqueue mqueue /mkfds-mqueue
22
parent: ASSOC,MODE,TYPE,SOURCE,NAME: 0
33
parent: INODE: 0
4-
4 -w- mqueue mqueue
4+
4 -w- mqueue mqueue
55
child: ASSOC,MODE,TYPE,SOURCE: 0
66
child: INODE: 0
77
INODE[STR]: 0

‎tests/expected/lsfd/mkfds-netlink-groups

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5
1+
3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL,NETLINK.GROUPS: 0
33
LPORT: OK

‎tests/expected/lsfd/mkfds-netlink-protocol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
3 NETLINK protocol=sock_diag lport= raw sock_diag 0
1+
3 NETLINK protocol=sock_diag lport= raw sock_diag 0
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL: 0
33
LPORT: OK

‎tests/expected/lsfd/mkfds-netns

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
net
1+
net
22
NAME_FD == NAME_NS: 0
33
NAME_FD == net:[INO_FD]: 0
44
NAME_FD == net:[INO_NS]: 0

‎tests/expected/lsfd/mkfds-pidfd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1
1+
3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1
22
ASSOC,STTYPE,SOURCE,NAME,PIDFD.COMM,PIDFD.PID: 0

‎tests/expected/lsfd/mkfds-ping-ping

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999
1+
3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0
3-
3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999
3+
3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999
44
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0

‎tests/expected/lsfd/mkfds-ping-ping6

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999
1+
3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0
3-
3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999
3+
3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999
44
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0

‎tests/expected/lsfd/mkfds-pipe-no-fork

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
3 r-- FIFO pipefs
2-
4 -w- FIFO pipefs wronly,nonblock
1+
3 r-- FIFO pipefs
2+
4 -w- FIFO pipefs wronly,nonblock
33
ASSOC,MODE,TYPE,SOURCE,FLAGS: 0
44
PID[RUN]: 0
55
PID[STR]: 0

‎tests/expected/lsfd/mkfds-raw

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5
1+
3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,RAW.PROTOCOL: 0

‎tests/expected/lsfd/mkfds-raw6

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5
1+
3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5
22
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,RAW.PROTOCOL: 0

‎tests/expected/lsfd/mkfds-ro-block-device

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 r-- BLK 0 loop blk
1+
3 r-- BLK 0 loop blk
22
ASSOC,MODE,TYPE,,POS,,BLKDRV,DEVTYPE: 0
33
NAME[RUN]: 0
44
NAME[STR]: 0

‎tests/expected/lsfd/mkfds-ro-regular-file

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ABC 3 r-- REG /etc/passwd 1
1+
ABC 3 r-- REG /etc/passwd 1
22
COMMAND,ASSOC,MODE,TYPE,NAME,POS: 0
33
PID[RUN]: 0
44
PID[STR]: 0

‎tests/expected/lsfd/mkfds-rw-character-device

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
1+
3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
22
ASSOC,MODE,TYPE,NAME,SOURCE,POS,MAJ:MIN,CHRDRV,DEVTYPE,RDEV: 0
33
DEV[RUN]: 0
44
STAT[RUN]: 0

‎tests/expected/lsfd/mkfds-signalfd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 signalfd mask=FPE,USR1,42 FPE,USR1,42
1+
3 signalfd mask=FPE,USR1,42 FPE,USR1,42
22
ASSOC,TYPE,NAME,SIGNALFD.MASK: 0

‎tests/expected/lsfd/mkfds-socketpair

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
3 rw- SOCK sockfs UNIX
2-
4 rw- SOCK sockfs UNIX
1+
3 rw- SOCK sockfs UNIX
2+
4 rw- SOCK sockfs UNIX
33
ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0

‎tests/expected/lsfd/mkfds-symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3 --- LINK /dev/stdin nofollow,path
1+
3 --- LINK /dev/stdin nofollow,path
22
ASSOC,MODE,TYPE,NAME,FLAGS: 0

‎tests/expected/lsfd/mkfds-tcp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 TCP SOCK state=listen laddr=127.0.0.1:34567 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
2-
4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
3-
5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456
1+
3 TCP SOCK state=listen laddr=127.0.0.1:34567 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
2+
4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
3+
5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456
44
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0

‎tests/expected/lsfd/mkfds-tcp6

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3 TCPv6 SOCK state=listen laddr=[::1]:34567 listen stream 1 ::1 :: [::1]:34567 34567 [::]:0 0
2-
4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
3-
5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456
1+
3 TCPv6 SOCK state=listen laddr=[::1]:34567 listen stream 1 ::1 :: [::1]:34567 34567 [::]:0 0
2+
4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
3+
5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456
44
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0

‎tests/expected/lsfd/mkfds-timerfd-alarm

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
3 timerfd clockid=realtime-alarm
1+
3 timerfd clockid=realtime-alarm
22
ASSOC,TYPE,NAME: 0
3-
realtime-alarm
3+
realtime-alarm
44
CLOCKID: 0
5-
0.000000000
5+
0.000000000
66
TIMERFD.REMAINING: 0
7-
0.000000000
7+
0.000000000
88
TIMERFD.INTERVAL: 0
9-
3 timerfd clockid=boottime-alarm
9+
3 timerfd clockid=boottime-alarm
1010
ASSOC,TYPE,NAME: 0
11-
boottime-alarm
11+
boottime-alarm
1212
CLOCKID: 0
13-
0.000000000
13+
0.000000000
1414
TIMERFD.REMAINING: 0
15-
0.000000000
15+
0.000000000
1616
TIMERFD.INTERVAL: 0

‎tests/expected/lsfd/mkfds-timerfd-boottime-interval-only

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
3 timerfd clockid=boottime interval=10.123456789
1+
3 timerfd clockid=boottime interval=10.123456789
22
ASSOC,TYPE,NAME: 0
3-
boottime
3+
boottime
44
CLOCKID: 0
5-
0.000000000
5+
0.000000000
66
TIMERFD.REMAINING: 0
7-
10.123456789
7+
10.123456789
88
TIMERFD.INTERVAL: 0

‎tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
3 timerfd clockid=monotonic remaining=100.987654321
1+
3 timerfd clockid=monotonic remaining=100.987654321
22
ASSOC,TYPE,NAME: 0
3-
monotonic
3+
monotonic
44
CLOCKID: 0
55
100.987654321
66
TIMERFD.REMAINING: 0
7-
0.000000000
7+
0.000000000
88
TIMERFD.INTERVAL: 0

‎tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
3 timerfd clockid=realtime remaining=100.987654321 interval=5.123456789
1+
3 timerfd clockid=realtime remaining=100.987654321 interval=5.123456789
22
ASSOC,TYPE,NAME: 0
3-
realtime
3+
realtime
44
CLOCKID: 0
55
100.987654321
66
TIMERFD.REMAINING: 0
7-
5.123456789
7+
5.123456789
88
TIMERFD.INTERVAL: 0

0 commit comments

Comments
 (0)