From nobody Mon Feb 9 00:30:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622812273; cv=none; d=zohomail.com; s=zohoarc; b=P80DKAvL+tCrp+vUhe1b1Miearx2OtdFKjY7krDfk0sOM+LNtLUlh3Zx5aNDTCAkSvs9bCCpSfFibP5rbwOJCpDlfHm8C/NSEQcLePeHSJQUlNvkExcYYtvcV0bkqKNOk79JBgigrNSuP2iOd6ISxaF3HPpRBVkZo1biaHU5ddc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622812273; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VaN1I0Bm2t5RF02SUyNGUvNOqy90Hoszj+58J3W6d7g=; b=GZC8Isji8kpM3fI6mhN8NY5ZbcTeLQeAlkwiC1Vk6h4TJjr/cR3lwobwHjGmBc6xJkgn2OsERziIEplBwMFPNL/vlccEE2eQ9GfbPpBXxXb7LnIGtxMLTneVcbX3EsaZuc6qkOJrKVZdVj2khYPmQqK0+QJH2hVgcPlswW6D4uE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622812273804644.4235345709553; Fri, 4 Jun 2021 06:11:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-465-c-bmqGbHOpm0kgr3E4vYEQ-1; Fri, 04 Jun 2021 09:11:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5210610074A7; Fri, 4 Jun 2021 13:11:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6DDF39A66; Fri, 4 Jun 2021 13:11:03 +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 BC72344A58; Fri, 4 Jun 2021 13:11:01 +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 154DAqPr026526 for ; Fri, 4 Jun 2021 09:10:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2605A5C26D; Fri, 4 Jun 2021 13:10:52 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E2635C1C5 for ; Fri, 4 Jun 2021 13:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622812272; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VaN1I0Bm2t5RF02SUyNGUvNOqy90Hoszj+58J3W6d7g=; b=f5sZ/m62gWhbiv8avb312vnNmPbqBmPd0xpRafytFEr/TBfd76+cW6GdSnjY7YCfrtmYfw RVyr3Cow5+8MorZqzU00G0DHlxzh5m20yKjeq9Q0T6+2Kf+5UW4amMVvgAkw+O4Dk6+QPF enoOEEx8RVVixrxGzg6p1/lBn6sXfGk= X-MC-Unique: c-bmqGbHOpm0kgr3E4vYEQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/6] chExtractVersionInfo: Don't check for retversion != NULL Date: Fri, 4 Jun 2021 15:10:41 +0200 Message-Id: <5d3b6deaafba09c607afb1705b61d895b3e694ab.1622812176.git.mprivozn@redhat.com> 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 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The only caller, chExtractVersion() passes not NULL. Therefore, it's redundant to check for NULL. Signed-off-by: Michal Privoznik --- src/ch/ch_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index d900ebc7dd..706e5f0ba4 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -201,8 +201,7 @@ chExtractVersionInfo(int *retversion) g_autofree char *ch_cmd =3D g_find_program_in_path(CH_CMD); virCommand *cmd =3D virCommandNewArgList(ch_cmd, "--version", NULL); =20 - if (retversion) - *retversion =3D 0; + *retversion =3D 0; =20 virCommandAddEnvString(cmd, "LC_ALL=3DC"); virCommandSetOutputBuffer(cmd, &help); @@ -231,9 +230,7 @@ chExtractVersionInfo(int *retversion) goto cleanup; } =20 - if (retversion) - *retversion =3D version; - + *retversion =3D version; ret =3D 0; =20 cleanup: --=20 2.31.1