diff options
| author | Juanma Barranquero | 2012-08-07 00:07:01 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-08-07 00:07:01 +0200 |
| commit | 25a20a3ad805aa2e504a9bd3d0dd66211fcdd0dc (patch) | |
| tree | dac0ee7abc838fcb6246fec5babed5ce7fa86251 | |
| parent | f91b35be6020fd9efd8e2d0f7555f5d6f5e998d1 (diff) | |
| download | emacs-25a20a3ad805aa2e504a9bd3d0dd66211fcdd0dc.tar.gz emacs-25a20a3ad805aa2e504a9bd3d0dd66211fcdd0dc.zip | |
src/w32.c: Silence compiler warnings.
(map_w32_filename): Remove unused variable `is_fat'.
(chase_symlinks): Add parentheses around expression.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5bccda264b2..ed2a18af3c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-08-06 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32.c: Silence compiler warnings. | ||
| 4 | (map_w32_filename): Remove unused variable `is_fat'. | ||
| 5 | (chase_symlinks): Add parentheses around expression. | ||
| 6 | |||
| 1 | 2012-08-06 Glenn Morris <rgm@gnu.org> | 7 | 2012-08-06 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * sysdep.c: Respect BROKEN_GETWD. | 9 | * sysdep.c: Respect BROKEN_GETWD. |
| @@ -2395,7 +2395,6 @@ map_w32_filename (const char * name, const char ** pPath) | |||
| 2395 | char c; | 2395 | char c; |
| 2396 | char * path; | 2396 | char * path; |
| 2397 | const char * save_name = name; | 2397 | const char * save_name = name; |
| 2398 | int is_fat = 0; | ||
| 2399 | 2398 | ||
| 2400 | if (strlen (name) >= MAX_PATH) | 2399 | if (strlen (name) >= MAX_PATH) |
| 2401 | { | 2400 | { |
| @@ -4433,7 +4432,7 @@ chase_symlinks (const char *file) | |||
| 4433 | { | 4432 | { |
| 4434 | target[res] = '\0'; | 4433 | target[res] = '\0'; |
| 4435 | if (!(IS_DEVICE_SEP (target[1]) | 4434 | if (!(IS_DEVICE_SEP (target[1]) |
| 4436 | || IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1]))) | 4435 | || (IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1])))) |
| 4437 | { | 4436 | { |
| 4438 | /* Target is relative. Append it to the directory part of | 4437 | /* Target is relative. Append it to the directory part of |
| 4439 | the symlink, then copy the result back to target. */ | 4438 | the symlink, then copy the result back to target. */ |