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

psl_*_count() return -1 if information is not available

This commit is contained in:
Tim Rühsen 2017-09-15 17:13:57 +02:00 committed by Dagobert Michelsen
parent 4bfb18af61
commit a48169e6da
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/psl.c
View File

@ -1346,7 +1346,10 @@ const psl_ctx_t *psl_builtin(void)
* This function returns number of public suffixes maintained by @psl. * This function returns number of public suffixes maintained by @psl.
* The number of exceptions within the Public Suffix List are not included. * The number of exceptions within the Public Suffix List are not included.
* *
* Returns: Number of public suffixes entries in PSL context. * If the information is not available, the return value is -1 (since 0.19).
* This is the case with DAFSA blobs or if @psl is NULL.
*
* Returns: Number of public suffixes entries in PSL context or -1 if this information is not available.
* *
* Since: 0.1 * Since: 0.1
*/ */
@ -1355,9 +1358,9 @@ int psl_suffix_count(const psl_ctx_t *psl)
if (psl == &_builtin_psl) if (psl == &_builtin_psl)
return _psl_nsuffixes; return _psl_nsuffixes;
else if (psl) else if (psl)
return psl->nsuffixes; return psl->dafsa ? -1 : psl->nsuffixes;
else else
return 0; return -1;
} }
/** /**
@ -1366,7 +1369,10 @@ int psl_suffix_count(const psl_ctx_t *psl)
* *
* This function returns number of public suffix exceptions maintained by @psl. * This function returns number of public suffix exceptions maintained by @psl.
* *
* Returns: Number of public suffix exceptions in PSL context. * If the information is not available, the return value is -1 (since 0.19).
* This is the case with DAFSA blobs or if @psl is NULL.
*
* Returns: Number of public suffix exceptions in PSL context or -1 if this information is not available.
* *
* Since: 0.1 * Since: 0.1
*/ */
@ -1375,9 +1381,9 @@ int psl_suffix_exception_count(const psl_ctx_t *psl)
if (psl == &_builtin_psl) if (psl == &_builtin_psl)
return _psl_nexceptions; return _psl_nexceptions;
else if (psl) else if (psl)
return psl->nexceptions; return psl->dafsa ? -1 : psl->nexceptions;
else else
return 0; return -1;
} }
/** /**
@ -1386,7 +1392,10 @@ int psl_suffix_exception_count(const psl_ctx_t *psl)
* *
* This function returns number of public suffix wildcards maintained by @psl. * This function returns number of public suffix wildcards maintained by @psl.
* *
* Returns: Number of public suffix wildcards in PSL context. * If the information is not available, the return value is -1 (since 0.19).
* This is the case with DAFSA blobs or if @psl is NULL.
*
* Returns: Number of public suffix wildcards in PSL context or -1 if this information is not available.
* *
* Since: 0.10.0 * Since: 0.10.0
*/ */
@ -1395,9 +1404,9 @@ int psl_suffix_wildcard_count(const psl_ctx_t *psl)
if (psl == &_builtin_psl) if (psl == &_builtin_psl)
return _psl_nwildcards; return _psl_nwildcards;
else if (psl) else if (psl)
return psl->nwildcards; return psl->dafsa ? -1 : psl->nwildcards;
else else
return 0; return -1;
} }
/** /**

20
tools/psl.c
View File

@ -210,9 +210,23 @@ int main(int argc, const char *const *argv)
printf("dist filename: %s\n", psl_dist_filename()); printf("dist filename: %s\n", psl_dist_filename());
if (psl && psl != psl_builtin()) { if (psl && psl != psl_builtin()) {
printf("suffixes: %d\n", psl_suffix_count(psl)); static char not_avail[] = "- information not available -";
printf("exceptions: %d\n", psl_suffix_exception_count(psl)); int n;
printf("wildcards: %d\n", psl_suffix_wildcard_count(psl));
if ((n = psl_suffix_count(psl)) >= 0)
printf("suffixes: %d\n", n);
else
printf("suffixes: %s\n", not_avail);
if ((n = psl_suffix_exception_count(psl)) >= 0)
printf("exceptions: %d\n", n);
else
printf("exceptions: %s\n", not_avail);
if ((n = psl_suffix_wildcard_count(psl)) >= 0)
printf("wildcards: %d\n", n);
else
printf("wildcards: %s\n", not_avail);
} }
psl_free(psl); psl_free(psl);