From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Brivio Subject: [PATCH iproute2 net-next 1/3] ss: Discard empty descriptor at the end of buffer, if any, before rendering Date: Tue, 30 Oct 2018 16:05:18 +0100 Message-ID: <664b3a17a1902a5fc25e5888aaf38fbc6152122d.1540910943.git.sbrivio@redhat.com> References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: "Yoann P." , Stephen Hemminger , netdev@vger.kernel.org To: David Ahern Return-path: Received: from mx1.redhat.com ([209.132.183.28]:37804 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726135AbeJ3X7Y (ORCPT ); Tue, 30 Oct 2018 19:59:24 -0400 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: This will allow us to disable display of any given column. Signed-off-by: Stefano Brivio --- misc/ss.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index c8970438ce73..c3f61ef66258 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1245,8 +1245,15 @@ static void render(void) token = (struct buf_token *)buffer.head->data; - /* Ensure end alignment of last token, it wasn't necessarily flushed */ - buffer.tail->end += buffer.cur->len % 2; + if (!buffer.cur->len) { + /* Last token was flushed, a new empty descriptor was appended: + * discard it + */ + buffer.tail->end -= sizeof(buffer.cur->len); + } else { + /* Last token wasn't flushed: ensure end alignment */ + buffer.tail->end += buffer.cur->len % 2; + } render_calc_width(); -- 2.19.1