jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Java] Eliminate some unnecessary uses of a temporary buffer

Browse source 
allocated using new[].  SF#1796609.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9948 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-09-20 01:04:35 +00:00
commit 532518c38a
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/java/std_wstring.i
View file

@ -37,12 +37,10 @@ class wstring;
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
jsize $1_len = jenv->GetStringLength($input); jsize $1_len = jenv->GetStringLength($input);
if ($1_len) { if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len]; $1.reserve($1_len);
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i]; $1.append((wchar_t)$1_pstr[i]);
} }
$1.assign(conv_buf, $1_len);
delete [] conv_buf;
} }
jenv->ReleaseStringChars($input, $1_pstr); jenv->ReleaseStringChars($input, $1_pstr);
%} %}
@ -56,12 +54,10 @@ class wstring;
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
jsize $1_len = jenv->GetStringLength($input); jsize $1_len = jenv->GetStringLength($input);
if ($1_len) { if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len]; $result.reserve($1_len);
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i]; $result.append((wchar_t)$1_pstr[i]);
} }
$result.assign(conv_buf, $1_len);
delete [] conv_buf;
} }
jenv->ReleaseStringChars($input, $1_pstr); jenv->ReleaseStringChars($input, $1_pstr);
%} %}
@ -108,12 +104,10 @@ class wstring;
jsize $1_len = jenv->GetStringLength($input); jsize $1_len = jenv->GetStringLength($input);
std::wstring $1_str; std::wstring $1_str;
if ($1_len) { if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len]; $1_str.reserve($1_len);
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i]; $1_str.append((wchar_t)$1_pstr[i]);
} }
$1_str.assign(conv_buf, $1_len);
delete [] conv_buf;
} }
$1 = &$1_str; $1 = &$1_str;
jenv->ReleaseStringChars($input, $1_pstr); jenv->ReleaseStringChars($input, $1_pstr);
@ -130,12 +124,10 @@ class wstring;
/* possible thread/reentrant code problem */ /* possible thread/reentrant code problem */
static std::wstring $1_str; static std::wstring $1_str;
if ($1_len) { if ($1_len) {
wchar_t *conv_buf = new wchar_t[$1_len]; $1_str.reserve($1_len);
for (jsize i = 0; i < $1_len; ++i) { for (jsize i = 0; i < $1_len; ++i) {
conv_buf[i] = $1_pstr[i]; $1_str.append((wchar_t)$1_pstr[i]);
} }
$1_str.assign(conv_buf, $1_len);
delete [] conv_buf;
} }
$result = &$1_str; $result = &$1_str;
jenv->ReleaseStringChars($input, $1_pstr); %} jenv->ReleaseStringChars($input, $1_pstr); %}