Skip to content

[meta] Make sure SAI version components are unsigned integers #1300

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
kcudnik merged 1 commit into from
Aug 28, 2021
+10 −4
Merged

[meta] Make sure SAI version components are unsigned integers #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 meta/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ saidepgraph.svg: saidepgraph.gv
.PHONY: clean

clean:
rm -f *.o *~ .*~ *.tmp .*.swp .*.swo *.bak sai*.gv sai*.svg *.o.symbols
rm -f *.o *~ .*~ *.tmp .*.swp .*.swo *.bak sai*.gv sai*.svg *.o.symbols doxygen*.db
rm -f saimetadata.h saimetadata.c saimetadatatest.c
rm -f saisanitycheck saimetadatatest saiserializetest saidepgraphgen
rm -rf xml html dist temp
12 changes: 9 additions & 3 deletions meta/saisanitycheck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5220,9 +5220,15 @@ void check_sai_version()

/* SAI_VERSION uses 100 base for each component, so each define must not exceed this value */

META_ASSERT_TRUE((SAI_MAJOR) >= 0 && (SAI_MAJOR) < 100, "invalid SAI_MAJOR version: %d", (SAI_MAJOR));
META_ASSERT_TRUE((SAI_MINOR) >= 0 && (SAI_MINOR) < 100, "invalid SAI_MINOR version: %d", (SAI_MINOR));
META_ASSERT_TRUE((SAI_REVISION) >= 0 && (SAI_REVISION) < 100, "invalid SAI_REVISION version: %d", (SAI_REVISION));
/* Make sure sai version components are assignable to uint32_t */

uint32_t major = SAI_MAJOR;
uint32_t minor = SAI_MINOR;
uint32_t revision = SAI_REVISION;

META_ASSERT_TRUE((major) < 100, "invalid SAI_MAJOR version: %d", (SAI_MAJOR));
META_ASSERT_TRUE((minor) < 100, "invalid SAI_MINOR version: %d", (SAI_MINOR));
META_ASSERT_TRUE((revision) < 100, "invalid SAI_REVISION version: %d", (SAI_REVISION));
}

void check_max_conditions_len()
Expand Down