walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

some libicu cleanups

This commit is contained in:
Tim Ruehsen 2014-06-18 15:21:22 +02:00
parent 28adbe1f1b
commit 4ae0fecc64
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/psl.c
View File

@ -447,12 +447,12 @@ static int _str_is_ascii(const char *s)
return !*s; return !*s;
} }
#ifdef WITH_LIBICU
static void _add_punycode_if_needed(UIDNA *idna, _psl_vector_t *v, _psl_entry_t *e) static void _add_punycode_if_needed(UIDNA *idna, _psl_vector_t *v, _psl_entry_t *e)
{ {
if (_str_is_ascii(e->label_buf)) if (_str_is_ascii(e->label_buf))
return; return;
#ifdef WITH_LIBICU
/* IDNA2008 UTS#46 punycode conversion */ /* IDNA2008 UTS#46 punycode conversion */
if (idna) { if (idna) {
_psl_entry_t suffix, *suffixp; _psl_entry_t suffix, *suffixp;
@ -482,8 +482,8 @@ static void _add_punycode_if_needed(UIDNA *idna, _psl_vector_t *v, _psl_entry_t
} /* else } /* else
fprintf(stderr, "Failed to convert UTF-8 to UTF-16 (status %d)\n", status); */ fprintf(stderr, "Failed to convert UTF-8 to UTF-16 (status %d)\n", status); */
} }
#endif
} }
#endif
/** /**
* psl_load_file: * psl_load_file:
@ -570,14 +570,18 @@ psl_ctx_t *psl_load_fp(FILE *fp)
if (_suffix_init(&suffix, p + 1, linep - p - 1) == 0) { if (_suffix_init(&suffix, p + 1, linep - p - 1) == 0) {
suffixp = _vector_get(psl->suffix_exceptions, _vector_add(psl->suffix_exceptions, &suffix)); suffixp = _vector_get(psl->suffix_exceptions, _vector_add(psl->suffix_exceptions, &suffix));
suffixp->label = suffixp->label_buf; /* set label to changed address */ suffixp->label = suffixp->label_buf; /* set label to changed address */
#ifdef WITH_LIBICU
_add_punycode_if_needed(idna, psl->suffix_exceptions, suffixp); _add_punycode_if_needed(idna, psl->suffix_exceptions, suffixp);
#endif
} }
} else { } else {
/* add to suffixes */ /* add to suffixes */
if (_suffix_init(&suffix, p, linep - p) == 0) { if (_suffix_init(&suffix, p, linep - p) == 0) {
suffixp = _vector_get(psl->suffixes, _vector_add(psl->suffixes, &suffix)); suffixp = _vector_get(psl->suffixes, _vector_add(psl->suffixes, &suffix));
suffixp->label = suffixp->label_buf; /* set label to changed address */ suffixp->label = suffixp->label_buf; /* set label to changed address */
#ifdef WITH_LIBICU
_add_punycode_if_needed(idna, psl->suffixes, suffixp); _add_punycode_if_needed(idna, psl->suffixes, suffixp);
#endif
} }
} }
} }
@ -759,11 +763,13 @@ const char *psl_builtin_filename(void)
**/ **/
const char *psl_get_version (void) const char *psl_get_version (void)
{ {
return PACKAGE_VERSION
#ifdef WITH_LIBICU #ifdef WITH_LIBICU
return PACKAGE_VERSION " +libicu/" U_ICU_VERSION; " (+libicu/" U_ICU_VERSION ")"
#else #else
return PACKAGE_VERSION; " (limited IDNA support)"
#endif #endif
;
} }
/** /**