From c2e1a261e466b828bc45240586c7e0d0b23e1a9c Mon Sep 17 00:00:00 2001 From: Cellie Date: Tue, 20 May 2025 13:46:09 +0200 Subject: [PATCH 1/5] Fix codacy warning about structs never used --- src/CachedTile.h | 1 + src/TileJob.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/CachedTile.h b/src/CachedTile.h index fece5de..8f68959 100644 --- a/src/CachedTile.h +++ b/src/CachedTile.h @@ -27,6 +27,7 @@ #include #include +// cppcheck-suppress unusedStruct struct CachedTile { uint32_t x; diff --git a/src/TileJob.h b/src/TileJob.h index 8172a0b..5840c41 100644 --- a/src/TileJob.h +++ b/src/TileJob.h @@ -26,6 +26,7 @@ #include "CachedTile.h" +// cppcheck-suppress unusedStruct struct TileJob { uint32_t x; From 71d5668f242f5e9f7db946c379ae7729ec80df72 Mon Sep 17 00:00:00 2001 From: Cellie Date: Tue, 20 May 2025 13:50:04 +0200 Subject: [PATCH 2/5] Another try --- src/CachedTile.h | 2 +- src/TileJob.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CachedTile.h b/src/CachedTile.h index 8f68959..e91e033 100644 --- a/src/CachedTile.h +++ b/src/CachedTile.h @@ -1,3 +1,4 @@ +// cppcheck-suppress unusedStruct /* Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32 @@ -27,7 +28,6 @@ #include #include -// cppcheck-suppress unusedStruct struct CachedTile { uint32_t x; diff --git a/src/TileJob.h b/src/TileJob.h index 5840c41..2c47c23 100644 --- a/src/TileJob.h +++ b/src/TileJob.h @@ -1,3 +1,4 @@ +// cppcheck-suppress unusedStruct /* Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32 @@ -26,7 +27,6 @@ #include "CachedTile.h" -// cppcheck-suppress unusedStruct struct TileJob { uint32_t x; From 554705e0e473f520a4bb8cf4265af89a1e38dded Mon Sep 17 00:00:00 2001 From: Cellie Date: Tue, 20 May 2025 14:00:42 +0200 Subject: [PATCH 3/5] Like this? --- src/CachedTile.h | 2 +- src/TileJob.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CachedTile.h b/src/CachedTile.h index e91e033..8f68959 100644 --- a/src/CachedTile.h +++ b/src/CachedTile.h @@ -1,4 +1,3 @@ -// cppcheck-suppress unusedStruct /* Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32 @@ -28,6 +27,7 @@ #include #include +// cppcheck-suppress unusedStruct struct CachedTile { uint32_t x; diff --git a/src/TileJob.h b/src/TileJob.h index 2c47c23..d694ee5 100644 --- a/src/TileJob.h +++ b/src/TileJob.h @@ -27,6 +27,7 @@ #include "CachedTile.h" +// cppcheck-suppress unusedStruct struct TileJob { uint32_t x; From daf00813bd68fbbd5a4b5e146ff2331bfb395ca2 Mon Sep 17 00:00:00 2001 From: Cellie Date: Tue, 20 May 2025 14:05:54 +0200 Subject: [PATCH 4/5] With a static assert maybe? --- src/CachedTile.h | 3 ++- src/TileJob.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CachedTile.h b/src/CachedTile.h index 8f68959..5e33ddf 100644 --- a/src/CachedTile.h +++ b/src/CachedTile.h @@ -27,7 +27,6 @@ #include #include -// cppcheck-suppress unusedStruct struct CachedTile { uint32_t x; @@ -71,4 +70,6 @@ struct CachedTile } }; +static_assert(sizeof(CachedTile) >= 0, "Suppress unusedStruct"); + #endif \ No newline at end of file diff --git a/src/TileJob.h b/src/TileJob.h index d694ee5..d43397d 100644 --- a/src/TileJob.h +++ b/src/TileJob.h @@ -1,4 +1,3 @@ -// cppcheck-suppress unusedStruct /* Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32 @@ -27,7 +26,6 @@ #include "CachedTile.h" -// cppcheck-suppress unusedStruct struct TileJob { uint32_t x; @@ -36,4 +34,6 @@ struct TileJob CachedTile *tile; }; +static_assert(sizeof(TileJob) >= 0, "Suppress unusedStruct"); + #endif \ No newline at end of file From ac4e2065f1905a1513c39149fe011e852b7a6017 Mon Sep 17 00:00:00 2001 From: Cellie Date: Tue, 20 May 2025 14:15:05 +0200 Subject: [PATCH 5/5] Formatting --- src/CachedTile.h | 2 +- src/TileJob.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CachedTile.h b/src/CachedTile.h index 5e33ddf..04e8899 100644 --- a/src/CachedTile.h +++ b/src/CachedTile.h @@ -72,4 +72,4 @@ struct CachedTile static_assert(sizeof(CachedTile) >= 0, "Suppress unusedStruct"); -#endif \ No newline at end of file +#endif diff --git a/src/TileJob.h b/src/TileJob.h index d43397d..5da1a91 100644 --- a/src/TileJob.h +++ b/src/TileJob.h @@ -36,4 +36,4 @@ struct TileJob static_assert(sizeof(TileJob) >= 0, "Suppress unusedStruct"); -#endif \ No newline at end of file +#endif