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

Commit 68fc89d9 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: remove superfluous checks." 

am: 8c2fb1f3

* commit '8c2fb1f3':
  adb: remove superfluous checks.
parents bc85e342 8c2fb1f3

adb/file_sync_client.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -545,9 +545,7 @@ static bool copy_local_dir_remote(SyncConnection& sc, std::string lpath, 
                                  std::string rpath, bool check_timestamps,

                                  std::string rpath, bool check_timestamps,

                                  bool list_only) {

                                  bool list_only) {

    // Make sure that both directory paths end in a slash.

    // Make sure that both directory paths end in a slash.

    if (lpath.empty() || rpath.empty()) {

    // Both paths are known to exist, so they cannot be empty.

        return false;

    }

    if (lpath.back() != '/') {

    if (lpath.back() != '/') {

        lpath.push_back('/');

        lpath.push_back('/');

    }

    }
@@ -717,9 +715,7 @@ static int set_time_and_mode(const char *lpath, time_t time, unsigned int mode) 
static bool copy_remote_dir_local(SyncConnection& sc, std::string rpath,

static bool copy_remote_dir_local(SyncConnection& sc, std::string rpath,

                                  std::string lpath, bool copy_attrs) {

                                  std::string lpath, bool copy_attrs) {

    // Make sure that both directory paths end in a slash.

    // Make sure that both directory paths end in a slash.

    if (rpath.empty() || lpath.empty()) {

    // Both paths are known to exist, so they cannot be empty.

        return false;

    }

    if (rpath.back() != '/') {

    if (rpath.back() != '/') {

        rpath.push_back('/');

        rpath.push_back('/');

    }

    }