Finish moving header guards to #pragma once

[libvirt] [PATCH 10/46] src/secret: use #pragma once in headers

Posted by Jonathon Jongsma 6 years, 7 months ago

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
---
 src/secret/secret_driver.h | 5 +----
 src/secret/secret_util.h   | 8 +++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h
index b7e46ee045..3dcf420792 100644
--- a/src/secret/secret_driver.h
+++ b/src/secret/secret_driver.h
@@ -18,9 +18,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECRET_DRIVER_H
-# define LIBVIRT_SECRET_DRIVER_H
+#pragma once
 
 int secretRegister(void);
-
-#endif /* LIBVIRT_SECRET_DRIVER_H */
diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h
index 7219707390..4fe8f98aa5 100644
--- a/src/secret/secret_util.h
+++ b/src/secret/secret_util.h
@@ -19,11 +19,10 @@
  *
  */
 
-#ifndef LIBVIRT_SECRET_UTIL_H
-# define LIBVIRT_SECRET_UTIL_H
+#pragma once
 
-# include "internal.h"
-# include "virsecret.h"
+#include "internal.h"
+#include "virsecret.h"
 
 int virSecretGetSecretString(virConnectPtr conn,
                              virSecretLookupTypeDefPtr seclookupdef,
@@ -32,4 +31,3 @@ int virSecretGetSecretString(virConnectPtr conn,
                              size_t *ret_secret_size)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
-#endif /* LIBVIRT_SECRET_UTIL_H */
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 10/46] src/secret: use #pragma once in headers

Posted by Ján Tomko 6 years, 7 months ago

On Tue, Jun 18, 2019 at 11:12:40AM -0500, Jonathon Jongsma wrote:
>Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
>---
> src/secret/secret_driver.h | 5 +----
> src/secret/secret_util.h   | 8 +++-----
> 2 files changed, 4 insertions(+), 9 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list