From: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
Date: Mon, 3 Feb 2020 13:30:33 +0000 (-0300)
Subject: Replaced strlen by GetSize into simplify.cc
X-Git-Tag: working-ls180~803^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=71f3afb9a26e7bad2a9e9d59877a94cbd757cad4;p=yosys.git

Replaced strlen by GetSize into simplify.cc

As recommended in CodingReadme.

Signed-off-by: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 310f6fc32..1b6618cd8 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2886,15 +2886,15 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 	int meminit_size=0;
 
 	std::ifstream f;
-	std::string path = filename.substr(0, filename.find_last_of("\\/")+1);
 	f.open(mem_filename.c_str());
 	if (f.fail()) {
+		std::string path = filename.substr(0, filename.find_last_of("\\/")+1);
 		f.open(path + mem_filename.c_str());
 		yosys_input_files.insert(path + mem_filename);
 	} else {
 		yosys_input_files.insert(mem_filename);
 	}
-	if (f.fail() || strlen(mem_filename.c_str()) == 0)
+	if (f.fail() || GetSize(mem_filename) == 0)
 		log_file_error(filename, linenum, "Can not open file `%s` for %s.\n", mem_filename.c_str(), str.c_str());
 
 	log_assert(GetSize(memory->children) == 2 && memory->children[1]->type == AST_RANGE && memory->children[1]->range_valid);