From b7fc67637e2fff059feff5a6e3febfd8db8535ea Mon Sep 17 00:00:00 2001
From: Anders Lindh Olsson <anders.lindholsson@ess.eu>
Date: Tue, 12 Apr 2022 13:52:22 +0200
Subject: [PATCH] Fix headerguards and clarify endifs

---
 require-ess/src/asprintf.h       | 14 ++++++++------
 require-ess/src/dbLoadTemplate.h |  7 ++-----
 require-ess/src/expr.h           |  8 +++-----
 require-ess/src/require.h        | 11 ++++-------
 require-ess/src/strdup.h         | 10 +++++-----
 require-ess/src/version.h        |  2 ++
 6 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/require-ess/src/asprintf.h b/require-ess/src/asprintf.h
index d2e232e1..d8c27299 100644
--- a/require-ess/src/asprintf.h
+++ b/require-ess/src/asprintf.h
@@ -1,18 +1,20 @@
-#ifndef asprintf_h
-#define asprintf_h
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
+
 #include <stdarg.h>
+
 #ifndef __GNUC__
 #define __attribute__(arg)
-#endif
+#endif // __GNUC__
 
 int asprintf(char **pbuffer, const char *format, ...)
     __attribute__((__format__(__printf__, 2, 3)));
 int vasprintf(char **pbuffer, const char *format, va_list ap)
     __attribute__((__format__(__printf__, 2, 0)));
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif // __cplusplus
diff --git a/require-ess/src/dbLoadTemplate.h b/require-ess/src/dbLoadTemplate.h
index 0d37f6ce..a720a515 100644
--- a/require-ess/src/dbLoadTemplate.h
+++ b/require-ess/src/dbLoadTemplate.h
@@ -6,13 +6,10 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* dbLoadTemplate.h */
 
-#ifndef INCdbLoadTemplateh
-#define INCdbLoadTemplateh
+#pragma once
 
 #include "dbCoreAPI.h"
+
 DBCORE_API int dbLoadTemplate(const char *sub_file, const char *cmd_collect,
                               const char *path);
-
-#endif /*INCdbLoadTemplateh*/
diff --git a/require-ess/src/expr.h b/require-ess/src/expr.h
index c3c5983f..589e55b6 100644
--- a/require-ess/src/expr.h
+++ b/require-ess/src/expr.h
@@ -1,11 +1,10 @@
-#ifndef expr_h
-#define expr_h
+#pragma once
 
 #include <stddef.h>
 
 #ifdef __cplusplus
 extern {
-#endif
+#endif // __cplusplus
 
   extern int exprDebug;
 
@@ -20,5 +19,4 @@ extern {
 
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif // __cplusplus
diff --git a/require-ess/src/require.h b/require-ess/src/require.h
index 59224c9f..7ab05442 100644
--- a/require-ess/src/require.h
+++ b/require-ess/src/require.h
@@ -1,13 +1,12 @@
-#ifndef require_h
-#define require_h
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
 
 #ifndef __GNUC__
 #define __attribute__(dummy)
-#endif
+#endif // __GNUC__
 
 int require(const char *libname, const char *version, const char *args);
 size_t foreachLoadedLib(size_t (*func)(const char *name, const char *version,
@@ -23,6 +22,4 @@ void pathAdd(const char *varname, const char *dirname);
 
 #ifdef __cplusplus
 }
-#endif
-
-#endif
+#endif // __cplusplus
diff --git a/require-ess/src/strdup.h b/require-ess/src/strdup.h
index a3738108..be5839b3 100644
--- a/require-ess/src/strdup.h
+++ b/require-ess/src/strdup.h
@@ -1,14 +1,14 @@
-#ifndef strdup_h
-#define strdup_h
+#pragma once
 
 #include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
+
 char *strdup(const char *s);
 char *strndup(const char *s, size_t n);
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif // __cplusplus
diff --git a/require-ess/src/version.h b/require-ess/src/version.h
index 8f72da6c..a81254fe 100644
--- a/require-ess/src/version.h
+++ b/require-ess/src/version.h
@@ -1,3 +1,5 @@
+#pragma once
+
 typedef struct semver_t {
   char *version_str;
   int major;
-- 
GitLab