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

Simplify adb_execute_p()

Browse source 
Only pass the stdout pipe as parameter, scrcpy never writes to stdin or
reads from stderr of an adb process.
This commit is contained in:
Romain Vimont 2021-11-17 21:53:11 +01:00
parent 0426ae885c
commit 13fd693b50
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/adb.c
View file

@ -111,7 +111,7 @@ show_adb_err_msg(enum sc_process_result err, const char *const argv[]) {
sc_pid sc_pid
adb_execute_p(const char *serial, const char *const adb_cmd[], adb_execute_p(const char *serial, const char *const adb_cmd[],
size_t len, sc_pipe *pin, sc_pipe *pout, sc_pipe *perr) { size_t len, sc_pipe *pout) {
int i; int i;
sc_pid pid; sc_pid pid;
@ -132,7 +132,7 @@ adb_execute_p(const char *serial, const char *const adb_cmd[],
memcpy(&argv[i], adb_cmd, len * sizeof(const char *)); memcpy(&argv[i], adb_cmd, len * sizeof(const char *));
argv[len + i] = NULL; argv[len + i] = NULL;
enum sc_process_result r = enum sc_process_result r =
sc_process_execute_p(argv, &pid, pin, pout, perr); sc_process_execute_p(argv, &pid, NULL, pout, NULL);
if (r != SC_PROCESS_SUCCESS) { if (r != SC_PROCESS_SUCCESS) {
show_adb_err_msg(r, argv); show_adb_err_msg(r, argv);
pid = SC_PROCESS_NONE; pid = SC_PROCESS_NONE;
@ -144,7 +144,7 @@ adb_execute_p(const char *serial, const char *const adb_cmd[],
sc_pid sc_pid
adb_execute(const char *serial, const char *const adb_cmd[], size_t len) { adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
return adb_execute_p(serial, adb_cmd, len, NULL, NULL, NULL); return adb_execute_p(serial, adb_cmd, len, NULL);
} }
sc_pid sc_pid
@ -236,5 +236,5 @@ adb_install(const char *serial, const char *local) {
sc_pid sc_pid
adb_get_serialno(sc_pipe *pout) { adb_get_serialno(sc_pipe *pout) {
const char *const adb_cmd[] = {"get-serialno"}; const char *const adb_cmd[] = {"get-serialno"};
return adb_execute_p(NULL, adb_cmd, ARRAY_LEN(adb_cmd), NULL, pout, NULL); return adb_execute_p(NULL, adb_cmd, ARRAY_LEN(adb_cmd), pout);
} }

4
app/src/adb.h
View file

@ -12,8 +12,8 @@ sc_pid
adb_execute(const char *serial, const char *const adb_cmd[], size_t len); adb_execute(const char *serial, const char *const adb_cmd[], size_t len);
sc_pid sc_pid
adb_execute_p(const char *serial, const char *const adb_cmd[], adb_execute_p(const char *serial, const char *const adb_cmd[], size_t len,
size_t len, sc_pipe *pin, sc_pipe *pout, sc_pipe *perr); sc_pipe *pout);
sc_pid sc_pid
adb_forward(const char *serial, uint16_t local_port, adb_forward(const char *serial, uint16_t local_port,