Fix a couple of nits picked up by gcc-4.5, which is more warningful than 4.4.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10876

diff --git a/coregrind/launcher-linux.c b/coregrind/launcher-linux.c
index 3a55cca93c5bbb387a6051c02c11ea29c7acc874..88b95810c2ba4f267db7cea683f63b915cd2d5cd 100644 (file)
--- a/coregrind/launcher-linux.c
+++ b/coregrind/launcher-linux.c
@@ -135,7 +135,8 @@ static const char *select_platform(const char *clientname)
       return NULL;
    }
 
-   VG_(debugLog)(2, "launcher", "read %ld bytes from '%s'\n", n_bytes, clientname);
+   VG_(debugLog)(2, "launcher", "read %ld bytes from '%s'\n",
+                    (long int)n_bytes, clientname);
 
    if (header[0] == '#' && header[1] == '!') {
       int i = 2;

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index bec9c1fc35daf508e7403bfa0837429ff794abb2..90eb51290dd05d126bd68f33c426b2982a3d9863 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -588,7 +588,7 @@ SysRes write_ldt ( ThreadId tid, void* ptr, UInt bytecount, Int oldmode )
 
    /* If this thread doesn't have an LDT, we'd better allocate it
       now. */
-   if (ldt == (HWord)NULL) {
+   if (ldt == NULL) {
       ldt = alloc_zeroed_x86_LDT();
       VG_(threads)[tid].arch.vex.guest_LDT = (HWord)ldt;
    }