diff options
Diffstat (limited to 'adb/adb_listeners.cpp')
-rw-r--r-- | adb/adb_listeners.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/adb/adb_listeners.cpp b/adb/adb_listeners.cpp index fecf452c1..ea5a44e46 100644 --- a/adb/adb_listeners.cpp +++ b/adb/adb_listeners.cpp | |||
@@ -42,7 +42,7 @@ class alistener { | |||
42 | alistener(const std::string& _local_name, const std::string& _connect_to); | 42 | alistener(const std::string& _local_name, const std::string& _connect_to); |
43 | ~alistener(); | 43 | ~alistener(); |
44 | 44 | ||
45 | fdevent fde; | 45 | fdevent* fde = nullptr; |
46 | int fd = -1; | 46 | int fd = -1; |
47 | 47 | ||
48 | std::string local_name; | 48 | std::string local_name; |
@@ -60,7 +60,7 @@ alistener::alistener(const std::string& _local_name, const std::string& _connect | |||
60 | 60 | ||
61 | alistener::~alistener() { | 61 | alistener::~alistener() { |
62 | // Closes the corresponding fd. | 62 | // Closes the corresponding fd. |
63 | fdevent_remove(&fde); | 63 | fdevent_destroy(fde); |
64 | 64 | ||
65 | if (transport) { | 65 | if (transport) { |
66 | transport->RemoveDisconnect(&disconnect); | 66 | transport->RemoveDisconnect(&disconnect); |
@@ -222,11 +222,11 @@ InstallStatus install_listener(const std::string& local_name, const char* connec | |||
222 | 222 | ||
223 | close_on_exec(listener->fd); | 223 | close_on_exec(listener->fd); |
224 | if (listener->connect_to == "*smartsocket*") { | 224 | if (listener->connect_to == "*smartsocket*") { |
225 | fdevent_install(&listener->fde, listener->fd, ss_listener_event_func, listener.get()); | 225 | listener->fde = fdevent_create(listener->fd, ss_listener_event_func, listener.get()); |
226 | } else { | 226 | } else { |
227 | fdevent_install(&listener->fde, listener->fd, listener_event_func, listener.get()); | 227 | listener->fde = fdevent_create(listener->fd, listener_event_func, listener.get()); |
228 | } | 228 | } |
229 | fdevent_set(&listener->fde, FDE_READ); | 229 | fdevent_set(listener->fde, FDE_READ); |
230 | 230 | ||
231 | listener->transport = transport; | 231 | listener->transport = transport; |
232 | 232 | ||