use more obivous code and safe b/c we hold lock

naughtont3 · naughtont3 · commit 6989cb329024 · 2025-10-03T00:13:29.000-04:00
Signed-off-by: Thomas Naughton &lt;naughtont@ornl.gov&gt;
diff --git a/ompi/errhandler/errcode.c b/ompi/errhandler/errcode.c
@@ -440,7 +440,7 @@ int ompi_mpi_errcode_remove(int errnum)
             if (OPAL_SUCCESS == ret) {
                 if (errnum == ompi_mpi_errcode_lastused) {
                     ompi_mpi_errcode_lastused--;
-                    ret = errnum - 1; /* lastused w/o lock */
+                    ret = ompi_mpi_errcode_lastused;
                 }
             }
         }
@@ -478,7 +478,7 @@ int ompi_mpi_errclass_remove(int errclass)
                 if (OPAL_SUCCESS == ret) {
                     if (errclass == ompi_mpi_errcode_lastused) {
                         ompi_mpi_errcode_lastused--;
-                        ret = errclass - 1; /* lastused w/o lock */
+                        ret = ompi_mpi_errcode_lastused;
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ int ompi_mpi_errcode_remove(int errnum)`
`440`	`440`	`if (OPAL_SUCCESS == ret) {`
`441`	`441`	`if (errnum == ompi_mpi_errcode_lastused) {`
`442`	`442`	`ompi_mpi_errcode_lastused--;`
`443`		`- ret = errnum - 1; /* lastused w/o lock */`
	`443`	`+ ret = ompi_mpi_errcode_lastused;`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`	`}`
`@@ -478,7 +478,7 @@ int ompi_mpi_errclass_remove(int errclass)`
`478`	`478`	`if (OPAL_SUCCESS == ret) {`
`479`	`479`	`if (errclass == ompi_mpi_errcode_lastused) {`
`480`	`480`	`ompi_mpi_errcode_lastused--;`
`481`		`- ret = errclass - 1; /* lastused w/o lock */`
	`481`	`+ ret = ompi_mpi_errcode_lastused;`
`482`	`482`	`}`
`483`	`483`	`}`
`484`	`484`	`}`