[valgrind-variant] r140 committed - Change some whitespaces to minimize the diff with upstream

2 views
Skip to first unread message

valgrind...@googlecode.com

unread,
Nov 29, 2012, 8:19:41 AM11/29/12
to valgrind-var...@googlegroups.com
Revision: 140
Author: timu...@google.com
Date: Thu Nov 29 04:00:54 2012
Log: Change some whitespaces to minimize the diff with upstream
http://code.google.com/p/valgrind-variant/source/detail?r=140

Modified:
/trunk/valgrind/memcheck/mc_include.h
/trunk/valgrind/memcheck/mc_leakcheck.c
/trunk/valgrind/memcheck/mc_main.c
/trunk/valgrind/memcheck/mc_malloc_wrappers.c

=======================================
--- /trunk/valgrind/memcheck/mc_include.h Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/memcheck/mc_include.h Thu Nov 29 04:00:54 2012
@@ -49,7 +49,6 @@
// effective redzone, as (possibly) modified by --redzone-size:
extern SizeT MC_(Malloc_Redzone_SzB);

-
/* For malloc()/new/new[] vs. free()/delete/delete[] mismatch checking. */
typedef
enum {
=======================================
--- /trunk/valgrind/memcheck/mc_leakcheck.c Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/memcheck/mc_leakcheck.c Thu Nov 29 04:00:54 2012
@@ -1635,3 +1635,4 @@
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/
+
=======================================
--- /trunk/valgrind/memcheck/mc_main.c Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/memcheck/mc_main.c Thu Nov 29 04:00:54 2012
@@ -5465,7 +5465,7 @@
break;

case VG_USERREQ__MAKE_MEM_UNDEFINED:
- make_mem_undefined_w_tid_and_okind ( arg[1], arg[2], tid,
+ make_mem_undefined_w_tid_and_okind ( arg[1], arg[2], tid,
MC_OKIND_USER );
*ret = -1;
break;
=======================================
--- /trunk/valgrind/memcheck/mc_malloc_wrappers.c Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/memcheck/mc_malloc_wrappers.c Thu Nov 29 04:00:54 2012
@@ -142,6 +142,7 @@
while (VG_(free_queue_volume) > MC_(clo_freelist_vol)
&& freed_list_start[i] != NULL) {
MC_Chunk* mc1;
+
tl_assert(freed_list_end[i] != NULL);

mc1 = freed_list_start[i];
@@ -158,11 +159,12 @@
freed_list_start[i] = mc1->next;
}
mc1->next = NULL; /* just paranoia */
+
/* free MC_Chunk */
if (MC_AllocCustom != mc1->allockind)
VG_(cli_free) ( (void*)(mc1->data) );
delete_MC_Chunk ( mc1 );
- }
+ }
}
}

Reply all
Reply to author
Forward
0 new messages