* fileio.c (read_non_regular, read_non_regular_quit): Rename arg.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c7ee7aeaa0bb27fdf7d8e05a7238fb63c9d05c2..27253207ebad56775dccc1a505fd0d32e19266a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,5 @@
 2010-07-04  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
-               Stefan Monnier  <monnier@iro.umontreal.ca>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lread.c (read1): Fix up last change to not mess up `c'.
 
@@ -13,8 +13,8 @@
 
        * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
        * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent.
-       * fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object,
-       as required by internal_condition_case_1.
+       * fileio.c (read_non_regular, read_non_regular_quit): Add Lisp_Object
+       arg, as required by internal_condition_case_1.
        * print.c (strout): Use const char* for arg PTR.
        * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
        (analyse_first): Fix "const const".

diff --git a/src/fileio.c b/src/fileio.c
index 0f80d57279499d869af8563b9f028ee0e978b57b..c68aa45e13de5b60318b9e4811ad93f4eea298ff 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3253,7 +3253,7 @@ static EMACS_INT non_regular_nbytes;
    Value is the number of bytes read.  */
 
 static Lisp_Object
-read_non_regular (Lisp_Object ignored)
+read_non_regular (Lisp_Object ignore)
 {
   EMACS_INT nbytes;
 
@@ -3271,7 +3271,7 @@ read_non_regular (Lisp_Object ignored)
    in insert-file-contents.  */
 
 static Lisp_Object
-read_non_regular_quit (Lisp_Object ignored)
+read_non_regular_quit (Lisp_Object ignore)
 {
   return Qnil;
 }