Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87af04a4 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Improve some adb error logging"

parents 4d87e743 93c91fad

adb/adb_client.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

adb/commandline.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }