Mercurial > emacs
changeset 109129:907fcf8bd2ef
Fix prototypes.
* 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.
* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
(analyse_first): Fix "const const".
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 04 Jul 2010 13:51:28 +0200 |
| parents | 89fa0d8c2e83 |
| children | cd13b432f239 |
| files | src/ChangeLog src/dired.c src/fileio.c src/regex.c |
| diffstat | 4 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jul 04 12:07:27 2010 +0200 +++ b/src/ChangeLog Sun Jul 04 13:51:28 2010 +0200 @@ -1,3 +1,13 @@ +2010-07-04 Juanma Barranquero <lekktu@gmail.com> + + Fix prototypes. + + * 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. + * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. + (analyse_first): Fix "const const". + 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> * alloc.c: Convert function definitions to standard C.
--- a/src/dired.c Sun Jul 04 12:07:27 2010 +0200 +++ b/src/dired.c Sun Jul 04 13:51:28 2010 +0200 @@ -472,7 +472,7 @@ return file_name_completion (file, directory, 1, 0, Qnil); } -static int file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr); +static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); Lisp_Object Qdefault_directory; Lisp_Object @@ -839,7 +839,7 @@ } static int -file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr) +file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr) { int len = NAMLEN (dp); int pos = SCHARS (dirname);
--- a/src/fileio.c Sun Jul 04 12:07:27 2010 +0200 +++ b/src/fileio.c Sun Jul 04 13:51:28 2010 +0200 @@ -3248,12 +3248,12 @@ /* Read from a non-regular file. - Read non_regular_trytry bytes max from non_regular_fd. + Read non_regular_nbytes bytes max from non_regular_fd. Non_regular_inserted specifies where to put the read bytes. Value is the number of bytes read. */ static Lisp_Object -read_non_regular (void) +read_non_regular (Lisp_Object ignored) { EMACS_INT nbytes; @@ -3271,7 +3271,7 @@ in insert-file-contents. */ static Lisp_Object -read_non_regular_quit (void) +read_non_regular_quit (Lisp_Object ignored) { return Qnil; }
--- a/src/regex.c Sun Jul 04 12:07:27 2010 +0200 +++ b/src/regex.c Sun Jul 04 13:51:28 2010 +0200 @@ -3984,7 +3984,7 @@ Return -1 if fastmap was not updated accurately. */ static int -analyse_first (const re_char *p, const re_char *pend, char *fastmap, const const int multibyte) +analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int multibyte) { int j, k; boolean not; @@ -6385,7 +6385,8 @@ bytes; nonzero otherwise. */ static int -bcmp_translate (const re_char *s1, const re_char *s2, register int len, Lisp_Object translate, const const int target_multibyte) +bcmp_translate (const re_char *s1, const re_char *s2, register int len, + RE_TRANSLATE_TYPE translate, const int target_multibyte) { register re_char *p1 = s1, *p2 = s2; re_char *p1_end = s1 + len;