diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-10-28 14:30:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-28 14:30:26 -0700 |
| commit | 406abdc8a2b68df77ab30836826f642c2ef37bda (patch) | |
| tree | c901e66c6f01f4ec78e6424b9aa00f084b046d97 /adb | |
| parent | 0bf7924df19f72258df7b553515bfbc9574d0114 (diff) | |
| parent | 5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7 (diff) | |
| download | system_core-406abdc8a2b68df77ab30836826f642c2ef37bda.zip system_core-406abdc8a2b68df77ab30836826f642c2ef37bda.tar.gz system_core-406abdc8a2b68df77ab30836826f642c2ef37bda.tar.bz2 | |
am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"
* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
Improve some adb error logging
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/adb_client.c | 4 | ||||
| -rw-r--r-- | adb/commandline.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 @@ int adb_connect(const char *service) 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); 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 @@ static int restore(int argc, char** argv) { 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; } |