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

* commit '406abdc8a2b68df77ab30836826f642c2ef37bda':
  Improve some adb error logging
This commit is contained in:
Brian Carlstrom 2013-10-28 14:33:57 -07:00 committed by Android Git Automerger
commit fd4d0de575
2 changed files with 4 additions and 2 deletions

View File

@ -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);

View File

@ -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;
}