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

Commit 00be9024 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: don\'t use adb_dirname in between getting and printing errno." am:... 

Merge "adb: don\'t use adb_dirname in between getting and printing errno." am: 44901f11 am: 975c9a68
am: 01f7f6fb

* commit '01f7f6fb':
  adb: don't use adb_dirname in between getting and printing errno.
parents d46ef1a2 01f7f6fb

adb/file_sync_client.cpp

+3 −3
Original line number Diff line number Diff line
@@ -403,9 +403,9 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath) 
    if (!sc.SendRequest(ID_RECV, rpath)) return false;



    adb_unlink(lpath);

    if (!mkdirs(adb_dirname(lpath))) {

        sc.Error("failed to create parent directory '%s': %s",

                 adb_dirname(lpath).c_str(), strerror(errno));

    const std::string dirpath = adb_dirname(lpath);

    if (!mkdirs(dirpath.c_str())) {

        sc.Error("failed to create parent directory '%s': %s", dirpath.c_str(), strerror(errno));

        return false;

    }