A few changes suggested by clang-tidy

snej · May 21, 2024 · 1176915 · 1176915
1 parent 71c578c
commit 1176915
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/include/monocypher/base.hh b/include/monocypher/base.hh
@@ -46,8 +46,8 @@ namespace monocypher {
 
 //======== Utilities:
 
-    static inline const uint8_t* u8(const void *p)  {return reinterpret_cast<const uint8_t*>(p);}
-    static inline uint8_t* u8(void *p)              {return reinterpret_cast<uint8_t*>(p);}
+    static inline const uint8_t* u8(const void *p)  {return static_cast<const uint8_t*>(p);}
+    static inline uint8_t* u8(void *p)              {return static_cast<uint8_t*>(p);}
 
 
     /// Fills the array with cryptographically-secure random bytes.

diff --git a/include/monocypher/encryption.hh b/include/monocypher/encryption.hh
@@ -73,11 +73,11 @@ namespace monocypher {
 
 
         namespace { // internal stuff
-            static constexpr size_t boxedSize(size_t plaintextSize) {
+            constexpr size_t boxedSize(size_t plaintextSize) {
                 return plaintextSize + sizeof(mac);
             }
 
-            static constexpr size_t unboxedSize(size_t ciphertextSize) {
+            constexpr size_t unboxedSize(size_t ciphertextSize) {
                 return std::max(ciphertextSize, sizeof(mac)) - sizeof(mac);
             }
 

diff --git a/include/monocypher/signatures.hh b/include/monocypher/signatures.hh
@@ -56,7 +56,7 @@ namespace monocypher {
         public_key()                                           :byte_array<32>(0) { }
         explicit public_key(const std::array<uint8_t,32> &a)   :byte_array<32>(a) { }
         public_key(const void *data, size_t size)              :byte_array<32>(data, size) { }
-        explicit public_key(input_bytes k)                      :public_key(k.data, k.size) { }
+        explicit public_key(input_bytes k)                     :public_key(k.data, k.size) { }
 
         /// Verifies a signature.
         [[nodiscard]]

diff --git a/src/Monocypher+xsalsa20.cc b/src/Monocypher+xsalsa20.cc
@@ -30,7 +30,7 @@
 
 #include "monocypher/ext/xsalsa20.hh"
 #include <memory>
-#include <string.h>
+#include <cstring>
 
 // Wrap 3rd party tweetnacl.c in a namespace to avoid messing with global namespace:
 namespace monocypher::tweetnacl {