diff options
| author | Erkki Seppälä <erkki.seppala@vincit.fi> | 2011-01-31 14:02:16 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-01 23:47:05 -0800 |
| commit | 03f81ad8fb9783986cf9b17661dd31e95c396681 (patch) | |
| tree | 9afe9292dd164c47344d9a634c42d4cd078e12ce | |
| parent | 1346b9ea3b3882201ff8c3ee462ff4b0d4edf639 (diff) | |
xlibi18n/lcFile: Removed superfluous check for NULL target_dir
The situation is already handled before this code.
Cannot reach dead expression "0U" inside statement "if (1U + (target_dir ? strl..."
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/xlibi18n/lcFile.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c index 21a546d8..18756c1c 100644 --- a/src/xlibi18n/lcFile.c +++ b/src/xlibi18n/lcFile.c @@ -685,8 +685,7 @@ _XlcLocaleDirName(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); } @@ -785,8 +784,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); } |