SocketWrapper: fix sock_fd check condition

leonardocavagnis · leonardocavagnis · commit c80ccfaf4bb5 · 2025-11-14T15:45:40.000+01:00
diff --git a/libraries/SocketWrapper/SocketWrapper.h b/libraries/SocketWrapper/SocketWrapper.h
@@ -67,7 +67,7 @@ class ZephyrSocketWrapper {
 		raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 		sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
 									   socket_deleter());
-		if (!sock_fd || *sock_fd < 0) {
+		if (!sock_fd) {
 			rv = false;
 
 			goto exit;
@@ -101,7 +101,7 @@ class ZephyrSocketWrapper {
 		raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 		sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
 									   socket_deleter());
-		if (!sock_fd || *sock_fd < 0) {
+		if (!sock_fd) {
 			return false;
 		}
 
@@ -162,7 +162,7 @@ class ZephyrSocketWrapper {
 		raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
 		sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
 									   socket_deleter());
-		if (!sock_fd || *sock_fd < 0) {
+		if (!sock_fd) {
 			goto exit;
 		}
 
@@ -240,7 +240,7 @@ class ZephyrSocketWrapper {
 	}
 
 	void close() {
-		if (sock_fd && *sock_fd != -1) {
+		if (sock_fd) {
 			sock_fd = nullptr;
 		}
 	}
@@ -255,7 +255,7 @@ class ZephyrSocketWrapper {
 		raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 		sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
 									   socket_deleter());
-		if (!sock_fd || *sock_fd < 0) {
+		if (!sock_fd) {
 			return false;
 		}
 
diff --git a/libraries/SocketWrapper/ZephyrClient.h b/libraries/SocketWrapper/ZephyrClient.h
@@ -98,7 +98,7 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {
 	}
 
 	operator bool() {
-		return sock_fd && *sock_fd != -1;
+		return sock_fd;
 	}
 
 	String remoteIP() {
diff --git a/libraries/SocketWrapper/ZephyrServer.h b/libraries/SocketWrapper/ZephyrServer.h
@@ -36,7 +36,7 @@ class ZephyrServer : public arduino::Server, ZephyrSocketWrapper {
 	}
 
 	explicit operator bool() {
-		return sock_fd && *sock_fd != -1;
+		return sock_fd;
 	}
 
 	ZephyrClient accept(uint8_t *status = nullptr) {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`operator bool() {`
`101`		`- return sock_fd && *sock_fd != -1;`
	`101`	`+ return sock_fd;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`String remoteIP() {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ZephyrServer : public arduino::Server, ZephyrSocketWrapper {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`explicit operator bool() {`
`39`		`- return sock_fd && *sock_fd != -1;`
	`39`	`+ return sock_fd;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`ZephyrClient accept(uint8_t *status = nullptr) {`