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

Use varargs version of Error:all() and Error::one() where applicable

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-04-25 21:30:51 -04:00
parent 4cbe6200d6
commit e9e0bb71b6
117 changed files with 522 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/input.cpp
View File

@ -270,7 +270,7 @@ void Input::file()
// execute the command
if (execute_command() && line)
error->all(FLERR,fmt::format("Unknown command: {}",line));
error->all(FLERR,"Unknown command: {}",line);
}
}
@ -302,8 +302,8 @@ void Input::file(const char *filename)
infile = fopen(filename,"r");
if (infile == nullptr)
error->one(FLERR,fmt::format("Cannot open input script {}: {}",
filename, utils::getsyserror()));
error->one(FLERR,"Cannot open input script {}: {}",
filename, utils::getsyserror());
infiles[nfile++] = infile;
}
@ -359,7 +359,7 @@ char *Input::one(const std::string &single)
// execute the command and return its name
if (execute_command())
error->all(FLERR,fmt::format("Unknown command: {}",line));
error->all(FLERR,"Unknown command: {}",line);
return command;
}
@ -613,8 +613,8 @@ void Input::substitute(char *&str, char *&str2, int &max, int &max2, int flag)
}
if (value == nullptr)
error->one(FLERR,fmt::format("Substitution for illegal "
"variable {}",var));
error->one(FLERR,"Substitution for illegal "
"variable {}",var);
// check if storage in str2 needs to be expanded
// re-initialize ptr and ptr2 to the point beyond the variable.
@ -971,8 +971,8 @@ void Input::include()
infile = fopen(arg[0],"r");
if (infile == nullptr)
error->one(FLERR,fmt::format("Cannot open input script {}: {}",
arg[0], utils::getsyserror()));
error->one(FLERR,"Cannot open input script {}: {}",
arg[0], utils::getsyserror());
infiles[nfile++] = infile;
}
@ -1005,8 +1005,8 @@ void Input::jump()
if (infile && infile != stdin) fclose(infile);
infile = fopen(arg[0],"r");
if (infile == nullptr)
error->one(FLERR,fmt::format("Cannot open input script {}: {}",
arg[0], utils::getsyserror()));
error->one(FLERR,"Cannot open input script {}: {}",
arg[0], utils::getsyserror());
infiles[nfile-1] = infile;
}
@ -1047,8 +1047,8 @@ void Input::log()
else logfile = fopen(arg[0],"w");
if (logfile == nullptr)
error->one(FLERR,fmt::format("Cannot open logfile {}: {}",
arg[0], utils::getsyserror()));
error->one(FLERR,"Cannot open logfile {}: {}",
arg[0], utils::getsyserror());
}
if (universe->nworlds == 1) universe->ulogfile = logfile;
@ -1123,8 +1123,8 @@ void Input::print()
if (strcmp(arg[iarg],"file") == 0) fp = fopen(arg[iarg+1],"w");
else fp = fopen(arg[iarg+1],"a");
if (fp == nullptr)
error->one(FLERR,fmt::format("Cannot open print file {}: {}",
arg[iarg+1], utils::getsyserror()));
error->one(FLERR,"Cannot open print file {}: {}",
arg[iarg+1], utils::getsyserror());
}
iarg += 2;
} else if (strcmp(arg[iarg],"screen") == 0) {