Skip to content

Add 'not found' check for finding file extension of arch xml #2418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Add 'not found' check for finding file extension of arch xml #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bb5d87
Add 'not found' check for finding file extension of arch xml
coolbreeze413 Oct 11, 2023
5d2977d
Fix clang-14 formatting complaints
coolbreeze413 Oct 12, 2023
86ecab7
Fix missing separator in .github/scripts/hostsetup.sh
coolbreeze413 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/hostsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ apt install -y \
gcc-9 \
wget \
openssl \
libssl-dev
libssl-dev \
libtbb-dev

# installing the latest version of cmake
Expand Down
2 changes: 1 addition & 1 deletion libs/libarchfpga/src/read_xml_arch_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void XmlReadArch(const char* ArchFile,
pugi::xml_node Next;
ReqOpt POWER_REQD, SWITCHBLOCKLIST_REQD;

if ((vtr::check_file_name_extension(ArchFile, ".xml") == false) && (vtr::check_file_name_extension(ArchFile, ".xml") == false)) {
if ((vtr::check_file_name_extension(ArchFile, ".xml") == false) && (vtr::check_file_name_extension(ArchFile, ".xmle") == false)) {
VTR_LOG_WARN(
"Architecture file '%s' may be in incorrect format. "
"Expecting .xml or .xmle format for architecture files.\n",
Expand Down
9 changes: 6 additions & 3 deletions libs/libpugiutil/src/pugixml_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ namespace pugiutil {
loc_data load_xml(pugi::xml_document& doc, //Document object to be loaded with file contents
const std::string filename) { //Filename to load from
//store the position of last '.' in the file name
int position = filename.find_last_of(".");
//store the characters after the '.' from the file_name string
std::string result = filename.substr(position);
size_t position = filename.find_last_of(".");
std::string result = "";
if (position != std::string::npos) {
//store the characters after the '.' from the file_name string
result = filename.substr(position);
}
if (result == ".xmle") {
Decryption E1(filename);
std::string fn_file = E1.getDecryptedContent();
Expand Down