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

make some more use of {fmt} in lammps.cpp

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-05-27 05:29:42 -04:00
parent dd61ac80f7
commit 1930a8fd00
3 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input.cpp
View File

@ -50,6 +50,7 @@
#include "error.h"
#include "memory.h"
#include "utils.h"
#include "fmt/format.h"
#ifdef _WIN32
#include <direct.h>
@ -275,11 +276,11 @@ void Input::file(const char *filename)
return command name to caller
------------------------------------------------------------------------- */
char *Input::one(const char *single)
char *Input::one(const std::string &single)
{
int n = strlen(single) + 1;
int n = single.size() + 1;
if (n > maxline) reallocate(line,maxline,n);
strcpy(line,single);
strcpy(line,single.c_str());
// echo the command unless scanning for label
@ -300,11 +301,8 @@ char *Input::one(const char *single)
// execute the command and return its name
if (execute_command()) {
char *str = new char[maxline+32];
sprintf(str,"Unknown command: %s",line);
error->all(FLERR,str);
}
if (execute_command())
error->all(FLERR,fmt::format("Unknown command: {}",line).c_str());
return command;
}