ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 87af04a4: Merge "Improve some adb error logging"

Browse source 
* commit '87af04a42ec2d959cced0f1c01888f9cf3b2b9c5':
  Improve some adb error logging
This commit is contained in:
Brian Carlstrom 2013-10-28 14:27:33 -07:00 • committed by Android Git Automerger
commit 5dadac50c4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/adb_client.c
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);

2
adb/commandline.c
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;
}