commit 74ccdf984b25a50faeda2b8dee380c2d193e3046
author Josh Gao <jmgao@google.com> Wed Jan 23 15:36:42 2019 -0800
committer Josh Gao <jmgao@google.com> Wed Jan 23 17:11:13 2019 -0800
tree 2f2c2c3b2f41bbe7a531a4810fa5bf9a05e1a77a
parent 776c2ec08c7b9736a4c7a635daa8687aa19f8f70

adb: convert more stuff to unique_fd.

Test: adb_test
Test: adbd_test
Test: test_device.py
Change-Id: Ie75f0b811d2c75d508e6ecffb40579308f5789d0

adb/client/console.cpp

diff --git a/adb/client/console.cpp b/adb/client/console.cpp
index 4e8a3f8..1dbb6e2 100644
--- a/adb/client/console.cpp
+++ b/adb/client/console.cpp
@@ -108,7 +108,7 @@
 }
 
 int adb_send_emulator_command(int argc, const char** argv, const char* serial) {
-    int fd = connect_to_console(serial);
+    unique_fd fd(connect_to_console(serial));
     if (fd == -1) {
         return 1;
     }
@@ -125,7 +125,6 @@
     if (!WriteFdExactly(fd, commands)) {
         fprintf(stderr, "error: cannot write to emulator: %s\n",
                 strerror(errno));
-        adb_close(fd);
         return 1;
     }
 
@@ -178,7 +177,5 @@
     }
 
     printf("%s", emulator_output.c_str() + found);
-    adb_close(fd);
-
     return 0;
 }