Commit 438105ed authored by Juanma Barranquero's avatar Juanma Barranquero

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".
parent 820ae8fe
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> 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu>
* alloc.c: Convert function definitions to standard C. * alloc.c: Convert function definitions to standard C.
......
...@@ -472,7 +472,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */) ...@@ -472,7 +472,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */)
return file_name_completion (file, directory, 1, 0, Qnil); 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 Qdefault_directory;
Lisp_Object Lisp_Object
...@@ -839,7 +839,7 @@ scmp (register unsigned char *s1, register unsigned char *s2, int len) ...@@ -839,7 +839,7 @@ scmp (register unsigned char *s1, register unsigned char *s2, int len)
} }
static int 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 len = NAMLEN (dp);
int pos = SCHARS (dirname); int pos = SCHARS (dirname);
......
...@@ -3248,12 +3248,12 @@ static EMACS_INT non_regular_nbytes; ...@@ -3248,12 +3248,12 @@ static EMACS_INT non_regular_nbytes;
/* Read from a non-regular file. /* 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. Non_regular_inserted specifies where to put the read bytes.
Value is the number of bytes read. */ Value is the number of bytes read. */
static Lisp_Object static Lisp_Object
read_non_regular (void) read_non_regular (Lisp_Object ignored)
{ {
EMACS_INT nbytes; EMACS_INT nbytes;
...@@ -3271,7 +3271,7 @@ read_non_regular (void) ...@@ -3271,7 +3271,7 @@ read_non_regular (void)
in insert-file-contents. */ in insert-file-contents. */
static Lisp_Object static Lisp_Object
read_non_regular_quit (void) read_non_regular_quit (Lisp_Object ignored)
{ {
return Qnil; return Qnil;
} }
......
...@@ -3984,7 +3984,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) ...@@ -3984,7 +3984,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
Return -1 if fastmap was not updated accurately. */ Return -1 if fastmap was not updated accurately. */
static int 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; int j, k;
boolean not; boolean not;
...@@ -6385,7 +6385,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int ...@@ -6385,7 +6385,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
bytes; nonzero otherwise. */ bytes; nonzero otherwise. */
static int 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; register re_char *p1 = s1, *p2 = s2;
re_char *p1_end = s1 + len; re_char *p1_end = s1 + len;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment