Skip to content
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

Improve BSD compatibility #1342

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Improve BSD compatibility #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c59110
Add cast
uweseimet Nov 12, 2023
31156d1
Improve BSD compatiblity
uweseimet Nov 12, 2023
c342c01
Revert "Improve BSD compatiblity"
uweseimet Nov 12, 2023
1d29ec7
Update compatibility handling
uweseimet Nov 12, 2023
a27323c
Fix SonarQube issue
uweseimet Nov 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 cpp/hal/sbc_version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ uint32_t SBC_Version::GetPeripheralAddress(void)

return address;
}
#elif defined __NetBSD__
#elif defined __NetBSD__ && (!defined(__x86_64__) || defined(__X86__))
uint32_t SBC_Version::GetPeripheralAddress(void)
{
char buf[1024];
Expand Down
3 changes: 2 additions & 1 deletion cpp/piscsi/piscsi_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ string PiscsiService::Init(const callback& cb, int port)
server.sin_family = PF_INET;
server.sin_port = htons((uint16_t)port);
server.sin_addr.s_addr = INADDR_ANY;
if (bind(service_socket, reinterpret_cast<const sockaddr *>(&server), sizeof(sockaddr_in)) < 0) { //NOSONAR bit_cast is not supported by the bullseye compiler
if (bind(service_socket, reinterpret_cast<const sockaddr*>(&server), //NOSONAR bit_cast is not supported by the bullseye compiler
static_cast<socklen_t>(sizeof(sockaddr_in))) < 0) {
Comment on lines +45 to +46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick, but I guess you used 4 spaces for indentation here instead of the tabs that the rest of this file uses?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, is this because a new stylistic rule about using spaces instead of tabs for indentation?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because of the Eclipse formatter. Spaces is the target format, but I don't yet want to reformat everything.
I suggest to have github ignore whitespaces, which can be configured when reviewing diffs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's related to the C++ style ticket.

Stop();
return "Port " + to_string(port) + " is in use, is piscsi already running?";
}
Expand Down