[mpich2-commits] r4030 - in mpich2/trunk/src/mpi/romio/adio: common include

[robl at mcs.anl.gov]

Author: robl
Date: 2009-03-12 12:58:51 -0500 (Thu, 12 Mar 2009)
New Revision: 4030

Modified:
   mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c
   mpich2/trunk/src/mpi/romio/adio/include/adio_cb_config_list.h
Log:
function prototype for keyval copy and delete callbacks takes an 
'int' not 'int *' -- man that's one old (but very minor) bug.


Modified: mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c	2009-03-12 17:43:01 UTC (rev 4029)
+++ mpich2/trunk/src/mpi/romio/adio/common/cb_config_list.c	2009-03-12 17:58:51 UTC (rev 4030)
@@ -362,7 +362,7 @@
 /* ADIOI_cb_copy_name_array() - attribute copy routine
  */
 int ADIOI_cb_copy_name_array(MPI_Comm comm, 
-		       int *keyval, 
+		       int keyval, 
 		       void *extra, 
 		       void *attr_in,
 		       void **attr_out, 
@@ -371,7 +371,7 @@
     ADIO_cb_name_array array;
 
     ADIOI_UNREFERENCED_ARG(comm);
-    ADIOI_UNREFERENCED_ARG(keyval);
+    ADIOI_UNREFERENCED_ARG(keyval); 
     ADIOI_UNREFERENCED_ARG(extra);
 
     array = (ADIO_cb_name_array) attr_in;
@@ -386,7 +386,7 @@
 /* ADIOI_cb_delete_name_array() - attribute destructor
  */
 int ADIOI_cb_delete_name_array(MPI_Comm comm, 
-			 int *keyval, 
+			 int keyval, 
 			 void *attr_val, 
 			 void *extra)
 {
@@ -411,7 +411,6 @@
 	if (array->names != NULL) ADIOI_Free(array->names);
 	ADIOI_Free(array);
     }
-
     return MPI_SUCCESS;
 }
 

Modified: mpich2/trunk/src/mpi/romio/adio/include/adio_cb_config_list.h
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/include/adio_cb_config_list.h	2009-03-12 17:43:01 UTC (rev 4029)
+++ mpich2/trunk/src/mpi/romio/adio/include/adio_cb_config_list.h	2009-03-12 17:58:51 UTC (rev 4030)
@@ -17,10 +17,10 @@
 
 int ADIOI_cb_gather_name_array(MPI_Comm comm, MPI_Comm dupcomm, 
 			       ADIO_cb_name_array *arrayp);
-int ADIOI_cb_copy_name_array(MPI_Comm comm, int *keyval, void *extra, 
+int ADIOI_cb_copy_name_array(MPI_Comm comm, int keyval, void *extra, 
 			     void *attr_in,
 			     void **attr_out, int *flag);
-int ADIOI_cb_delete_name_array(MPI_Comm comm, int *keyval, void *attr_val, 
+int ADIOI_cb_delete_name_array(MPI_Comm comm, int keyval, void *attr_val, 
 			       void *extra);
 int ADIOI_cb_config_list_parse(char *config_list, ADIO_cb_name_array array, 
 			       int ranklist[], int cb_nodes);