[Valgrind-developers] [valgrind] Solaris: fix a few compiler warnings

[Paul F. <pa...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=b93ae9a9c8c071fcbf2d0ece052d084b63f6c39c

commit b93ae9a9c8c071fcbf2d0ece052d084b63f6c39c
Author: Paul Floyd <pj...@wa...>
Date:   Sat Sep 2 13:52:12 2023 +0200

    Solaris: fix a few compiler warnings

Diff:
---
 coregrind/m_coredump/coredump-solaris.c | 2 +-
 coregrind/m_debuginfo/readelf.c         | 2 +-
 coregrind/m_initimg/initimg-solaris.c   | 2 +-
 coregrind/m_syswrap/syswrap-solaris.c   | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/coregrind/m_coredump/coredump-solaris.c b/coregrind/m_coredump/coredump-solaris.c
index 8e84dba51f..00d131b370 100644
--- a/coregrind/m_coredump/coredump-solaris.c
+++ b/coregrind/m_coredump/coredump-solaris.c
@@ -886,7 +886,7 @@ void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si,
 	 VG_(snprintf)(filename, filename_size, "%s%s.%d",
 		      basename, coreext, VG_(getpid)());
       else
-	 VG_(snprintf)(filename, filename_size, "%s%s.%d.%d",
+	 VG_(snprintf)(filename, filename_size, "%s%s.%d.%u",
 		      basename, coreext, VG_(getpid)(), seq);
       seq++;
 
diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index a4c79efd0f..ef9a722ad9 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -1343,7 +1343,7 @@ DiImage* open_debug_file( const HChar* name, const HChar* buildid, UInt crc,
          if (VG_(clo_verbosity) > 1)
             VG_(message)(Vg_DebugMsg, 
                "  .. build-id mismatch (found %s wanted %s)\n", 
-               debug_buildid, buildid);
+               (debug_buildid ? debug_buildid : "(null)"), buildid);
          ML_(dinfo_free)(debug_buildid);
          return NULL;
       }
diff --git a/coregrind/m_initimg/initimg-solaris.c b/coregrind/m_initimg/initimg-solaris.c
index 3e473c8803..1e9e3fd061 100644
--- a/coregrind/m_initimg/initimg-solaris.c
+++ b/coregrind/m_initimg/initimg-solaris.c
@@ -920,7 +920,7 @@ IIFinaliseImageInfo VG_(ii_create_image)(IICreateImageInfo iicii,
 
       szB = VG_PGROUNDUP(szB);
       VG_(debugLog)(1, "initimg",
-                       "Setup client stack: size will be %ld\n", szB);
+                       "Setup client stack: size will be %lu\n", szB);
 
       iifii.clstack_max_size = szB;
       iifii.initial_client_SP = setup_client_stack(init_sp, env, &info,
diff --git a/coregrind/m_syswrap/syswrap-solaris.c b/coregrind/m_syswrap/syswrap-solaris.c
index ed3cb4a551..b5489644c1 100644
--- a/coregrind/m_syswrap/syswrap-solaris.c
+++ b/coregrind/m_syswrap/syswrap-solaris.c
@@ -639,10 +639,11 @@ void VG_(restore_context)(ThreadId tid, vki_ucontext_t *uc, CorePart part,
       if (tst->os_state.ustack
           && VG_(am_is_valid_for_client)((Addr)tst->os_state.ustack,
                                          sizeof(*tst->os_state.ustack),
-                                         VKI_PROT_WRITE))
+                                         VKI_PROT_WRITE)) {
          *tst->os_state.ustack = uc->uc_stack;
          VG_TRACK(post_mem_write, part, tid, (Addr)&tst->os_state.ustack,
                   sizeof(tst->os_state.ustack));
+      }
    }
 
    /* Restore the architecture-specific part of the context. */