From 4b0ae5121246c3a840f2e8de140aa271f8ccc292 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Tue, 28 May 2013 21:21:46 +0000 Subject: [PATCH] MFp4 @229085: Rearrange the code so we don't call ioctl(TIOCGWINSZ) if the -s option is given, as the result won't be used then. Sponsored by: The FreeBSD Foundation --- usr.bin/kdump/kdump.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 82317f2c576..b06b4ab0a4c 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1205,6 +1205,11 @@ ktrgenio(struct ktr_genio *ktr, int len) static int screenwidth = 0; int i, binary; + printf("fd %d %s %d byte%s\n", ktr->ktr_fd, + ktr->ktr_rw == UIO_READ ? "read" : "wrote", datalen, + datalen == 1 ? "" : "s"); + if (suppressdata) + return; if (screenwidth == 0) { struct winsize ws; @@ -1214,11 +1219,6 @@ ktrgenio(struct ktr_genio *ktr, int len) else screenwidth = 80; } - printf("fd %d %s %d byte%s\n", ktr->ktr_fd, - ktr->ktr_rw == UIO_READ ? "read" : "wrote", datalen, - datalen == 1 ? "" : "s"); - if (suppressdata) - return; if (maxdata && datalen > maxdata) datalen = maxdata;