From 36a4e3d88f478fe9b9b739a2c55cb01a7e14356f Mon Sep 17 00:00:00 2001
From: Ken Raffenetti <raffenet@mcs.anl.gov>
Date: Wed, 10 Sep 2025 14:43:58 -0500
Subject: [PATCH 1/2] mpi_t: Remove invalid error check

MPL_env2str is used to check for CVARs with string or enum type. It
returns only 0 or 1 based on whether the environment variable is
found. It never returns -1, so we can safely remove the error check.
---
 maint/extractcvars | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maint/extractcvars b/maint/extractcvars
index aab9ce5568d..4965982e8a3 100755
--- a/maint/extractcvars
+++ b/maint/extractcvars
@@ -340,7 +340,6 @@ EOT
         elsif ($p->{type} eq 'string' or $p->{type} eq 'enum') {
 print OUTPUT_C <<EOT;
     rc = MPL_env2${env_fn}("$env_name", &tmp_str);
-    MPIR_ERR_CHKANDJUMP1((-1 == rc),mpi_errno,MPI_ERR_OTHER,"**envvarparse","**envvarparse %s","$env_name");
     got_rc += rc;
 EOT
         }

From 87e7b130f5e5e605c5945cdc3a8f6b95a5b17e21 Mon Sep 17 00:00:00 2001
From: Ken Raffenetti <raffenet@mcs.anl.gov>
Date: Thu, 18 Sep 2025 10:33:10 -0500
Subject: [PATCH 2/2] mpi_t: Rename variable for clarity

Whether or not the user has set an environment variable is tracked by
the return codes of various MPL_env2* functions. If a variable is set
and debugging is enabled, the setting gets printed out for the
user. Rename got_rc->is_set to better indicate what the value
represents.
---
 maint/extractcvars | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/maint/extractcvars b/maint/extractcvars
index 4965982e8a3..580fa11359b 100755
--- a/maint/extractcvars
+++ b/maint/extractcvars
@@ -247,7 +247,7 @@ print OUTPUT_C <<EOT;
 int ${fn_ns}_init(void)
 {
     int mpi_errno = MPI_SUCCESS;
-    int rc, got_rc;
+    int rc, is_set;
     const char *tmp_str;
     MPIR_T_cvar_value_t defaultval;
 
@@ -327,33 +327,33 @@ foreach my $p (@cvars) {
     push @env_names, "${alt_ns}_" . $p->{name};
     push @env_names, "${uc_ns}_" . $p->{name};
 
-    print OUTPUT_C "    got_rc = 0;\n";
+    print OUTPUT_C "    is_set = 0;\n";
     foreach my $env_name (@env_names) {
         # assumes rc is defined
         if ($p->{type} eq 'range') {
 print OUTPUT_C <<EOT;
     rc = MPL_env2${env_fn}("$env_name", &($var_name.low), &($var_name.high));
     MPIR_ERR_CHKANDJUMP1((-1 == rc),mpi_errno,MPI_ERR_OTHER,"**envvarparse","**envvarparse %s","$env_name");
-    got_rc += rc;
+    is_set += rc;
 EOT
         }
         elsif ($p->{type} eq 'string' or $p->{type} eq 'enum') {
 print OUTPUT_C <<EOT;
     rc = MPL_env2${env_fn}("$env_name", &tmp_str);
-    got_rc += rc;
+    is_set += rc;
 EOT
         }
         else {
 print OUTPUT_C <<EOT;
     rc = MPL_env2${env_fn}("$env_name", &($var_name));
     MPIR_ERR_CHKANDJUMP1((-1 == rc),mpi_errno,MPI_ERR_OTHER,"**envvarparse","**envvarparse %s","$env_name");
-    got_rc += rc;
+    is_set += rc;
 EOT
         }
     }
 
     # debugging
-    print OUTPUT_C "    if (got_rc && debug) {\n";
+    print OUTPUT_C "    if (is_set && debug) {\n";
     if ($p->{type} eq 'string' or $p->{type} eq 'enum') {
         print OUTPUT_C "        printf(\"CVAR: $var_name = %s\\n\", tmp_str);\n";
     } elsif ($p->{type} eq "range") {