Merge pull request #2320 from mazunki/fix-silence-unused-parameters

Silence unused warnings

Author: MagnusS

deps/lest/default.nix

@@ -4,7 +4,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "lest";
-  version = "1.35.2";
+  version = "1.36.0";
 
   meta = {
     description = "A tiny C++11 test framework – lest errors escape testing.";
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   src = fetchGit {
     url = "https://github.com/martinmoene/lest.git";
-    rev = "1eda2f7c33941617fc368ce764b5fbeffccb59bc";
+    ref = "refs/tags/v${version}";
+    rev = "57197f32f2c7d3f3d3664a9010d3ff181a40f6ca";
   };
 
   cmakeBuildType = "Debug";

lib/LiveUpdate/src/update.cpp

@@ -248,11 +248,14 @@ void LiveUpdate::exec(const buffer_t& blob, void* location)
 #ifdef PLATFORM_x86_solo5
   solo5_exec(blob.data(), blob.size());
   throw std::runtime_error("solo5_exec returned");
+  (void) found_kernel_start;
 # elif defined(PLATFORM_UNITTEST)
   throw liveupdate_exec_success();
+  (void) found_kernel_start;
 # elif defined(USERSPACE_KERNEL)
   hotswap(phys_base, bin_data, bin_len, (void*) (uintptr_t) start_offset, sr_data);
   throw liveupdate_exec_success();
+  (void) found_kernel_start;
 # elif defined(ARCH_x86_64)
     // change to simple pagetable
     __x86_init_paging((void*) 0x1000);
@@ -270,6 +273,8 @@ void LiveUpdate::exec(const buffer_t& blob, void* location)
     ((decltype(&hotswap64)) HOTSWAP_AREA)(phys_base, bin_data, bin_len, start_offset, sr_data, nullptr);
   }
   }
+#else
+  (void) found_kernel_start;
 # endif
   // copy hotswapping function to sweet spot
   memcpy(HOTSWAP_AREA, (void*) &hotswap, &__hotswap_length - (char*) &hotswap);

src/arch/i686/paging.cpp

@@ -28,7 +28,7 @@ void __arch_init_paging()
 namespace os {
 namespace mem {
   __attribute__((weak))
-  Map map(Map m, const char* name) {
+  Map map(Map m, const char* name) {  // FIXME: use params, remove or mark unused
     return {};
   }
 

src/crt/c_abi.c

@@ -108,7 +108,7 @@ int __vsprintf_chk(char* s, int flag, size_t slen, const char* format, va_list a
   __assert ((size_t) res < slen);
   return res;
 }
-int __vsnprintf_chk (char *s, size_t maxlen, int flags, size_t slen,
+int __vsnprintf_chk (char *s, [[maybe_unused]] size_t maxlen, int flags, size_t slen,
 		                  const char *format, va_list args)
 {
   assert (slen < maxlen);

src/drivers/vmxnet3.cpp

@@ -178,7 +178,7 @@ vmxnet3::vmxnet3(hw::PCI_Device& d, const uint16_t mtu) :
   assert(this->ptbase);
 
   // verify and select version
-  bool ok = check_version();
+  [[maybe_unused]] bool ok = check_version();
   assert(ok);
 
   // reset device

src/hw/ps2.cpp

@@ -217,7 +217,7 @@ namespace hw
 
     // self-test (port1)
     write_port1(0xFF);
-    const uint8_t selftest = read_data();
+    [[maybe_unused]] const uint8_t selftest = read_data();
     assert(selftest == 0xAA && "PS/2 controller self-test");
 
     write_port1(DEV_IDENTIFY);

src/kernel/events.cpp

@@ -24,7 +24,9 @@
 //#define DEBUG_SMP
 
 static SMP::Array<Events> managers;
+#ifdef INCLUDEOS_SMP_ENABLE
 static Spinlock em_lock_;
+#endif
 
 Events& Events::get(int cpuid)
 {
@@ -39,7 +41,7 @@ Events& Events::get(int cpuid)
 Events& Events::get()
 {
 #ifdef INCLUDEOS_SMP_ENABLE
-  static Spinlock lock;
+  static Spinlock lock;  // FIXME: this seems unused.
   std::lock_guard<Spinlock> guard(em_lock_);
 #endif
   return PER_CPU(managers);

src/kernel/liveupdate.cpp

@@ -20,7 +20,7 @@ void kernel::setup_liveupdate()
   kernel::state().liveupdate_loc = kernel::state().liveupdate_phys;
 #endif
 
-  const size_t size = kernel::state().liveupdate_size;
+  [[maybe_unused]] const size_t size = kernel::state().liveupdate_size;
   PRATTLE("Setting up LiveUpdate from %p to %p, %zx\n",
           (void*) kernel::state().liveupdate_phys,
           (void*) kernel::state().liveupdate_loc, size);

src/musl/getrandom.cpp

@@ -1,7 +1,7 @@
 #include "common.hpp"
 #include <kernel/rng.hpp>
 
-// TODO Flags are ignored.
+// TODO: flags are ignored.
 static long sys_getrandom(void* buf, size_t len, unsigned int flags)
 {
   rng_absorb(buf, len);

src/net/dhcp/dh4client.cpp

@@ -42,7 +42,7 @@ namespace net {
   {
     // default timed out handler spams logs
     this->on_config(
-    [this] (bool timed_out)
+    [&] (bool timed_out)
     {
       if (timed_out)
         MYINFO("Negotiation timed out (%s)", this->stack.ifname().c_str());