attributes - clean up extra helper data

using the bindings_extra_state arg to ompi_attr_create_keyval

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/c/comm_create_keyval.c.in

@@ -14,7 +14,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
- * Copyright (c) 2024      Triad National Security, LLC. All rights
+ * Copyright (c) 2024-2025 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -52,13 +52,14 @@ PROTOTYPE ERROR_CLASS comm_create_keyval(COMM_COPY_ATTR_FUNCTION comm_copy_attr_
 #if OMPI_ABI_SRC
     copy_fn.attr_communicator_copy_fn = ompi_abi_copy_attr_fn;
     del_fn.attr_communicator_delete_fn = ompi_abi_delete_attr_fn;
+    ret = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn,
+                                  comm_keyval, extra_state, flags, extra_state);
 #else
     copy_fn.attr_communicator_copy_fn = comm_copy_attr_fn;
     del_fn.attr_communicator_delete_fn = comm_delete_attr_fn;
-#endif
-
     ret = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn,
                                   comm_keyval, extra_state, flags, NULL);
+#endif
 
     OMPI_ERRHANDLER_NOHANDLE_RETURN(ret, MPI_ERR_OTHER, FUNC_NAME);
 }

ompi/mpi/c/type_create_keyval.c.in

@@ -14,7 +14,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
- * Copyright (c) 2024      Triad National Security, LLC. All rights
+ * Copyright (c) 2024-2025 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -53,13 +53,15 @@ PROTOTYPE ERROR_CLASS type_create_keyval(TYPE_COPY_ATTR_FUNCTION type_copy_attr_
 #if OMPI_ABI_SRC
     copy_fn.attr_datatype_copy_fn = ompi_abi_copy_attr_fn;
     del_fn.attr_datatype_delete_fn = ompi_abi_delete_attr_fn;
+    ret = ompi_attr_create_keyval(TYPE_ATTR, copy_fn, del_fn,
+                                  type_keyval, extra_state, flags, extra_state);
 #else
     copy_fn.attr_datatype_copy_fn = type_copy_attr_fn;
     del_fn.attr_datatype_delete_fn = type_delete_attr_fn;
-#endif
-
     ret = ompi_attr_create_keyval(TYPE_ATTR, copy_fn, del_fn,
                                   type_keyval, extra_state, flags, NULL);
+#endif
+
     OMPI_ERRHANDLER_NOHANDLE_RETURN(ret, ret, FUNC_NAME);
 }
 

ompi/mpi/c/win_create_keyval.c.in

@@ -14,7 +14,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
- * Copyright (c) 2024      Triad National Security, LLC. All rights
+ * Copyright (c) 2024-2025 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -51,12 +51,14 @@ PROTOTYPE ERROR_CLASS win_create_keyval(WIN_COPY_ATTR_FUNCTION win_copy_attr_fn,
 #if OMPI_ABI_SRC
     copy_fn.attr_win_copy_fn = ompi_abi_copy_attr_fn;
     del_fn.attr_win_delete_fn = ompi_abi_delete_attr_fn;
+    ret = ompi_attr_create_keyval(WIN_ATTR, copy_fn, del_fn,
+                                  win_keyval, extra_state, flags, extra_state);
 #else
     copy_fn.attr_win_copy_fn = win_copy_attr_fn;
     del_fn.attr_win_delete_fn = win_delete_attr_fn;
-#endif
-
     ret = ompi_attr_create_keyval(WIN_ATTR, copy_fn, del_fn,
                                   win_keyval, extra_state, flags, NULL);
+#endif
+
     OMPI_ERRHANDLER_NOHANDLE_RETURN(ret, MPI_ERR_OTHER, FUNC_NAME);
 }