Replaced strlen by GetSize into simplify.cc
authorRodrigo Alejandro Melo <rmelo@inti.gob.ar>
Mon, 3 Feb 2020 13:30:33 +0000 (10:30 -0300)
committerRodrigo Alejandro Melo <rmelo@inti.gob.ar>
Mon, 3 Feb 2020 13:44:09 +0000 (10:44 -0300)
As recommended in CodingReadme.

Signed-off-by: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
frontends/ast/simplify.cc

index 310f6fc3246b345740d4b535ca5cd0b307bdf0c2..1b6618cd847c614f784df29dc1d3303f38db4e70 100644 (file)
@@ -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);