tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove explicit mode parameter from tl_file_utils.

Browse Source
This commit is contained in:
levlam 2023-06-26 06:59:19 +03:00
parent 29ca948f09
commit 6ce85fdc4f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/generate/remove_documentation.cpp
View File

@ -13,9 +13,9 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
std::string file_name = argv[i]; std::string file_name = argv[i];
std::string old_contents = td::tl::get_file_contents(file_name, "rb"); std::string old_contents = td::tl::get_file_contents(file_name);
std::string new_contents = td::tl::remove_documentation(old_contents); std::string new_contents = td::tl::remove_documentation(old_contents);
if (new_contents != old_contents && !td::tl::put_file_contents(file_name, "wb", new_contents)) { if (new_contents != old_contents && !td::tl::put_file_contents(file_name, new_contents)) {
std::fprintf(stderr, "Can't write file %s\n", file_name.c_str()); std::fprintf(stderr, "Can't write file %s\n", file_name.c_str());
std::abort(); std::abort();
} }

8
tdtl/td/tl/tl_file_utils.cpp
View File

@ -12,8 +12,8 @@
namespace td { namespace td {
namespace tl { namespace tl {
std::string get_file_contents(const std::string &file_name, const std::string &mode) { std::string get_file_contents(const std::string &file_name) {
FILE *f = std::fopen(file_name.c_str(), mode.c_str()); FILE *f = std::fopen(file_name.c_str(), "rb");
if (f == NULL) { if (f == NULL) {
return std::string(); return std::string();
} }
@ -44,8 +44,8 @@ std::string get_file_contents(const std::string &file_name, const std::string &m
return result; return result;
} }
bool put_file_contents(const std::string &file_name, const std::string &mode, const std::string &contents) { bool put_file_contents(const std::string &file_name, const std::string &contents) {
FILE *f = std::fopen(file_name.c_str(), mode.c_str()); FILE *f = std::fopen(file_name.c_str(), "wb");
if (f == NULL) { if (f == NULL) {
std::fprintf(stderr, "Can't open file \"%s\"\n", file_name.c_str()); std::fprintf(stderr, "Can't open file \"%s\"\n", file_name.c_str());
return false; return false;

4
tdtl/td/tl/tl_file_utils.h
View File

@ -11,9 +11,9 @@
namespace td { namespace td {
namespace tl { namespace tl {
std::string get_file_contents(const std::string &file_name, const std::string &mode); std::string get_file_contents(const std::string &file_name);
bool put_file_contents(const std::string &file_name, const std::string &mode, const std::string &contents); bool put_file_contents(const std::string &file_name, const std::string &contents);
std::string remove_documentation(const std::string &str); std::string remove_documentation(const std::string &str);

6
tdtl/td/tl/tl_generate.cpp
View File

@ -837,7 +837,7 @@ void write_tl(const tl_config &config, tl_outputer &out, const TL_writer &w) {
} }
tl_config read_tl_config_from_file(const std::string &file_name) { tl_config read_tl_config_from_file(const std::string &file_name) {
std::string config = get_file_contents(file_name, "rb"); std::string config = get_file_contents(file_name);
if (config.empty()) { if (config.empty()) {
std::fprintf(stderr, "Config file %s is empty\n", file_name.c_str()); std::fprintf(stderr, "Config file %s is empty\n", file_name.c_str());
std::abort(); std::abort();
@ -856,14 +856,14 @@ bool write_tl_to_file(const tl_config &config, const std::string &file_name, con
tl_string_outputer out; tl_string_outputer out;
write_tl(config, out, w); write_tl(config, out, w);
std::string old_file_contents = get_file_contents(file_name, "rb"); std::string old_file_contents = get_file_contents(file_name);
if (!w.is_documentation_generated()) { if (!w.is_documentation_generated()) {
old_file_contents = remove_documentation(old_file_contents); old_file_contents = remove_documentation(old_file_contents);
} }
if (old_file_contents != out.get_result()) { if (old_file_contents != out.get_result()) {
std::fprintf(stderr, "Write tl to file %s\n", file_name.c_str()); std::fprintf(stderr, "Write tl to file %s\n", file_name.c_str());
return put_file_contents(file_name, "wb", out.get_result()); return put_file_contents(file_name, out.get_result());
} }
return true; return true;