Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use new roundtrip code for ICU get_character_name

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-06 17:35:18 +05:30
parent a8d8f92e9f
commit 68a37c565d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/utils/icu.c
View File

@ -696,22 +696,18 @@ icu_get_available_transliterators(PyObject *self, PyObject *args) {
// character_name {{{ // character_name {{{
static PyObject * static PyObject *
icu_character_name(PyObject *self, PyObject *args) { icu_character_name(PyObject *self, PyObject *args) {
char *input = NULL, name[512] = {0}; char name[512] = {0};
int32_t sz, alias = 0; int32_t sz, alias = 0;
UChar *buf; UChar *buf;
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
PyObject *palias = NULL, *result = NULL; PyObject *palias = NULL, *result = NULL, *input = NULL;
UChar32 code = 0; UChar32 code = 0;
if (!PyArg_ParseTuple(args, "es|O", "UTF-8", &input, &palias)) return NULL; if (!PyArg_ParseTuple(args, "O|O", &input, &palias)) return NULL;
if (palias != NULL && PyObject_IsTrue(palias)) alias = 1; if (palias != NULL && PyObject_IsTrue(palias)) alias = 1;
buf = python_to_icu(input, NULL, 1);
sz = (int32_t)strlen(input); if (buf == NULL) goto end;
buf = (UChar*)calloc(sz*4 + 1, sizeof(UChar));
if (buf == NULL) { PyErr_NoMemory(); goto end; }
u_strFromUTF8(buf, sz*4, &sz, input, sz, &status);
if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, "Failed to decode char string"); goto end; }
U16_GET(buf, 0, 0, -1, code); U16_GET(buf, 0, 0, -1, code);
if (alias) { if (alias) {
sz = u_charName(code, U_CHAR_NAME_ALIAS, name, 511, &status); sz = u_charName(code, U_CHAR_NAME_ALIAS, name, 511, &status);
@ -722,7 +718,6 @@ icu_character_name(PyObject *self, PyObject *args) {
result = PyUnicode_DecodeUTF8(name, sz, "strict"); result = PyUnicode_DecodeUTF8(name, sz, "strict");
end: end:
if (buf != NULL) free(buf); if (buf != NULL) free(buf);
PyMem_Free(input);
return result; return result;
} // }}} } // }}}