Merge "Remove the weird range variants of String8::toLower() and String8::toUpper()." (561209ee) · Commits · e / os / android_system_core

libutils/String8.cpp

+10 −32

Original line number	Diff line number	Diff line
		@@ -415,50 +415,28 @@ bool String8::removeAll(const char* other) {

		void String8::toLower()
		{
		toLower(0, size());
		}
		const size_t length = size();
		if (length == 0) return;

		void String8::toLower(size_t start, size_t length)
		{
		const size_t len = size();
		if (start >= len) {
		return;
		}
		if (start+length > len) {
		length = len-start;
		}
		char* buf = lockBuffer(len);
		buf += start;
		while (length > 0) {
		char* buf = lockBuffer(length);
		for (size_t i = length; i > 0; --i) {
		buf = static_cast<char>(tolower(buf));
		buf++;
		length--;
		}
		unlockBuffer(len);
		unlockBuffer(length);
		}

		void String8::toUpper()
		{
		toUpper(0, size());
		}
		const size_t length = size();
		if (length == 0) return;

		void String8::toUpper(size_t start, size_t length)
		{
		const size_t len = size();
		if (start >= len) {
		return;
		}
		if (start+length > len) {
		length = len-start;
		}
		char* buf = lockBuffer(len);
		buf += start;
		while (length > 0) {
		char* buf = lockBuffer(length);
		for (size_t i = length; i > 0; --i) {
		buf = static_cast<char>(toupper(buf));
		buf++;
		length--;
		}
		unlockBuffer(len);
		unlockBuffer(length);
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -130,9 +130,7 @@ public:
		bool removeAll(const char* other);

		void toLower();
		void toLower(size_t start, size_t numChars);
		void toUpper();
		void toUpper(size_t start, size_t numChars);


		/*