Fixing some edge cases in cpp00 and cpp01, Updated formatting

1 files changed, 6 insertions, 7 deletions

diff --git a/cpp01/ex07/main.cpp b/cpp01/ex07/main.cpp
index 64e5ce8..d98168a 100644
--- a/cpp01/ex07/main.cpp
+++ b/cpp01/ex07/main.cpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 17:08:28 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/13 10:31:55 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/09 11:22:46 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,27 +21,26 @@ int main(int argc, char **argv)
 		std::cerr << "Usage: " << argv[0] << " filename s1 s2" << std::endl;
 		return 1;
 	}
+
 	std::string filename(argv[1]);
 	std::string s1(argv[2]);
 	std::string s2(argv[3]);
-    if (s1 == "" || s2 == "")
+    if (filename.empty() || s1.empty() || s2.empty())
     {
-		std::cerr << "Error: s1 and s2 should not be empty" << std::endl;
+		std::cerr << "Error: filename, s1 and s2 should not be empty" << std::endl;
 		return 1;
     }
 
 	std::ifstream file(filename);
 	std::ofstream outfile(filename + ".replace");
-	if (!file)
+	if (!file.is_open())
 	{
 		std::cerr << "Could not open " << filename;
-		outfile.close();
 		return 1;
 	}
-	if (!outfile)
+	if (!outfile.is_open())
 	{
 		std::cerr << "Could not create " << filename << ".replace";
-		file.close();
 		return 1;
 	}