From nobody Sun Feb 8 04:30:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1549963320233753.7713906333488; Tue, 12 Feb 2019 01:22:00 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95EADB655; Tue, 12 Feb 2019 09:21:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6001E5C23F; Tue, 12 Feb 2019 09:21:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0678A1819AFF; Tue, 12 Feb 2019 09:21:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1C9LZiZ023911 for ; Tue, 12 Feb 2019 04:21:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9A98C5C229; Tue, 12 Feb 2019 09:21:35 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FFEE5C21A for ; Tue, 12 Feb 2019 09:21:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 12 Feb 2019 10:21:20 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/9] vsh-table: allow empty columns X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 12 Feb 2019 09:21:58 +0000 (UTC) Trivially implement this by deleting the bogus check in vshTableSafeEncode. Now it returns an empty string for an empty string instead of returning NULL without setting an error. Signed-off-by: J=C3=A1n Tomko --- tests/vshtabletest.c | 4 +++- tools/vsh-table.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 79285b14a9..b07db3cf23 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -291,7 +291,8 @@ testNTables(const void *opaque ATTRIBUTE_UNUSED) " Id Name Status\n" "--------------------------\n" " 1 fedora28 running\n" - " 2 rhel7.5 running\n"; + " 2 rhel7.5 running\n" + " 3 gazpacho \n"; const char *exp2 =3D " Id Name Status\n" "---------------------\n"; @@ -311,6 +312,7 @@ testNTables(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; vshTableRowAppend(table1, "1", "fedora28", "running", NULL); vshTableRowAppend(table1, "2", "rhel7.5", "running", NULL); + vshTableRowAppend(table1, "3", "gazpacho", "", NULL); act1 =3D vshTablePrintToString(table1, true); =20 table2 =3D vshTableNew("Id", "Name", "Status", NULL); diff --git a/tools/vsh-table.c b/tools/vsh-table.c index fda8f15879..8bd6d99778 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -219,9 +219,6 @@ vshTableSafeEncode(const char *s, size_t *width) =20 memset(&st, 0, sizeof(st)); =20 - if (!sz) - return NULL; - if (VIR_ALLOC_N(buf, (sz * HEX_ENCODE_LENGTH) + 1) < 0) return NULL; =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list