From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 18 Mar 2014 15:47:14 +0000 (+0100)
Subject: [mc] Fix compile_warnings
X-Git-Tag: v3_11~199^2~2^2~6
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/859be56ee4794f262b79665d2caa32664e52cbed

[mc] Fix compile_warnings
---

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 8c49abb216..d80a004838 100644
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -482,9 +482,9 @@ uintptr_t mc_untranslate_address(void* addr, mc_snapshot_t snapshot) {
 
   for(size_t i=0; i!=NB_REGIONS; ++i) {
     mc_mem_region_t region = snapshot->regions[i];
-    if(addr>=region->data && addr<=region->data+region->size) {
+    if(addr>=region->data && addr<=(void*)(((char*)region->data)+region->size)) {
       size_t offset = (size_t) ((char*) addr - (char*) region->data);
-      return (uintptr_t) (region->start_addr + offset);
+      return ((uintptr_t) region->start_addr) + offset;
     }
   }
 
diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index f9b125b64b..8e51c81093 100644
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -245,14 +245,11 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_
   void* start_data_libsimgrid = mc_libsimgrid_info->start_rw;
 
   mc_object_info_t object_info = NULL;
-  mc_object_info_t other_object_info = NULL;
   if(region_type == 2){
     object_info = mc_binary_info;
-    other_object_info = mc_libsimgrid_info;
     start_data = start_data_binary;
   }else{
     object_info = mc_libsimgrid_info;
-    other_object_info = mc_binary_info;
     start_data = start_data_libsimgrid;
   }
   variables = object_info->global_variables;
diff --git a/src/mc/mc_dwarf.c b/src/mc/mc_dwarf.c
index 1ee1468c7b..f646d51bf8 100644
--- a/src/mc/mc_dwarf.c
+++ b/src/mc/mc_dwarf.c
@@ -520,7 +520,7 @@ static dw_type_t MC_dwarf_die_to_type(mc_object_info_t info, Dwarf_Die* die, Dwa
   // Global Offset
   type->id = (void *) dwarf_dieoffset(die);
 
-  char* prefix = "";
+  const char* prefix = "";
   switch (type->type) {
   case DW_TAG_structure_type:
     prefix = "struct ";
@@ -734,7 +734,7 @@ static void MC_dwarf_handle_subprogram_die(mc_object_info_t info, Dwarf_Die* die
 
   Dwarf_Attribute attr_frame_base;
   if (!dwarf_attr_integrate(die, DW_AT_frame_base, &attr_frame_base))
-    xbt_die("Coult not find DW_AT_frame_base for subprogram %s %p", frame->name, frame->start);
+    xbt_die("Coult not find DW_AT_frame_base for subprogram %s 0x%lx", frame->name, frame->start);
   mc_dwarf_location_list_init(&frame->frame_base, info, die, &attr_frame_base);
 
   frame->end = -1; // This one is now useless:
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 73650bd787..12208e4a5c 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -252,7 +252,6 @@ static void MC_make_functions_index(mc_object_info_t info) {
 }
 
 mc_object_info_t MC_ip_find_object_info(void* ip) {
-  size_t n = 2;
   size_t i;
   for(i=0; i!=mc_object_infos_size; ++i) {
     if(ip >= (void*)mc_object_infos[i]->start_exec && ip <= (void*)mc_object_infos[i]->end_exec) {
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index ae7acf6565..1e2e0a994b 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -528,7 +528,7 @@ void get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request,
 typedef struct s_mc_address_set *mc_address_set_t;
 
 mc_address_set_t mc_address_set_new();
-mc_address_set_t mc_address_set_free(mc_address_set_t* p);
+void mc_address_set_free(mc_address_set_t* p);
 void mc_address_add(mc_address_set_t p, const void* value);
 bool mc_address_test(mc_address_set_t p, const void* value);
 
diff --git a/src/mc/mc_set.cpp b/src/mc/mc_set.cpp
index b04c1ff54b..1ab9584495 100644
--- a/src/mc/mc_set.cpp
+++ b/src/mc/mc_set.cpp
@@ -12,7 +12,7 @@ typedef std::set<const void*>*  mc_address_set_t;
 extern "C" {
 
 mc_address_set_t mc_address_set_new();
-mc_address_set_t mc_address_set_free(mc_address_set_t* p);
+void mc_address_set_free(mc_address_set_t* p);
 void mc_address_add(mc_address_set_t p, const void* value);
 bool mc_address_test(mc_address_set_t p, const void* value);
 
@@ -20,7 +20,7 @@ mc_address_set_t mc_address_set_new() {
   return new std::set<const void*>();
 }
 
-mc_address_set_t mc_address_set_free(mc_address_set_t* p) {
+void mc_address_set_free(mc_address_set_t* p) {
   delete *p;
   *p = NULL;
 }
diff --git a/testsuite/mc/dwarf.c b/testsuite/mc/dwarf.c
index c6b1fe5565..b373c1fb31 100644
--- a/testsuite/mc/dwarf.c
+++ b/testsuite/mc/dwarf.c
@@ -101,6 +101,10 @@ int some_local_variable = 0;
 
 typedef struct foo {int i;} s_foo;
 
+static void test_type_by_name(s_foo my_foo) {
+  assert(xbt_dict_get_or_null(mc_binary_info->full_types_by_name, "struct foo"));
+}
+
 int main(int argc, char** argv) {
 
   // xbt_init(&argc, argv);
@@ -131,8 +135,7 @@ int main(int argc, char** argv) {
   test_local_variable(mc_binary_info, "main", "argc", &argc, &cursor);
 
   s_foo my_foo;
-
-  assert(xbt_dict_get_or_null(mc_binary_info->full_types_by_name, "struct foo"));
+  test_type_by_name(my_foo);
 
   _exit(0);
 }
diff --git a/testsuite/mc/dwarf_expression.c b/testsuite/mc/dwarf_expression.c
index 719c73b454..98ee29adb9 100644
--- a/testsuite/mc/dwarf_expression.c
+++ b/testsuite/mc/dwarf_expression.c
@@ -8,6 +8,7 @@
 
 #include "../src/mc/mc_private.h"
 
+static
 uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a, uintptr_t b) {
   state->stack_size = 0;
 
@@ -23,6 +24,7 @@ uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a
   return state->stack[state->stack_size - 1];
 }
 
+static
 void basic_test(mc_expression_state_t state) {
   Dwarf_Op ops[60];
 
@@ -88,7 +90,8 @@ void basic_test(mc_expression_state_t state) {
   assert(state->stack[state->stack_size-2]== b);
 }
 
-int test_deref(mc_expression_state_t state) {
+static
+void test_deref(mc_expression_state_t state) {
   uintptr_t foo = 42;
 
   Dwarf_Op ops[60];