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

Commit 85cc860f authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers." 

* commit 'ce2047a9':
  Fix const-ness of strrchr callers.
parents 25cc1017 ce2047a9

adb/adb_utils.cpp

+6 −5
Original line number Diff line number Diff line
@@ -72,16 +72,17 @@ std::string escape_arg(const std::string& s) { 
  return result;

}



int mkdirs(const char *path)

{

int mkdirs(const std::string& path) {

    // TODO: rewrite this function and merge it with the *other* mkdirs in adb.

    std::unique_ptr<char> path_rw(strdup(path.c_str()));

    int ret;

    char *x = (char *)path + 1;

    char* x = path_rw.get() + 1;



    for(;;) {

        x = adb_dirstart(x);

        x = const_cast<char*>(adb_dirstart(x));

        if(x == 0) return 0;

        *x = 0;

        ret = adb_mkdir(path, 0775);

        ret = adb_mkdir(path_rw.get(), 0775);

        *x = OS_PATH_SEPARATOR;

        if((ret < 0) && (errno != EEXIST)) {

            return ret;

adb/adb_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
bool getcwd(std::string* cwd);

bool directory_exists(const std::string& path);



int mkdirs(const char *path);

int mkdirs(const std::string& path);



std::string escape_arg(const std::string& s);

adb/commandline.cpp

+4 −4
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int adb_download_buffer(const char *service, const char *fn, const void* 
    const uint8_t* ptr = reinterpret_cast<const uint8_t*>(data);



    if (show_progress) {

        char *x = strrchr(service, ':');

        const char* x = strrchr(service, ':');

        if (x) service = x + 1;

    }
@@ -1504,7 +1504,7 @@ static int install_app(TransportType transport, const char* serial, int argc, co 
    int last_apk = -1;

    for (i = argc - 1; i >= 0; i--) {

        const char* file = argv[i];

        char* dot = strrchr(file, '.');

        const char* dot = strrchr(file, '.');

        if (dot && !strcasecmp(dot, ".apk")) {

            if (stat(file, &sb) == -1 || !S_ISREG(sb.st_mode)) {

                fprintf(stderr, "Invalid APK file: %s\n", file);
@@ -1550,7 +1550,7 @@ static int install_multiple_app(TransportType transport, const char* serial, int 
    int first_apk = -1;

    for (i = argc - 1; i >= 0; i--) {

        const char* file = argv[i];

        char* dot = strrchr(file, '.');

        const char* dot = strrchr(file, '.');

        if (dot && !strcasecmp(dot, ".apk")) {

            if (stat(file, &sb) == -1 || !S_ISREG(sb.st_mode)) {

                fprintf(stderr, "Invalid APK file: %s\n", file);

adb/file_sync_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int mkdirs(char *name) 
    if(name[0] != '/') return -1;



    for(;;) {

        x = adb_dirstart(x);

        x = const_cast<char*>(adb_dirstart(x));

        if(x == 0) return 0;

        *x = 0;

        if (should_use_fs_config(name)) {

adb/sysdeps.h

+5 −5
Original line number Diff line number Diff line
@@ -247,10 +247,10 @@ static __inline__ char* adb_dirstart( const char* path ) 
    return p;

}



static __inline__  char*  adb_dirstop( const char*  path )

static __inline__  const char*  adb_dirstop( const char*  path )

{

    char*  p  = strrchr(path, '/');

    char*  p2 = strrchr(path, '\\');

    const char*  p  = strrchr(path, '/');

    const char*  p2 = strrchr(path, '\\');



    if ( !p )

        p = p2;
@@ -521,12 +521,12 @@ static __inline__ void adb_sysdeps_init(void) 
{

}



static __inline__ char*  adb_dirstart(const char*  path)

static __inline__ const char*  adb_dirstart(const char*  path)

{

    return strchr(path, '/');

}



static __inline__ char*  adb_dirstop(const char*  path)

static __inline__ const char*  adb_dirstop(const char*  path)

{

    return strrchr(path, '/');

}