diff options
| author | Eli Zaretskii | 2012-12-11 10:24:09 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-11 10:24:09 +0200 |
| commit | 1b47babdb7fd503ad79a696a1b9d9b2e2b46e10c (patch) | |
| tree | a4f87393ba54988d7c630757929982cbfc0575a4 /src | |
| parent | d46d2d3a70ee7cc2ac156d5a2824e83e9160b96a (diff) | |
| download | emacs-1b47babdb7fd503ad79a696a1b9d9b2e2b46e10c.tar.gz emacs-1b47babdb7fd503ad79a696a1b9d9b2e2b46e10c.zip | |
Minor change in variable name in inotify.c.
src/inotify.c (Finotify_add_watch): Rename decoded_file_name to
encoded_file_name, which is what it is.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/inotify.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 631425552f8..3472dbec611 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inotify.c (Finotify_add_watch): Rename decoded_file_name to | ||
| 4 | encoded_file_name, which is what it is. | ||
| 5 | |||
| 1 | 2012-12-11 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-12-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Consistently use marker_position and marker_byte_position. | 8 | Consistently use marker_position and marker_byte_position. |
diff --git a/src/inotify.c b/src/inotify.c index 4db95a069fe..17104c89064 100644 --- a/src/inotify.c +++ b/src/inotify.c | |||
| @@ -325,7 +325,7 @@ is managed internally and there is no corresponding inotify_init. Use | |||
| 325 | { | 325 | { |
| 326 | uint32_t mask; | 326 | uint32_t mask; |
| 327 | Lisp_Object watch_object; | 327 | Lisp_Object watch_object; |
| 328 | Lisp_Object decoded_file_name; | 328 | Lisp_Object encoded_file_name; |
| 329 | Lisp_Object watch_descriptor; | 329 | Lisp_Object watch_descriptor; |
| 330 | int watchdesc = -1; | 330 | int watchdesc = -1; |
| 331 | 331 | ||
| @@ -345,8 +345,8 @@ is managed internally and there is no corresponding inotify_init. Use | |||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | mask = aspect_to_inotifymask (aspect); | 347 | mask = aspect_to_inotifymask (aspect); |
| 348 | decoded_file_name = ENCODE_FILE (file_name); | 348 | encoded_file_name = ENCODE_FILE (file_name); |
| 349 | watchdesc = inotify_add_watch (inotifyfd, SSDATA (decoded_file_name), mask); | 349 | watchdesc = inotify_add_watch (inotifyfd, SSDATA (encoded_file_name), mask); |
| 350 | if (watchdesc == -1) | 350 | if (watchdesc == -1) |
| 351 | report_file_error ("Could not add watch for file", Fcons (file_name, Qnil)); | 351 | report_file_error ("Could not add watch for file", Fcons (file_name, Qnil)); |
| 352 | 352 | ||