2 files changed, 17 insertions, 43 deletions
diff --git a/include/lv2/log/log.h b/include/lv2/log/log.h
index cc62bef..2616ffe 100644
--- a/include/lv2/log/log.h
+++ b/include/lv2/log/log.h
@@ -1,21 +1,8 @@
-/*
-  Copyright 2012-2016 David Robillard <d@drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+// Copyright 2012-2016 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
 
-#ifndef LV2_LOG_H
-#define LV2_LOG_H
+#ifndef LV2_LOG_LOG_H
+#define LV2_LOG_LOG_H
 
 /**
    @defgroup log Log
@@ -42,7 +29,7 @@
 
 // clang-format on
 
-#include "lv2/urid/urid.h"
+#include <lv2/urid/urid.h>
 
 #include <stdarg.h>
 
@@ -110,4 +97,4 @@ typedef struct {
    @}
 */
 
-#endif /* LV2_LOG_H */
+#endif // LV2_LOG_LOG_H
diff --git a/include/lv2/log/logger.h b/include/lv2/log/logger.h
index d6919a2..83e2132 100644
--- a/include/lv2/log/logger.h
+++ b/include/lv2/log/logger.h
@@ -1,21 +1,8 @@
-/*
-  Copyright 2012-2016 David Robillard <d@drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+// Copyright 2012-2016 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
 
-#ifndef LV2_ATOM_LOGGER_H
-#define LV2_ATOM_LOGGER_H
+#ifndef LV2_LOG_LOGGER_H
+#define LV2_LOG_LOGGER_H
 
 /**
    @defgroup logger Logger
@@ -28,8 +15,8 @@
    @{
 */
 
-#include "lv2/log/log.h"
-#include "lv2/urid/urid.h"
+#include <lv2/log/log.h>
+#include <lv2/urid/urid.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -103,7 +90,7 @@ LV2_LOG_FUNC(2, 3)
 static inline int
 lv2_log_error(LV2_Log_Logger* logger, const char* fmt, ...)
 {
-  va_list args;
+  va_list args; // NOLINT(cppcoreguidelines-init-variables)
   va_start(args, fmt);
   const int ret = lv2_log_vprintf(logger, logger->Error, fmt, args);
   va_end(args);
@@ -115,7 +102,7 @@ LV2_LOG_FUNC(2, 3)
 static inline int
 lv2_log_note(LV2_Log_Logger* logger, const char* fmt, ...)
 {
-  va_list args;
+  va_list args; // NOLINT(cppcoreguidelines-init-variables)
   va_start(args, fmt);
   const int ret = lv2_log_vprintf(logger, logger->Note, fmt, args);
   va_end(args);
@@ -127,7 +114,7 @@ LV2_LOG_FUNC(2, 3)
 static inline int
 lv2_log_trace(LV2_Log_Logger* logger, const char* fmt, ...)
 {
-  va_list args;
+  va_list args; // NOLINT(cppcoreguidelines-init-variables)
   va_start(args, fmt);
   const int ret = lv2_log_vprintf(logger, logger->Trace, fmt, args);
   va_end(args);
@@ -139,7 +126,7 @@ LV2_LOG_FUNC(2, 3)
 static inline int
 lv2_log_warning(LV2_Log_Logger* logger, const char* fmt, ...)
 {
-  va_list args;
+  va_list args; // NOLINT(cppcoreguidelines-init-variables)
   va_start(args, fmt);
   const int ret = lv2_log_vprintf(logger, logger->Warning, fmt, args);
   va_end(args);
@@ -154,4 +141,4 @@ lv2_log_warning(LV2_Log_Logger* logger, const char* fmt, ...)
    @}
 */
 
-#endif /* LV2_LOG_LOGGER_H */
+#endif // LV2_LOG_LOGGER_H