From: Julian Seward <jseward@acm.org>
Date: Thu, 27 Aug 2009 23:22:39 +0000 (+0000)
Subject: Fix a couple of nits picked up by gcc-4.5, which is more warningful than 4.4.
X-Git-Tag: svn/VALGRIND_3_6_0~521
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8acdbc2e02ac2d5ecafa9d1e1392df1a5dc0341;p=thirdparty%2Fvalgrind.git

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 3a55cca93c..88b95810c2 100644
--- 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 bec9c1fc35..90eb51290d 100644
--- 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;
    }