Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Simplify switch to TCPIP function

Browse source 
Do not use an output parameter to return the value. Instead, return the
actual ip:port string on success or NULL on error.
This commit is contained in:
Romain Vimont 2022-02-04 19:42:42 +01:00
parent 386cf7d7ac
commit 08f16a9dde
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/server.c
View file

@ -580,8 +580,8 @@ append_port_5555(const char *ip) {
return ip_port; return ip_port;
} }
static bool static char *
sc_server_switch_to_tcpip(struct sc_server *server, char **out_ip_port) { sc_server_switch_to_tcpip(struct sc_server *server) {
const char *serial = server->params.serial; const char *serial = server->params.serial;
assert(serial); assert(serial);
@ -590,13 +590,13 @@ sc_server_switch_to_tcpip(struct sc_server *server, char **out_ip_port) {
char *ip = sc_adb_get_device_ip(intr, serial, 0); char *ip = sc_adb_get_device_ip(intr, serial, 0);
if (!ip) { if (!ip) {
LOGE("Device IP not found"); LOGE("Device IP not found");
return false; return NULL;
} }
char *ip_port = append_port_5555(ip); char *ip_port = append_port_5555(ip);
free(ip); free(ip);
if (!ip_port) { if (!ip_port) {
return false; return NULL;
} }
bool tcp_mode = is_tcpip_mode_enabled(server); bool tcp_mode = is_tcpip_mode_enabled(server);
@ -616,13 +616,11 @@ sc_server_switch_to_tcpip(struct sc_server *server, char **out_ip_port) {
} }
} }
*out_ip_port = ip_port; return ip_port;
return true;
error: error:
free(ip_port); free(ip_port);
return false; return NULL;
} }
static bool static bool
@ -687,8 +685,8 @@ sc_server_configure_tcpip(struct sc_server *server) {
return true; return true;
} }
bool ok = sc_server_switch_to_tcpip(server, &ip_port); ip_port = sc_server_switch_to_tcpip(server);
if (!ok) { if (!ip_port) {
return false; return false;
} }
} }