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

java/String: add method ToString()

This commit is contained in:
Max Kellermann 2019-04-24 13:55:15 +02:00
parent 0d2ec5ead2
commit 61b2ae0f7c
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/String.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2018 Max Kellermann <max.kellermann@gmail.com> * Copyright 2010-2019 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -29,6 +29,7 @@
#include "String.hxx" #include "String.hxx"
#include "util/TruncateString.hxx" #include "util/TruncateString.hxx"
#include "util/ScopeExit.hxx"
char * char *
Java::String::CopyTo(JNIEnv *env, jstring value, Java::String::CopyTo(JNIEnv *env, jstring value,
@ -42,3 +43,20 @@ Java::String::CopyTo(JNIEnv *env, jstring value,
env->ReleaseStringUTFChars(value, p); env->ReleaseStringUTFChars(value, p);
return result; return result;
} }
std::string
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);
}

10
src/java/String.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2018 Max Kellermann <max.kellermann@gmail.com> * Copyright 2010-2019 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -34,6 +34,8 @@
#include <jni.h> #include <jni.h>
#include <string>
#include <stddef.h> #include <stddef.h>
namespace Java { namespace Java {
@ -69,6 +71,12 @@ namespace Java {
char *buffer, size_t max_size) noexcept { char *buffer, size_t max_size) noexcept {
return CopyTo(env, Get(), buffer, max_size); return CopyTo(env, Get(), buffer, max_size);
} }
static std::string ToString(JNIEnv *env, jstring s) noexcept;
std::string ToString() const noexcept {
return ToString(GetEnv(), Get());
}
}; };
} }