From 75649be00016cfd8c38ad8234387a50170f09b9a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 29 Oct 2020 21:43:20 +0100 Subject: [PATCH] Make code simpler. --- src/smpi/bindings/smpi_pmpi.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 658d06ec29..090f52a88d 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -152,10 +152,10 @@ int PMPI_Get_address(const void *location, MPI_Aint * address) int PMPI_Get_processor_name(char *name, int *resultlen) { - strncpy(name, sg_host_self()->get_cname(), - strlen(sg_host_self()->get_cname()) < MPI_MAX_PROCESSOR_NAME - 1 ? strlen(sg_host_self()->get_cname()) + 1 - : MPI_MAX_PROCESSOR_NAME - 1); - *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); + int len = std::min(sg_host_self()->get_name().size(), MPI_MAX_PROCESSOR_NAME - 1); + std::string(sg_host_self()->get_name()).copy(name, len); + name[len] = '\0'; + *resultlen = len; return MPI_SUCCESS; } -- 2.20.1