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

Make owned serial a pointer-to-non-const

Browse source 
The server owns the serial, so it needs to free it. Therefore, it should
not be a pointer-to-const.
This commit is contained in:
Romain Vimont 2019-03-03 00:01:16 +01:00
parent dfed1b250e
commit 9ef345fdd0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/server.c
View file

@ -172,12 +172,12 @@ server_start(struct server *server, const char *serial,
} }
if (!push_server(serial)) { if (!push_server(serial)) {
SDL_free((void *) server->serial); SDL_free(server->serial);
return false; return false;
} }
if (!enable_tunnel(server)) { if (!enable_tunnel(server)) {
SDL_free((void *) server->serial); SDL_free(server->serial);
return false; return false;
} }
@ -195,7 +195,7 @@ server_start(struct server *server, const char *serial,
if (server->server_socket == INVALID_SOCKET) { if (server->server_socket == INVALID_SOCKET) {
LOGE("Could not listen on port %" PRIu16, local_port); LOGE("Could not listen on port %" PRIu16, local_port);
disable_tunnel(server); disable_tunnel(server);
SDL_free((void *) server->serial); SDL_free(server->serial);
return false; return false;
} }
} }
@ -271,5 +271,5 @@ server_destroy(struct server *server) {
if (server->device_socket != INVALID_SOCKET) { if (server->device_socket != INVALID_SOCKET) {
close_socket(&server->device_socket); close_socket(&server->device_socket);
} }
SDL_free((void *) server->serial); SDL_free(server->serial);
} }

2
app/src/server.h
View file

@ -8,7 +8,7 @@
#include "net.h" #include "net.h"
struct server { struct server {
const char *serial; char *serial;
process_t process; process_t process;
socket_t server_socket; // only used if !tunnel_forward socket_t server_socket; // only used if !tunnel_forward
socket_t device_socket; socket_t device_socket;