openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adbd_auth function signature changes." am: d62c817cce 

Change-Id: I39eea46dc9d475bf9724125708541c577fbab4c7
This commit is contained in:
Automerger Merge Worker 2020-02-21 21:14:29 +00:00
parent cfb05f56eb d62c817cce
commit f3c0bcf622
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adb/daemon/auth.cpp
View File

@ -85,8 +85,8 @@ static atransport* transport_from_callback_arg(void* id) {
static void IteratePublicKeys(std::function<bool(std::string_view public_key)> f) {
adbd_auth_get_public_keys(
auth_ctx,
[](const char* public_key, size_t len, void* arg) {
return (*static_cast<decltype(f)*>(arg))(std::string_view(public_key, len));
[](void* opaque, const char* public_key, size_t len) {
return (*static_cast<decltype(f)*>(opaque))(std::string_view(public_key, len));
},
&f);
}
@ -160,9 +160,9 @@ static void adbd_auth_key_authorized(void* arg, uint64_t id) {
}
void adbd_auth_init(void) {
AdbdAuthCallbacks cb;
AdbdAuthCallbacksV1 cb;
cb.version = 1;
cb.callbacks.v1.key_authorized = adbd_auth_key_authorized;
cb.key_authorized = adbd_auth_key_authorized;
auth_ctx = adbd_auth_new(&cb);
std::thread([]() {
adb_thread_setname("adbd auth");