mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 13:36:12 +01:00
Clean up IpAddress implementation
This commit is contained in:
1 parent
fd8e6a0364
commit
5385f329c6
1 file changed
+5
-13
@@ -37,21 +37,13 @@ namespace
|
|||||||
// Helper function for converting a SFML address to a CSFML one
|
// Helper function for converting a SFML address to a CSFML one
|
||||||
[[nodiscard]] sfIpAddress fromSFMLAddress(std::optional<sf::IpAddress> address)
|
[[nodiscard]] sfIpAddress fromSFMLAddress(std::optional<sf::IpAddress> address)
|
||||||
{
|
{
|
||||||
|
if (!address)
|
||||||
|
return sfIpAddress_None;
|
||||||
|
|
||||||
sfIpAddress result{};
|
sfIpAddress result{};
|
||||||
|
std::strncpy(result.address, address->toString().c_str(), 15);
|
||||||
if (address)
|
|
||||||
{
|
|
||||||
std::strncpy(result.address, address->toString().c_str(), 15);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper function for converting a CSFML address to a SFML one
|
|
||||||
[[nodiscard]] std::optional<sf::IpAddress> toSFMLAddress(sfIpAddress address)
|
|
||||||
{
|
|
||||||
return sf::IpAddress::resolve(address.address);
|
|
||||||
}
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
|
||||||
@@ -104,7 +96,7 @@ void sfIpAddress_toString(sfIpAddress address, char* string)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
uint32_t sfIpAddress_toInteger(sfIpAddress address)
|
uint32_t sfIpAddress_toInteger(sfIpAddress address)
|
||||||
{
|
{
|
||||||
auto sfmlAddress = toSFMLAddress(address);
|
const auto sfmlAddress = sf::IpAddress::resolve(address.address);
|
||||||
return sfmlAddress ? sfmlAddress->toInteger() : 0;
|
return sfmlAddress ? sfmlAddress->toInteger() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user