Skip to content

Commit 233d9f3

Browse files
SocketWrapper: fix sock_fd check condition
1 parent 9bd4b06 commit 233d9f3

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

libraries/SocketWrapper/SocketWrapper.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class ZephyrSocketWrapper {
7373
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
7474
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
7575
socket_deleter());
76-
if (!sock_fd || *sock_fd < 0) {
76+
if (!sock_fd) {
7777
rv = false;
7878

7979
goto exit;
@@ -107,7 +107,7 @@ class ZephyrSocketWrapper {
107107
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
108108
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
109109
socket_deleter());
110-
if (!sock_fd || *sock_fd < 0) {
110+
if (!sock_fd) {
111111
return false;
112112
}
113113

@@ -168,7 +168,7 @@ class ZephyrSocketWrapper {
168168
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
169169
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
170170
socket_deleter());
171-
if (!sock_fd || *sock_fd < 0) {
171+
if (!sock_fd) {
172172
goto exit;
173173
}
174174

@@ -246,7 +246,7 @@ class ZephyrSocketWrapper {
246246
}
247247

248248
void close() {
249-
if (sock_fd && *sock_fd != -1) {
249+
if (sock_fd) {
250250
sock_fd = nullptr;
251251
}
252252
}
@@ -261,7 +261,7 @@ class ZephyrSocketWrapper {
261261
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
262262
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd),
263263
socket_deleter());
264-
if (!sock_fd || *sock_fd < 0) {
264+
if (!sock_fd) {
265265
return false;
266266
}
267267

libraries/SocketWrapper/ZephyrClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {
104104
}
105105

106106
operator bool() {
107-
return sock_fd && *sock_fd != -1;
107+
return sock_fd;
108108
}
109109

110110
String remoteIP() {

libraries/SocketWrapper/ZephyrServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ZephyrServer : public arduino::Server, ZephyrSocketWrapper {
4242
}
4343

4444
explicit operator bool() {
45-
return sock_fd && *sock_fd != -1;
45+
return sock_fd;
4646
}
4747

4848
ZephyrClient accept(uint8_t *status = nullptr) {

0 commit comments

Comments
 (0)