Merge remote-tracking branch 'upstream/nfbot/clang-format-fix/22b97dff-c1e8-478b-99b7-3164189b87f4' into IDF5_4

AdrianSoundy · AdrianSoundy · commit 384d200ec9ce · 2025-04-12T22:46:47.000+12:00
diff --git a/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp b/src/PAL/COM/sockets/ssl/MbedTLS/ssl_generic.cpp
@@ -158,7 +158,7 @@ int mbedtls_net_recv_timeout(void *ctx, unsigned char *buf, size_t len, uint32_t
 
     ret = select(fd + 1, &read_fds, NULL, NULL, timeout == 0 ? NULL : &tv);
 
-    // Zero fds ready means we timed out 
+    // Zero fds ready means we timed out
     if (ret == 0)
         return (MBEDTLS_ERR_SSL_TIMEOUT);
 
@@ -175,7 +175,7 @@ int mbedtls_net_recv_timeout(void *ctx, unsigned char *buf, size_t len, uint32_t
         return (MBEDTLS_ERR_NET_RECV_FAILED);
     }
 
-    // This call will not block 
+    // This call will not block
     return (mbedtls_net_recv(ctx, buf, len));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ int mbedtls_net_recv_timeout(void ctx, unsigned char buf, size_t len, uint32_t`
`158`	`158`
`159`	`159`	`ret = select(fd + 1, &read_fds, NULL, NULL, timeout == 0 ? NULL : &tv);`
`160`	`160`
`161`		`- // Zero fds ready means we timed out`
	`161`	`+ // Zero fds ready means we timed out`
`162`	`162`	`if (ret == 0)`
`163`	`163`	`return (MBEDTLS_ERR_SSL_TIMEOUT);`
`164`	`164`
`@@ -175,7 +175,7 @@ int mbedtls_net_recv_timeout(void ctx, unsigned char buf, size_t len, uint32_t`
`175`	`175`	`return (MBEDTLS_ERR_NET_RECV_FAILED);`
`176`	`176`	`}`
`177`	`177`
`178`		`- // This call will not block`
	`178`	`+ // This call will not block`
`179`	`179`	`return (mbedtls_net_recv(ctx, buf, len));`
`180`	`180`	`}`
`181`	`181`