adb: convert more stuff to unique_fd.
Test: adb_test
Test: adbd_test
Test: test_device.py
Change-Id: Ie75f0b811d2c75d508e6ecffb40579308f5789d0
diff --git a/adb/sockets.cpp b/adb/sockets.cpp
index 47ae883..28da975 100644
--- a/adb/sockets.cpp
+++ b/adb/sockets.cpp
@@ -333,7 +333,8 @@
}
}
-asocket* create_local_socket(int fd) {
+asocket* create_local_socket(unique_fd ufd) {
+ int fd = ufd.release();
asocket* s = new asocket();
s->fd = fd;
s->enqueue = local_socket_enqueue;
@@ -353,13 +354,13 @@
return s;
}
#endif
- int fd = service_to_fd(name, transport);
+ unique_fd fd = service_to_fd(name, transport);
if (fd < 0) {
return nullptr;
}
- asocket* s = create_local_socket(fd);
- LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd;
+ asocket* s = create_local_socket(std::move(fd));
+ LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd.get();
#if !ADB_HOST
if ((name.starts_with("root:") && getuid() != 0 && __android_log_is_debuggable()) ||