dmesg: --notime should not suppress --show-delta

The --show-delta is off by default, which means it can be only on when user
has requested to see these time stamps.  The --notime option should not turn
the delta outputing off, because then option order matters and no-one wants
that.  Example of the old output:

$ dmesg --notime --show-delta | sed -n 's/ version.*//p; q'
[<    0.000000>] Linux
$ dmesg --show-delta --notime | sed -n 's/ version.*//p; q'
Linux

Addresses: https://bugs.launchpad.net/bugs/1544595
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 99cf26e37e92d657f635626866670f5a4fa1b501..cf93331418f681679361ceda0f82ff3bd5d68457 100644 (file)
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1363,7 +1363,6 @@ int main(int argc, char *argv[])
                        break;
                case 't':
                        ctl.time_fmt = DMESG_TIMEFTM_NONE;
-                       delta = 0;
                        break;
                case 'u':
                        ctl.fltr_fac = 1;