From patchwork Thu May 22 14:57:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 351517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C9FE3140084 for ; Fri, 23 May 2014 01:00:15 +1000 (EST) Received: from localhost ([::1]:38032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUTd-00043A-O7 for incoming@patchwork.ozlabs.org; Thu, 22 May 2014 11:00:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUR7-0000Dn-Tc for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnUQx-0003Kk-7c for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUQw-0003KB-W5 for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:27 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4MEvPPJ019987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 May 2014 10:57:25 -0400 Received: from blackfin.pond.sub.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4MEvNdC028396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 22 May 2014 10:57:25 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1B4383042B74; Thu, 22 May 2014 16:57:23 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 22 May 2014 16:57:16 +0200 Message-Id: <1400770642-18196-2-git-send-email-armbru@redhat.com> In-Reply-To: <1400770642-18196-1-git-send-email-armbru@redhat.com> References: <1400770642-18196-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: alevy@redhat.com Subject: [Qemu-devel] [PATCH 1/7] libcacard/vscclient: Bury some dead code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Spotted by Coverity. Signed-off-by: Markus Armbruster --- libcacard/vscclient.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index 3477ab3..29f4958 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -502,8 +502,7 @@ do_command(GIOChannel *source, if (reader != NULL) { error = vcard_emul_force_card_insert(reader); printf("insert %s, returned %d\n", - reader ? vreader_get_name(reader) - : "invalid reader", error); + vreader_get_name(reader), error); } else { printf("no reader by id %u found\n", reader_id); } @@ -515,8 +514,7 @@ do_command(GIOChannel *source, if (reader != NULL) { error = vcard_emul_force_card_remove(reader); printf("remove %s, returned %d\n", - reader ? vreader_get_name(reader) - : "invalid reader", error); + vreader_get_name(reader), error); } else { printf("no reader by id %u found\n", reader_id); }