Revision: 141
Author:
timu...@google.com
Date: Thu Nov 29 04:08:30 2012
Log: Change some whitespaces to minimize the diff with upstream (2)
http://code.google.com/p/valgrind-variant/source/detail?r=141
Modified:
/trunk/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c
/trunk/valgrind/coregrind/m_syswrap/syswrap-generic.c
/trunk/valgrind/coregrind/m_syswrap/syswrap-x86-darwin.c
/trunk/valgrind/coregrind/m_ume/macho.c
=======================================
--- /trunk/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c Thu Nov 22
04:55:39 2012
+++ /trunk/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c Thu Nov 29
04:08:30 2012
@@ -2560,7 +2560,6 @@
/* Map a file at an unconstrained address for V, and update the
- segment array accordingly. This is used by V for transiently
segment array accordingly. Use the provided flags */
SysRes VG_(am_mmap_file_float_valgrind_flags) ( SizeT length, UInt prot,
@@ -2606,7 +2605,7 @@
sres = VG_(am_do_mmap_NO_NOTIFY)(
advised, length, prot,
flags,
- fd, offset
+ fd, offset
);
if (sr_isError(sres))
return sres;
@@ -2643,7 +2642,6 @@
AM_SANITY_CHECK;
return sres;
}
-
/* Map privately a file at an unconstrained address for V, and update the
segment array accordingly. This is used by V for transiently
mapping in object files to read their debug info. */
=======================================
--- /trunk/valgrind/coregrind/m_syswrap/syswrap-generic.c Thu Nov 22
04:55:39 2012
+++ /trunk/valgrind/coregrind/m_syswrap/syswrap-generic.c Thu Nov 29
04:08:30 2012
@@ -2565,6 +2565,7 @@
SET_STATUS_Failure( VKI_EFAULT );
return;
}
+
// debug-only printing
if (0) {
VG_(printf)("ARG1 = %p(%s)\n", (void*)ARG1, (HChar*)ARG1);
=======================================
--- /trunk/valgrind/coregrind/m_syswrap/syswrap-x86-darwin.c Thu Nov 22
04:55:39 2012
+++ /trunk/valgrind/coregrind/m_syswrap/syswrap-x86-darwin.c Thu Nov 29
04:08:30 2012
@@ -401,6 +401,7 @@
set the mask correctly when we finally get there. */
VG_(sigfillset)(&blockall);
VG_(sigprocmask)(VKI_SIG_SETMASK, &blockall, NULL);
+
if (reuse) {
/* For whatever reason, tst->os_state.pthread appear to have a
=======================================
--- /trunk/valgrind/coregrind/m_ume/macho.c Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/coregrind/m_ume/macho.c Thu Nov 29 04:08:30 2012
@@ -856,3 +856,4 @@
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
+