@@ -341,7 +341,7 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
341
341
}
342
342
343
343
if (size > INT32_MAX ) {
344
- /* TODO(fa): error message */
344
+ /* TODO(fa): error message */
345
345
return HPy_NULL ;
346
346
}
347
347
@@ -365,7 +365,8 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
365
365
into the new object */
366
366
uint32_t maxchar = 0 ;
367
367
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 ++ ) {
369
370
#if SIZEOF_WCHAR_T == 2
370
371
if (Py_UNICODE_IS_HIGH_SURROGATE (iter [0 ])
371
372
&& (iter + 1 ) < end
@@ -392,15 +393,16 @@ static HPy augment_UnicodeFromWideChar(HPyContext ctx, const wchar_t *u, HPy_ssi
392
393
}
393
394
394
395
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 ];
399
401
}
400
- (* jniEnv )-> ReleasePrimitiveArrayCritical (jniEnv , jCharArray , content , 0 );
402
+ (* jniEnv )-> ReleasePrimitiveArrayCritical (jniEnv , jCharArray , content , 0 );
401
403
return DO_UPCALL_HPY (CONTEXT_INSTANCE (ctx ), UnicodeFromJCharArray , jCharArray );
402
404
} else {
403
- return original_UnicodeFromWideChar (ctx , u , size );
405
+ return original_UnicodeFromWideChar (ctx , u , size );
404
406
}
405
407
}
406
408
0 commit comments