From nobody Mon Feb 9 12:24:46 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=1611829505; cv=none; d=zohomail.com; s=zohoarc; b=IYvRcsO/PxWRbNjThxP8CIhe+YsEGJuaW0Es0I5GTKPjgxdPwM4X4HleyB47mzDUa81d2ueVbONbUUMVIKgoyzgPd4U0wxe/zfR+gySEoojmOS+jIJTAhx4WuKrwV318DqN6PbecP8DoqyVe036USLc1S6fkpbTUr2XL8bOdFUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611829505; h=Content-Type:Content-Transfer-Encoding:Cc: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=zHondSDWll4gHGndrLuGxcKyAXKQ+6wj3PujF1a9fEA=; b=mV3xTo1vgeXmi8C9N3Nbtx7GKq2WcKgKrCnadQ4VeCCAAKiL/1E9kJpzkM1mtX9YNCv07FUtMUL8R2g9AyF2tB4ilgXM+nOhPjir0akzrEpjYMkQayH7qf4jyawYxBOp0/WYRIBGiyaJ7FwBOsV7IfkIWShoKwMbecR68bN3z6I= 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 1611829505910936.7544033142442; Thu, 28 Jan 2021 02:25:05 -0800 (PST) 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-299-mZXZZgAnMiSzv4p6VNICmA-1; Thu, 28 Jan 2021 05:25:02 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C45681934101; Thu, 28 Jan 2021 10:24:55 +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 53E2C1002C11; Thu, 28 Jan 2021 10:24:55 +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 A59EE5002C; Thu, 28 Jan 2021 10:24:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10SAOlV8026572 for ; Thu, 28 Jan 2021 05:24:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 705E110023BE; Thu, 28 Jan 2021 10:24:47 +0000 (UTC) Received: from work.redhat.com (ovpn-112-226.ams2.redhat.com [10.36.112.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4F4C10023BA; Thu, 28 Jan 2021 10:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611829504; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=zHondSDWll4gHGndrLuGxcKyAXKQ+6wj3PujF1a9fEA=; b=gK3gF0XLWeqM8IUU8McwypUCLK4CJ+hbZXgr3IG9HcMB/alVXbW1lTlGb/izIgE7H+QKyH Jk4elZhvsKHpqhvBgB76ZnLO5fWIDstii7Ac3V9JQw/sb8VhYW3MWJzqV0RKDoU6t1em6J liyXq0fBF2EaxuId9iSRQkmyaj0ytCk= X-MC-Unique: mZXZZgAnMiSzv4p6VNICmA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/11] virfile: Remove redundant #ifndef Date: Thu, 28 Jan 2021 11:24:31 +0100 Message-Id: <20210128102441.20241-2-twiederh@redhat.com> In-Reply-To: <20210128102441.20241-1-twiederh@redhat.com> References: <20210128102441.20241-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.84 on 10.5.11.22 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" This section is guarded by "#ifndef WIN32" in line 2109--2808. Found by clang-tidy's "readability-redundant-preprocessor" check. Signed-off-by: Tim Wiederhake --- src/util/virfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 609cafdd34..5201b7fb07 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2632,7 +2632,7 @@ virDirCreateNoFork(const char *path, virReportSystemError(errno, _("stat of '%s' failed"), path); goto error; } -# ifndef WIN32 + if (((uid !=3D (uid_t) -1 && st.st_uid !=3D uid) || (gid !=3D (gid_t) -1 && st.st_gid !=3D gid)) && (chown(path, uid, gid) < 0)) { @@ -2641,7 +2641,7 @@ virDirCreateNoFork(const char *path, path, (unsigned int) uid, (unsigned int) gid); goto error; } -# endif /* !WIN32 */ + if (mode !=3D (mode_t) -1 && chmod(path, mode) < 0) { ret =3D -errno; virReportSystemError(errno, --=20 2.26.2