[vlc-devel] [PATCH 3/3] freetype: Simplify path check

[Francois Cartegnie]

Le 17/06/2017 à 17:08, Marvin Scholz a écrit :
> ---
>  modules/text_renderer/freetype/fonts/darwin.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/modules/text_renderer/freetype/fonts/darwin.c b/modules/text_renderer/freetype/fonts/darwin.c
> index 06dec792da..a3ea832954 100644
> --- a/modules/text_renderer/freetype/fonts/darwin.c
> +++ b/modules/text_renderer/freetype/fonts/darwin.c
> @@ -172,12 +172,8 @@ const vlc_family_t *CoreText_GetFamily(filter_t *p_filter, const char *psz_famil
>          path = getPathForFontDescription(iter);
>  
>          /* check if the path is empty, which can happen in rare circumstances */
> -        if (path != NULL) {
> -            if (strcmp("", path) == 0) {
> -                FREENULL(path);
> -                continue;
> -            }
> -        } else {
> +        if (path == NULL || *path == '\0') {
> +            FREENULL(path);
>              continue;
>          }

No simplification as it is not checking the same thing

Francois