diff options
| author | Hans Wennborg | 2015-01-29 21:31:14 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-29 21:31:14 +0200 |
| commit | 868df451530c294cff3d4ccb98873626aa8105df (patch) | |
| tree | 982325c7c7053e19fa18e82d141eb777f5648c98 /src | |
| parent | b28c97942e29eb193951e56b6b8c2b7f21763333 (diff) | |
| download | emacs-868df451530c294cff3d4ccb98873626aa8105df.tar.gz emacs-868df451530c294cff3d4ccb98873626aa8105df.zip | |
Avoid compiler warnings in decode_env_path.
src/emacs.c (decode_env_path): Add parentheses around ternary
operator to increase readability and pacify compiler warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 08779405acb..949ea741e1d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-29 Hans Wennborg <hwennborg@google.com> (tiny change) | ||
| 2 | |||
| 3 | * emacs.c (decode_env_path): Add parentheses around ternary | ||
| 4 | operator to increase readability and pacify compiler warnings. | ||
| 5 | |||
| 1 | 2015-01-29 Eli Zaretskii <eliz@gnu.org> | 6 | 2015-01-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not | 8 | * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not |
diff --git a/src/emacs.c b/src/emacs.c index 0b7adbd0967..9b78a70428e 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2300,7 +2300,7 @@ decode_env_path (const char *evarname, const char *defalt, bool empty) | |||
| 2300 | p = strchr (path, SEPCHAR); | 2300 | p = strchr (path, SEPCHAR); |
| 2301 | if (!p) | 2301 | if (!p) |
| 2302 | p = path + strlen (path); | 2302 | p = path + strlen (path); |
| 2303 | element = (p - path ? make_unibyte_string (path, p - path) | 2303 | element = ((p - path) ? make_unibyte_string (path, p - path) |
| 2304 | : empty_element); | 2304 | : empty_element); |
| 2305 | if (! NILP (element)) | 2305 | if (! NILP (element)) |
| 2306 | { | 2306 | { |