diff options
| author | Erkki Seppälä <erkki.seppala@vincit.fi> | 2011-01-31 14:02:16 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:24 +0200 |
| commit | 7576f5f150ee5d6cb32ebc55d2a5b32bd642a32d (patch) | |
| tree | 75ddbe7bb2f9dfbdae5038d512e3af25a8eb997d /nx-X11/lib/X11/lcFile.c | |
| parent | 698270c47b3b78e3e746c4767a277c5e1e73ec14 (diff) | |
| download | nx-libs-7576f5f150ee5d6cb32ebc55d2a5b32bd642a32d.tar.gz nx-libs-7576f5f150ee5d6cb32ebc55d2a5b32bd642a32d.tar.bz2 nx-libs-7576f5f150ee5d6cb32ebc55d2a5b32bd642a32d.zip | |
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>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/lcFile.c')
| -rw-r--r-- | nx-X11/lib/X11/lcFile.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/X11/lcFile.c index 8c2e7c062..e657e707f 100644 --- a/nx-X11/lib/X11/lcFile.c +++ b/nx-X11/lib/X11/lcFile.c @@ -663,8 +663,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); } @@ -763,8 +762,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); } |