Skip to content

Commit 0a176b9

Browse files
committed
Fix compilation warning in hpy_jni.c
1 parent 9e9e4d5 commit 0a176b9

File tree

1 file changed

+10
-8
lines changed
  • graalpython/com.oracle.graal.python.jni/src

1 file changed

+10
-8
lines changed

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
341341
}
342342

343343
if (size > INT32_MAX) {
344-
/* TODO(fa): error message */
344+
/* TODO(fa): error message */
345345
return HPy_NULL;
346346
}
347347

@@ -365,7 +365,8 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
365365
into the new object */
366366
uint32_t maxchar = 0;
367367
wchar_t ch;
368-
for (HPy_ssize_t i = 0; i < size; i++) {
368+
HPy_ssize_t i;
369+
for (i = 0; i < size; i++) {
369370
#if SIZEOF_WCHAR_T == 2
370371
if (Py_UNICODE_IS_HIGH_SURROGATE(iter[0])
371372
&& (iter+1) < end
@@ -392,15 +393,16 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
392393
}
393394

394395
if (maxchar < 65536) {
395-
jarray jCharArray = (*jniEnv)->NewCharArray(jniEnv, (jsize) size);
396-
jchar *content = (*jniEnv)->GetPrimitiveArrayCritical(jniEnv, jCharArray, 0);
397-
for (HPy_ssize_t i = 0; i < size; i++) {
398-
content[i] = (jchar) u[i];
396+
jarray jCharArray = (*jniEnv)->NewCharArray(jniEnv, (jsize) size);
397+
jchar *content = (*jniEnv)->GetPrimitiveArrayCritical(jniEnv, jCharArray, 0);
398+
HPy_ssize_t i;
399+
for (i = 0; i < size; i++) {
400+
content[i] = (jchar) u[i];
399401
}
400-
(*jniEnv)->ReleasePrimitiveArrayCritical(jniEnv, jCharArray, content, 0);
402+
(*jniEnv)->ReleasePrimitiveArrayCritical(jniEnv, jCharArray, content, 0);
401403
return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), UnicodeFromJCharArray, jCharArray);
402404
} else {
403-
return original_UnicodeFromWideChar(ctx, u, size);
405+
return original_UnicodeFromWideChar(ctx, u, size);
404406
}
405407
}
406408

0 commit comments

Comments
 (0)