Loading src/utils.cpp +23 −0 Changes for src/utils.cpp: 23 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -127,6 +127,29 @@ void utils::sfgets(const char *srcname, int srcline, char *s, int size, return; } /* like fread() but aborts with an error or EOF is encountered */ void sfread(const char *srcname, int srcline, void *s, size_t size, size_t num, FILE *fp, const char *filename, Error *error) { size_t rv = fread(s,size,num,fp); if (rv != num) { // something went wrong std::string errmsg; if (feof(fp)) { errmsg = "Unexpected end of file while reading file '"; } else if (ferror(fp)) { errmsg = "Unexpected error while reading file '"; } else { errmsg = "Unexpected short read while reading file '"; } errmsg += filename; errmsg += "'"; if (error) error->one(srcname,srcline,errmsg.c_str()); } return; } /* ------------------------------------------------------------------ */ std::string utils::check_packages_for_style(std::string style, Loading src/utils.h +15 −0 Changes for src/utils.h: 15 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -69,6 +69,21 @@ namespace LAMMPS_NS { void sfgets(const char *srcname, int srcline, char *s, int size, FILE *fp, const char *filename, Error *error); /** \brief safe wrapper around fread() which aborts on errors * or EOF and prints a suitable error message to help debugging * * \param srcname name of the calling source file (from FLERR macro) * \param srcline line in the calling source file (from FLERR macro) * \param s buffer for storing the result of fread() * \param size size of data elements read by fread() * \param num number of data elements read by fread() * \param fp file pointer used by fread() * \param filename file name associated with fp (for error message) * \param error pointer to Error class instance (for abort) */ void sfread(const char *srcname, int srcline, void *s, size_t size, size_t num, FILE *fp, const char *filename, Error *error); /** \brief Report if a requested style is in a package or may have a typo * * \param style type of style that is to be checked for Loading Loading
src/utils.cpp +23 −0 Changes for src/utils.cpp: 23 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -127,6 +127,29 @@ void utils::sfgets(const char *srcname, int srcline, char *s, int size, return; } /* like fread() but aborts with an error or EOF is encountered */ void sfread(const char *srcname, int srcline, void *s, size_t size, size_t num, FILE *fp, const char *filename, Error *error) { size_t rv = fread(s,size,num,fp); if (rv != num) { // something went wrong std::string errmsg; if (feof(fp)) { errmsg = "Unexpected end of file while reading file '"; } else if (ferror(fp)) { errmsg = "Unexpected error while reading file '"; } else { errmsg = "Unexpected short read while reading file '"; } errmsg += filename; errmsg += "'"; if (error) error->one(srcname,srcline,errmsg.c_str()); } return; } /* ------------------------------------------------------------------ */ std::string utils::check_packages_for_style(std::string style, Loading
src/utils.h +15 −0 Changes for src/utils.h: 15 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -69,6 +69,21 @@ namespace LAMMPS_NS { void sfgets(const char *srcname, int srcline, char *s, int size, FILE *fp, const char *filename, Error *error); /** \brief safe wrapper around fread() which aborts on errors * or EOF and prints a suitable error message to help debugging * * \param srcname name of the calling source file (from FLERR macro) * \param srcline line in the calling source file (from FLERR macro) * \param s buffer for storing the result of fread() * \param size size of data elements read by fread() * \param num number of data elements read by fread() * \param fp file pointer used by fread() * \param filename file name associated with fp (for error message) * \param error pointer to Error class instance (for abort) */ void sfread(const char *srcname, int srcline, void *s, size_t size, size_t num, FILE *fp, const char *filename, Error *error); /** \brief Report if a requested style is in a package or may have a typo * * \param style type of style that is to be checked for Loading
