oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

java/String: add class StringUTFChars()

Browse Source
This commit is contained in:
Max Kellermann
2021-07-22 21:05:48 +02:00
committed by Max Kellermann
parent 56997290d7
commit 9e61bda592
2 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/String.cxx
View File

@@ -35,13 +35,8 @@ char *
Java::String::CopyTo(JNIEnv *env, jstring value,
char *buffer, size_t max_size) noexcept
{
const char *p = env->GetStringUTFChars(value, nullptr);
if (p == nullptr)
return nullptr;
char *result = CopyTruncateString(buffer, p, max_size);
env->ReleaseStringUTFChars(value, p);
return result;
return CopyTruncateString(buffer, GetUTFChars(env, value).c_str(),
max_size);
}
std::string
@@ -50,13 +45,5 @@ Java::String::ToString(JNIEnv *env, jstring s) noexcept
assert(env != nullptr);
assert(s != nullptr);
const char *p = env->GetStringUTFChars(s, nullptr);
if (p == nullptr)
return std::string();
AtScopeExit(env, s, p) {
env->ReleaseStringUTFChars(s, p);
};
return std::string(p);
return std::string(GetUTFChars(env, s).c_str());
}