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

Commit 5f7d548d authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Remove unused String8::setPathName." am: 40a0664b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1765465

Change-Id: I0e97d07a522f6041beb1a4bfdc66123b7e25511d
parents ea969ebe 40a0664b

libutils/String8.cpp

+7 −14
Original line number Original line Diff line number Diff line
@@ -429,24 +429,17 @@ void String8::toLower() 
// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

// Path functions

// Path functions





void String8::setPathName(const char* name)

static void setPathName(String8& s, const char* name) {

{

    size_t len = strlen(name);

    setPathName(name, strlen(name));

    char* buf = s.lockBuffer(len);

}



void String8::setPathName(const char* name, size_t len)

{

    char* buf = lockBuffer(len);





    memcpy(buf, name, len);

    memcpy(buf, name, len);





    // remove trailing path separator, if present

    // remove trailing path separator, if present

    if (len > 0 && buf[len-1] == OS_PATH_SEPARATOR)

    if (len > 0 && buf[len - 1] == OS_PATH_SEPARATOR) len--;

        len--;



    buf[len] = '\0';

    buf[len] = '\0';





    unlockBuffer(len);

    s.unlockBuffer(len);

}

}





String8 String8::getPathLeaf(void) const

String8 String8::getPathLeaf(void) const
@@ -559,7 +552,7 @@ String8& String8::appendPath(const char* name) 
        size_t len = length();

        size_t len = length();

        if (len == 0) {

        if (len == 0) {

            // no existing filename, just use the new one

            // no existing filename, just use the new one

            setPathName(name);

            setPathName(*this, name);

            return *this;

            return *this;

        }

        }
@@ -579,7 +572,7 @@ String8& String8::appendPath(const char* name) 




        return *this;

        return *this;

    } else {

    } else {

        setPathName(name);

        setPathName(*this, name);

        return *this;

        return *this;

    }

    }

}

}

libutils/String8_fuzz.cpp

+0 −4
Original line number Original line Diff line number Diff line
@@ -89,10 +89,6 @@ std::vector<std::function<void(FuzzedDataProvider*, android::String8*, android:: 
                    str1->walkPath(path_out_str.get());

                    str1->walkPath(path_out_str.get());

                    path_out_str->clear();

                    path_out_str->clear();

                },

                },

                [](FuzzedDataProvider* dataProvider, android::String8* str1,

                   android::String8*) -> void {

                    str1->setPathName(dataProvider->ConsumeBytesWithTerminator<char>(5).data());

                },

                [](FuzzedDataProvider* dataProvider, android::String8* str1,

                [](FuzzedDataProvider* dataProvider, android::String8* str1,

                   android::String8*) -> void {

                   android::String8*) -> void {

                    str1->appendPath(dataProvider->ConsumeBytesWithTerminator<char>(5).data());

                    str1->appendPath(dataProvider->ConsumeBytesWithTerminator<char>(5).data());

libutils/include/utils/String8.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -136,14 +136,6 @@ public: 
     * These methods operate on the string as if it were a path name.

     * These methods operate on the string as if it were a path name.

     */

     */





    /*

     * Set the filename field to a specific value.

     *

     * Normalizes the filename, removing a trailing '/' if present.

     */

    void setPathName(const char* name);

    void setPathName(const char* name, size_t numChars);



    /*

    /*

     * Get just the filename component.

     * Get just the filename component.

     *

     *