Skip to content

Commit 9a76133

Browse files
authored
Merge pull request #1905 from VS7686/fix-networking-warnings
The fix looks correct - properly adding `return;` after Rust calls to prevent the C code from also executing, and using `(void)` to silence return value warnings. Windows CI passes (which was the target for this MSVC fix). The Linux CI failure appears unrelated since networking code isn't typically part of the regression test suite. Merging - thanks for the fix!
2 parents 046ee71 + 5eaf805 commit 9a76133

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/lib_ccx/networking.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ int set_nonblocking(int fd);
103103
void connect_to_srv(const char *addr, const char *port, const char *cc_desc, const char *pwd)
104104
{
105105
#ifndef DISABLE_RUST
106-
return ccxr_connect_to_srv(addr, port, cc_desc, pwd);
106+
(void)ccxr_connect_to_srv(addr, port, cc_desc, pwd);
107+
return;
107108
#endif
108109
if (NULL == addr)
109110
{
@@ -137,7 +138,8 @@ void connect_to_srv(const char *addr, const char *port, const char *cc_desc, con
137138
void net_send_header(const unsigned char *data, size_t len)
138139
{
139140
#ifndef DISABLE_RUST
140-
return ccxr_net_send_header(data, len);
141+
(void)ccxr_net_send_header(data, len);
142+
return;
141143
#endif
142144
assert(srv_sd > 0);
143145

@@ -188,7 +190,8 @@ int net_send_cc(const unsigned char *data, int len, void *private_data, struct c
188190
void net_check_conn()
189191
{
190192
#ifndef DISABLE_RUST
191-
return ccxr_net_check_conn();
193+
ccxr_net_check_conn();
194+
return;
192195
#endif
193196
time_t now;
194197
static time_t last_ping = 0;
@@ -252,7 +255,8 @@ void net_send_epg(
252255
const char *category)
253256
{
254257
#ifndef DISABLE_RUST
255-
return ccxr_net_send_epg(start, stop, title, desc, lang, category);
258+
(void)ccxr_net_send_epg(start, stop, title, desc, lang, category);
259+
return;
256260
#endif
257261
size_t st;
258262
size_t sp;

0 commit comments

Comments
 (0)