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

Remove sc_adb_get_serialno()

Browse source 
The device serial is now retrieved from `adb devices -l`, `adb
get-serialno` is not called anymore.

PR #3005 <https://github.com/Genymobile/scrcpy/pull/3005>
This commit is contained in:
Romain Vimont 2022-02-06 15:22:01 +01:00
parent 0a619dc9ef
commit 9c545e8c29
2 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/adb/adb.c
View file

@ -587,38 +587,6 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
return strdup(buf); return strdup(buf);
} }
char *
sc_adb_get_serialno(struct sc_intr *intr, unsigned flags) {
const char *const argv[] = SC_ADB_COMMAND("get-serialno");
sc_pipe pout;
sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
if (pid == SC_PROCESS_NONE) {
LOGE("Could not execute \"adb get-serialno\"");
return NULL;
}
char buf[128];
ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
sc_pipe_close(pout);
bool ok = process_check_success_intr(intr, pid, "adb get-serialno", flags);
if (!ok) {
return NULL;
}
if (r == -1) {
return NULL;
}
assert((size_t) r < sizeof(buf));
buf[r] = '\0';
size_t len = strcspn(buf, " \r\n");
buf[len] = '\0';
return strdup(buf);
}
char * char *
sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) { sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
assert(serial); assert(serial);

8
app/src/adb/adb.h
View file

@ -86,14 +86,6 @@ char *
sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop, sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
unsigned flags); unsigned flags);
/**
* Execute `adb get-serialno`
*
* Return the result, to be freed by the caller, or NULL on error.
*/
char *
sc_adb_get_serialno(struct sc_intr *intr, unsigned flags);
/** /**
* Attempt to retrieve the device IP * Attempt to retrieve the device IP
* *