From: Augustin Degomme Date: Mon, 6 Oct 2014 12:28:00 +0000 (+0200) Subject: give correct pointer when calling delete function X-Git-Tag: v3_12~767 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e1e905a601e44cbd1f80bedf98a9ba409049724a give correct pointer when calling delete function --- diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c index add045fa1d..2e3bf4f041 100644 --- a/src/smpi/smpi_comm.c +++ b/src/smpi/smpi_comm.c @@ -545,7 +545,7 @@ int smpi_comm_attr_delete(MPI_Comm comm, int keyval){ void * value; int flag; if(smpi_comm_attr_get(comm, keyval, &value, &flag)==MPI_SUCCESS){ - int ret = elem->delete_fn(comm, keyval, &value, &flag); + int ret = elem->delete_fn(comm, keyval, value, &flag); if(ret!=MPI_SUCCESS) return ret; } } @@ -592,7 +592,7 @@ int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value){ void* value; smpi_comm_attr_get(comm, keyval, &value, &flag); if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){ - int ret = elem->delete_fn(comm, keyval, &value, &flag); + int ret = elem->delete_fn(comm, keyval, value, &flag); if(ret!=MPI_SUCCESS) return ret; } if(comm->attributes==NULL) diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c index d7f0fc9ce3..c5e93f38a5 100644 --- a/src/smpi/smpi_mpi_dt.c +++ b/src/smpi/smpi_mpi_dt.c @@ -412,7 +412,7 @@ void smpi_datatype_free(MPI_Datatype* type){ xbt_dict_foreach((*type)->attributes, cursor, key, value){ smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key); if(elem && elem->delete_fn) - elem->delete_fn(*type, atoi((const char*)key), &value, &flag); + elem->delete_fn(*type, atoi((const char*)key), value, &flag); } } @@ -1679,7 +1679,7 @@ int smpi_type_attr_delete(MPI_Datatype type, int keyval){ void * value; int flag; if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){ - int ret = elem->delete_fn(type, keyval, &value, &flag); + int ret = elem->delete_fn(type, keyval, value, &flag); if(ret!=MPI_SUCCESS) return ret; } } @@ -1726,7 +1726,7 @@ int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){ void* value; smpi_type_attr_get(type, keyval, &value, &flag); if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){ - int ret = elem->delete_fn(type, keyval, &value, &flag); + int ret = elem->delete_fn(type, keyval, value, &flag); if(ret!=MPI_SUCCESS) return ret; } if(type->attributes==NULL)