From nobody Tue Feb 10 08:01:19 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 ARC-Seal: i=1; a=rsa-sha256; t=1560874554; cv=none; d=zoho.com; s=zohoarc; b=jg4Xehd6XIRgTEkp+w0S2Fk6u8fT1xPUYJK32nCSCkQ9yhvwzOw+K7HdMaA5kZv1rpu9Is1CA8Lm64iSOmwlr74lXTdlOgcjg1CyezP06a0yC5LrauNDnCtPoEgP6fUZBpNtQ7S39zNqhDtqVb2xDvDEk+tY/4ZTsU/hkNynWq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874554; 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:ARC-Authentication-Results; bh=wXj+6Y4MNqWxLNXH3p+/Six49wRC8P+pLB4Gw2uB0xQ=; b=RYx5QKIs6eyYTlpOZeawGR/Qn1WPIjnZUXLSZiz7m1vyUURdx5aRx8Op1pJc5t4ZN8lI+Wk5lmjASpT/dFxQ/kTZRKhcgNenVIqqVMx4CY+EK67JXOYCbhW7uEkvTyJRDTpdAsJCBw7lnYfB+ljbUELJ13kPfV9m8h1bcBi+A7E= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560874554440859.1923332283277; Tue, 18 Jun 2019 09:15:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07EB8C04FFF1; Tue, 18 Jun 2019 16:15:46 +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 B64D17D925; Tue, 18 Jun 2019 16:15:44 +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 767B9206DA; Tue, 18 Jun 2019 16:15:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IGDTrB024229 for ; Tue, 18 Jun 2019 12:13:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB01D60FAB; Tue, 18 Jun 2019 16:13:29 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-198.phx2.redhat.com [10.3.117.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99D4C84EF for ; Tue, 18 Jun 2019 16:13:29 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:12:47 -0500 Message-Id: <20190618161316.1722-18-jjongsma@redhat.com> In-Reply-To: <20190618161316.1722-1-jjongsma@redhat.com> References: <20190618161316.1722-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/46] util: storage: use #pragma once in headers 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-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 18 Jun 2019 16:15:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/util/virstorageencryption.h | 17 +++++++---------- src/util/virstoragefile.h | 31 ++++++++++++++----------------- src/util/virstoragefilebackend.h | 9 +++------ 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryptio= n.h index 68d879a63e..3e5485d88b 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -18,16 +18,15 @@ * . */ =20 -#ifndef LIBVIRT_VIRSTORAGEENCRYPTION_H -# define LIBVIRT_VIRSTORAGEENCRYPTION_H +#pragma once =20 -# include "internal.h" -# include "virbuffer.h" -# include "virsecret.h" -# include "virutil.h" -# include "virenum.h" +#include "internal.h" +#include "virbuffer.h" +#include "virsecret.h" +#include "virutil.h" +#include "virenum.h" =20 -# include +#include =20 typedef enum { VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE =3D 0, @@ -93,5 +92,3 @@ enum { }; =20 int virStorageGenerateQcowPassphrase(unsigned char *dest); - -#endif /* LIBVIRT_VIRSTORAGEENCRYPTION_H */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 763030eefa..38ba901858 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -19,19 +19,18 @@ * . */ =20 -#ifndef LIBVIRT_VIRSTORAGEFILE_H -# define LIBVIRT_VIRSTORAGEFILE_H +#pragma once =20 -# include +#include =20 -# include "virbitmap.h" -# include "virobject.h" -# include "virseclabel.h" -# include "virstorageencryption.h" -# include "virutil.h" -# include "virsecret.h" -# include "virautoclean.h" -# include "virenum.h" +#include "virbitmap.h" +#include "virobject.h" +#include "virseclabel.h" +#include "virstorageencryption.h" +#include "virutil.h" +#include "virsecret.h" +#include "virautoclean.h" +#include "virenum.h" =20 /* Minimum header size required to probe all known formats with * virStorageFileProbeFormat, or obtain metadata from a known format. @@ -39,7 +38,7 @@ * 32769). Some formats can be probed with fewer bytes. Although * some formats theoretically permit metadata that can rely on offsets * beyond this size, in practice that doesn't matter. */ -# define VIR_STORAGE_MAX_HEADER 0x8200 +#define VIR_STORAGE_MAX_HEADER 0x8200 =20 =20 /* Types of disk backends (host resource). Comparable to the public @@ -341,9 +340,9 @@ struct _virStorageSource { }; =20 =20 -# ifndef DEV_BSIZE -# define DEV_BSIZE 512 -# endif +#ifndef DEV_BSIZE +# define DEV_BSIZE 512 +#endif =20 int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid); =20 @@ -548,5 +547,3 @@ void virStorageFileReportBrokenChain(int errcode, virStorageSourcePtr parent); =20 VIR_DEFINE_AUTOPTR_FUNC(virStorageAuthDef, virStorageAuthDefFree); - -#endif /* LIBVIRT_VIRSTORAGEFILE_H */ diff --git a/src/util/virstoragefilebackend.h b/src/util/virstoragefileback= end.h index c93bc4033a..c7af77bf8f 100644 --- a/src/util/virstoragefilebackend.h +++ b/src/util/virstoragefilebackend.h @@ -18,12 +18,11 @@ * . */ =20 -#ifndef LIBVIRT_VIRSTORAGEFILEBACKEND_H -# define LIBVIRT_VIRSTORAGEFILEBACKEND_H +#pragma once =20 -# include +#include =20 -# include "virstoragefile.h" +#include "virstoragefile.h" =20 /* ------- virStorageFile backends ------------ */ typedef struct _virStorageFileBackend virStorageFileBackend; @@ -99,5 +98,3 @@ struct _virStorageFileBackend { }; =20 int virStorageFileBackendRegister(virStorageFileBackendPtr backend); - -#endif /* LIBVIRT_VIRSTORAGEFILEBACKEND_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list