Remove SbSocketGetLastError

Change-Id: I618f5a51d0bb624d4f62191ff999fa7e8768b03c
youtube · Sep 30, 2024 · b306e8b · b306e8b
1 parent ca4aefb
commit b306e8b
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 70 deletions.
diff --git a/net/base/net_errors.h b/net/base/net_errors.h
@@ -61,14 +61,6 @@ NET_EXPORT bool IsRequestBlockedError(int error);
 NET_EXPORT Error MapSystemError(logging::SystemErrorCode os_error);
 
 #if defined(STARBOARD)
-// Map socket error code to Error.
-NET_EXPORT Error MapSocketError(SbSocketError error);
-
-// Gets the last socket error as a net error.
-static inline Error MapLastSocketError(SbSocket socket) {
-  return MapSocketError(SbSocketGetLastError(socket));
-}
-
 // Gets the last system error as a net error.
 static inline Error MapLastSystemError() {
   return MapSystemError(SbSystemGetLastError());

diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn
@@ -91,7 +91,6 @@ static_library("starboard_platform") {
     "//starboard/shared/posix/socket_connect.cc",
     "//starboard/shared/posix/socket_create.cc",
     "//starboard/shared/posix/socket_destroy.cc",
-    "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",

diff --git a/starboard/common/socket.cc b/starboard/common/socket.cc
@@ -96,10 +96,6 @@ bool Socket::IsPending() {
   return GetLastError() == kSbSocketPending;
 }
 
-SbSocketError Socket::GetLastError() {
-  return SbSocketGetLastError(socket_);
-}
-
 int Socket::ReceiveFrom(char* out_data,
                         int data_size,
                         SbSocketAddress* out_source) {

diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc
@@ -153,7 +153,6 @@ ExportedSymbols::ExportedSymbols() {
   REGISTER_SYMBOL(SbSocketCreate);
   REGISTER_SYMBOL(SbSocketDestroy);
   REGISTER_SYMBOL(SbSocketGetInterfaceAddress);
-  REGISTER_SYMBOL(SbSocketGetLastError);
   REGISTER_SYMBOL(SbSocketGetLocalAddress);
   REGISTER_SYMBOL(SbSocketIsIpv6Supported);
   REGISTER_SYMBOL(SbSocketListen);

diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn
@@ -161,7 +161,6 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/posix/socket_connect.cc",
     "//starboard/shared/posix/socket_create.cc",
     "//starboard/shared/posix/socket_destroy.cc",
-    "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",

diff --git a/starboard/nplb/socket_get_last_error_test.cc b/starboard/nplb/socket_get_last_error_test.cc
@@ -14,7 +14,7 @@
 
 // The Sunny Day test is used in several other tests as the way to detect if the
 // error is correct, so it is not repeated here.
-
+#if SB_API_VERSION < 17
 #include "starboard/common/socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -29,3 +29,4 @@ TEST(SbSocketGetLastErrorTest, RainyDayInvalidSocket) {
 }  // namespace
 }  // namespace nplb
 }  // namespace starboard
+#endif  // SB_API_VERSION < 17
diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn
@@ -119,7 +119,6 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/posix/socket_connect.cc",
     "//starboard/shared/posix/socket_create.cc",
     "//starboard/shared/posix/socket_destroy.cc",
-    "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",

diff --git a/starboard/shared/posix/socket_get_last_error.cc b/starboard/shared/posix/socket_get_last_error.cc
diff --git a/starboard/shared/stub/socket_get_last_error.cc b/starboard/shared/stub/socket_get_last_error.cc
diff --git a/starboard/socket.h b/starboard/socket.h
@@ -207,14 +207,6 @@ SB_EXPORT SbSocketError SbSocketListen(SbSocket socket);
 // |socket|: The SbSocket that is accepting a pending connection.
 SB_EXPORT SbSocket SbSocketAccept(SbSocket socket);
 
-// DEPRECATED with SB_API_VERSION 16
-//
-// Returns the last error set on |socket|. If |socket| is not valid, this
-// function returns |kSbSocketErrorFailed|.
-//
-// |socket|: The SbSocket that the last error is returned for.
-SB_EXPORT SbSocketError SbSocketGetLastError(SbSocket socket);
-
 // DEPRECATED with SB_API_VERSION 16
 //
 // Gets the address that this socket is bound to locally, if the socket is

diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn
@@ -107,7 +107,6 @@ static_library("stub_sources") {
     "//starboard/shared/stub/socket_create.cc",
     "//starboard/shared/stub/socket_destroy.cc",
     "//starboard/shared/stub/socket_get_interface_address.cc",
-    "//starboard/shared/stub/socket_get_last_error.cc",
     "//starboard/shared/stub/socket_get_local_address.cc",
     "//starboard/shared/stub/socket_is_ipv6_supported.cc",
     "//starboard/shared/stub/socket_listen.cc",