From 5385f329c6ab847b2021e2eeebd6663f2d58e184 Mon Sep 17 00:00:00 2001
From: Chris Thrasher <chrisjthrasher@gmail.com>
Date: Fri, 27 Sep 2024 13:44:46 -0600
Subject: [PATCH] Clean up IpAddress implementation

---
 src/CSFML/Network/IpAddress.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/CSFML/Network/IpAddress.cpp b/src/CSFML/Network/IpAddress.cpp
index cce0f97..fa0ab2c 100644
--- a/src/CSFML/Network/IpAddress.cpp
+++ b/src/CSFML/Network/IpAddress.cpp
@@ -37,21 +37,13 @@ namespace
 // Helper function for converting a SFML address to a CSFML one
 [[nodiscard]] sfIpAddress fromSFMLAddress(std::optional<sf::IpAddress> address)
 {
+    if (!address)
+        return sfIpAddress_None;
+
     sfIpAddress result{};
-
-    if (address)
-    {
-        std::strncpy(result.address, address->toString().c_str(), 15);
-    }
-
+    std::strncpy(result.address, address->toString().c_str(), 15);
     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
 
 
@@ -104,7 +96,7 @@ void sfIpAddress_toString(sfIpAddress address, char* string)
 ////////////////////////////////////////////////////////////
 uint32_t sfIpAddress_toInteger(sfIpAddress address)
 {
-    auto sfmlAddress = toSFMLAddress(address);
+    const auto sfmlAddress = sf::IpAddress::resolve(address.address);
     return sfmlAddress ? sfmlAddress->toInteger() : 0;
 }