From 69f864bdb385e3d7584c751b4c485d553b819978 Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Thu, 29 May 2025 10:16:27 +0300
Subject: [PATCH] fixups based on reviews

---
 src/core/libraries/network/net.cpp | 31 ++++++++++++------------------
 src/core/libraries/network/net.h   |  4 ++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/core/libraries/network/net.cpp b/src/core/libraries/network/net.cpp
index 762c49552..12cdc7c36 100644
--- a/src/core/libraries/network/net.cpp
+++ b/src/core/libraries/network/net.cpp
@@ -1078,29 +1078,22 @@ const char* freebsd_inet_ntop6(const char* src, char* dst, u64 size) {
     return (dst);
 }
 const char* PS4_SYSV_ABI sceNetInetNtop(int af, const void* src, char* dst, u32 size) {
-    char temp[16];
-    u32 len;
-
-    if (af == 0x1C) { // AF_INET6
-        if (src && dst) {
-            return freebsd_inet_ntop6((const char*)src, dst, size);
-        } else {
-            *sceNetErrnoLoc() = ORBIS_NET_ENOSPC;
-            LOG_ERROR(Lib_Net, "returned ORBIS_NET_ENOSPC");
-        }
+    if (!(src && dst)) {
+        *sceNetErrnoLoc() = ORBIS_NET_ENOSPC;
+        LOG_ERROR(Lib_Net, "returned ORBIS_NET_ENOSPC");
+        return nullptr;
     }
-    if (af == 2) { // AF_INET
-        if (src && dst) {
-            return freebsd_inet_ntop4((const char*)src, dst, size);
-        } else {
-            *sceNetErrnoLoc() = ORBIS_NET_ENOSPC;
-            LOG_ERROR(Lib_Net, "returned ORBIS_NET_ENOSPC");
-        }
-    } else {
+
+    switch (af) {
+    case ORBIS_NET_AF_INET:
+        return freebsd_inet_ntop4((const char*)src, dst, size);
+    case ORBIS_NET_AF_INET6:
+        return freebsd_inet_ntop6((const char*)src, dst, size);
+    default:
         *sceNetErrnoLoc() = ORBIS_NET_EAFNOSUPPORT;
         LOG_ERROR(Lib_Net, "returned ORBIS_NET_EAFNOSUPPORT");
+        return nullptr;
     }
-    return nullptr;
 }
 
 int PS4_SYSV_ABI sceNetInetNtopWithScopeId() {
diff --git a/src/core/libraries/network/net.h b/src/core/libraries/network/net.h
index 812ee6bd7..1393ecb1d 100644
--- a/src/core/libraries/network/net.h
+++ b/src/core/libraries/network/net.h
@@ -20,6 +20,10 @@ class SymbolsResolver;
 
 namespace Libraries::Net {
 
+enum OrbisNetFamily : u32 {
+    ORBIS_NET_AF_INET = 2,
+    ORBIS_NET_AF_INET6 = 28,
+};
 enum OrbisNetSocketType : u32 {
     ORBIS_NET_SOCK_STREAM = 1,
     ORBIS_NET_SOCK_DGRAM = 2,