OMPI timing: fix two minor bugs

1. In ompi_mpi_init, fix a typo that was causing a meaningless /
   ignored computation instead of an assignment.
2. Fix the name of a shadowed variable in the OMPI_TIMING_OUT macro.

Signed-off-by: Jeff Squyres <[email protected]>

Author: jsquyres

ompi/runtime/ompi_mpi_init.c

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2018 Cisco Systems, Inc.  All rights reserved
+ * Copyright (c) 2006-2022 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2006-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2009 University of Houston. All rights reserved.
@@ -728,7 +728,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
     if (OMPI_TIMING_ENABLED && !opal_pmix_base_async_modex &&
             opal_pmix_collect_all_data && !ompi_singleton) {
         if (PMIX_SUCCESS != (rc = PMIx_Fence(NULL, 0, NULL, 0))) {
-            ret - opal_pmix_convert_status(rc);
+            ret = opal_pmix_convert_status(rc);
             error = "timing: pmix-barrier-1 failed";
             goto error;
         }

ompi/util/timings.h

@@ -169,14 +169,14 @@ typedef struct ompi_timing_t {
             int i;                                                                \
             int size = ompi_comm_size(MPI_COMM_WORLD);                            \
             int rank = ompi_comm_rank(MPI_COMM_WORLD);                            \
-            int error = 0;                                                        \
+            int timing_error = 0;                                                 \
             int imported = 0;                                                     \
                                                                                   \
-            MPI_COMM_WORLD->c_coll->coll_reduce(&OMPI_TIMING.error, &error, 1,    \
+            MPI_COMM_WORLD->c_coll->coll_reduce(&OMPI_TIMING.error, &timing_error, 1, \
                                                 MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD, \
                                                 MPI_COMM_WORLD->c_coll->coll_reduce_module); \
                                                                                   \
-            if (error) {                                                          \
+            if (timing_error) {                                                   \
                 if (0 == rank) {                                                  \
                     printf("==OMPI_TIMING== error: something went wrong, timings doesn't work\n"); \
                 }                                                                 \