From 654684c51db9ad1cf35745bb56bae4db4731d528 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Tue, 8 Jul 2014 14:48:42 +0200 Subject: [PATCH 1/1] [mc] Fix name of mc_snapshot_region_memcmp --- src/mc/mc_diff.c | 8 ++++---- src/mc/mc_private.h | 2 +- src/mc/mc_snapshot.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mc/mc_diff.c b/src/mc/mc_diff.c index d465400d41..a3a0bd895b 100644 --- a/src/mc/mc_diff.c +++ b/src/mc/mc_diff.c @@ -793,7 +793,7 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, } } - if (mc_snapshot_region_memcp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { + if (mc_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { pointer_align = (i / sizeof(void *)) * sizeof(void *); addr_pointed1 = mc_snapshot_read_pointer((char *) real_area1 + pointer_align, snapshot1); @@ -886,12 +886,12 @@ top: if (real_area1 == real_area2) return -1; else - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0); } else { if (area_size != -1 && type->byte_size != area_size) return -1; else { - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); } } break; @@ -899,7 +899,7 @@ top: if (area_size != -1 && type->byte_size != area_size) return -1; else - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); break; case DW_TAG_typedef: case DW_TAG_const_type: diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 8783ad81d3..c47f9315ba 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -153,7 +153,7 @@ bool mc_snapshot_region_linear(mc_mem_region_t region) { void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size); void* mc_snapshot_read(void* addr, mc_snapshot_t snapshot, void* target, size_t size); -int mc_snapshot_region_memcp( +int mc_snapshot_region_memcmp( void* addr1, mc_mem_region_t region1, void* addr2, mc_mem_region_t region2, size_t size); int mc_snapshot_memcp( diff --git a/src/mc/mc_snapshot.c b/src/mc/mc_snapshot.c index a7bd4dfea8..da79fe83dd 100644 --- a/src/mc/mc_snapshot.c +++ b/src/mc/mc_snapshot.c @@ -83,7 +83,7 @@ void* mc_snapshot_read(void* addr, mc_snapshot_t snapshot, void* target, size_t * @param snapshot2 Region of the address in the second snapshot * @return same as memcmp * */ -int mc_snapshot_region_memcp( +int mc_snapshot_region_memcmp( void* addr1, mc_mem_region_t region1, void* addr2, mc_mem_region_t region2, size_t size) { @@ -120,5 +120,5 @@ int mc_snapshot_memcp( { mc_mem_region_t region1 = mc_get_snapshot_region(addr1, snapshot1); mc_mem_region_t region2 = mc_get_snapshot_region(addr2, snapshot2); - return mc_snapshot_region_memcp(addr1, region1, addr2, region2, size); + return mc_snapshot_region_memcmp(addr1, region1, addr2, region2, size); } -- 2.20.1