[PATCH v2 24/25] [libx11] Removed superfluous check for NULL target_dir; it is already handled before this code.

[Alan Coopersmith]

On 01/31/11 04:02 AM, Erkki Seppälä wrote:
> Cannot reach dead expression "0U" inside statement "if (1U + (target_dir ? strl..."
> 
> Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
> Signed-off-by: Erkki Seppälä <erkki.seppala at vincit.fi>
> ---
>  src/xlibi18n/lcFile.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
> index 21a546d..d7e375e 100644
> --- a/src/xlibi18n/lcFile.c
> +++ b/src/xlibi18n/lcFile.c
> @@ -785,8 +785,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
>   		Xfree(name);
>   	    continue;
>   	}
> - 	if ((1 + (target_dir ? strlen (target_dir) : 0) +
> - 	     strlen("locale.dir")) < PATH_MAX) {
> + 	if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
>   	    sprintf(buf, "%s/locale.dir", target_dir);
>   	    target_name = resolve_name(name, buf, RtoL);
>   	}

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System