[3.5] bpo-32563: Get expat to compile under C89 (#5201) · python/cpython@57fa0ab (original) (raw)

`@@ -405,16 +405,20 @@ utf8_toUtf8(const ENCODING *UNUSED_P(enc),

`

405

405

` }

`

406

406

``

407

407

`/* Avoid copying partial characters (from incomplete input). */

`

408

``

`-

const char * const fromLimBefore = fromLim;

`

409

``

`-

align_limit_to_full_utf8_characters(*fromP, &fromLim);

`

410

``

`-

if (fromLim < fromLimBefore) {

`

411

``

`-

input_incomplete = true;

`

``

408

`+

{

`

``

409

`+

const char * const fromLimBefore = fromLim;

`

``

410

`+

align_limit_to_full_utf8_characters(*fromP, &fromLim);

`

``

411

`+

if (fromLim < fromLimBefore) {

`

``

412

`+

input_incomplete = true;

`

``

413

`+

}

`

412

414

` }

`

413

415

``

414

``

`-

const ptrdiff_t bytesToCopy = fromLim - *fromP;

`

415

``

`-

memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);

`

416

``

`-

*fromP += bytesToCopy;

`

417

``

`-

*toP += bytesToCopy;

`

``

416

`+

{

`

``

417

`+

const ptrdiff_t bytesToCopy = fromLim - *fromP;

`

``

418

`+

memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);

`

``

419

`+

*fromP += bytesToCopy;

`

``

420

`+

*toP += bytesToCopy;

`

``

421

`+

}

`

418

422

``

419

423

`if (output_exhausted) // needs to go first

`

420

424

`return XML_CONVERT_OUTPUT_EXHAUSTED;

`