commit fd4d0de5753a069740f9f8c84ef3da0f6696fe0f
author Brian Carlstrom <bdc@google.com> Mon Oct 28 14:33:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 28 14:33:57 2013 -0700
tree c3a30bdbb7315d3f19e249773bba9faa1d7413f6
parent 866977526cccc21c889236085b405e1b1ff41b9f
parent 406abdc8a2b68df77ab30836826f642c2ef37bda

am 406abdc8: am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"

* commit '406abdc8a2b68df77ab30836826f642c2ef37bda':
  Improve some adb error logging

adb/adb_client.c

diff --git a/adb/adb_client.c b/adb/adb_client.c
index 8340738..f7823a8 100644
--- a/adb/adb_client.c
+++ b/adb/adb_client.c
@@ -278,7 +278,9 @@
         return 0;
 
     fd = _adb_connect(service);
-    if(fd == -2) {
+    if(fd == -1) {
+        fprintf(stderr,"error: %s\n", __adb_error);
+    } else if(fd == -2) {
         fprintf(stderr,"** daemon still not running\n");
     }
     D("adb_connect: return fd %d\n", fd);

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index 27a1754..c9bb437 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -767,7 +767,7 @@
 
     fd = adb_connect("restore:");
     if (fd < 0) {
-        fprintf(stderr, "adb: unable to connect for backup\n");
+        fprintf(stderr, "adb: unable to connect for restore\n");
         adb_close(tarFd);
         return -1;
     }