Two patches attached.
0001 fixes a style issue. Backport because it eliminates a warning in
the 'update-unicode' target.
0002 looks like a bug, but is not a real issue because there are no
callers that pass srclen==-1, aside from a test (which fails to fail).
So it's just cleanup, but it seems worth backporting.
Regards,
Jeff Davis