Refactoring

uweseimet · Jan 14, 2025 · 9de2f3c · 9de2f3c
1 parent 877f98c
commit 9de2f3c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cpp/s2p/s2p_core.cpp b/cpp/s2p/s2p_core.cpp
@@ -79,7 +79,7 @@ void S2p::ReadAccessToken(const path &filename)
     }
 
     ifstream token_file(filename);
-    if (token_file.fail()) {
+    if (!token_file) {
         throw ParserException("Can't open access token file '" + filename.string() + "'");
     }
 

diff --git a/cpp/s2pdump/s2pdump_core.cpp b/cpp/s2pdump/s2pdump_core.cpp
@@ -548,7 +548,7 @@ string S2pDump::DumpRestore()
     }
 
     fstream file(filename, (restore ? ios::in : ios::out) | ios::binary);
-    if (file.fail()) {
+    if (!file) {
         return "Can't open image file '" + filename + "': " + strerror(errno);
     }
 

diff --git a/cpp/s2pexec/s2pexec_core.cpp b/cpp/s2pexec/s2pexec_core.cpp
@@ -529,7 +529,7 @@ string S2pExec::ReadData()
     const bool text = binary_input_filename.empty();
 
     ifstream in(filename, text ? ios::in : ios::in | ios::binary);
-    if (in.fail()) {
+    if (!in) {
         return fmt::format("Can't open input file '{0}': {1}", filename, strerror(errno));
     }
 
@@ -563,7 +563,7 @@ string S2pExec::WriteData(span<const uint8_t> data)
     }
     else {
         ofstream out(filename, text ? ios::out : ios::out | ios::binary);
-        if (out.fail()) {
+        if (!out) {
             return fmt::format("Can't open output file '{0}': {1}", filename, strerror(errno));
         }
 

diff --git a/cpp/s2pproto/s2pproto_core.cpp b/cpp/s2pproto/s2pproto_core.cpp
@@ -262,7 +262,7 @@ int S2pProto::GenerateOutput(const string &input_filename, const string &output_
     }
 
     ofstream out(output_filename, output_format == ProtobufFormat::BINARY ? ios::binary : ios::out);
-    if (out.fail()) {
+    if (!out) {
         cerr << "Error: Can't open protobuf data output file '" << output_filename << "'\n";
         return EXIT_FAILURE;
     }

diff --git a/cpp/s2psimh/s2psimh_core.cpp b/cpp/s2psimh/s2psimh_core.cpp
@@ -139,7 +139,7 @@ bool S2pSimh::ParseArguments(span<char*> args)
 
     if (truncate) {
         ofstream f(simh_filename);
-        if (f.fail()) {
+        if (!f) {
             cerr << "Error: Can't open '" << simh_filename << "'\n";
             return false;
         }
@@ -161,7 +161,7 @@ int S2pSimh::Run(span<char*> args)
     }
 
     simh_file.open(simh_filename, (meta_data.empty() ? ios::in : ios::out) | ios::binary);
-    if (simh_file.fail()) {
+    if (!simh_file) {
         cerr << "Error: Can't open '" << simh_filename << "':" << strerror(errno) << '\n';
         return EXIT_FAILURE;
     }