commit cad813209dadd5da46536735b209851b05ba4559
author Brian Carlstrom <bdc@google.com> Fri Oct 18 13:58:48 2013 -0700
committer Brian Carlstrom <bdc@google.com> Sun Oct 27 16:56:55 2013 -0700
tree eabb4a64323b4f2de240a8a644872571442bc141
parent bee5e5a165d314b2e261d3f42bda3806eb945b8c

Improve some adb error logging

Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848

adb_client.c

diff --git a/adb_client.c b/adb_client.c
index 8340738..f7823a8 100644
--- a/adb_client.c
+++ b/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);

commandline.c

diff --git a/commandline.c b/commandline.c
index 27a1754..c9bb437 100644
--- a/commandline.c
+++ b/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;
     }