From nobody Mon Feb 9 03:29:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1642516760; cv=none; d=zohomail.com; s=zohoarc; b=WBmSp1Lq3VrGxTzbT0qhP6t+Dx09YyHMjm53LlpOvDsUvnCFDjtPbGr3HqsE0Kp3FUHKiqrIjRktppKihgOUFLEzaFmM9B+7EcDYbfzHMhEQfpF6+D/GfeGf2OXBw58xZL6pefxRK0DKVCoof//ZUk1MzrbN23BjQPuRzicdg4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642516760; 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=rRUw1l7fnjmlnM9PNfggg1c2AdOFR/rOvIkOES39xoE=; b=MRjsbkPXp+kaMZCe1tZiBlz1JAs0oin/A1/pwlnhz1l/ufqZQ5vjt0pPUgXcNxDjpCAeyH0wQfL9T/h+xJagkSg82qFjOGh2qXgNflxw3loIHD9vcFoI61JXDsz5x/OJfn29+2dwRTfoA75F601smUfjr7/VmWLrPpxcB5O/TvU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642516760297821.4398055787518; Tue, 18 Jan 2022 06:39:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-373-YnKFPTTSOe-X-hnZHLfEDg-1; Tue, 18 Jan 2022 09:39:15 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2ABFE10247AC; Tue, 18 Jan 2022 14:39:07 +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 04BED7A2E2; Tue, 18 Jan 2022 14:39:07 +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 6CD454CA9B; Tue, 18 Jan 2022 14:39:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IEbkhh016696 for ; Tue, 18 Jan 2022 09:37:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id C93FA2BE7F; Tue, 18 Jan 2022 14:37:46 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5253C2C1B4 for ; Tue, 18 Jan 2022 14:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642516759; 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=rRUw1l7fnjmlnM9PNfggg1c2AdOFR/rOvIkOES39xoE=; b=T2rp9mQUor5KJ/Y587T438v7PbUCuiM+lUMtErrF6LCHvk1r6VD/dPrGF8KfLPcHyZGBE6 Uc/L02cCWMgf2YCtQLJ2RkC7aehGAcYcrEMajvXF+sPZjCvUJPgIA0Nz26jEXIzWDBe4u1 T8wFTQ2dm35MhYWEtSLQgwv5i+qKpqc= X-MC-Unique: YnKFPTTSOe-X-hnZHLfEDg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v5 09/13] virdnsmasq: Require non NULL @caps in dnsmasqCapsGetBinaryPath() Date: Tue, 18 Jan 2022 15:37:16 +0100 Message-Id: <4b68c982e283471575bacbf87302495864da46fe.1642516422.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.16 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) X-ZM-MESSAGEID: 1642516762100100003 Content-Type: text/plain; charset="utf-8" First observation: There is no way that caps->binaryPath can be NULL. Second observation: There is no caller that passes NULL. Let's drop the ternary operator and access @caps directly. Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- src/util/virdnsmasq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 579c67d86a..841689b782 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -711,7 +711,7 @@ dnsmasqCapsNewFromBinary(void) const char * dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps) { - return caps ? caps->binaryPath : DNSMASQ; + return caps->binaryPath; } =20 /** dnsmasqDhcpHostsToString: --=20 2.34.1