ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redundant calls to fmt::format() from calls to error->one/all() and utils::logmesg()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-09-26 23:56:51 -04:00
parent 6115edefcb
commit 5a455c5e3a
19 changed files with 57 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils.cpp
View File

@ -557,7 +557,7 @@ void utils::bounds(const char *file, int line, const std::string &str,
// check for illegal charcters
size_t found = str.find_first_not_of("*-0123456789");
if (found != std::string::npos) {
if (error) error->all(file, line, fmt::format("Invalid range string: {}", str));
if (error) error->all(file, line, "Invalid range string: {}", str);
return;
}
@ -580,17 +580,14 @@ void utils::bounds(const char *file, int line, const std::string &str,
if (error) {
if ((nlo <= 0) || (nhi <= 0))
error->all(file, line, fmt::format("Invalid range string: {}", str));
error->all(file, line, "Invalid range string: {}", str);
if (nlo < nmin)
error->all(file, line, fmt::format("Numeric index {} is out of bounds ({}-{})",
nlo, nmin, nmax));
error->all(file, line, "Numeric index {} is out of bounds ({}-{})", nlo, nmin, nmax);
else if (nhi > nmax)
error->all(file, line, fmt::format("Numeric index {} is out of bounds ({}-{})",
nhi, nmin, nmax));
error->all(file, line, "Numeric index {} is out of bounds ({}-{})", nhi, nmin, nmax);
else if (nlo > nhi)
error->all(file, line, fmt::format("Numeric index {} is out of bounds ({}-{})",
nlo, nmin, nhi));
error->all(file, line, "Numeric index {} is out of bounds ({}-{})", nlo, nmin, nhi);
}
}