Change error handling code to takein proper object handle

This commit was SVN r1178.

src/mpi/c/type_create_keyval.c

@@ -31,7 +31,8 @@ MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
     if (MPI_PARAM_CHECK) {
 	if ((NULL == type_copy_attr_fn) || (NULL == type_delete_attr_fn) ||
 	    (NULL == type_keyval)) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, 
+	    return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL,
+					 MPI_ERR_ARG, 
 					 FUNC_NAME);
 	}
     }
@@ -42,7 +43,8 @@ MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
     ret = lam_attr_create_keyval(TYPE_ATTR, copy_fn, del_fn,
 				 type_keyval, extra_state, 0);
 
-    LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME);
+    LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
+			  MPI_ERR_OTHER, FUNC_NAME);
 }
 
 

src/mpi/c/type_delete_attr.c

@@ -25,12 +25,14 @@ MPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
 
     if (MPI_PARAM_CHECK) {
 	if (MPI_DATATYPE_NULL == type) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, 
+	    return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL, 
+					 MPI_ERR_TYPE, 
 					 FUNC_NAME);
 	}
     }
   
     ret = lam_attr_delete(TYPE_ATTR, type, type->d_keyhash, type_keyval, 0);
 
-    LAM_ERRHANDLER_RETURN(ret, type, MPI_ERR_OTHER, FUNC_NAME);  
+    LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
+			  MPI_ERR_OTHER, FUNC_NAME);  
 }

src/mpi/c/type_free_keyval.c

@@ -27,12 +27,14 @@ MPI_Type_free_keyval(int *type_keyval)
 
     if (MPI_PARAM_CHECK) {
 	if (NULL == type_keyval) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, 
+	    return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL,
+					 MPI_ERR_ARG, 
 					 FUNC_NAME);
 	}
     }
 
     ret = lam_attr_free_keyval(TYPE_ATTR, type_keyval, 0);
 
-    LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME);
+    LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
+			  MPI_ERR_OTHER, FUNC_NAME);
 }

src/mpi/c/type_get_attr.c

@@ -28,7 +28,8 @@ MPI_Type_get_attr (MPI_Datatype type,
 
     if (MPI_PARAM_CHECK) {
 	if ((NULL == attribute_val) || (NULL == flag)) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, 
+	    return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL, 
+					 MPI_ERR_ARG, 
 					 FUNC_NAME);
 	}
     }
@@ -36,5 +37,6 @@ MPI_Type_get_attr (MPI_Datatype type,
     ret = lam_attr_get(type->d_keyhash, type_keyval, 
 		       attribute_val, flag);
 
-    LAM_ERRHANDLER_RETURN(ret, type, MPI_ERR_OTHER, FUNC_NAME);  
+    LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL,
+			  MPI_ERR_OTHER, FUNC_NAME);  
 }

src/mpi/c/type_set_attr.c

@@ -27,7 +27,8 @@ MPI_Type_set_attr (MPI_Datatype type,
 
     if (MPI_PARAM_CHECK) {
 	if (MPI_DATATYPE_NULL == type) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, 
+	    return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL,
+					 MPI_ERR_TYPE, 
 					 FUNC_NAME);
 	}
     }
@@ -35,6 +36,7 @@ MPI_Type_set_attr (MPI_Datatype type,
     ret = lam_attr_set(TYPE_ATTR, type, type->d_keyhash, 
 		       type_keyval, attribute_val, 0);
 
-    LAM_ERRHANDLER_RETURN(ret, type, MPI_ERR_OTHER, FUNC_NAME);  
+    LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL,
+			  MPI_ERR_OTHER, FUNC_NAME);  
 
 }

src/mpi/c/win_delete_attr.c

@@ -24,7 +24,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval)
 
     if (MPI_PARAM_CHECK) {
 	if (MPI_WIN_NULL == win) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_WIN, 
+	    return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_WIN, 
 					 FUNC_NAME);
 	}
     }

src/mpi/c/win_get_attr.c

@@ -24,7 +24,7 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval,
 
     if (MPI_PARAM_CHECK) {
 	if ((NULL == attribute_val) || (NULL == flag)) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, 
+	    return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_ARG, 
 					 FUNC_NAME);
 	}
     }

src/mpi/c/win_set_attr.c

@@ -24,7 +24,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val) {
 
     if (MPI_PARAM_CHECK) {
 	if (MPI_WIN_NULL == win) {
-	    return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_WIN, 
+	    return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_WIN, 
 					 FUNC_NAME);
 	}
     }