Clean up clang warnings

diff --git a/src/includes/dinit-client.h b/src/includes/dinit-client.h
index a6afe2aef78b07bbf60a6e8b12ba0bb487244b4e..09746c9630de595d585a49f19bf17c62631b831e 100644 (file)
--- a/src/includes/dinit-client.h
+++ b/src/includes/dinit-client.h
@@ -49,14 +49,14 @@ template <int N> class static_membuf
     template <typename T>
     static_membuf(const T &val)
     {
     template <typename T>
     static_membuf(const T &val)
     {

-        static_assert(sizeof(T) == N);
+        static_assert(sizeof(T) == N, "must initialise with object of correct size");

         memcpy(buf, &val, N);
     }
 
     template <int M, typename T>
     static_membuf(char (&prevbuf)[M], const T &val)
     {
         memcpy(buf, &val, N);
     }
 
     template <int M, typename T>
     static_membuf(char (&prevbuf)[M], const T &val)
     {

-        static_assert(M + sizeof(T) == N);
+        static_assert(M + sizeof(T) == N, "size is not correct");

         memcpy(buf, prevbuf, M);
         memcpy(buf + M, &val, sizeof(val));
     }
         memcpy(buf, prevbuf, M);
         memcpy(buf + M, &val, sizeof(val));
     }

diff --git a/src/includes/proc-service.h b/src/includes/proc-service.h
index 7056a6db8b2ce8871afdd09eba1afe46fe7e68e0..a3ff05a5f57a47a15a347cd22fddd364649831d2 100644 (file)
--- a/src/includes/proc-service.h
+++ b/src/includes/proc-service.h
@@ -446,8 +446,8 @@ class process_service : public base_process_service
         return inittab_line;
     }
 
         return inittab_line;
     }
 

-    constexpr size_t get_utmp_id_size() { return sizeof(inittab_id); }
-    constexpr size_t get_utmp_line_size() { return sizeof(inittab_line); }
+    constexpr size_t get_utmp_id_size() const { return sizeof(inittab_id); }
+    constexpr size_t get_utmp_line_size() const { return sizeof(inittab_line); }

 
 #endif
 
 
 #endif