Mercurial > emacs
changeset 109126:aec1143e8d85
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
line wrap: on
line diff
--- a/src/ChangeLog Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ChangeLog Sun Jul 04 00:50:25 2010 -0700 @@ -1,3 +1,81 @@ +2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> + + * alloc.c: Convert function definitions to standard C. + * atimer.c: + * bidi.c: + * bytecode.c: + * callint.c: + * callproc.c: + * casefiddle.c: + * casetab.c: + * category.c: + * ccl.c: + * character.c: + * charset.c: + * chartab.c: + * cmds.c: + * coding.c: + * composite.c: + * data.c: + * dbusbind.c: + * dired.c: + * dispnew.c: + * doc.c: + * doprnt.c: + * ecrt0.c: + * editfns.c: + * fileio.c: + * filelock.c: + * filemode.c: + * fns.c: + * font.c: + * fontset.c: + * frame.c: + * fringe.c: + * ftfont.c: + * ftxfont.c: + * gtkutil.c: + * indent.c: + * insdel.c: + * intervals.c: + * keymap.c: + * lread.c: + * macros.c: + * marker.c: + * md5.c: + * menu.c: + * minibuf.c: + * prefix-args.c: + * print.c: + * ralloc.c: + * regex.c: + * region-cache.c: + * scroll.c: + * search.c: + * sound.c: + * strftime.c: + * syntax.c: + * sysdep.c: + * termcap.c: + * terminal.c: + * terminfo.c: + * textprop.c: + * tparam.c: + * undo.c: + * unexelf.c: + * window.c: + * xfaces.c: + * xfns.c: + * xfont.c: + * xftfont.c: + * xgselect.c: + * xmenu.c: + * xrdb.c: + * xselect.c: + * xsettings.c: + * xsmfns.c: + * xterm.c: Likewise. + 2010-07-03 Eli Zaretskii <eliz@gnu.org> * msdos.c (IT_set_frame_parameters): Fix setting of colors in
--- a/src/alloc.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/alloc.c Sun Jul 04 00:50:25 2010 -0700 @@ -371,7 +371,7 @@ static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type); static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); -void refill_memory_reserve (); +void refill_memory_reserve (void); #if GC_MARK_STACK || defined GC_MALLOC_CHECK @@ -514,8 +514,7 @@ /* Function malloc calls this if it finds we are near exhausting storage. */ void -malloc_warning (str) - char *str; +malloc_warning (char *str) { pending_malloc_warning = str; } @@ -524,7 +523,7 @@ /* Display an already-pending malloc warning. */ void -display_malloc_warning () +display_malloc_warning (void) { call3 (intern ("display-warning"), intern ("alloc"), @@ -543,7 +542,7 @@ /* Called if we can't allocate relocatable space for a buffer. */ void -buffer_memory_full () +buffer_memory_full (void) { /* If buffers use the relocating allocator, no need to free spare_memory, because we may have plenty of malloc space left @@ -742,8 +741,7 @@ /* Like malloc but check for no memory and block interrupt input.. */ POINTER_TYPE * -xmalloc (size) - size_t size; +xmalloc (size_t size) { register POINTER_TYPE *val; @@ -760,9 +758,7 @@ /* Like realloc but check for no memory and block interrupt input.. */ POINTER_TYPE * -xrealloc (block, size) - POINTER_TYPE *block; - size_t size; +xrealloc (POINTER_TYPE *block, size_t size) { register POINTER_TYPE *val; @@ -783,8 +779,7 @@ /* Like free but block interrupt input. */ void -xfree (block) - POINTER_TYPE *block; +xfree (POINTER_TYPE *block) { if (!block) return; @@ -800,8 +795,7 @@ /* Like strdup, but uses xmalloc. */ char * -xstrdup (s) - const char *s; +xstrdup (const char *s) { size_t len = strlen (s) + 1; char *p = (char *) xmalloc (len); @@ -813,8 +807,7 @@ /* Unwind for SAFE_ALLOCA */ Lisp_Object -safe_alloca_unwind (arg) - Lisp_Object arg; +safe_alloca_unwind (Lisp_Object arg) { register struct Lisp_Save_Value *p = XSAVE_VALUE (arg); @@ -835,9 +828,7 @@ #endif static POINTER_TYPE * -lisp_malloc (nbytes, type) - size_t nbytes; - enum mem_type type; +lisp_malloc (size_t nbytes, enum mem_type type) { register void *val; @@ -881,8 +872,7 @@ call to lisp_malloc. */ static void -lisp_free (block) - POINTER_TYPE *block; +lisp_free (POINTER_TYPE *block) { MALLOC_BLOCK_INPUT; free (block); @@ -981,9 +971,7 @@ Alignment is on a multiple of BLOCK_ALIGN and `nbytes' has to be smaller or equal to BLOCK_BYTES. */ static POINTER_TYPE * -lisp_align_malloc (nbytes, type) - size_t nbytes; - enum mem_type type; +lisp_align_malloc (size_t nbytes, enum mem_type type) { void *base, *val; struct ablocks *abase; @@ -1090,8 +1078,7 @@ } static void -lisp_align_free (block) - POINTER_TYPE *block; +lisp_align_free (POINTER_TYPE *block) { struct ablock *ablock = block; struct ablocks *abase = ABLOCK_ABASE (ablock); @@ -1136,7 +1123,7 @@ a call to lisp_malloc. */ struct buffer * -allocate_buffer () +allocate_buffer (void) { struct buffer *b = (struct buffer *) lisp_malloc (sizeof (struct buffer), @@ -1434,7 +1421,7 @@ /* Initialize interval allocation. */ static void -init_intervals () +init_intervals (void) { interval_block = NULL; interval_block_index = INTERVAL_BLOCK_SIZE; @@ -1446,7 +1433,7 @@ /* Return a new interval. */ INTERVAL -make_interval () +make_interval (void) { INTERVAL val; @@ -1489,9 +1476,7 @@ /* Mark Lisp objects in interval I. */ static void -mark_interval (i, dummy) - register INTERVAL i; - Lisp_Object dummy; +mark_interval (register INTERVAL i, Lisp_Object dummy) { eassert (!i->gcmarkbit); /* Intervals are never shared. */ i->gcmarkbit = 1; @@ -1503,8 +1488,7 @@ use the macro MARK_INTERVAL_TREE instead. */ static void -mark_interval_tree (tree) - register INTERVAL tree; +mark_interval_tree (register INTERVAL tree) { /* No need to test if this tree has been marked already; this function is always called through the MARK_INTERVAL_TREE macro, @@ -1751,7 +1735,7 @@ /* Initialize string allocation. Called from init_alloc_once. */ static void -init_strings () +init_strings (void) { total_strings = total_free_strings = total_string_size = 0; oldest_sblock = current_sblock = large_sblocks = NULL; @@ -1873,7 +1857,7 @@ /* Return a new Lisp_String. */ static struct Lisp_String * -allocate_string () +allocate_string (void) { struct Lisp_String *s; @@ -1944,9 +1928,7 @@ S->data if it was initially non-null. */ void -allocate_string_data (s, nchars, nbytes) - struct Lisp_String *s; - int nchars, nbytes; +allocate_string_data (struct Lisp_String *s, int nchars, int nbytes) { struct sdata *data, *old_data; struct sblock *b; @@ -2043,7 +2025,7 @@ /* Sweep and compact strings. */ static void -sweep_strings () +sweep_strings (void) { struct string_block *b, *next; struct string_block *live_blocks = NULL; @@ -2143,7 +2125,7 @@ /* Free dead large strings. */ static void -free_large_strings () +free_large_strings (void) { struct sblock *b, *next; struct sblock *live_blocks = NULL; @@ -2169,7 +2151,7 @@ data of live strings after compaction. */ static void -compact_small_strings () +compact_small_strings (void) { struct sblock *b, *tb, *next; struct sdata *from, *to, *end, *tb_end; @@ -2357,9 +2339,7 @@ multibyte, depending on the contents. */ Lisp_Object -make_string (contents, nbytes) - const char *contents; - int nbytes; +make_string (const char *contents, int nbytes) { register Lisp_Object val; int nchars, multibyte_nbytes; @@ -2378,9 +2358,7 @@ /* Make an unibyte string from LENGTH bytes at CONTENTS. */ Lisp_Object -make_unibyte_string (contents, length) - const char *contents; - int length; +make_unibyte_string (const char *contents, int length) { register Lisp_Object val; val = make_uninit_string (length); @@ -2394,9 +2372,7 @@ bytes at CONTENTS. */ Lisp_Object -make_multibyte_string (contents, nchars, nbytes) - const char *contents; - int nchars, nbytes; +make_multibyte_string (const char *contents, int nchars, int nbytes) { register Lisp_Object val; val = make_uninit_multibyte_string (nchars, nbytes); @@ -2409,9 +2385,7 @@ CONTENTS. It is a multibyte string if NBYTES != NCHARS. */ Lisp_Object -make_string_from_bytes (contents, nchars, nbytes) - const char *contents; - int nchars, nbytes; +make_string_from_bytes (const char *contents, int nchars, int nbytes) { register Lisp_Object val; val = make_uninit_multibyte_string (nchars, nbytes); @@ -2428,10 +2402,7 @@ characters by itself. */ Lisp_Object -make_specified_string (contents, nchars, nbytes, multibyte) - const char *contents; - int nchars, nbytes; - int multibyte; +make_specified_string (const char *contents, int nchars, int nbytes, int multibyte) { register Lisp_Object val; @@ -2454,8 +2425,7 @@ data warrants. */ Lisp_Object -build_string (str) - const char *str; +build_string (const char *str) { return make_string (str, strlen (str)); } @@ -2465,8 +2435,7 @@ occupying LENGTH bytes. */ Lisp_Object -make_uninit_string (length) - int length; +make_uninit_string (int length) { Lisp_Object val; @@ -2482,8 +2451,7 @@ which occupy NBYTES bytes. */ Lisp_Object -make_uninit_multibyte_string (nchars, nbytes) - int nchars, nbytes; +make_uninit_multibyte_string (int nchars, int nbytes) { Lisp_Object string; struct Lisp_String *s; @@ -2573,7 +2541,7 @@ /* Initialize float allocation. */ static void -init_float () +init_float (void) { float_block = NULL; float_block_index = FLOAT_BLOCK_SIZE; /* Force alloc of new float_block. */ @@ -2585,8 +2553,7 @@ /* Explicitly free a float cell by putting it on the free-list. */ static void -free_float (ptr) - struct Lisp_Float *ptr; +free_float (struct Lisp_Float *ptr) { ptr->u.chain = float_free_list; float_free_list = ptr; @@ -2596,8 +2563,7 @@ /* Return a new float object with value FLOAT_VALUE. */ Lisp_Object -make_float (float_value) - double float_value; +make_float (double float_value) { register Lisp_Object val; @@ -2697,7 +2663,7 @@ /* Initialize cons allocation. */ static void -init_cons () +init_cons (void) { cons_block = NULL; cons_block_index = CONS_BLOCK_SIZE; /* Force alloc of new cons_block. */ @@ -2709,8 +2675,7 @@ /* Explicitly free a cons cell by putting it on the free-list. */ void -free_cons (ptr) - struct Lisp_Cons *ptr; +free_cons (struct Lisp_Cons *ptr) { ptr->u.chain = cons_free_list; #if GC_MARK_STACK @@ -2766,7 +2731,7 @@ /* Get an error now if there's any junk in the cons free list. */ void -check_cons_list () +check_cons_list (void) { #ifdef GC_CHECK_CONS_LIST struct Lisp_Cons *tail = cons_free_list; @@ -2779,39 +2744,34 @@ /* Make a list of 1, 2, 3, 4 or 5 specified objects. */ Lisp_Object -list1 (arg1) - Lisp_Object arg1; +list1 (Lisp_Object arg1) { return Fcons (arg1, Qnil); } Lisp_Object -list2 (arg1, arg2) - Lisp_Object arg1, arg2; +list2 (Lisp_Object arg1, Lisp_Object arg2) { return Fcons (arg1, Fcons (arg2, Qnil)); } Lisp_Object -list3 (arg1, arg2, arg3) - Lisp_Object arg1, arg2, arg3; +list3 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3) { return Fcons (arg1, Fcons (arg2, Fcons (arg3, Qnil))); } Lisp_Object -list4 (arg1, arg2, arg3, arg4) - Lisp_Object arg1, arg2, arg3, arg4; +list4 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4) { return Fcons (arg1, Fcons (arg2, Fcons (arg3, Fcons (arg4, Qnil)))); } Lisp_Object -list5 (arg1, arg2, arg3, arg4, arg5) - Lisp_Object arg1, arg2, arg3, arg4, arg5; +list5 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, Lisp_Object arg5) { return Fcons (arg1, Fcons (arg2, Fcons (arg3, Fcons (arg4, Fcons (arg5, Qnil))))); @@ -2904,8 +2864,7 @@ with room for LEN Lisp_Objects. */ static struct Lisp_Vector * -allocate_vectorlike (len) - EMACS_INT len; +allocate_vectorlike (EMACS_INT len) { struct Lisp_Vector *p; size_t nbytes; @@ -2946,8 +2905,7 @@ /* Allocate a vector with NSLOTS slots. */ struct Lisp_Vector * -allocate_vector (nslots) - EMACS_INT nslots; +allocate_vector (EMACS_INT nslots) { struct Lisp_Vector *v = allocate_vectorlike (nslots); v->size = nslots; @@ -2958,9 +2916,7 @@ /* Allocate other vector-like structures. */ struct Lisp_Vector * -allocate_pseudovector (memlen, lisplen, tag) - int memlen, lisplen; - EMACS_INT tag; +allocate_pseudovector (int memlen, int lisplen, EMACS_INT tag) { struct Lisp_Vector *v = allocate_vectorlike (memlen); EMACS_INT i; @@ -2982,14 +2938,14 @@ struct window * -allocate_window () +allocate_window (void) { return ALLOCATE_PSEUDOVECTOR(struct window, current_matrix, PVEC_WINDOW); } struct terminal * -allocate_terminal () +allocate_terminal (void) { struct terminal *t = ALLOCATE_PSEUDOVECTOR (struct terminal, next_terminal, PVEC_TERMINAL); @@ -3001,7 +2957,7 @@ } struct frame * -allocate_frame () +allocate_frame (void) { struct frame *f = ALLOCATE_PSEUDOVECTOR (struct frame, face_cache, PVEC_FRAME); @@ -3013,7 +2969,7 @@ struct Lisp_Process * -allocate_process () +allocate_process (void) { return ALLOCATE_PSEUDOVECTOR (struct Lisp_Process, pid, PVEC_PROCESS); } @@ -3142,7 +3098,7 @@ /* Initialize symbol allocation. */ static void -init_symbol () +init_symbol (void) { symbol_block = NULL; symbol_block_index = SYMBOL_BLOCK_SIZE; @@ -3233,7 +3189,7 @@ static int n_marker_blocks; static void -init_marker () +init_marker (void) { marker_block = NULL; marker_block_index = MARKER_BLOCK_SIZE; @@ -3244,7 +3200,7 @@ /* Return a newly allocated Lisp_Misc object, with no substructure. */ Lisp_Object -allocate_misc () +allocate_misc (void) { Lisp_Object val; @@ -3286,8 +3242,7 @@ /* Free a Lisp_Misc object */ void -free_misc (misc) - Lisp_Object misc; +free_misc (Lisp_Object misc) { XMISCTYPE (misc) = Lisp_Misc_Free; XMISC (misc)->u_free.chain = marker_free_list; @@ -3301,9 +3256,7 @@ The unwind function can get the C values back using XSAVE_VALUE. */ Lisp_Object -make_save_value (pointer, integer) - void *pointer; - int integer; +make_save_value (void *pointer, int integer) { register Lisp_Object val; register struct Lisp_Save_Value *p; @@ -3338,8 +3291,7 @@ /* Put MARKER back on the free list after using it temporarily. */ void -free_marker (marker) - Lisp_Object marker; +free_marker (Lisp_Object marker) { unchain_marker (XMARKER (marker)); free_misc (marker); @@ -3353,9 +3305,7 @@ Any number of arguments, even zero arguments, are allowed. */ Lisp_Object -make_event_array (nargs, args) - register int nargs; - Lisp_Object *args; +make_event_array (register int nargs, Lisp_Object *args) { int i; @@ -3395,7 +3345,7 @@ /* Called if malloc returns zero. */ void -memory_full () +memory_full (void) { int i; @@ -3435,7 +3385,7 @@ and also directly from this file, in case we're not using ralloc.c. */ void -refill_memory_reserve () +refill_memory_reserve (void) { #ifndef SYSTEM_MALLOC if (spare_memory[0] == 0) @@ -3483,7 +3433,7 @@ /* Initialize this part of alloc.c. */ static void -mem_init () +mem_init (void) { mem_z.left = mem_z.right = MEM_NIL; mem_z.parent = NULL; @@ -3497,8 +3447,7 @@ MEM_NIL if there is no node in the tree containing START. */ static INLINE struct mem_node * -mem_find (start) - void *start; +mem_find (void *start) { struct mem_node *p; @@ -3521,9 +3470,7 @@ pointer to the node that was inserted. */ static struct mem_node * -mem_insert (start, end, type) - void *start, *end; - enum mem_type type; +mem_insert (void *start, void *end, enum mem_type type) { struct mem_node *c, *parent, *x; @@ -3595,8 +3542,7 @@ balance the tree, after node X has been inserted; X is always red. */ static void -mem_insert_fixup (x) - struct mem_node *x; +mem_insert_fixup (struct mem_node *x) { while (x != mem_root && x->parent->color == MEM_RED) { @@ -3674,8 +3620,7 @@ b c a b */ static void -mem_rotate_left (x) - struct mem_node *x; +mem_rotate_left (struct mem_node *x) { struct mem_node *y; @@ -3714,8 +3659,7 @@ a b b c */ static void -mem_rotate_right (x) - struct mem_node *x; +mem_rotate_right (struct mem_node *x) { struct mem_node *y = x->left; @@ -3744,8 +3688,7 @@ /* Delete node Z from the tree. If Z is null or MEM_NIL, do nothing. */ static void -mem_delete (z) - struct mem_node *z; +mem_delete (struct mem_node *z) { struct mem_node *x, *y; @@ -3799,8 +3742,7 @@ deletion. */ static void -mem_delete_fixup (x) - struct mem_node *x; +mem_delete_fixup (struct mem_node *x) { while (x != mem_root && x->color == MEM_BLACK) { @@ -3881,9 +3823,7 @@ the heap. M is a pointer to the mem_block for P. */ static INLINE int -live_string_p (m, p) - struct mem_node *m; - void *p; +live_string_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_STRING) { @@ -3906,9 +3846,7 @@ the heap. M is a pointer to the mem_block for P. */ static INLINE int -live_cons_p (m, p) - struct mem_node *m; - void *p; +live_cons_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_CONS) { @@ -3934,9 +3872,7 @@ the heap. M is a pointer to the mem_block for P. */ static INLINE int -live_symbol_p (m, p) - struct mem_node *m; - void *p; +live_symbol_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_SYMBOL) { @@ -3962,9 +3898,7 @@ the heap. M is a pointer to the mem_block for P. */ static INLINE int -live_float_p (m, p) - struct mem_node *m; - void *p; +live_float_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_FLOAT) { @@ -3988,9 +3922,7 @@ the heap. M is a pointer to the mem_block for P. */ static INLINE int -live_misc_p (m, p) - struct mem_node *m; - void *p; +live_misc_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_MISC) { @@ -4016,9 +3948,7 @@ M is a pointer to the mem_block for P. */ static INLINE int -live_vector_p (m, p) - struct mem_node *m; - void *p; +live_vector_p (struct mem_node *m, void *p) { return (p == m->start && m->type == MEM_TYPE_VECTORLIKE); } @@ -4028,9 +3958,7 @@ pointer to the mem_block for P. */ static INLINE int -live_buffer_p (m, p) - struct mem_node *m; - void *p; +live_buffer_p (struct mem_node *m, void *p) { /* P must point to the start of the block, and the buffer must not have been killed. */ @@ -4096,8 +4024,7 @@ /* Mark OBJ if we can prove it's a Lisp_Object. */ static INLINE void -mark_maybe_object (obj) - Lisp_Object obj; +mark_maybe_object (Lisp_Object obj) { void *po = (void *) XPNTR (obj); struct mem_node *m = mem_find (po); @@ -4160,8 +4087,7 @@ marked. */ static INLINE void -mark_maybe_pointer (p) - void *p; +mark_maybe_pointer (void *p) { struct mem_node *m; @@ -4241,9 +4167,7 @@ or END+OFFSET..START. */ static void -mark_memory (start, end, offset) - void *start, *end; - int offset; +mark_memory (void *start, void *end, int offset) { Lisp_Object *p; void **pp; @@ -4459,7 +4383,7 @@ equally on the stack. */ static void -mark_stack () +mark_stack (void) { int i; /* jmp_buf may not be aligned enough on darwin-ppc64 */ @@ -4534,8 +4458,7 @@ /* Determine whether it is safe to access memory at address P. */ static int -valid_pointer_p (p) - void *p; +valid_pointer_p (void *p) { #ifdef WINDOWSNT return w32_valid_pointer_p (p, 16); @@ -4566,8 +4489,7 @@ so it should only be used in code for manual debugging. */ int -valid_lisp_object_p (obj) - Lisp_Object obj; +valid_lisp_object_p (Lisp_Object obj) { void *p; #if GC_MARK_STACK @@ -4645,9 +4567,7 @@ allocated. TYPE < 0 means it's not used for a Lisp object. */ static POINTER_TYPE * -pure_alloc (size, type) - size_t size; - int type; +pure_alloc (size_t size, int type) { POINTER_TYPE *result; #ifdef USE_LSB_TAG @@ -4701,7 +4621,7 @@ /* Print a warning if PURESIZE is too small. */ void -check_pure_size () +check_pure_size (void) { if (pure_bytes_used_before_overflow) message ("emacs:0:Pure Lisp storage overflow (approx. %d bytes needed)", @@ -4714,9 +4634,7 @@ address. Return NULL if not found. */ static char * -find_string_data_in_pure (data, nbytes) - const char *data; - int nbytes; +find_string_data_in_pure (const char *data, int nbytes) { int i, skip, bm_skip[256], last_char_skip, infinity, start, start_max; const unsigned char *p; @@ -4785,10 +4703,7 @@ string; then the string is not protected from gc. */ Lisp_Object -make_pure_string (data, nchars, nbytes, multibyte) - const char *data; - int nchars, nbytes; - int multibyte; +make_pure_string (const char *data, int nchars, int nbytes, int multibyte) { Lisp_Object string; struct Lisp_String *s; @@ -4831,8 +4746,7 @@ of CAR as car and CDR as cdr. */ Lisp_Object -pure_cons (car, cdr) - Lisp_Object car, cdr; +pure_cons (Lisp_Object car, Lisp_Object cdr) { register Lisp_Object new; struct Lisp_Cons *p; @@ -4848,8 +4762,7 @@ /* Value is a float object with value NUM allocated from pure space. */ static Lisp_Object -make_pure_float (num) - double num; +make_pure_float (double num) { register Lisp_Object new; struct Lisp_Float *p; @@ -4865,8 +4778,7 @@ pure space. */ Lisp_Object -make_pure_vector (len) - EMACS_INT len; +make_pure_vector (EMACS_INT len) { Lisp_Object new; struct Lisp_Vector *p; @@ -4949,8 +4861,7 @@ VARADDRESS. */ void -staticpro (varaddress) - Lisp_Object *varaddress; +staticpro (Lisp_Object *varaddress) { staticvec[staticidx++] = varaddress; if (staticidx >= NSTATICS) @@ -4965,7 +4876,7 @@ /* Temporarily prevent garbage collection. */ int -inhibit_garbage_collection () +inhibit_garbage_collection (void) { int count = SPECPDL_INDEX (); int nbits = min (VALBITS, BITS_PER_INT); @@ -5297,8 +5208,7 @@ only interesting objects referenced from glyphs are strings. */ static void -mark_glyph_matrix (matrix) - struct glyph_matrix *matrix; +mark_glyph_matrix (struct glyph_matrix *matrix) { struct glyph_row *row = matrix->rows; struct glyph_row *end = row + matrix->nrows; @@ -5324,8 +5234,7 @@ /* Mark Lisp faces in the face cache C. */ static void -mark_face_cache (c) - struct face_cache *c; +mark_face_cache (struct face_cache *c) { if (c) { @@ -5360,8 +5269,7 @@ static int mark_object_loop_halt; static void -mark_vectorlike (ptr) - struct Lisp_Vector *ptr; +mark_vectorlike (struct Lisp_Vector *ptr) { register EMACS_INT size = ptr->size; register int i; @@ -5384,8 +5292,7 @@ symbols. */ static void -mark_char_table (ptr) - struct Lisp_Vector *ptr; +mark_char_table (struct Lisp_Vector *ptr) { register EMACS_INT size = ptr->size & PSEUDOVECTOR_SIZE_MASK; register int i; @@ -5409,8 +5316,7 @@ } void -mark_object (arg) - Lisp_Object arg; +mark_object (Lisp_Object arg) { register Lisp_Object obj = arg; #ifdef GC_CHECK_MARKED_OBJECTS @@ -5719,8 +5625,7 @@ /* Mark the pointers in a buffer structure. */ static void -mark_buffer (buf) - Lisp_Object buf; +mark_buffer (Lisp_Object buf) { register struct buffer *buffer = XBUFFER (buf); register Lisp_Object *ptr, tmp; @@ -5787,8 +5692,7 @@ either marked or does not need to be marked to survive. */ int -survives_gc_p (obj) - Lisp_Object obj; +survives_gc_p (Lisp_Object obj) { int survives_p; @@ -5834,7 +5738,7 @@ /* Sweep: find all structures not marked, and free them. */ static void -gc_sweep () +gc_sweep (void) { /* Remove or mark entries in weak hash tables. This must be done before any object is unmarked. */ @@ -6251,10 +6155,7 @@ int suppress_checking; void -die (msg, file, line) - const char *msg; - const char *file; - int line; +die (const char *msg, const char *file, int line) { fprintf (stderr, "\r\n%s:%d: Emacs fatal error: %s\r\n", file, line, msg); @@ -6264,7 +6165,7 @@ /* Initialization */ void -init_alloc_once () +init_alloc_once (void) { /* Used to do Vpurify_flag = Qt here, but Qt isn't set up yet! */ purebeg = PUREBEG; @@ -6319,7 +6220,7 @@ } void -init_alloc () +init_alloc (void) { gcprolist = 0; byte_stack_list = 0; @@ -6333,7 +6234,7 @@ } void -syms_of_alloc () +syms_of_alloc (void) { DEFVAR_INT ("gc-cons-threshold", &gc_cons_threshold, doc: /* *Number of bytes of consing between garbage collections.
--- a/src/atimer.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/atimer.c Sun Jul 04 00:50:25 2010 -0700 @@ -68,7 +68,7 @@ static void schedule_atimer (struct atimer *); static struct atimer *append_atimer_lists (struct atimer *, struct atimer *); -SIGTYPE alarm_signal_handler (); +SIGTYPE alarm_signal_handler (int signo); /* Start a new atimer of type TYPE. TIME specifies when the timer is @@ -90,11 +90,7 @@ to cancel_atimer; don't free it yourself. */ struct atimer * -start_atimer (type, time, fn, client_data) - enum atimer_type type; - EMACS_TIME time; - atimer_callback fn; - void *client_data; +start_atimer (enum atimer_type type, struct timeval time, atimer_callback fn, void *client_data) { struct atimer *t; @@ -159,8 +155,7 @@ /* Cancel and free atimer TIMER. */ void -cancel_atimer (timer) - struct atimer *timer; +cancel_atimer (struct atimer *timer) { int i; @@ -199,8 +194,7 @@ result list. */ static struct atimer * -append_atimer_lists (list1, list2) - struct atimer *list1, *list2; +append_atimer_lists (struct atimer *list1, struct atimer *list2) { if (list1 == NULL) return list2; @@ -221,8 +215,7 @@ /* Stop all timers except timer T. T null means stop all timers. */ void -stop_other_atimers (t) - struct atimer *t; +stop_other_atimers (struct atimer *t) { BLOCK_ATIMERS; @@ -257,7 +250,7 @@ stop_other_atimers. */ void -run_all_atimers () +run_all_atimers (void) { if (stopped_atimers) { @@ -283,8 +276,7 @@ /* A version of run_all_timers suitable for a record_unwind_protect. */ Lisp_Object -unwind_stop_other_atimers (dummy) - Lisp_Object dummy; +unwind_stop_other_atimers (Lisp_Object dummy) { run_all_atimers (); return Qnil; @@ -294,7 +286,7 @@ /* Arrange for a SIGALRM to arrive when the next timer is ripe. */ static void -set_alarm () +set_alarm (void) { if (atimers) { @@ -330,8 +322,7 @@ already. */ static void -schedule_atimer (t) - struct atimer *t; +schedule_atimer (struct atimer *t) { struct atimer *a = atimers, *prev = NULL; @@ -349,7 +340,7 @@ } static void -run_timers () +run_timers (void) { EMACS_TIME now; @@ -401,8 +392,7 @@ SIGALRM. */ SIGTYPE -alarm_signal_handler (signo) - int signo; +alarm_signal_handler (int signo) { #ifndef SYNC_INPUT SIGNAL_THREAD_CHECK (signo); @@ -420,7 +410,7 @@ /* Call alarm_signal_handler for pending timers. */ void -do_pending_atimers () +do_pending_atimers (void) { if (pending_atimers) { @@ -435,8 +425,7 @@ some systems like HPUX (see process.c). */ void -turn_on_atimers (on) - int on; +turn_on_atimers (int on) { if (on) { @@ -449,7 +438,7 @@ void -init_atimer () +init_atimer (void) { free_atimers = stopped_atimers = atimers = NULL; pending_atimers = 0;
--- a/src/bidi.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/bidi.c Sun Jul 04 00:50:25 2010 -0700 @@ -106,7 +106,7 @@ static Lisp_Object Qparagraph_start, Qparagraph_separate; static void -bidi_initialize () +bidi_initialize (void) { #include "biditype.h"
--- a/src/bytecode.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/bytecode.c Sun Jul 04 00:50:25 2010 -0700 @@ -272,7 +272,7 @@ /* Mark objects on byte_stack_list. Called during GC. */ void -mark_byte_stack () +mark_byte_stack (void) { struct byte_stack *stack; Lisp_Object *obj; @@ -301,7 +301,7 @@ counters. Called when GC has completed. */ void -unmark_byte_stack () +unmark_byte_stack (void) { struct byte_stack *stack; @@ -1678,7 +1678,7 @@ } void -syms_of_bytecode () +syms_of_bytecode (void) { Qbytecode = intern_c_string ("byte-code"); staticpro (&Qbytecode);
--- a/src/callint.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/callint.c Sun Jul 04 00:50:25 2010 -0700 @@ -140,8 +140,7 @@ /* Quotify EXP: if EXP is constant, return it. If EXP is not constant, return (quote EXP). */ Lisp_Object -quotify_arg (exp) - register Lisp_Object exp; +quotify_arg (register Lisp_Object exp) { if (!INTEGERP (exp) && !STRINGP (exp) && !NILP (exp) && !EQ (exp, Qt)) @@ -152,8 +151,7 @@ /* Modify EXP by quotifying each element (except the first). */ Lisp_Object -quotify_args (exp) - Lisp_Object exp; +quotify_args (Lisp_Object exp) { register Lisp_Object tail; Lisp_Object next; @@ -169,8 +167,7 @@ = {"", "point", "mark", "region-beginning", "region-end"}; static void -check_mark (for_region) - int for_region; +check_mark (int for_region) { Lisp_Object tem; tem = Fmarker_buffer (current_buffer->mark); @@ -191,8 +188,7 @@ of VALUES to do its job. */ static void -fix_command (input, values) - Lisp_Object input, values; +fix_command (Lisp_Object input, Lisp_Object values) { if (CONSP (input)) { @@ -897,7 +893,7 @@ } void -syms_of_callint () +syms_of_callint (void) { point_marker = Fmake_marker (); staticpro (&point_marker);
--- a/src/callproc.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/callproc.c Sun Jul 04 00:50:25 2010 -0700 @@ -137,8 +137,7 @@ EXFUN (Fgetenv_internal, 2); static Lisp_Object -call_process_kill (fdpid) - Lisp_Object fdpid; +call_process_kill (Lisp_Object fdpid) { emacs_close (XFASTINT (Fcar (fdpid))); EMACS_KILLPG (XFASTINT (Fcdr (fdpid)), SIGKILL); @@ -147,8 +146,7 @@ } Lisp_Object -call_process_cleanup (arg) - Lisp_Object arg; +call_process_cleanup (Lisp_Object arg) { Lisp_Object fdpid = Fcdr (arg); #if defined (MSDOS) @@ -848,8 +846,7 @@ } static Lisp_Object -delete_temp_file (name) - Lisp_Object name; +delete_temp_file (Lisp_Object name) { /* Suppress jka-compr handling, etc. */ int count = SPECPDL_INDEX (); @@ -997,7 +994,7 @@ RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs, args))); } -static int relocate_fd (); +static int relocate_fd (int fd, int minfd); static char ** add_env (char **env, char **new_env, char *string) @@ -1052,11 +1049,7 @@ executable directory by the parent. */ int -child_setup (in, out, err, new_argv, set_pgrp, current_dir) - int in, out, err; - register char **new_argv; - int set_pgrp; - Lisp_Object current_dir; +child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, Lisp_Object current_dir) { char **env; char *pwd_var; @@ -1295,8 +1288,7 @@ /* Move the file descriptor FD so that its number is not less than MINFD. If the file descriptor is moved at all, the original is freed. */ static int -relocate_fd (fd, minfd) - int fd, minfd; +relocate_fd (int fd, int minfd) { if (fd >= minfd) return fd; @@ -1322,12 +1314,7 @@ } static int -getenv_internal_1 (var, varlen, value, valuelen, env) - char *var; - int varlen; - char **value; - int *valuelen; - Lisp_Object env; +getenv_internal_1 (char *var, int varlen, char **value, int *valuelen, Lisp_Object env) { for (; CONSP (env); env = XCDR (env)) { @@ -1361,12 +1348,7 @@ } static int -getenv_internal (var, varlen, value, valuelen, frame) - char *var; - int varlen; - char **value; - int *valuelen; - Lisp_Object frame; +getenv_internal (char *var, int varlen, char **value, int *valuelen, Lisp_Object frame) { /* Try to find VAR in Vprocess_environment first. */ if (getenv_internal_1 (var, varlen, value, valuelen, @@ -1428,8 +1410,7 @@ /* A version of getenv that consults the Lisp environment lists, easily callable from C. */ char * -egetenv (var) - char *var; +egetenv (char *var) { char *value; int valuelen; @@ -1444,7 +1425,7 @@ /* This is run before init_cmdargs. */ void -init_callproc_1 () +init_callproc_1 (void) { char *data_dir = egetenv ("EMACSDATA"); char *doc_dir = egetenv ("EMACSDOC"); @@ -1466,7 +1447,7 @@ /* This is run after init_cmdargs, when Vinstallation_directory is valid. */ void -init_callproc () +init_callproc (void) { char *data_dir = egetenv ("EMACSDATA"); @@ -1555,7 +1536,7 @@ } void -set_initial_environment () +set_initial_environment (void) { register char **envp; #ifndef CANNOT_DUMP @@ -1575,7 +1556,7 @@ } void -syms_of_callproc () +syms_of_callproc (void) { #ifdef DOS_NT Qbuffer_file_type = intern ("buffer-file-type");
--- a/src/casefiddle.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/casefiddle.c Sun Jul 04 00:50:25 2010 -0700 @@ -33,9 +33,7 @@ Lisp_Object Qidentity; Lisp_Object -casify_object (flag, obj) - enum case_action flag; - Lisp_Object obj; +casify_object (enum case_action flag, Lisp_Object obj) { register int c, c1; register int inword = flag == CASE_DOWN; @@ -200,9 +198,7 @@ b and e specify range of buffer to operate on. */ void -casify_region (flag, b, e) - enum case_action flag; - Lisp_Object b, e; +casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e) { register int c; register int inword = flag == CASE_DOWN; @@ -358,9 +354,7 @@ } static Lisp_Object -operate_on_word (arg, newpoint) - Lisp_Object arg; - EMACS_INT *newpoint; +operate_on_word (Lisp_Object arg, EMACS_INT *newpoint) { Lisp_Object val; int farend; @@ -427,7 +421,7 @@ } void -syms_of_casefiddle () +syms_of_casefiddle (void) { Qidentity = intern_c_string ("identity"); staticpro (&Qidentity); @@ -445,7 +439,7 @@ } void -keys_of_casefiddle () +keys_of_casefiddle (void) { initial_define_key (control_x_map, Ctl('U'), "upcase-region"); Fput (intern ("upcase-region"), Qdisabled, Qt);
--- a/src/casetab.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/casetab.c Sun Jul 04 00:50:25 2010 -0700 @@ -34,9 +34,9 @@ int case_temp1; Lisp_Object case_temp2; -static void set_canon (); -static void set_identity (); -static void shuffle (); +static void set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt); +static void set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt); +static void shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt); DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, doc: /* Return t if OBJECT is a case table. @@ -63,8 +63,7 @@ } static Lisp_Object -check_case_table (obj) - Lisp_Object obj; +check_case_table (Lisp_Object obj) { CHECK_TYPE (!NILP (Fcase_table_p (obj)), Qcase_table_p, obj); return (obj); @@ -85,7 +84,7 @@ return Vascii_downcase_table; } -static Lisp_Object set_case_table (); +static Lisp_Object set_case_table (Lisp_Object table, int standard); DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, doc: /* Select a new case table for the current buffer. @@ -120,9 +119,7 @@ } static Lisp_Object -set_case_table (table, standard) - Lisp_Object table; - int standard; +set_case_table (Lisp_Object table, int standard) { Lisp_Object up, canon, eqv; @@ -184,8 +181,7 @@ CASE_TABLE. */ static void -set_canon (case_table, range, elt) - Lisp_Object case_table, range, elt; +set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt) { Lisp_Object up = XCHAR_TABLE (case_table)->extras[0]; Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1]; @@ -200,8 +196,7 @@ character. This is called in map_char_table. */ static void -set_identity (table, c, elt) - Lisp_Object table, c, elt; +set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt) { if (NATNUMP (elt)) { @@ -225,8 +220,7 @@ operated. */ static void -shuffle (table, c, elt) - Lisp_Object table, c, elt; +shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt) { if (NATNUMP (elt)) { @@ -250,7 +244,7 @@ } void -init_casetab_once () +init_casetab_once (void) { register int i; Lisp_Object down, up; @@ -296,7 +290,7 @@ } void -syms_of_casetab () +syms_of_casetab (void) { Qcase_table_p = intern_c_string ("case-table-p"); staticpro (&Qcase_table_p);
--- a/src/category.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/category.c Sun Jul 04 00:50:25 2010 -0700 @@ -62,8 +62,7 @@ static Lisp_Object hash_get_category_set (Lisp_Object, Lisp_Object); static Lisp_Object -hash_get_category_set (table, category_set) - Lisp_Object table, category_set; +hash_get_category_set (Lisp_Object table, Lisp_Object category_set) { Lisp_Object val; struct Lisp_Hash_Table *h; @@ -117,7 +116,7 @@ /* Category staff. */ -Lisp_Object check_category_table (); +Lisp_Object check_category_table (Lisp_Object table); DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0, doc: /* Define CATEGORY as a category which is described by DOCSTRING. @@ -196,8 +195,7 @@ wrong-type-argument. */ Lisp_Object -check_category_table (table) - Lisp_Object table; +check_category_table (Lisp_Object table) { if (NILP (table)) return current_buffer->category_table; @@ -224,8 +222,7 @@ static void -copy_category_entry (table, c, val) - Lisp_Object table, c, val; +copy_category_entry (Lisp_Object table, Lisp_Object c, Lisp_Object val) { val = Fcopy_sequence (val); if (CONSP (c)) @@ -240,8 +237,7 @@ binding TABLE to a sub char table. */ Lisp_Object -copy_category_table (table) - Lisp_Object table; +copy_category_table (Lisp_Object table) { table = copy_char_table (table); @@ -304,8 +300,7 @@ Lisp_Object -char_category_set (c) - int c; +char_category_set (int c) { return CHAR_TABLE_REF (current_buffer->category_table, c); } @@ -344,8 +339,7 @@ } void -set_category_set (category_set, category, val) - Lisp_Object category_set, category, val; +set_category_set (Lisp_Object category_set, Lisp_Object category, Lisp_Object val) { do { int idx = XINT (category) / 8; @@ -420,8 +414,7 @@ directly. */ int -word_boundary_p (c1, c2) - int c1, c2; +word_boundary_p (int c1, int c2) { Lisp_Object category_set1, category_set2; Lisp_Object tail; @@ -466,7 +459,7 @@ void -init_category_once () +init_category_once (void) { /* This has to be done here, before we call Fmake_char_table. */ Qcategory_table = intern_c_string ("category-table"); @@ -489,7 +482,7 @@ } void -syms_of_category () +syms_of_category (void) { Qcategoryp = intern_c_string ("categoryp"); staticpro (&Qcategoryp);
--- a/src/ccl.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ccl.c Sun Jul 04 00:50:25 2010 -0700 @@ -862,11 +862,7 @@ static struct ccl_prog_stack ccl_prog_stack_struct[256]; void -ccl_driver (ccl, source, destination, src_size, dst_size, charset_list) - struct ccl_program *ccl; - int *source, *destination; - int src_size, dst_size; - Lisp_Object charset_list; +ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size, int dst_size, Lisp_Object charset_list) { register int *reg = ccl->reg; register int ic = ccl->ic; @@ -1795,8 +1791,7 @@ or nil if CCL contains invalid data. */ static Lisp_Object -resolve_symbol_ccl_program (ccl) - Lisp_Object ccl; +resolve_symbol_ccl_program (Lisp_Object ccl) { int i, veclen, unresolved = 0; Lisp_Object result, contents, val; @@ -1867,9 +1862,7 @@ symbols, return Qnil. */ static Lisp_Object -ccl_get_compiled_code (ccl_prog, idx) - Lisp_Object ccl_prog; - int *idx; +ccl_get_compiled_code (Lisp_Object ccl_prog, int *idx) { Lisp_Object val, slot; @@ -1910,9 +1903,7 @@ If CCL_PROG is nil, we just reset the structure pointed by CCL. */ int -setup_ccl_program (ccl, ccl_prog) - struct ccl_program *ccl; - Lisp_Object ccl_prog; +setup_ccl_program (struct ccl_program *ccl, Lisp_Object ccl_prog) { int i; @@ -1953,8 +1944,7 @@ /* Check if CCL is updated or not. If not, re-setup members of CCL. */ int -check_ccl_update (ccl) - struct ccl_program *ccl; +check_ccl_update (struct ccl_program *ccl) { Lisp_Object slot, ccl_prog; @@ -2315,7 +2305,7 @@ void -syms_of_ccl () +syms_of_ccl (void) { staticpro (&Vccl_program_table); Vccl_program_table = Fmake_vector (make_number (32), Qnil);
--- a/src/character.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/character.c Sun Jul 04 00:50:25 2010 -0700 @@ -93,8 +93,7 @@ character code if possible. Return the resulting code. */ int -char_resolve_modifier_mask (c) - int c; +char_resolve_modifier_mask (int c) { /* A non-ASCII character can't reflect modifier bits to the code. */ if (! ASCII_CHAR_P ((c & ~CHAR_MODIFIER_MASK))) @@ -143,9 +142,7 @@ handle them appropriately. */ int -char_string (c, p) - unsigned c; - unsigned char *p; +char_string (unsigned int c, unsigned char *p) { int bytes; @@ -199,10 +196,7 @@ character) of the multibyte form. */ int -string_char (p, advanced, len) - const unsigned char *p; - const unsigned char **advanced; - int *len; +string_char (const unsigned char *p, const unsigned char **advanced, int *len) { int c; const unsigned char *saved_p = p; @@ -245,9 +239,7 @@ case, translace C by all tables. */ int -translate_char (table, c) - Lisp_Object table; - int c; +translate_char (Lisp_Object table, int c) { if (CHAR_TABLE_P (table)) { @@ -272,9 +264,7 @@ future. */ int -multibyte_char_to_unibyte (c, rev_tbl) - int c; - Lisp_Object rev_tbl; +multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl) { if (c < 0x80) return c; @@ -287,8 +277,7 @@ by charset_unibyte. */ int -multibyte_char_to_unibyte_safe (c) - int c; +multibyte_char_to_unibyte_safe (int c) { if (c < 0x80) return c; @@ -446,9 +435,7 @@ occupies on the screen. */ int -strwidth (str, len) - unsigned char *str; - int len; +strwidth (unsigned char *str, int len) { return c_string_width (str, len, -1, NULL, NULL); } @@ -461,9 +448,7 @@ in *NCHARS and *NBYTES respectively. */ int -lisp_string_width (string, precision, nchars, nbytes) - Lisp_Object string; - int precision, *nchars, *nbytes; +lisp_string_width (Lisp_Object string, int precision, int *nchars, int *nbytes) { int len = SCHARS (string); /* This set multibyte to 0 even if STRING is multibyte when it @@ -573,9 +558,7 @@ nil, we treat each byte as a character. */ EMACS_INT -chars_in_text (ptr, nbytes) - const unsigned char *ptr; - EMACS_INT nbytes; +chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) { /* current_buffer is null at early stages of Emacs initialization. */ if (current_buffer == 0 @@ -591,9 +574,7 @@ ignores enable-multibyte-characters. */ EMACS_INT -multibyte_chars_in_text (ptr, nbytes) - const unsigned char *ptr; - EMACS_INT nbytes; +multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) { const unsigned char *endp = ptr + nbytes; int chars = 0; @@ -618,9 +599,7 @@ represented by 2-byte in a multibyte text. */ void -parse_str_as_multibyte (str, len, nchars, nbytes) - const unsigned char *str; - int len, *nchars, *nbytes; +parse_str_as_multibyte (const unsigned char *str, int len, int *nchars, int *nbytes) { const unsigned char *endp = str + len; int n, chars = 0, bytes = 0; @@ -662,9 +641,7 @@ resulting text. */ int -str_as_multibyte (str, len, nbytes, nchars) - unsigned char *str; - int len, nbytes, *nchars; +str_as_multibyte (unsigned char *str, int len, int nbytes, int *nchars) { unsigned char *p = str, *endp = str + nbytes; unsigned char *to; @@ -740,9 +717,7 @@ `str_to_multibyte'. */ int -parse_str_to_multibyte (str, len) - unsigned char *str; - int len; +parse_str_to_multibyte (unsigned char *str, int len) { unsigned char *endp = str + len; int bytes; @@ -760,9 +735,7 @@ enough. */ int -str_to_multibyte (str, len, bytes) - unsigned char *str; - int len, bytes; +str_to_multibyte (unsigned char *str, int len, int bytes) { unsigned char *p = str, *endp = str + bytes; unsigned char *to; @@ -791,9 +764,7 @@ unibyte. */ int -str_as_unibyte (str, bytes) - unsigned char *str; - int bytes; +str_as_unibyte (unsigned char *str, int bytes) { const unsigned char *p = str, *endp = str + bytes; unsigned char *to; @@ -835,11 +806,7 @@ Note: Currently the arg ACCEPT_LATIN_1 is not used. */ EMACS_INT -str_to_unibyte (src, dst, chars, accept_latin_1) - const unsigned char *src; - unsigned char *dst; - EMACS_INT chars; - int accept_latin_1; +str_to_unibyte (const unsigned char *src, unsigned char *dst, EMACS_INT chars, int accept_latin_1) { EMACS_INT i; @@ -859,8 +826,7 @@ int -string_count_byte8 (string) - Lisp_Object string; +string_count_byte8 (Lisp_Object string) { int multibyte = STRING_MULTIBYTE (string); int nbytes = SBYTES (string); @@ -890,8 +856,7 @@ Lisp_Object -string_escape_byte8 (string) - Lisp_Object string; +string_escape_byte8 (Lisp_Object string) { int nchars = SCHARS (string); int nbytes = SBYTES (string); @@ -1088,14 +1053,14 @@ void -init_character_once () +init_character_once (void) { } #ifdef emacs void -syms_of_character () +syms_of_character (void) { DEFSYM (Qcharacterp, "characterp"); DEFSYM (Qauto_fill_chars, "auto-fill-chars");
--- a/src/charset.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/charset.c Sun Jul 04 00:50:25 2010 -0700 @@ -267,11 +267,7 @@ */ static void -load_charset_map (charset, entries, n_entries, control_flag) - struct charset *charset; - struct charset_map_entries *entries; - int n_entries; - int control_flag; +load_charset_map (struct charset *charset, struct charset_map_entries *entries, int n_entries, int control_flag) { Lisp_Object vec, table; unsigned max_code = CHARSET_MAX_CODE (charset); @@ -440,9 +436,7 @@ paying attention to comment charcter '#'. */ static INLINE unsigned -read_hex (fp, eof) - FILE *fp; - int *eof; +read_hex (FILE *fp, int *eof) { int c; unsigned n; @@ -500,10 +494,7 @@ extern void add_to_log (char *, Lisp_Object, Lisp_Object); static void -load_charset_map_from_file (charset, mapfile, control_flag) - struct charset *charset; - Lisp_Object mapfile; - int control_flag; +load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile, int control_flag) { unsigned min_code = CHARSET_MIN_CODE (charset); unsigned max_code = CHARSET_MAX_CODE (charset); @@ -573,10 +564,7 @@ } static void -load_charset_map_from_vector (charset, vec, control_flag) - struct charset *charset; - Lisp_Object vec; - int control_flag; +load_charset_map_from_vector (struct charset *charset, Lisp_Object vec, int control_flag) { unsigned min_code = CHARSET_MIN_CODE (charset); unsigned max_code = CHARSET_MAX_CODE (charset); @@ -652,9 +640,7 @@ map it is (see the comment of load_charset_map for the detail). */ static void -load_charset (charset, control_flag) - struct charset *charset; - int control_flag; +load_charset (struct charset *charset, int control_flag) { Lisp_Object map; @@ -689,10 +675,7 @@ unsigned from, unsigned to); void -map_charset_for_dump (c_function, function, arg, from, to) - void (*c_function) (Lisp_Object, Lisp_Object); - Lisp_Object function, arg; - unsigned from, to; +map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object arg, unsigned int from, unsigned int to) { int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from); int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to); @@ -1484,8 +1467,7 @@ } static void -check_iso_charset_parameter (dimension, chars, final_char) - Lisp_Object dimension, chars, final_char; +check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) { CHECK_NATNUM (dimension); CHECK_NATNUM (chars); @@ -1535,8 +1517,7 @@ */ int -string_xstring_p (string) - Lisp_Object string; +string_xstring_p (Lisp_Object string) { const unsigned char *p = SDATA (string); const unsigned char *endp = p + SBYTES (string); @@ -1563,11 +1544,7 @@ It may lookup a translation table TABLE if supplied. */ static void -find_charsets_in_text (ptr, nchars, nbytes, charsets, table, multibyte) - const unsigned char *ptr; - EMACS_INT nchars, nbytes; - Lisp_Object charsets, table; - int multibyte; +find_charsets_in_text (const unsigned char *ptr, EMACS_INT nchars, EMACS_INT nbytes, Lisp_Object charsets, Lisp_Object table, int multibyte) { const unsigned char *pend = ptr + nbytes; @@ -1689,9 +1666,7 @@ value of Vchar_unify_table for C; i.e. it is nil, an integer, or a charset symbol. */ int -maybe_unify_char (c, val) - int c; - Lisp_Object val; +maybe_unify_char (int c, Lisp_Object val) { struct charset *charset; @@ -1724,9 +1699,7 @@ CHARSET. */ int -decode_char (charset, code) - struct charset *charset; - unsigned code; +decode_char (struct charset *charset, unsigned int code) { int c, char_index; enum charset_method method = CHARSET_METHOD (charset); @@ -1805,9 +1778,7 @@ use CHARSET's strict_max_char instead of max_char. */ unsigned -encode_char (charset, c) - struct charset *charset; - int c; +encode_char (struct charset *charset, int c) { unsigned code; enum charset_method method = CHARSET_METHOD (charset); @@ -2057,10 +2028,7 @@ Vcharset_ordered_list. */ struct charset * -char_charset (c, charset_list, code_return) - int c; - Lisp_Object charset_list; - unsigned *code_return; +char_charset (int c, Lisp_Object charset_list, unsigned int *code_return) { int maybe_null = 0; @@ -2314,7 +2282,7 @@ void -init_charset () +init_charset (void) { Lisp_Object tempdir; tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); @@ -2332,7 +2300,7 @@ void -init_charset_once () +init_charset_once (void) { int i, j, k; @@ -2353,7 +2321,7 @@ #ifdef emacs void -syms_of_charset () +syms_of_charset (void) { DEFSYM (Qcharsetp, "charsetp");
--- a/src/chartab.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/chartab.c Sun Jul 04 00:50:25 2010 -0700 @@ -92,9 +92,7 @@ } static Lisp_Object -make_sub_char_table (depth, min_char, defalt) - int depth, min_char; - Lisp_Object defalt; +make_sub_char_table (int depth, int min_char, Lisp_Object defalt) { Lisp_Object table; int size = VECSIZE (struct Lisp_Sub_Char_Table) - 1 + chartab_size[depth]; @@ -108,8 +106,7 @@ } static Lisp_Object -char_table_ascii (table) - Lisp_Object table; +char_table_ascii (Lisp_Object table) { Lisp_Object sub; @@ -123,8 +120,7 @@ } Lisp_Object -copy_sub_char_table (table) - Lisp_Object table; +copy_sub_char_table (Lisp_Object table) { Lisp_Object copy; int depth = XINT (XSUB_CHAR_TABLE (table)->depth); @@ -148,8 +144,7 @@ Lisp_Object -copy_char_table (table) - Lisp_Object table; +copy_char_table (Lisp_Object table) { Lisp_Object copy; int size = XCHAR_TABLE (table)->size & PSEUDOVECTOR_SIZE_MASK; @@ -175,9 +170,7 @@ } Lisp_Object -sub_char_table_ref (table, c) - Lisp_Object table; - int c; +sub_char_table_ref (Lisp_Object table, int c) { struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); int depth = XINT (tbl->depth); @@ -191,9 +184,7 @@ } Lisp_Object -char_table_ref (table, c) - Lisp_Object table; - int c; +char_table_ref (Lisp_Object table, int c) { struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); Lisp_Object val; @@ -220,11 +211,7 @@ } static Lisp_Object -sub_char_table_ref_and_range (table, c, from, to, defalt) - Lisp_Object table; - int c; - int *from, *to; - Lisp_Object defalt; +sub_char_table_ref_and_range (Lisp_Object table, int c, int *from, int *to, Lisp_Object defalt) { struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); int depth = XINT (tbl->depth); @@ -286,10 +273,7 @@ 1) are different from that of C. */ Lisp_Object -char_table_ref_and_range (table, c, from, to) - Lisp_Object table; - int c; - int *from, *to; +char_table_ref_and_range (Lisp_Object table, int c, int *from, int *to) { struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); int index = CHARTAB_IDX (c, 0, 0), idx; @@ -363,10 +347,7 @@ static void -sub_char_table_set (table, c, val) - Lisp_Object table; - int c; - Lisp_Object val; +sub_char_table_set (Lisp_Object table, int c, Lisp_Object val) { struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); int depth = XINT ((tbl)->depth); @@ -390,10 +371,7 @@ } Lisp_Object -char_table_set (table, c, val) - Lisp_Object table; - int c; - Lisp_Object val; +char_table_set (Lisp_Object table, int c, Lisp_Object val) { struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); @@ -421,12 +399,7 @@ } static void -sub_char_table_set_range (table, depth, min_char, from, to, val) - Lisp_Object *table; - int depth; - int min_char; - int from, to; - Lisp_Object val; +sub_char_table_set_range (Lisp_Object *table, int depth, int min_char, int from, int to, Lisp_Object val) { int max_char = min_char + chartab_chars[depth] - 1; @@ -454,10 +427,7 @@ Lisp_Object -char_table_set_range (table, from, to, val) - Lisp_Object table; - int from, to; - Lisp_Object val; +char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val) { struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); Lisp_Object *contents = tbl->contents; @@ -640,9 +610,7 @@ integer. If the element is not a character, return CH itself. */ int -char_table_translate (table, ch) - Lisp_Object table; - int ch; +char_table_translate (Lisp_Object table, int ch) { Lisp_Object value; value = Faref (table, make_number (ch)); @@ -652,8 +620,7 @@ } static Lisp_Object -optimize_sub_char_table (table, test) - Lisp_Object table, test; +optimize_sub_char_table (Lisp_Object table, Lisp_Object test) { struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); int depth = XINT (tbl->depth); @@ -840,9 +807,7 @@ ARG is passed to C_FUNCTION when that is called. */ void -map_char_table (c_function, function, table, arg) - void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object function, table, arg; +map_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object table, Lisp_Object arg) { Lisp_Object range, val; struct gcpro gcpro1, gcpro2, gcpro3; @@ -1049,7 +1014,7 @@ void -syms_of_chartab () +syms_of_chartab (void) { defsubr (&Smake_char_table); defsubr (&Schar_table_parent);
--- a/src/cmds.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/cmds.c Sun Jul 04 00:50:25 2010 -0700 @@ -356,9 +356,7 @@ static Lisp_Object Qexpand_abbrev; int -internal_self_insert (c, noautofill) - int c; - int noautofill; +internal_self_insert (int c, int noautofill) { int hairy = 0; Lisp_Object tem; @@ -546,7 +544,7 @@ /* module initialization */ void -syms_of_cmds () +syms_of_cmds (void) { Qkill_backward_chars = intern_c_string ("kill-backward-chars"); staticpro (&Qkill_backward_chars); @@ -587,7 +585,7 @@ } void -keys_of_cmds () +keys_of_cmds (void) { int n;
--- a/src/coding.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/coding.c Sun Jul 04 00:50:25 2010 -0700 @@ -1106,8 +1106,7 @@ static void -coding_set_source (coding) - struct coding_system *coding; +coding_set_source (struct coding_system *coding) { if (BUFFERP (coding->src_object)) { @@ -1129,8 +1128,7 @@ } static void -coding_set_destination (coding) - struct coding_system *coding; +coding_set_destination (struct coding_system *coding) { if (BUFFERP (coding->dst_object)) { @@ -1159,9 +1157,7 @@ static void -coding_alloc_by_realloc (coding, bytes) - struct coding_system *coding; - EMACS_INT bytes; +coding_alloc_by_realloc (struct coding_system *coding, EMACS_INT bytes) { coding->destination = (unsigned char *) xrealloc (coding->destination, coding->dst_bytes + bytes); @@ -1169,9 +1165,7 @@ } static void -coding_alloc_by_making_gap (coding, gap_head_used, bytes) - struct coding_system *coding; - EMACS_INT gap_head_used, bytes; +coding_alloc_by_making_gap (struct coding_system *coding, EMACS_INT gap_head_used, EMACS_INT bytes) { if (EQ (coding->src_object, coding->dst_object)) { @@ -1200,10 +1194,7 @@ static unsigned char * -alloc_destination (coding, nbytes, dst) - struct coding_system *coding; - EMACS_INT nbytes; - unsigned char *dst; +alloc_destination (struct coding_system *coding, EMACS_INT nbytes, unsigned char *dst) { EMACS_INT offset = dst - coding->destination; @@ -1301,9 +1292,7 @@ #define UTF_8_BOM_3 0xBF static int -detect_coding_utf_8 (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_utf_8 (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1386,8 +1375,7 @@ static void -decode_coding_utf_8 (coding) - struct coding_system *coding; +decode_coding_utf_8 (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1543,8 +1531,7 @@ static int -encode_coding_utf_8 (coding) - struct coding_system *coding; +encode_coding_utf_8 (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -1623,9 +1610,7 @@ static int -detect_coding_utf_16 (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_utf_16 (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base = src; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1708,8 +1693,7 @@ } static void -decode_coding_utf_16 (coding) - struct coding_system *coding; +decode_coding_utf_16 (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -1837,8 +1821,7 @@ } static int -encode_coding_utf_16 (coding) - struct coding_system *coding; +encode_coding_utf_16 (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -1979,9 +1962,7 @@ else return 0. */ static int -detect_coding_emacs_mule (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_emacs_mule (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -2069,11 +2050,7 @@ -1. If SRC is too short, return -2. */ int -emacs_mule_char (coding, src, nbytes, nchars, id, cmp_status) - struct coding_system *coding; - const unsigned char *src; - int *nbytes, *nchars, *id; - struct composition_status *cmp_status; +emacs_mule_char (struct coding_system *coding, const unsigned char *src, int *nbytes, int *nchars, int *id, struct composition_status *cmp_status) { const unsigned char *src_end = coding->source + coding->src_bytes; const unsigned char *src_base = src; @@ -2391,9 +2368,7 @@ static int -emacs_mule_finish_composition (charbuf, cmp_status) - int *charbuf; - struct composition_status *cmp_status; +emacs_mule_finish_composition (int *charbuf, struct composition_status *cmp_status) { int idx = - cmp_status->length; int new_chars; @@ -2448,8 +2423,7 @@ static void -decode_coding_emacs_mule (coding) - struct coding_system *coding; +decode_coding_emacs_mule (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -2713,8 +2687,7 @@ static int -encode_coding_emacs_mule (coding) - struct coding_system *coding; +encode_coding_emacs_mule (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -3007,8 +2980,7 @@ (CODING_ISO_INITIAL (&coding_categories[category], 1) >= 0) static void -setup_iso_safe_charsets (attrs) - Lisp_Object attrs; +setup_iso_safe_charsets (Lisp_Object attrs) { Lisp_Object charset_list, safe_charsets; Lisp_Object request; @@ -3076,9 +3048,7 @@ If it is, return 1, else return 0. */ static int -detect_coding_iso_2022 (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_iso_2022 (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base = src; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -3445,9 +3415,7 @@ static int finish_composition (int *, struct composition_status *); static int -finish_composition (charbuf, cmp_status) - int *charbuf; - struct composition_status *cmp_status; +finish_composition (int *charbuf, struct composition_status *cmp_status) { int idx = - cmp_status->length; int new_chars; @@ -3584,8 +3552,7 @@ /* See the above "GENERAL NOTES on `decode_coding_XXX ()' functions". */ static void -decode_coding_iso_2022 (coding) - struct coding_system *coding; +decode_coding_iso_2022 (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4331,11 +4298,7 @@ Return new DST. */ unsigned char * -encode_invocation_designation (charset, coding, dst, p_nchars) - struct charset *charset; - struct coding_system *coding; - unsigned char *dst; - int *p_nchars; +encode_invocation_designation (struct charset *charset, struct coding_system *coding, unsigned char *dst, int *p_nchars) { int multibytep = coding->dst_multibyte; int produced_chars = *p_nchars; @@ -4447,10 +4410,7 @@ find all the necessary designations. */ static unsigned char * -encode_designation_at_bol (coding, charbuf, charbuf_end, dst) - struct coding_system *coding; - int *charbuf, *charbuf_end; - unsigned char *dst; +encode_designation_at_bol (struct coding_system *coding, int *charbuf, int *charbuf_end, unsigned char *dst) { struct charset *charset; /* Table of charsets to be designated to each graphic register. */ @@ -4500,8 +4460,7 @@ /* See the above "GENERAL NOTES on `encode_coding_XXX ()' functions". */ static int -encode_coding_iso_2022 (coding) - struct coding_system *coding; +encode_coding_iso_2022 (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -4691,9 +4650,7 @@ CATEGORY_MASK_SJIS, else return 0. */ static int -detect_coding_sjis (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_sjis (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4749,9 +4706,7 @@ CATEGORY_MASK_BIG5, else return 0. */ static int -detect_coding_big5 (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_big5 (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4797,8 +4752,7 @@ If SJIS_P is 1, decode SJIS text, else decode BIG5 test. */ static void -decode_coding_sjis (coding) - struct coding_system *coding; +decode_coding_sjis (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -4916,8 +4870,7 @@ } static void -decode_coding_big5 (coding) - struct coding_system *coding; +decode_coding_big5 (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5021,8 +4974,7 @@ SJIS text, else encode BIG5 text. */ static int -encode_coding_sjis (coding) - struct coding_system *coding; +encode_coding_sjis (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -5114,8 +5066,7 @@ } static int -encode_coding_big5 (coding) - struct coding_system *coding; +encode_coding_big5 (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -5193,9 +5144,7 @@ CATEGORY_MASK_CCL, else return 0. */ static int -detect_coding_ccl (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_ccl (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5234,8 +5183,7 @@ } static void -decode_coding_ccl (coding) - struct coding_system *coding; +decode_coding_ccl (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5304,8 +5252,7 @@ } static int -encode_coding_ccl (coding) - struct coding_system *coding; +encode_coding_ccl (struct coding_system *coding) { struct ccl_program *ccl = &coding->spec.ccl->ccl; int multibytep = coding->dst_multibyte; @@ -5374,8 +5321,7 @@ /* See the above "GENERAL NOTES on `decode_coding_XXX ()' functions". */ static void -decode_coding_raw_text (coding) - struct coding_system *coding; +decode_coding_raw_text (struct coding_system *coding) { int eol_crlf = !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); @@ -5394,8 +5340,7 @@ } static int -encode_coding_raw_text (coding) - struct coding_system *coding; +encode_coding_raw_text (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -5478,9 +5423,7 @@ is, return 1, else return 0. */ static int -detect_coding_charset (coding, detect_info) - struct coding_system *coding; - struct coding_detection_info *detect_info; +detect_coding_charset (struct coding_system *coding, struct coding_detection_info *detect_info) { const unsigned char *src = coding->source, *src_base; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5582,8 +5525,7 @@ } static void -decode_coding_charset (coding) - struct coding_system *coding; +decode_coding_charset (struct coding_system *coding) { const unsigned char *src = coding->source + coding->consumed; const unsigned char *src_end = coding->source + coding->src_bytes; @@ -5711,8 +5653,7 @@ } static int -encode_coding_charset (coding) - struct coding_system *coding; +encode_coding_charset (struct coding_system *coding) { int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; @@ -5782,9 +5723,7 @@ CODING_SYSTEM is invalid, signal an error. */ void -setup_coding_system (coding_system, coding) - Lisp_Object coding_system; - struct coding_system *coding; +setup_coding_system (Lisp_Object coding_system, struct coding_system *coding) { Lisp_Object attrs; Lisp_Object eol_type; @@ -5987,8 +5926,7 @@ /* Return a list of charsets supported by CODING. */ Lisp_Object -coding_charset_list (coding) - struct coding_system *coding; +coding_charset_list (struct coding_system *coding) { Lisp_Object attrs, charset_list; @@ -6011,8 +5949,7 @@ /* Return a list of charsets supported by CODING-SYSTEM. */ Lisp_Object -coding_system_charset_list (coding_system) - Lisp_Object coding_system; +coding_system_charset_list (Lisp_Object coding_system) { int id; Lisp_Object attrs, charset_list; @@ -6045,8 +5982,7 @@ eol_type as CODING-SYSTEM. */ Lisp_Object -raw_text_coding_system (coding_system) - Lisp_Object coding_system; +raw_text_coding_system (Lisp_Object coding_system) { Lisp_Object spec, attrs; Lisp_Object eol_type, raw_text_eol_type; @@ -6077,8 +6013,7 @@ (system_eol_type). */ Lisp_Object -coding_inherit_eol_type (coding_system, parent) - Lisp_Object coding_system, parent; +coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent) { Lisp_Object spec, eol_type; @@ -6233,10 +6168,7 @@ #define MAX_EOL_CHECK_COUNT 3 static int -detect_eol (source, src_bytes, category) - const unsigned char *source; - EMACS_INT src_bytes; - enum coding_category category; +detect_eol (const unsigned char *source, EMACS_INT src_bytes, enum coding_category category) { const unsigned char *src = source, *src_end = src + src_bytes; unsigned char c; @@ -6334,9 +6266,7 @@ static Lisp_Object -adjust_coding_eol_type (coding, eol_seen) - struct coding_system *coding; - int eol_seen; +adjust_coding_eol_type (struct coding_system *coding, int eol_seen) { Lisp_Object eol_type; @@ -6364,8 +6294,7 @@ system. */ void -detect_coding (coding) - struct coding_system *coding; +detect_coding (struct coding_system *coding) { const unsigned char *src, *src_end; int saved_mode = coding->mode; @@ -6544,8 +6473,7 @@ static void -decode_eol (coding) - struct coding_system *coding; +decode_eol (struct coding_system *coding) { Lisp_Object eol_type; unsigned char *p, *pbeg, *pend; @@ -6647,9 +6575,7 @@ decoding (ENCODEP is zero). */ static Lisp_Object -get_translation_table (attrs, encodep, max_lookup) - Lisp_Object attrs; - int encodep, *max_lookup; +get_translation_table (Lisp_Object attrs, int encodep, int *max_lookup) { Lisp_Object standard, translation_table; Lisp_Object val; @@ -6751,9 +6677,7 @@ If BUF is too short to lookup characters in FROM, return Qt. */ static Lisp_Object -get_translation (trans, buf, buf_end) - Lisp_Object trans; - int *buf, *buf_end; +get_translation (Lisp_Object trans, int *buf, int *buf_end) { if (INTEGERP (trans)) @@ -6780,10 +6704,7 @@ static int -produce_chars (coding, translation_table, last_block) - struct coding_system *coding; - Lisp_Object translation_table; - int last_block; +produce_chars (struct coding_system *coding, Lisp_Object translation_table, int last_block) { unsigned char *dst = coding->destination + coding->produced; unsigned char *dst_end = coding->destination + coding->dst_bytes; @@ -6981,10 +6902,7 @@ */ static INLINE void -produce_composition (coding, charbuf, pos) - struct coding_system *coding; - int *charbuf; - EMACS_INT pos; +produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos) { int len; EMACS_INT to; @@ -7028,10 +6946,7 @@ */ static INLINE void -produce_charset (coding, charbuf, pos) - struct coding_system *coding; - int *charbuf; - EMACS_INT pos; +produce_charset (struct coding_system *coding, int *charbuf, EMACS_INT pos) { EMACS_INT from = pos - charbuf[2]; struct charset *charset = CHARSET_FROM_ID (charbuf[3]); @@ -7066,9 +6981,7 @@ static void -produce_annotation (coding, pos) - struct coding_system *coding; - EMACS_INT pos; +produce_annotation (struct coding_system *coding, EMACS_INT pos) { int *charbuf = coding->charbuf; int *charbuf_end = charbuf + coding->charbuf_used; @@ -7123,8 +7036,7 @@ */ static int -decode_coding (coding) - struct coding_system *coding; +decode_coding (struct coding_system *coding) { Lisp_Object attrs; Lisp_Object undo_list; @@ -7262,11 +7174,7 @@ return BUF. */ static INLINE int * -handle_composition_annotation (pos, limit, coding, buf, stop) - EMACS_INT pos, limit; - struct coding_system *coding; - int *buf; - EMACS_INT *stop; +handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) { EMACS_INT start, end; Lisp_Object prop; @@ -7347,11 +7255,7 @@ property value is non-nil (limiting by LIMIT), and return BUF. */ static INLINE int * -handle_charset_annotation (pos, limit, coding, buf, stop) - EMACS_INT pos, limit; - struct coding_system *coding; - int *buf; - EMACS_INT *stop; +handle_charset_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) { Lisp_Object val, next; int id; @@ -7371,10 +7275,7 @@ static void -consume_chars (coding, translation_table, max_lookup) - struct coding_system *coding; - Lisp_Object translation_table; - int max_lookup; +consume_chars (struct coding_system *coding, Lisp_Object translation_table, int max_lookup) { int *buf = coding->charbuf; int *buf_end = coding->charbuf + coding->charbuf_size; @@ -7530,8 +7431,7 @@ memory area specified by CODING->destination. */ static int -encode_coding (coding) - struct coding_system *coding; +encode_coding (struct coding_system *coding) { Lisp_Object attrs; Lisp_Object translation_table; @@ -7595,8 +7495,7 @@ multibyteness of returning buffer. */ static Lisp_Object -make_conversion_work_buffer (multibyte) - int multibyte; +make_conversion_work_buffer (int multibyte) { Lisp_Object name, workbuf; struct buffer *current; @@ -7628,8 +7527,7 @@ static Lisp_Object -code_conversion_restore (arg) - Lisp_Object arg; +code_conversion_restore (Lisp_Object arg) { Lisp_Object current, workbuf; struct gcpro gcpro1; @@ -7650,8 +7548,7 @@ } Lisp_Object -code_conversion_save (with_work_buf, multibyte) - int with_work_buf, multibyte; +code_conversion_save (int with_work_buf, int multibyte) { Lisp_Object workbuf = Qnil; @@ -7663,9 +7560,7 @@ } int -decode_coding_gap (coding, chars, bytes) - struct coding_system *coding; - EMACS_INT chars, bytes; +decode_coding_gap (struct coding_system *coding, EMACS_INT chars, EMACS_INT bytes) { int count = specpdl_ptr - specpdl; Lisp_Object attrs; @@ -7710,9 +7605,7 @@ } int -encode_coding_gap (coding, chars, bytes) - struct coding_system *coding; - EMACS_INT chars, bytes; +encode_coding_gap (struct coding_system *coding, EMACS_INT chars, EMACS_INT bytes) { int count = specpdl_ptr - specpdl; @@ -8165,7 +8058,7 @@ Lisp_Object -preferred_coding_system () +preferred_coding_system (void) { int id = coding_categories[coding_priorities[0]].id; @@ -8643,9 +8536,7 @@ static INLINE int -char_encodable_p (c, attrs) - int c; - Lisp_Object attrs; +char_encodable_p (int c, Lisp_Object attrs) { Lisp_Object tail; struct charset *charset; @@ -9031,9 +8922,7 @@ Lisp_Object -code_convert_region (start, end, coding_system, dst_object, encodep, norecord) - Lisp_Object start, end, coding_system, dst_object; - int encodep, norecord; +code_convert_region (Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object dst_object, int encodep, int norecord) { struct coding_system coding; EMACS_INT from, from_byte, to, to_byte; @@ -9172,9 +9061,7 @@ ENCODE_FILE, thus we ignore character composition. */ Lisp_Object -code_convert_string_norecord (string, coding_system, encodep) - Lisp_Object string, coding_system; - int encodep; +code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system, int encodep) { return code_convert_string (string, coding_system, Qt, encodep, 0, 1); } @@ -9656,8 +9543,7 @@ static const char *const suffixes[] = { "-unix", "-dos", "-mac" }; static Lisp_Object -make_subsidiaries (base) - Lisp_Object base; +make_subsidiaries (Lisp_Object base) { Lisp_Object subsidiaries; int base_name_len = SBYTES (SYMBOL_NAME (base)); @@ -10385,7 +10271,7 @@ /*** 9. Post-amble ***/ void -init_coding_once () +init_coding_once (void) { int i; @@ -10427,7 +10313,7 @@ #ifdef emacs void -syms_of_coding () +syms_of_coding (void) { staticpro (&Vcoding_system_hash_table); { @@ -10977,8 +10863,7 @@ } char * -emacs_strerror (error_number) - int error_number; +emacs_strerror (int error_number) { char *str;
--- a/src/composite.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/composite.c Sun Jul 04 00:50:25 2010 -0700 @@ -180,9 +180,7 @@ If the composition is invalid, return -1. */ int -get_composition_id (charpos, bytepos, nchars, prop, string) - int charpos, bytepos, nchars; - Lisp_Object prop, string; +get_composition_id (int charpos, int bytepos, int nchars, Lisp_Object prop, Lisp_Object string) { Lisp_Object id, length, components, key, *key_contents; int glyph_len; @@ -429,10 +427,7 @@ This doesn't check the validity of composition. */ int -find_composition (pos, limit, start, end, prop, object) - int pos, limit; - EMACS_INT *start, *end; - Lisp_Object *prop, object; +find_composition (int pos, int limit, EMACS_INT *start, EMACS_INT *end, Lisp_Object *prop, Lisp_Object object) { Lisp_Object val; @@ -470,9 +465,7 @@ FROM and TO with property PROP. */ static void -run_composition_function (from, to, prop) - int from, to; - Lisp_Object prop; +run_composition_function (int from, int to, Lisp_Object prop) { Lisp_Object func; EMACS_INT start, end; @@ -504,9 +497,7 @@ change is deletion, FROM == TO. Otherwise, FROM < TO. */ void -update_compositions (from, to, check_mask) - EMACS_INT from, to; - int check_mask; +update_compositions (EMACS_INT from, EMACS_INT to, int check_mask) { Lisp_Object prop; EMACS_INT start, end; @@ -612,8 +603,7 @@ top-level copies of them so that none of them are `eq'. */ void -make_composition_value_copy (list) - Lisp_Object list; +make_composition_value_copy (Lisp_Object list) { Lisp_Object plist, val; @@ -638,9 +628,7 @@ indices START and END in STRING. */ void -compose_text (start, end, components, modification_func, string) - int start, end; - Lisp_Object components, modification_func, string; +compose_text (int start, int end, Lisp_Object components, Lisp_Object modification_func, Lisp_Object string) { Lisp_Object prop; @@ -667,8 +655,7 @@ static Lisp_Object gstring_lookup_cache (Lisp_Object); static Lisp_Object -gstring_lookup_cache (header) - Lisp_Object header; +gstring_lookup_cache (Lisp_Object header) { struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); int i = hash_lookup (h, header, NULL); @@ -677,9 +664,7 @@ } Lisp_Object -composition_gstring_put_cache (gstring, len) - Lisp_Object gstring; - int len; +composition_gstring_put_cache (Lisp_Object gstring, int len) { struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); unsigned hash; @@ -707,8 +692,7 @@ } Lisp_Object -composition_gstring_from_id (id) - int id; +composition_gstring_from_id (int id) { struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); @@ -720,8 +704,7 @@ Lisp_Object); int -composition_gstring_p (gstring) - Lisp_Object gstring; +composition_gstring_p (Lisp_Object gstring) { Lisp_Object header; int i; @@ -752,10 +735,7 @@ } int -composition_gstring_width (gstring, from, to, metrics) - Lisp_Object gstring; - int from, to; - struct font_metrics *metrics; +composition_gstring_width (Lisp_Object gstring, int from, int to, struct font_metrics *metrics) { Lisp_Object *glyph; int width = 0; @@ -811,8 +791,7 @@ static Lisp_Object gstring_work_headers; static Lisp_Object -fill_gstring_header (header, start, end, font_object, string) - Lisp_Object header, start, end, font_object, string; +fill_gstring_header (Lisp_Object header, Lisp_Object start, Lisp_Object end, Lisp_Object font_object, Lisp_Object string) { EMACS_INT from, to, from_byte; EMACS_INT len, i; @@ -872,8 +851,7 @@ extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); static void -fill_gstring_body (gstring) - Lisp_Object gstring; +fill_gstring_body (Lisp_Object gstring) { Lisp_Object font_object = LGSTRING_FONT (gstring); Lisp_Object header = AREF (gstring, 0); @@ -923,12 +901,7 @@ object. Otherwise return nil. */ static Lisp_Object -autocmp_chars (rule, charpos, bytepos, limit, win, face, string) - Lisp_Object rule; - EMACS_INT charpos, bytepos, limit; - struct window *win; - struct face *face; - Lisp_Object string; +autocmp_chars (Lisp_Object rule, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT limit, struct window *win, struct face *face, Lisp_Object string) { int count = SPECPDL_INDEX (); FRAME_PTR f = XFRAME (win->frame); @@ -1020,10 +993,7 @@ composition. */ void -composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string) - struct composition_it *cmp_it; - EMACS_INT charpos, bytepos, endpos; - Lisp_Object string; +composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, Lisp_Object string) { EMACS_INT start, end, c; Lisp_Object prop, val; @@ -1253,12 +1223,7 @@ CMP_IT->stop_pos, and return 0. */ int -composition_reseat_it (cmp_it, charpos, bytepos, endpos, w, face, string) - struct composition_it *cmp_it; - EMACS_INT charpos, bytepos, endpos; - struct window *w; - struct face *face; - Lisp_Object string; +composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, struct window *w, struct face *face, Lisp_Object string) { if (endpos <= charpos) { @@ -1417,10 +1382,7 @@ the cluster, or -1 if the composition is somehow broken. */ int -composition_update_it (cmp_it, charpos, bytepos, string) - struct composition_it *cmp_it; - EMACS_INT charpos, bytepos; - Lisp_Object string; +composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, Lisp_Object string) { int i, c; @@ -1543,9 +1505,7 @@ the composition, and return 1. Otherwise, return 0. */ static int -find_automatic_composition (pos, limit, start, end, gstring, string) - EMACS_INT pos, limit, *start, *end; - Lisp_Object *gstring, string; +find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EMACS_INT *end, Lisp_Object *gstring, Lisp_Object string) { EMACS_INT head, tail, stop; /* Limit to check a composition after POS. */ @@ -1716,8 +1676,7 @@ to NEW_PT. */ int -composition_adjust_point (last_pt, new_pt) - EMACS_INT last_pt, new_pt; +composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) { EMACS_INT charpos, bytepos, startpos, beg, end, pos; Lisp_Object val; @@ -1974,7 +1933,7 @@ void -syms_of_composite () +syms_of_composite (void) { int i;
--- a/src/data.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/data.c Sun Jul 04 00:50:25 2010 -0700 @@ -50,7 +50,7 @@ #include <math.h> #if !defined (atof) -extern double atof (); +extern double atof (const char *); #endif /* !atof */ Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; @@ -97,16 +97,14 @@ void -circular_list_error (list) - Lisp_Object list; +circular_list_error (Lisp_Object list) { xsignal (Qcircular_list, list); } Lisp_Object -wrong_type_argument (predicate, value) - register Lisp_Object predicate, value; +wrong_type_argument (register Lisp_Object predicate, register Lisp_Object value) { /* If VALUE is not even a valid Lisp object, we'd want to abort here where we can get a backtrace showing where it came from. We used @@ -119,21 +117,19 @@ } void -pure_write_error () +pure_write_error (void) { error ("Attempt to modify read-only object"); } void -args_out_of_range (a1, a2) - Lisp_Object a1, a2; +args_out_of_range (Lisp_Object a1, Lisp_Object a2) { xsignal2 (Qargs_out_of_range, a1, a2); } void -args_out_of_range_3 (a1, a2, a3) - Lisp_Object a1, a2, a3; +args_out_of_range_3 (Lisp_Object a1, Lisp_Object a2, Lisp_Object a3) { xsignal3 (Qargs_out_of_range, a1, a2, a3); } @@ -146,8 +142,7 @@ /* On a few machines, XINT can only be done by calling this. */ int -sign_extend_lisp_int (num) - EMACS_INT num; +sign_extend_lisp_int (EMACS_INT num) { if (num & (((EMACS_INT) 1) << (VALBITS - 1))) return num | (((EMACS_INT) (-1)) << VALBITS); @@ -840,8 +835,7 @@ indirections contains a loop. */ struct Lisp_Symbol * -indirect_variable (symbol) - struct Lisp_Symbol *symbol; +indirect_variable (struct Lisp_Symbol *symbol) { struct Lisp_Symbol *tortoise, *hare; @@ -892,8 +886,7 @@ ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv)) Lisp_Object -do_symval_forwarding (valcontents) - register union Lisp_Fwd *valcontents; +do_symval_forwarding (register union Lisp_Fwd *valcontents) { register Lisp_Object val; switch (XFWDTYPE (valcontents)) @@ -947,11 +940,11 @@ } while (0) static void -store_symval_forwarding (/* symbol, */ valcontents, newval, buf) +store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf) /* struct Lisp_Symbol *symbol; */ - union Lisp_Fwd *valcontents; - register Lisp_Object newval; - struct buffer *buf; + + + { switch (XFWDTYPE (valcontents)) { @@ -1032,8 +1025,7 @@ This makes it safe to alter the status of other bindings. */ void -swap_in_global_binding (symbol) - struct Lisp_Symbol *symbol; +swap_in_global_binding (struct Lisp_Symbol *symbol) { struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (symbol); @@ -1059,9 +1051,7 @@ This could be another forwarding pointer. */ static void -swap_in_symval_forwarding (symbol, blv) - struct Lisp_Symbol *symbol; - struct Lisp_Buffer_Local_Value *blv; +swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_Value *blv) { register Lisp_Object tem1; @@ -1111,8 +1101,7 @@ within this function. Great care is required for this. */ Lisp_Object -find_symbol_value (symbol) - Lisp_Object symbol; +find_symbol_value (Lisp_Object symbol) { struct Lisp_Symbol *sym; @@ -1183,8 +1172,7 @@ } static int -let_shadows_global_binding_p (symbol) - Lisp_Object symbol; +let_shadows_global_binding_p (Lisp_Object symbol) { struct specbinding *p; @@ -1204,9 +1192,7 @@ If BINDFLAG is nonzero, we don't do that. */ void -set_internal (symbol, newval, where, bindflag) - register Lisp_Object symbol, newval, where; - int bindflag; +set_internal (register Lisp_Object symbol, register Lisp_Object newval, register Lisp_Object where, int bindflag) { int voide = EQ (newval, Qunbound); struct Lisp_Symbol *sym; @@ -1357,8 +1343,7 @@ Return Qunbound if it is void. */ Lisp_Object -default_value (symbol) - Lisp_Object symbol; +default_value (Lisp_Object symbol) { struct Lisp_Symbol *sym; @@ -2109,8 +2094,7 @@ This is like Findirect_function, except that it doesn't signal an error if the chain ends up unbound. */ Lisp_Object -indirect_function (object) - register Lisp_Object object; +indirect_function (register Lisp_Object object) { Lisp_Object tortoise, hare; @@ -2326,9 +2310,7 @@ enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal }; Lisp_Object -arithcompare (num1, num2, comparison) - Lisp_Object num1, num2; - enum comparison comparison; +arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison) { double f1 = 0, f2 = 0; int floatp = 0; @@ -2454,8 +2436,7 @@ when the value fits in one. */ Lisp_Object -long_to_cons (i) - unsigned long i; +long_to_cons (long unsigned int i) { unsigned long top = i >> 16; unsigned int bot = i & 0xFFFF; @@ -2467,8 +2448,7 @@ } unsigned long -cons_to_long (c) - Lisp_Object c; +cons_to_long (Lisp_Object c) { Lisp_Object top, bot; if (INTEGERP (c)) @@ -2509,8 +2489,7 @@ } INLINE static int -digit_to_number (character, base) - int character, base; +digit_to_number (int character, int base) { int digit; @@ -2610,10 +2589,7 @@ extern Lisp_Object fmod_float (); Lisp_Object -arith_driver (code, nargs, args) - enum arithop code; - int nargs; - register Lisp_Object *args; +arith_driver (enum arithop code, int nargs, register Lisp_Object *args) { register Lisp_Object val; register int argnum; @@ -2698,12 +2674,7 @@ #define isnan(x) ((x) != (x)) static Lisp_Object -float_arith_driver (accum, argnum, code, nargs, args) - double accum; - register int argnum; - enum arithop code; - int nargs; - register Lisp_Object *args; +float_arith_driver (double accum, register int argnum, enum arithop code, int nargs, register Lisp_Object *args) { register Lisp_Object val; double next; @@ -3038,7 +3009,7 @@ void -syms_of_data () +syms_of_data (void) { Lisp_Object error_tail, arith_tail; @@ -3467,8 +3438,7 @@ } SIGTYPE -arith_error (signo) - int signo; +arith_error (int signo) { sigsetmask (SIGEMPTYMASK); @@ -3477,7 +3447,7 @@ } void -init_data () +init_data (void) { /* Don't do this if just dumping out. We don't want to call `signal' in this case
--- a/src/dbusbind.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/dbusbind.c Sun Jul 04 00:50:25 2010 -0700 @@ -163,8 +163,7 @@ /* Determine the DBusType of a given Lisp symbol. OBJECT must be one of the predefined D-Bus type symbols. */ static int -xd_symbol_to_dbus_type (object) - Lisp_Object object; +xd_symbol_to_dbus_type (Lisp_Object object) { return ((EQ (object, QCdbus_type_byte)) ? DBUS_TYPE_BYTE @@ -221,10 +220,7 @@ signature is embedded, or DBUS_TYPE_INVALID. It is needed for the check that DBUS_TYPE_DICT_ENTRY occurs only as array element. */ static void -xd_signature (signature, dtype, parent_type, object) - char *signature; - unsigned int dtype, parent_type; - Lisp_Object object; +xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lisp_Object object) { unsigned int subtype; Lisp_Object elt; @@ -393,10 +389,7 @@ `dbus-send-signal', into corresponding C values appended as arguments to a D-Bus message. */ static void -xd_append_arg (dtype, object, iter) - unsigned int dtype; - Lisp_Object object; - DBusMessageIter *iter; +xd_append_arg (unsigned int dtype, Lisp_Object object, DBusMessageIter *iter) { char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH]; DBusMessageIter subiter; @@ -604,9 +597,7 @@ D-Bus message must be a valid DBusType. Compound D-Bus types result always in a Lisp list. */ static Lisp_Object -xd_retrieve_arg (dtype, iter) - unsigned int dtype; - DBusMessageIter *iter; +xd_retrieve_arg (unsigned int dtype, DBusMessageIter *iter) { switch (dtype) @@ -725,8 +716,7 @@ /* Initialize D-Bus connection. BUS is a Lisp symbol, either :system or :session. It tells which D-Bus to be initialized. */ static DBusConnection * -xd_initialize (bus) - Lisp_Object bus; +xd_initialize (Lisp_Object bus) { DBusConnection *connection; DBusError derror; @@ -766,9 +756,7 @@ /* Add connection file descriptor to input_wait_mask, in order to let select() detect, whether a new message has been arrived. */ dbus_bool_t -xd_add_watch (watch, data) - DBusWatch *watch; - void *data; +xd_add_watch (DBusWatch *watch, void *data) { /* We check only for incoming data. */ if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE) @@ -797,9 +785,7 @@ /* Remove connection file descriptor from input_wait_mask. DATA is the used bus, either QCdbus_system_bus or QCdbus_session_bus. */ void -xd_remove_watch (watch, data) - DBusWatch *watch; - void *data; +xd_remove_watch (DBusWatch *watch, void *data) { /* We check only for incoming data. */ if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE) @@ -1569,8 +1555,7 @@ /* Check, whether there is pending input in the message queue of the D-Bus BUS. BUS is a Lisp symbol, either :system or :session. */ int -xd_get_dispatch_status (bus) - Lisp_Object bus; +xd_get_dispatch_status (Lisp_Object bus) { DBusConnection *connection; @@ -1589,7 +1574,7 @@ /* Check for queued incoming messages from the system and session buses. */ int -xd_pending_messages () +xd_pending_messages (void) { /* Vdbus_registered_objects_table will be initialized as hash table @@ -1606,8 +1591,7 @@ /* Read queued incoming message of the D-Bus BUS. BUS is a Lisp symbol, either :system or :session. */ static Lisp_Object -xd_read_message (bus) - Lisp_Object bus; +xd_read_message (Lisp_Object bus) { Lisp_Object args, key, value; struct gcpro gcpro1; @@ -1764,7 +1748,7 @@ /* Read queued incoming messages from the system and session buses. */ void -xd_read_queued_messages () +xd_read_queued_messages (void) { /* Vdbus_registered_objects_table will be initialized as hash table @@ -1990,7 +1974,7 @@ void -syms_of_dbusbind () +syms_of_dbusbind (void) { Qdbus_init_bus = intern_c_string ("dbus-init-bus");
--- a/src/dired.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/dired.c Sun Jul 04 00:50:25 2010 -0700 @@ -127,8 +127,7 @@ #endif Lisp_Object -directory_files_internal_unwind (dh) - Lisp_Object dh; +directory_files_internal_unwind (Lisp_Object dh) { DIR *d = (DIR *) XSAVE_VALUE (dh)->pointer; BLOCK_INPUT; @@ -143,10 +142,7 @@ In the latter case, ID_FORMAT is passed to Ffile_attributes. */ Lisp_Object -directory_files_internal (directory, full, match, nosort, attrs, id_format) - Lisp_Object directory, full, match, nosort; - int attrs; - Lisp_Object id_format; +directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object match, Lisp_Object nosort, int attrs, Lisp_Object id_format) { DIR *d; int directory_nbytes; @@ -417,7 +413,7 @@ } -Lisp_Object file_name_completion (); +Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate); DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, 2, 3, 0, @@ -476,14 +472,11 @@ return file_name_completion (file, directory, 1, 0, Qnil); } -static int file_name_completion_stat (); +static int file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr); Lisp_Object Qdefault_directory; Lisp_Object -file_name_completion (file, dirname, all_flag, ver_flag, predicate) - Lisp_Object file, dirname; - int all_flag, ver_flag; - Lisp_Object predicate; +file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) { DIR *d; int bestmatchsize = 0; @@ -825,9 +818,7 @@ else number of chars that match at the beginning. */ static int -scmp (s1, s2, len) - register unsigned char *s1, *s2; - int len; +scmp (register unsigned char *s1, register unsigned char *s2, int len) { register int l = len; @@ -848,10 +839,7 @@ } static int -file_name_completion_stat (dirname, dp, st_addr) - Lisp_Object dirname; - DIRENTRY *dp; - struct stat *st_addr; +file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr) { int len = NAMLEN (dp); int pos = SCHARS (dirname); @@ -893,8 +881,7 @@ } Lisp_Object -make_time (time) - time_t time; +make_time (time_t time) { return Fcons (make_number (time >> 16), Fcons (make_number (time & 0177777), Qnil)); @@ -1103,7 +1090,7 @@ } void -syms_of_dired () +syms_of_dired (void) { Qdirectory_files = intern_c_string ("directory-files"); Qdirectory_files_and_attributes = intern_c_string ("directory-files-and-attributes");
--- a/src/dispnew.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/dispnew.c Sun Jul 04 00:50:25 2010 -0700 @@ -441,10 +441,7 @@ address of this function is used. */ void -safe_bcopy (from, to, size) - const char *from; - char *to; - int size; +safe_bcopy (const char *from, char *to, int size) { if (size <= 0 || from == to) return; @@ -507,8 +504,7 @@ POOL, the structure is otherwise zeroed. */ struct glyph_matrix * -new_glyph_matrix (pool) - struct glyph_pool *pool; +new_glyph_matrix (struct glyph_pool *pool) { struct glyph_matrix *result; @@ -538,8 +534,7 @@ matrix also frees the glyph memory in this case. */ static void -free_glyph_matrix (matrix) - struct glyph_matrix *matrix; +free_glyph_matrix (struct glyph_matrix *matrix) { if (matrix) { @@ -569,10 +564,7 @@ or a float. */ static int -margin_glyphs_to_reserve (w, total_glyphs, margin) - struct window *w; - int total_glyphs; - Lisp_Object margin; +margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin) { int n; @@ -613,11 +605,7 @@ leads to screen flickering. */ static void -adjust_glyph_matrix (w, matrix, x, y, dim) - struct window *w; - struct glyph_matrix *matrix; - int x, y; - struct dim dim; +adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y, struct dim dim) { int i; int new_rows; @@ -860,9 +848,7 @@ below). */ static void -reverse_rows (matrix, start, end) - struct glyph_matrix *matrix; - int start, end; +reverse_rows (struct glyph_matrix *matrix, int start, int end) { int i, j; @@ -891,9 +877,7 @@ rotating right. */ void -rotate_matrix (matrix, first, last, by) - struct glyph_matrix *matrix; - int first, last, by; +rotate_matrix (struct glyph_matrix *matrix, int first, int last, int by) { if (by < 0) { @@ -918,9 +902,7 @@ DELTA_BYTES. */ void -increment_matrix_positions (matrix, start, end, delta, delta_bytes) - struct glyph_matrix *matrix; - int start, end, delta, delta_bytes; +increment_matrix_positions (struct glyph_matrix *matrix, int start, int end, int delta, int delta_bytes) { /* Check that START and END are reasonable values. */ xassert (start >= 0 && start <= matrix->nrows); @@ -937,10 +919,7 @@ ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ void -enable_glyph_matrix_rows (matrix, start, end, enabled_p) - struct glyph_matrix *matrix; - int start, end; - int enabled_p; +enable_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end, int enabled_p) { xassert (start <= end); xassert (start >= 0 && start < matrix->nrows); @@ -962,8 +941,7 @@ currently present is the flag MATRIX->no_scrolling_p. */ void -clear_glyph_matrix (matrix) - struct glyph_matrix *matrix; +clear_glyph_matrix (struct glyph_matrix *matrix) { if (matrix) { @@ -978,10 +956,7 @@ and recompute their visible height. */ void -shift_glyph_matrix (w, matrix, start, end, dy) - struct window *w; - struct glyph_matrix *matrix; - int start, end, dy; +shift_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int start, int end, int dy) { int min_y, max_y; @@ -1012,8 +987,7 @@ current matrix. */ void -clear_current_matrices (f) - register struct frame *f; +clear_current_matrices (register struct frame *f) { /* Clear frame current matrix, if we have one. */ if (f->current_matrix) @@ -1038,8 +1012,7 @@ /* Clear out all display lines of F for a coming redisplay. */ void -clear_desired_matrices (f) - register struct frame *f; +clear_desired_matrices (register struct frame *f) { if (f->desired_matrix) clear_glyph_matrix (f->desired_matrix); @@ -1060,9 +1033,7 @@ non-zero clear desired matrices, otherwise clear current matrices. */ static void -clear_window_matrices (w, desired_p) - struct window *w; - int desired_p; +clear_window_matrices (struct window *w, int desired_p) { while (w) { @@ -1106,8 +1077,7 @@ static struct glyph_row null_row; void -clear_glyph_row (row) - struct glyph_row *row; +clear_glyph_row (struct glyph_row *row) { struct glyph *p[1 + LAST_AREA]; @@ -1142,10 +1112,7 @@ in window W starting at y-position Y. */ void -blank_row (w, row, y) - struct window *w; - struct glyph_row *row; - int y; +blank_row (struct window *w, struct glyph_row *row, int y) { int min_y, max_y; @@ -1174,9 +1141,7 @@ ends. */ void -increment_row_positions (row, delta, delta_bytes) - struct glyph_row *row; - int delta, delta_bytes; +increment_row_positions (struct glyph_row *row, int delta, int delta_bytes) { int area, i; @@ -1251,8 +1216,7 @@ /* Exchange pointers to glyph memory between glyph rows A and B. */ static INLINE void -swap_glyph_pointers (a, b) - struct glyph_row *a, *b; +swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b) { int i; for (i = 0; i < LAST_AREA + 1; ++i) @@ -1268,8 +1232,7 @@ that glyph pointers in the structures are left unchanged. */ INLINE void -copy_row_except_pointers (to, from) - struct glyph_row *to, *from; +copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) { struct glyph *pointers[1 + LAST_AREA]; @@ -1290,9 +1253,7 @@ positions in row TO by DELTA/ DELTA_BYTES. */ void -copy_glyph_row_contents (to, from, delta, delta_bytes) - struct glyph_row *to, *from; - int delta, delta_bytes; +copy_glyph_row_contents (struct glyph_row *to, struct glyph_row *from, int delta, int delta_bytes) { int area; @@ -1317,8 +1278,7 @@ a memory leak. */ static INLINE void -assign_row (to, from) - struct glyph_row *to, *from; +assign_row (struct glyph_row *to, struct glyph_row *from) { swap_glyph_pointers (to, from); copy_row_except_pointers (to, from); @@ -1378,8 +1338,7 @@ call to this function really clears it. */ void -prepare_desired_row (row) - struct glyph_row *row; +prepare_desired_row (struct glyph_row *row) { if (!row->enabled_p) { @@ -1395,8 +1354,7 @@ /* Return a hash code for glyph row ROW. */ int -line_hash_code (row) - struct glyph_row *row; +line_hash_code (struct glyph_row *row) { int hash = 0; @@ -1429,9 +1387,7 @@ zero, leading and trailing spaces are ignored. */ static unsigned int -line_draw_cost (matrix, vpos) - struct glyph_matrix *matrix; - int vpos; +line_draw_cost (struct glyph_matrix *matrix, int vpos) { struct glyph_row *row = matrix->rows + vpos; struct glyph *beg = row->glyphs[TEXT_AREA]; @@ -1492,10 +1448,7 @@ flags of A and B, too. */ static INLINE int -row_equal_p (w, a, b, mouse_face_p) - struct window *w; - struct glyph_row *a, *b; - int mouse_face_p; +row_equal_p (struct window *w, struct glyph_row *a, struct glyph_row *b, int mouse_face_p) { if (a == b) return 1; @@ -1565,7 +1518,7 @@ incremented for each pool allocated. */ static struct glyph_pool * -new_glyph_pool () +new_glyph_pool (void) { struct glyph_pool *result; @@ -1588,8 +1541,7 @@ was passed to free_glyph_pool. */ static void -free_glyph_pool (pool) - struct glyph_pool *pool; +free_glyph_pool (struct glyph_pool *pool) { if (pool) { @@ -1613,9 +1565,7 @@ re-adjusting window glyph matrices necessary. */ static int -realloc_glyph_pool (pool, matrix_dim) - struct glyph_pool *pool; - struct dim matrix_dim; +realloc_glyph_pool (struct glyph_pool *pool, struct dim matrix_dim) { int needed; int changed_p; @@ -1994,8 +1944,7 @@ /* Return the required height of glyph matrices for window W. */ int -required_matrix_height (w) - struct window *w; +required_matrix_height (struct window *w) { #ifdef HAVE_WINDOW_SYSTEM struct frame *f = XFRAME (w->frame); @@ -2021,8 +1970,7 @@ /* Return the required width of glyph matrices for window W. */ int -required_matrix_width (w) - struct window *w; +required_matrix_width (struct window *w) { #ifdef HAVE_WINDOW_SYSTEM struct frame *f = XFRAME (w->frame); @@ -2050,8 +1998,7 @@ window whose matrices must be allocated/reallocated. */ static void -allocate_matrices_for_window_redisplay (w) - struct window *w; +allocate_matrices_for_window_redisplay (struct window *w) { while (w) { @@ -2088,8 +2035,7 @@ changes, or its window configuration changes. */ void -adjust_glyphs (f) - struct frame *f; +adjust_glyphs (struct frame *f) { /* Block input so that expose events and other events that access glyph matrices are not processed while we are changing them. */ @@ -2121,7 +2067,7 @@ windows to estimated values. */ static void -adjust_frame_glyphs_initially () +adjust_frame_glyphs_initially (void) { struct frame *sf = SELECTED_FRAME (); struct window *root = XWINDOW (sf->root_window); @@ -2148,8 +2094,7 @@ /* Allocate/reallocate glyph matrices of a single frame F. */ static void -adjust_frame_glyphs (f) - struct frame *f; +adjust_frame_glyphs (struct frame *f) { if (FRAME_WINDOW_P (f)) adjust_frame_glyphs_for_window_redisplay (f); @@ -2167,8 +2112,7 @@ /* Return 1 if any window in the tree has nonzero window margins. See the hack at the end of adjust_frame_glyphs_for_frame_redisplay. */ static int -showing_window_margins_p (w) - struct window *w; +showing_window_margins_p (struct window *w) { while (w) { @@ -2196,8 +2140,7 @@ windows from the frame's current matrix. */ static void -fake_current_matrices (window) - Lisp_Object window; +fake_current_matrices (Lisp_Object window) { struct window *w; @@ -2247,8 +2190,7 @@ a glyph matrix holding the contents of F's current frame matrix. */ static struct glyph_matrix * -save_current_matrix (f) - struct frame *f; +save_current_matrix (struct frame *f) { int i; struct glyph_matrix *saved; @@ -2278,9 +2220,7 @@ and free memory associated with SAVED. */ static void -restore_current_matrix (f, saved) - struct frame *f; - struct glyph_matrix *saved; +restore_current_matrix (struct frame *f, struct glyph_matrix *saved) { int i; @@ -2304,8 +2244,7 @@ frame-based redisplay. */ static void -adjust_frame_glyphs_for_frame_redisplay (f) - struct frame *f; +adjust_frame_glyphs_for_frame_redisplay (struct frame *f) { struct dim matrix_dim; int pool_changed_p; @@ -2405,8 +2344,7 @@ window-based redisplay. */ static void -adjust_frame_glyphs_for_window_redisplay (f) - struct frame *f; +adjust_frame_glyphs_for_window_redisplay (struct frame *f) { struct window *w; @@ -2474,8 +2412,7 @@ eventually without causing trouble). */ static void -adjust_frame_message_buffer (f) - struct frame *f; +adjust_frame_message_buffer (struct frame *f) { int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; @@ -2493,8 +2430,7 @@ /* Re-allocate buffer for decode_mode_spec on frame F. */ static void -adjust_decode_mode_spec_buffer (f) - struct frame *f; +adjust_decode_mode_spec_buffer (struct frame *f) { f->decode_mode_spec_buffer = (char *) xrealloc (f->decode_mode_spec_buffer, @@ -2513,8 +2449,7 @@ the function is called when F is destroyed. */ void -free_glyphs (f) - struct frame *f; +free_glyphs (struct frame *f) { if (f && f->glyphs_initialized_p) { @@ -2575,8 +2510,7 @@ the same tree more than once. */ void -free_window_matrices (w) - struct window *w; +free_window_matrices (struct window *w) { while (w) { @@ -2606,7 +2540,7 @@ explicitly and check that nothing is left allocated. */ void -check_glyph_memory () +check_glyph_memory (void) { Lisp_Object tail, frame; @@ -2690,8 +2624,7 @@ sure not to touch them in this function. */ static void -build_frame_matrix (f) - struct frame *f; +build_frame_matrix (struct frame *f) { int i; @@ -2713,9 +2646,7 @@ matrices. W is the root of a window tree. */ static void -build_frame_matrix_from_window_tree (matrix, w) - struct glyph_matrix *matrix; - struct window *w; +build_frame_matrix_from_window_tree (struct glyph_matrix *matrix, struct window *w) { while (w) { @@ -2743,9 +2674,7 @@ preserve_other_columns in the old redisplay. */ static void -build_frame_matrix_from_leaf_window (frame_matrix, w) - struct glyph_matrix *frame_matrix; - struct window *w; +build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct window *w) { struct glyph_matrix *window_matrix; int window_y, frame_y; @@ -2862,9 +2791,7 @@ for instance, vertical separators, truncation markers, etc. */ void -spec_glyph_lookup_face (w, glyph) - struct window *w; - GLYPH *glyph; +spec_glyph_lookup_face (struct window *w, GLYPH *glyph) { int lface_id = GLYPH_FACE (*glyph); /* Convert the glyph's specified face to a realized (cache) face. */ @@ -2893,8 +2820,7 @@ To be called for frame-based redisplay, only. */ static void -fill_up_glyph_row_with_spaces (row) - struct glyph_row *row; +fill_up_glyph_row_with_spaces (struct glyph_row *row) { fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); @@ -2906,9 +2832,7 @@ frame-based redisplay only. */ static void -fill_up_glyph_row_area_with_spaces (row, area) - struct glyph_row *row; - int area; +fill_up_glyph_row_area_with_spaces (struct glyph_row *row, int area) { if (row->glyphs[area] < row->glyphs[area + 1]) { @@ -2926,9 +2850,7 @@ reached. In frame matrices only one area, TEXT_AREA, is used. */ static void -fill_up_frame_row_with_spaces (row, upto) - struct glyph_row *row; - int upto; +fill_up_frame_row_with_spaces (struct glyph_row *row, int upto) { int i = row->used[TEXT_AREA]; struct glyph *glyph = row->glyphs[TEXT_AREA]; @@ -2950,8 +2872,7 @@ working on frame matrices or not. */ static INLINE void -set_frame_matrix_frame (f) - struct frame *f; +set_frame_matrix_frame (struct frame *f) { frame_matrix_frame = f; } @@ -2966,9 +2887,7 @@ operations in window matrices of frame_matrix_frame. */ static INLINE void -make_current (desired_matrix, current_matrix, row) - struct glyph_matrix *desired_matrix, *current_matrix; - int row; +make_current (struct glyph_matrix *desired_matrix, struct glyph_matrix *current_matrix, int row) { struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, row); @@ -2995,9 +2914,7 @@ matrices of leaf windows in the window tree rooted at W. */ static void -mirror_make_current (w, frame_row) - struct window *w; - int frame_row; +mirror_make_current (struct window *w, int frame_row) { while (w) { @@ -3090,8 +3007,7 @@ the current frame matrix. */ static void -sync_window_with_frame_matrix_rows (w) - struct window *w; +sync_window_with_frame_matrix_rows (struct window *w) { struct frame *f = XFRAME (w->frame); struct glyph_row *window_row, *window_row_end, *frame_row; @@ -3128,9 +3044,7 @@ row ROW. Value is null if none is found. */ struct window * -frame_row_to_window (w, row) - struct window *w; - int row; +frame_row_to_window (struct window *w, int row) { struct window *found = NULL; @@ -3163,11 +3077,7 @@ which is empty. */ static void -mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) - struct window *w; - int unchanged_at_top, nlines; - int *copy_from; - char *retained_p; +mirror_line_dance (struct window *w, int unchanged_at_top, int nlines, int *copy_from, char *retained_p) { while (w) { @@ -3419,8 +3329,7 @@ function redraw-frame. */ void -redraw_frame (f) - struct frame *f; +redraw_frame (struct frame *f) { Lisp_Object frame; XSETFRAME (frame, f); @@ -3446,7 +3355,7 @@ visible frames marked as garbaged. */ void -redraw_garbaged_frames () +redraw_garbaged_frames (void) { Lisp_Object tail, frame; @@ -3471,10 +3380,7 @@ Value is non-zero if redisplay was stopped due to pending input. */ int -update_frame (f, force_p, inhibit_hairy_id_p) - struct frame *f; - int force_p; - int inhibit_hairy_id_p; +update_frame (struct frame *f, int force_p, int inhibit_hairy_id_p) { /* 1 means display has been paused because of pending input. */ int paused_p; @@ -3606,9 +3512,7 @@ don't stop updating when input is pending. */ static int -update_window_tree (w, force_p) - struct window *w; - int force_p; +update_window_tree (struct window *w, int force_p) { int paused_p = 0; @@ -3632,9 +3536,7 @@ FORCE_P is non-zero, don't stop updating if input is pending. */ void -update_single_window (w, force_p) - struct window *w; - int force_p; +update_single_window (struct window *w, int force_p) { if (w->must_be_updated_p) { @@ -3679,9 +3581,7 @@ overlapped by other rows. YB is bottom-most y-position in W. */ static void -redraw_overlapped_rows (w, yb) - struct window *w; - int yb; +redraw_overlapped_rows (struct window *w, int yb) { int i; struct frame *f = XFRAME (WINDOW_FRAME (w)); @@ -3729,9 +3629,7 @@ others. YB is bottom-most y-position in W. */ static void -redraw_overlapping_rows (w, yb) - struct window *w; - int yb; +redraw_overlapping_rows (struct window *w, int yb) { int i, bottom_y; struct glyph_row *row; @@ -3793,8 +3691,7 @@ which is below what's displayed in the window. */ void -check_current_matrix_flags (w) - struct window *w; +check_current_matrix_flags (struct window *w) { int last_seen_p = 0; int i, yb = window_text_bottom_y (w); @@ -3816,9 +3713,7 @@ not stop when detecting pending input. */ static int -update_window (w, force_p) - struct window *w; - int force_p; +update_window (struct window *w, int force_p) { struct glyph_matrix *desired_matrix = w->desired_matrix; int paused_p; @@ -4010,9 +3905,7 @@ AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ static void -update_marginal_area (w, area, vpos) - struct window *w; - int area, vpos; +update_marginal_area (struct window *w, int area, int vpos) { struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); @@ -4035,9 +3928,7 @@ Value is non-zero if display has changed. */ static int -update_text_area (w, vpos) - struct window *w; - int vpos; +update_text_area (struct window *w, int vpos) { struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); @@ -4282,9 +4173,7 @@ changed. */ static int -update_window_line (w, vpos, mouse_face_overwritten_p) - struct window *w; - int vpos, *mouse_face_overwritten_p; +update_window_line (struct window *w, int vpos, int *mouse_face_overwritten_p) { struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); @@ -4353,8 +4242,7 @@ be called from update_window. */ static void -set_window_cursor_after_update (w) - struct window *w; +set_window_cursor_after_update (struct window *w) { struct frame *f = XFRAME (w->frame); struct redisplay_interface *rif = FRAME_RIF (f); @@ -4438,9 +4326,7 @@ tree rooted at W. */ void -set_window_update_flags (w, on_p) - struct window *w; - int on_p; +set_window_update_flags (struct window *w, int on_p) { while (w) { @@ -4518,9 +4404,7 @@ of window W. */ static INLINE struct row_entry * -add_row_entry (w, row) - struct window *w; - struct glyph_row *row; +add_row_entry (struct window *w, struct glyph_row *row) { struct row_entry *entry; int i = row->hash % row_table_size; @@ -4571,9 +4455,7 @@ 1 if we did scroll. */ static int -scrolling_window (w, header_line_p) - struct window *w; - int header_line_p; +scrolling_window (struct window *w, int header_line_p) { struct glyph_matrix *desired_matrix = w->desired_matrix; struct glyph_matrix *current_matrix = w->current_matrix; @@ -4876,10 +4758,7 @@ Value is non-zero if update was stopped due to pending input. */ static int -update_frame_1 (f, force_p, inhibit_id_p) - struct frame *f; - int force_p; - int inhibit_id_p; +update_frame_1 (struct frame *f, int force_p, int inhibit_id_p) { /* Frame matrices to work on. */ struct glyph_matrix *current_matrix = f->current_matrix; @@ -5089,8 +4968,7 @@ /* Do line insertions/deletions on frame F for frame-based redisplay. */ int -scrolling (frame) - struct frame *frame; +scrolling (struct frame *frame) { int unchanged_at_top, unchanged_at_bottom; int window_size; @@ -5184,9 +5062,7 @@ which is LEN glyphs long. */ static int -count_blanks (r, len) - struct glyph *r; - int len; +count_blanks (struct glyph *r, int len) { int i; @@ -5203,8 +5079,7 @@ of STR2. Value is the number of equal glyphs equal at the start. */ static int -count_match (str1, end1, str2, end2) - struct glyph *str1, *end1, *str2, *end2; +count_match (struct glyph *str1, struct glyph *end1, struct glyph *str2, struct glyph *end2) { struct glyph *p1 = str1; struct glyph *p2 = str2; @@ -5227,9 +5102,7 @@ /* Perform a frame-based update on line VPOS in frame FRAME. */ static void -update_frame_line (f, vpos) - struct frame *f; - int vpos; +update_frame_line (struct frame *f, int vpos) { struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; int tem; @@ -5545,13 +5418,7 @@ Adjust *X and *Y to character positions. */ Lisp_Object -buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) - struct window *w; - int *x, *y; - struct display_pos *pos; - Lisp_Object *object; - int *dx, *dy; - int *width, *height; +buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *pos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) { struct it it; Lisp_Object old_current_buffer = Fcurrent_buffer (); @@ -5646,14 +5513,7 @@ *CHARPOS is set to the position in the string returned. */ Lisp_Object -mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) - struct window *w; - enum window_part part; - int *x, *y; - int *charpos; - Lisp_Object *object; - int *dx, *dy; - int *width, *height; +mode_line_string (struct window *w, enum window_part part, int *x, int *y, int *charpos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) { struct glyph_row *row; struct glyph *glyph, *end; @@ -5720,14 +5580,7 @@ the string returned. */ Lisp_Object -marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height) - struct window *w; - enum window_part part; - int *x, *y; - int *charpos; - Lisp_Object *object; - int *dx, *dy; - int *width, *height; +marginal_area_string (struct window *w, enum window_part part, int *x, int *y, int *charpos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) { struct glyph_row *row = w->current_matrix->rows; struct glyph *glyph, *end; @@ -5816,8 +5669,8 @@ #ifdef SIGWINCH SIGTYPE -window_change_signal (signalnum) /* If we don't have an argument, */ - int signalnum; /* some compilers complain in signal calls. */ +window_change_signal (int signalnum) /* If we don't have an argument, */ + /* some compilers complain in signal calls. */ { int width, height; int old_errno = errno; @@ -5865,8 +5718,7 @@ safe to change frame sizes while a redisplay is in progress. */ void -do_pending_window_change (safe) - int safe; +do_pending_window_change (int safe) { /* If window_change_signal should have run before, run it now. */ if (redisplaying_p && !safe) @@ -5902,9 +5754,7 @@ safe to change frame sizes while a redisplay is in progress. */ void -change_frame_size (f, newheight, newwidth, pretend, delay, safe) - register struct frame *f; - int newheight, newwidth, pretend, delay, safe; +change_frame_size (register struct frame *f, int newheight, int newwidth, int pretend, int delay, int safe) { Lisp_Object tail, frame; @@ -5923,9 +5773,7 @@ } static void -change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) - register struct frame *f; - int newheight, newwidth, pretend, delay, safe; +change_frame_size_1 (register struct frame *f, int newheight, int newwidth, int pretend, int delay, int safe) { int new_frame_total_cols; int count = SPECPDL_INDEX (); @@ -6153,7 +6001,7 @@ } void -bitch_at_user () +bitch_at_user (void) { if (noninteractive) putchar (07); @@ -6230,9 +6078,7 @@ */ Lisp_Object -sit_for (timeout, reading, do_display) - Lisp_Object timeout; - int reading, do_display; +sit_for (Lisp_Object timeout, int reading, int do_display) { int sec, usec; @@ -6448,7 +6294,7 @@ decoding routine to set up variables in the terminal package. */ void -init_display () +init_display (void) { char *terminal_type; @@ -6710,7 +6556,7 @@ ***********************************************************************/ void -syms_of_display () +syms_of_display (void) { defsubr (&Sredraw_frame); defsubr (&Sredraw_display);
--- a/src/doc.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/doc.c Sun Jul 04 00:50:25 2010 -0700 @@ -71,8 +71,7 @@ If UNREADFLAG is 1, we unread a byte. */ int -read_bytecode_char (unreadflag) - int unreadflag; +read_bytecode_char (int unreadflag) { if (unreadflag) { @@ -102,9 +101,7 @@ and return a cons cell. */ Lisp_Object -get_doc_string (filepos, unibyte, definition) - Lisp_Object filepos; - int unibyte, definition; +get_doc_string (Lisp_Object filepos, int unibyte, int definition) { char *from, *to; register int fd; @@ -311,15 +308,13 @@ of a compiled function from the .elc file. */ Lisp_Object -read_doc_string (filepos) - Lisp_Object filepos; +read_doc_string (Lisp_Object filepos) { return get_doc_string (filepos, 0, 1); } static int -reread_doc_file (file) - Lisp_Object file; +reread_doc_file (Lisp_Object file) { #if 0 Lisp_Object reply, prompt[3]; @@ -515,10 +510,10 @@ /* Scanning the DOC files and placing docstring offsets into functions. */ static void -store_function_docstring (fun, offset) - Lisp_Object fun; +store_function_docstring (Lisp_Object fun, EMACS_INT offset) + /* Use EMACS_INT because we get this from pointer subtraction. */ - EMACS_INT offset; + { fun = indirect_function (fun); @@ -951,7 +946,7 @@ } void -syms_of_doc () +syms_of_doc (void) { Qfunction_documentation = intern_c_string ("function-documentation"); staticpro (&Qfunction_documentation);
--- a/src/doprnt.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/doprnt.c Sun Jul 04 00:50:25 2010 -0700 @@ -61,13 +61,7 @@ Integers are passed as C integers. */ int -doprnt (buffer, bufsize, format, format_end, nargs, args) - char *buffer; - register int bufsize; - char *format; - char *format_end; - int nargs; - char **args; +doprnt (char *buffer, register int bufsize, char *format, char *format_end, int nargs, char **args) { int cnt = 0; /* Number of arg to gobble next */ register char *fmt = format; /* Pointer into format string */
--- a/src/ecrt0.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ecrt0.c Sun Jul 04 00:50:25 2010 -0700 @@ -61,23 +61,21 @@ char **environ; -static start1 (); +static start1 (int bogus_fp, int argc, char *xargv); /* Define symbol "start": here; some systems want that symbol. */ asm(" .text "); asm(" .globl start "); asm(" start: "); -_start () +_start (void) { /* On vax, nothing is pushed here */ start1 (); } static -start1 (bogus_fp, argc, xargv) - int argc; - char *xargv; +start1 (int bogus_fp, int argc, char *xargv) { register char **argv = &xargv; environ = argv + argc + 1;
--- a/src/editfns.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/editfns.c Sun Jul 04 00:50:25 2010 -0700 @@ -141,7 +141,7 @@ void -init_editfns () +init_editfns (void) { char *user_name; register unsigned char *p; @@ -253,8 +253,7 @@ } static Lisp_Object -buildmark (charpos, bytepos) - int charpos, bytepos; +buildmark (int charpos, int bytepos) { register Lisp_Object mark; mark = Fmake_marker (); @@ -280,8 +279,7 @@ } int -clip_to_bounds (lower, num, upper) - int lower, num, upper; +clip_to_bounds (int lower, int num, int upper) { if (num < lower) return lower; @@ -328,8 +326,7 @@ If there is no region active, signal an error. */ static Lisp_Object -region_limit (beginningp) - int beginningp; +region_limit (int beginningp) { extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */ Lisp_Object m; @@ -377,10 +374,7 @@ of length LEN. */ static int -overlays_around (pos, vec, len) - int pos; - Lisp_Object *vec; - int len; +overlays_around (int pos, Lisp_Object *vec, int len) { Lisp_Object overlay, start, end; struct Lisp_Overlay *tail; @@ -436,9 +430,7 @@ window-specific overlays are considered only if they are associated with OBJECT. */ Lisp_Object -get_pos_property (position, prop, object) - Lisp_Object position, object; - register Lisp_Object prop; +get_pos_property (Lisp_Object position, register Lisp_Object prop, Lisp_Object object) { CHECK_NUMBER_COERCE_MARKER (position); @@ -533,11 +525,7 @@ is not stored. */ static void -find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end) - Lisp_Object pos; - Lisp_Object merge_at_boundary; - Lisp_Object beg_limit, end_limit; - int *beg, *end; +find_field (Lisp_Object pos, Lisp_Object merge_at_boundary, Lisp_Object beg_limit, int *beg, Lisp_Object end_limit, int *end) { /* Fields right before and after the point. */ Lisp_Object before_field, after_field; @@ -900,7 +888,7 @@ Lisp_Object -save_excursion_save () +save_excursion_save (void) { int visible = (XBUFFER (XWINDOW (selected_window)->buffer) == current_buffer); @@ -913,8 +901,7 @@ } Lisp_Object -save_excursion_restore (info) - Lisp_Object info; +save_excursion_restore (Lisp_Object info) { Lisp_Object tem, tem1, omark, nmark; struct gcpro gcpro1, gcpro2, gcpro3; @@ -1440,7 +1427,7 @@ /* For the benefit of callers who don't want to include lisp.h */ char * -get_system_name () +get_system_name (void) { if (STRINGP (Vsystem_name)) return (char *) SDATA (Vsystem_name); @@ -1449,7 +1436,7 @@ } char * -get_operating_system_release() +get_operating_system_release(void) { if (STRINGP (Voperating_system_release)) return (char *) SDATA (Voperating_system_release); @@ -1527,10 +1514,7 @@ int -lisp_time_argument (specified_time, result, usec) - Lisp_Object specified_time; - time_t *result; - int *usec; +lisp_time_argument (Lisp_Object specified_time, time_t *result, int *usec) { if (NILP (specified_time)) { @@ -1611,13 +1595,7 @@ This function behaves like emacs_strftimeu, except it allows null bytes in FORMAT. */ static size_t -emacs_memftimeu (s, maxsize, format, format_len, tp, ut) - char *s; - size_t maxsize; - const char *format; - size_t format_len; - const struct tm *tp; - int ut; +emacs_memftimeu (char *s, size_t maxsize, const char *format, size_t format_len, const struct tm *tp, int ut) { size_t total = 0; @@ -1950,8 +1928,7 @@ /* Yield A - B, measured in seconds. This function is copied from the GNU C Library. */ static int -tm_diff (a, b) - struct tm *a, *b; +tm_diff (struct tm *a, struct tm *b) { /* Compute intervening leap days correctly even if year is negative. Take care to avoid int overflow in leap day calculations, @@ -2098,8 +2075,7 @@ responsibility to free. */ void -set_time_zone_rule (tzstring) - char *tzstring; +set_time_zone_rule (char *tzstring) { int envptrs; char **from, **to, **newenv; @@ -2221,8 +2197,7 @@ } void -insert1 (arg) - Lisp_Object arg; +insert1 (Lisp_Object arg) { Finsert (1, &arg); } @@ -2408,9 +2383,7 @@ buffer substrings. */ Lisp_Object -make_buffer_string (start, end, props) - int start, end; - int props; +make_buffer_string (int start, int end, int props) { int start_byte = CHAR_TO_BYTE (start); int end_byte = CHAR_TO_BYTE (end); @@ -2434,9 +2407,7 @@ buffer substrings. */ Lisp_Object -make_buffer_string_both (start, start_byte, end, end_byte, props) - int start, start_byte, end, end_byte; - int props; +make_buffer_string_both (int start, int start_byte, int end, int end_byte, int props) { Lisp_Object result, tem, tem1; @@ -2470,8 +2441,7 @@ in the current buffer, if necessary. */ static void -update_buffer_properties (start, end) - int start, end; +update_buffer_properties (int start, int end) { /* If this buffer has some access functions, call them, specifying the range of the buffer being accessed. */ @@ -2757,15 +2727,13 @@ } static Lisp_Object -subst_char_in_region_unwind (arg) - Lisp_Object arg; +subst_char_in_region_unwind (Lisp_Object arg) { return current_buffer->undo_list = arg; } static Lisp_Object -subst_char_in_region_unwind_1 (arg) - Lisp_Object arg; +subst_char_in_region_unwind_1 (Lisp_Object arg) { return current_buffer->filename = arg; } @@ -2962,9 +2930,7 @@ element is found, return it. Otherwise return Qnil. */ static Lisp_Object -check_translation (pos, pos_byte, end, val) - int pos, pos_byte, end; - Lisp_Object val; +check_translation (int pos, int pos_byte, int end, Lisp_Object val) { int buf_size = 16, buf_used = 0; int *buf = alloca (sizeof (int) * buf_size); @@ -3263,7 +3229,7 @@ } Lisp_Object -save_restriction_save () +save_restriction_save (void) { if (BEGV == BEG && ZV == Z) /* The common case that the buffer isn't narrowed. @@ -3287,8 +3253,7 @@ } Lisp_Object -save_restriction_restore (data) - Lisp_Object data; +save_restriction_restore (Lisp_Object data) { struct buffer *cur = NULL; struct buffer *buf = (CONSP (data) @@ -4209,9 +4174,7 @@ } Lisp_Object -format2 (string1, arg0, arg1) - char *string1; - Lisp_Object arg0, arg1; +format2 (char *string1, Lisp_Object arg0, Lisp_Object arg1) { Lisp_Object args[3]; args[0] = build_string (string1); @@ -4639,7 +4602,7 @@ void -syms_of_editfns () +syms_of_editfns (void) { environbuf = 0; initial_tz = 0;
--- a/src/fileio.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/fileio.c Sun Jul 04 00:50:25 2010 -0700 @@ -246,9 +246,7 @@ void -report_file_error (string, data) - const char *string; - Lisp_Object data; +report_file_error (const char *string, Lisp_Object data) { Lisp_Object errstring; int errorno = errno; @@ -286,8 +284,7 @@ } Lisp_Object -close_file_unwind (fd) - Lisp_Object fd; +close_file_unwind (Lisp_Object fd) { emacs_close (XFASTINT (fd)); return Qnil; @@ -296,8 +293,7 @@ /* Restore point, having saved it as a marker. */ Lisp_Object -restore_point_unwind (location) - Lisp_Object location; +restore_point_unwind (Lisp_Object location) { Fgoto_char (location); Fset_marker (location, Qnil, Qnil); @@ -539,8 +535,7 @@ char * -file_name_as_directory (out, in) - char *out, *in; +file_name_as_directory (char *out, char *in) { int size = strlen (in) - 1; @@ -604,8 +599,7 @@ */ int -directory_file_name (src, dst) - char *src, *dst; +directory_file_name (char *src, char *dst) { long slen; @@ -688,9 +682,7 @@ generated. */ Lisp_Object -make_temp_name (prefix, base64_p) - Lisp_Object prefix; - int base64_p; +make_temp_name (Lisp_Object prefix, int base64_p) { Lisp_Object val; int len, clen; @@ -1558,8 +1550,7 @@ /* If /~ or // appears, discard everything through first slash. */ static int -file_name_absolute_p (filename) - const unsigned char *filename; +file_name_absolute_p (const unsigned char *filename) { return (IS_DIRECTORY_SEP (*filename) || *filename == '~' @@ -1571,8 +1562,7 @@ } static unsigned char * -search_embedded_absfilename (nm, endp) - unsigned char *nm, *endp; +search_embedded_absfilename (unsigned char *nm, unsigned char *endp) { unsigned char *p, *s; @@ -1823,8 +1813,7 @@ (directory-file-name (expand-file-name FOO)). */ Lisp_Object -expand_and_dir_to_file (filename, defdir) - Lisp_Object filename, defdir; +expand_and_dir_to_file (Lisp_Object filename, Lisp_Object defdir) { register Lisp_Object absname; @@ -1853,12 +1842,7 @@ If QUICK is nonzero, we ask for y or n, not yes or no. */ void -barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick) - Lisp_Object absname; - unsigned char *querystring; - int interactive; - struct stat *statptr; - int quick; +barf_or_query_if_file_exists (Lisp_Object absname, unsigned char *querystring, int interactive, struct stat *statptr, int quick) { register Lisp_Object tem, encoded_filename; struct stat statbuf; @@ -2228,8 +2212,7 @@ } static Lisp_Object -internal_delete_file_1 (ignore) - Lisp_Object ignore; +internal_delete_file_1 (Lisp_Object ignore) { return Qt; } @@ -2495,8 +2478,7 @@ /* Return nonzero if file FILENAME exists and can be executed. */ static int -check_executable (filename) - char *filename; +check_executable (char *filename) { #ifdef DOS_NT int len = strlen (filename); @@ -2520,8 +2502,7 @@ /* Return nonzero if file FILENAME exists and can be written. */ static int -check_writable (filename) - char *filename; +check_writable (char *filename) { #ifdef MSDOS struct stat st; @@ -3235,8 +3216,7 @@ o set back the buffer multibyteness. */ static Lisp_Object -decide_coding_unwind (unwind_data) - Lisp_Object unwind_data; +decide_coding_unwind (Lisp_Object unwind_data) { Lisp_Object multibyte, undo_list, buffer; @@ -3273,7 +3253,7 @@ Value is the number of bytes read. */ static Lisp_Object -read_non_regular () +read_non_regular (void) { EMACS_INT nbytes; @@ -3291,7 +3271,7 @@ in insert-file-contents. */ static Lisp_Object -read_non_regular_quit () +read_non_regular_quit (void) { return Qnil; } @@ -4448,8 +4428,7 @@ static Lisp_Object build_annotations (Lisp_Object, Lisp_Object); static Lisp_Object -build_annotations_unwind (arg) - Lisp_Object arg; +build_annotations_unwind (Lisp_Object arg) { Vwrite_region_annotation_buffers = arg; return Qnil; @@ -4923,8 +4902,7 @@ as save-excursion would do. */ static Lisp_Object -build_annotations (start, end) - Lisp_Object start, end; +build_annotations (Lisp_Object start, Lisp_Object end) { Lisp_Object annotations; Lisp_Object p, res; @@ -5013,13 +4991,7 @@ The return value is negative in case of system call failure. */ static int -a_write (desc, string, pos, nchars, annot, coding) - int desc; - Lisp_Object string; - register int nchars; - int pos; - Lisp_Object *annot; - struct coding_system *coding; +a_write (int desc, Lisp_Object string, int pos, register int nchars, Lisp_Object *annot, struct coding_system *coding) { Lisp_Object tem; int nextpos; @@ -5063,11 +5035,7 @@ are indexes to the string STRING. */ static int -e_write (desc, string, start, end, coding) - int desc; - Lisp_Object string; - int start, end; - struct coding_system *coding; +e_write (int desc, Lisp_Object string, int start, int end, struct coding_system *coding) { if (STRINGP (string)) { @@ -5259,8 +5227,7 @@ } Lisp_Object -auto_save_error (error) - Lisp_Object error; +auto_save_error (Lisp_Object error) { Lisp_Object args[3], msg; int i, nbytes; @@ -5296,7 +5263,7 @@ } Lisp_Object -auto_save_1 () +auto_save_1 (void) { struct stat st; Lisp_Object modes; @@ -5322,8 +5289,8 @@ } static Lisp_Object -do_auto_save_unwind (arg) /* used as unwind-protect function */ - Lisp_Object arg; +do_auto_save_unwind (Lisp_Object arg) /* used as unwind-protect function */ + { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; auto_saving = 0; @@ -5337,16 +5304,15 @@ } static Lisp_Object -do_auto_save_unwind_1 (value) /* used as unwind-protect function */ - Lisp_Object value; +do_auto_save_unwind_1 (Lisp_Object value) /* used as unwind-protect function */ + { minibuffer_auto_raise = XINT (value); return Qnil; } static Lisp_Object -do_auto_save_make_dir (dir) - Lisp_Object dir; +do_auto_save_make_dir (Lisp_Object dir) { Lisp_Object mode; @@ -5356,8 +5322,7 @@ } static Lisp_Object -do_auto_save_eh (ignore) - Lisp_Object ignore; +do_auto_save_eh (Lisp_Object ignore) { return Qnil; } @@ -5627,8 +5592,7 @@ } Lisp_Object -Fread_file_name (prompt, dir, default_filename, mustmatch, initial, predicate) - Lisp_Object prompt, dir, default_filename, mustmatch, initial, predicate; +Fread_file_name (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object initial, Lisp_Object predicate) { struct gcpro gcpro1, gcpro2; Lisp_Object args[7]; @@ -5646,7 +5610,7 @@ void -syms_of_fileio () +syms_of_fileio (void) { Qoperations = intern_c_string ("operations"); Qexpand_file_name = intern_c_string ("expand-file-name");
--- a/src/filelock.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/filelock.c Sun Jul 04 00:50:25 2010 -0700 @@ -126,7 +126,7 @@ #endif static time_t -get_boot_time () +get_boot_time (void) { #if defined (BOOT_TIME) int counter; @@ -253,9 +253,7 @@ Success is indicated by setting BOOT_TIME to a larger value. */ void -get_boot_time_1 (filename, newest) - char *filename; - int newest; +get_boot_time_1 (char *filename, int newest) { struct utmp ut, *utp; int desc; @@ -326,9 +324,7 @@ fill_in_lock_file_name (lock, (file))) static void -fill_in_lock_file_name (lockfile, fn) - register char *lockfile; - register Lisp_Object fn; +fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn) { register char *p; struct stat st; @@ -364,9 +360,7 @@ Return 1 if successful, 0 if not. */ static int -lock_file_1 (lfname, force) - char *lfname; - int force; +lock_file_1 (char *lfname, int force) { register int err; time_t boot_time; @@ -408,8 +402,7 @@ /* Return 1 if times A and B are no more than one second apart. */ int -within_one_second (a, b) - time_t a, b; +within_one_second (time_t a, time_t b) { return (a - b >= -1 && a - b <= 1); } @@ -420,12 +413,10 @@ or -1 if something is wrong with the locking mechanism. */ static int -current_lock_owner (owner, lfname) - lock_info_type *owner; - char *lfname; +current_lock_owner (lock_info_type *owner, char *lfname) { #ifndef index - extern char *rindex (), *index (); + extern char *rindex (const char *, int), *index (const char *, int); #endif int len, ret; int local_owner = 0; @@ -540,9 +531,7 @@ Return -1 if cannot lock for any other reason. */ static int -lock_if_free (clasher, lfname) - lock_info_type *clasher; - register char *lfname; +lock_if_free (lock_info_type *clasher, register char *lfname) { while (lock_file_1 (lfname, 0) == 0) { @@ -585,8 +574,7 @@ take away the lock, or return nil meaning ignore the lock. */ void -lock_file (fn) - Lisp_Object fn; +lock_file (Lisp_Object fn) { register Lisp_Object attack, orig_fn, encoded_fn; register char *lfname, *locker; @@ -645,8 +633,7 @@ } void -unlock_file (fn) - register Lisp_Object fn; +unlock_file (register Lisp_Object fn) { register char *lfname; @@ -660,7 +647,7 @@ } void -unlock_all_files () +unlock_all_files (void) { register Lisp_Object tail; register struct buffer *b; @@ -709,8 +696,7 @@ /* Unlock the file visited in buffer BUFFER. */ void -unlock_buffer (buffer) - struct buffer *buffer; +unlock_buffer (struct buffer *buffer) { if (BUF_SAVE_MODIFF (buffer) < BUF_MODIFF (buffer) && STRINGP (buffer->file_truename)) @@ -750,14 +736,14 @@ /* Initialization functions. */ void -init_filelock () +init_filelock (void) { boot_time = 0; boot_time_initialized = 0; } void -syms_of_filelock () +syms_of_filelock (void) { DEFVAR_LISP ("temporary-file-directory", &Vtemporary_file_directory, doc: /* The directory for writing temporary files. */);
--- a/src/filemode.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/filemode.c Sun Jul 04 00:50:25 2010 -0700 @@ -90,10 +90,10 @@ #define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif -void mode_string (); -static char ftypelet (); -static void rwx (); -static void setst (); +void mode_string (short unsigned int mode, char *str); +static char ftypelet (long int bits); +static void rwx (short unsigned int bits, char *chars); +static void setst (short unsigned int bits, char *chars); /* filemodestring - fill in string STR with an ls-style ASCII representation of the st_mode field of file stats block STATP. @@ -132,9 +132,7 @@ 'T' if the file is sticky but not executable. */ void -filemodestring (statp, str) - struct stat *statp; - char *str; +filemodestring (struct stat *statp, char *str) { mode_string (statp->st_mode, str); } @@ -143,9 +141,7 @@ is given as an argument. */ void -mode_string (mode, str) - unsigned short mode; - char *str; +mode_string (short unsigned int mode, char *str) { str[0] = ftypelet ((long) mode); rwx ((mode & 0700) << 0, &str[1]); @@ -167,8 +163,7 @@ '?' for any other file type. */ static char -ftypelet (bits) - long bits; +ftypelet (long int bits) { #ifdef S_ISBLK if (S_ISBLK (bits)) @@ -207,9 +202,7 @@ flags in CHARS accordingly. */ static void -rwx (bits, chars) - unsigned short bits; - char *chars; +rwx (short unsigned int bits, char *chars) { chars[0] = (bits & S_IRUSR) ? 'r' : '-'; chars[1] = (bits & S_IWUSR) ? 'w' : '-'; @@ -220,9 +213,7 @@ according to the file mode BITS. */ static void -setst (bits, chars) - unsigned short bits; - char *chars; +setst (short unsigned int bits, char *chars) { #ifdef S_ISUID if (bits & S_ISUID)
--- a/src/fns.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/fns.c Sun Jul 04 00:50:25 2010 -0700 @@ -76,7 +76,7 @@ static int internal_equal (Lisp_Object , Lisp_Object, int, int); -extern long get_random (); +extern long get_random (void); extern void seed_random (long); #ifndef HAVE_UNISTD_H @@ -390,8 +390,7 @@ /* ARGSUSED */ Lisp_Object -concat2 (s1, s2) - Lisp_Object s1, s2; +concat2 (Lisp_Object s1, Lisp_Object s2) { Lisp_Object args[2]; args[0] = s1; @@ -401,8 +400,7 @@ /* ARGSUSED */ Lisp_Object -concat3 (s1, s2, s3) - Lisp_Object s1, s2, s3; +concat3 (Lisp_Object s1, Lisp_Object s2, Lisp_Object s3) { Lisp_Object args[3]; args[0] = s1; @@ -492,11 +490,7 @@ }; static Lisp_Object -concat (nargs, args, target_type, last_special) - int nargs; - Lisp_Object *args; - enum Lisp_Type target_type; - int last_special; +concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special) { Lisp_Object val; register Lisp_Object tail; @@ -777,7 +771,7 @@ static EMACS_INT string_char_byte_cache_bytepos; void -clear_string_char_byte_cache () +clear_string_char_byte_cache (void) { string_char_byte_cache_string = Qnil; } @@ -785,9 +779,7 @@ /* Return the byte index corresponding to CHAR_INDEX in STRING. */ EMACS_INT -string_char_to_byte (string, char_index) - Lisp_Object string; - EMACS_INT char_index; +string_char_to_byte (Lisp_Object string, EMACS_INT char_index) { EMACS_INT i_byte; EMACS_INT best_below, best_below_byte; @@ -847,9 +839,7 @@ /* Return the character index corresponding to BYTE_INDEX in STRING. */ EMACS_INT -string_byte_to_char (string, byte_index) - Lisp_Object string; - EMACS_INT byte_index; +string_byte_to_char (Lisp_Object string, EMACS_INT byte_index) { EMACS_INT i, i_byte; EMACS_INT best_below, best_below_byte; @@ -913,8 +903,7 @@ /* Convert STRING to a multibyte string. */ Lisp_Object -string_make_multibyte (string) - Lisp_Object string; +string_make_multibyte (Lisp_Object string) { unsigned char *buf; EMACS_INT nbytes; @@ -947,8 +936,7 @@ converted to eight-bit characters. */ Lisp_Object -string_to_multibyte (string) - Lisp_Object string; +string_to_multibyte (Lisp_Object string) { unsigned char *buf; EMACS_INT nbytes; @@ -978,8 +966,7 @@ /* Convert STRING to a single-byte string. */ Lisp_Object -string_make_unibyte (string) - Lisp_Object string; +string_make_unibyte (Lisp_Object string) { int nchars; unsigned char *buf; @@ -1311,9 +1298,7 @@ both in characters and in bytes. */ Lisp_Object -substring_both (string, from, from_byte, to, to_byte) - Lisp_Object string; - int from, from_byte, to, to_byte; +substring_both (Lisp_Object string, int from, int from_byte, int to, int to_byte) { Lisp_Object res; int size; @@ -1495,8 +1480,7 @@ Use only on lists known never to be circular. */ Lisp_Object -assq_no_quit (key, list) - Lisp_Object key, list; +assq_no_quit (Lisp_Object key, Lisp_Object list) { while (CONSP (list) && (!CONSP (XCAR (list)) @@ -1547,8 +1531,7 @@ Use only on lists known never to be circular. */ Lisp_Object -assoc_no_quit (key, list) - Lisp_Object key, list; +assoc_no_quit (Lisp_Object key, Lisp_Object list) { while (CONSP (list) && (!CONSP (XCAR (list)) @@ -1824,7 +1807,7 @@ return new; } -Lisp_Object merge (); +Lisp_Object merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred); DEFUN ("sort", Fsort, Ssort, 2, 2, 0, doc: /* Sort LIST, stably, comparing elements using PREDICATE. @@ -1858,9 +1841,7 @@ } Lisp_Object -merge (org_l1, org_l2, pred) - Lisp_Object org_l1, org_l2; - Lisp_Object pred; +merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred) { Lisp_Object value; register Lisp_Object tail; @@ -2117,9 +2098,7 @@ PROPS, if non-nil, means compare string text properties too. */ static int -internal_equal (o1, o2, depth, props) - register Lisp_Object o1, o2; - int depth, props; +internal_equal (register Lisp_Object o1, register Lisp_Object o2, int depth, int props) { if (depth > 200) error ("Stack overflow in equal"); @@ -2240,7 +2219,6 @@ return 0; } -extern Lisp_Object Fmake_char_internal (); DEFUN ("fillarray", Ffillarray, Sfillarray, 2, 2, 0, doc: /* Store each element of ARRAY with ITEM. @@ -2334,8 +2312,7 @@ /* ARGSUSED */ Lisp_Object -nconc2 (s1, s2) - Lisp_Object s1, s2; +nconc2 (Lisp_Object s1, Lisp_Object s2) { Lisp_Object args[2]; args[0] = s1; @@ -2390,10 +2367,7 @@ LENI is the length of VALS, which should also be the length of SEQ. */ static void -mapcar1 (leni, vals, fn, seq) - int leni; - Lisp_Object *vals; - Lisp_Object fn, seq; +mapcar1 (int leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq) { register Lisp_Object tail; Lisp_Object dummy; @@ -2702,8 +2676,7 @@ Anything that calls this function must protect from GC! */ Lisp_Object -do_yes_or_no_p (prompt) - Lisp_Object prompt; +do_yes_or_no_p (Lisp_Object prompt) { return call1 (intern ("yes-or-no-p"), prompt); } @@ -2870,8 +2843,7 @@ Lisp_Object require_nesting_list; Lisp_Object -require_unwind (old_value) - Lisp_Object old_value; +require_unwind (Lisp_Object old_value) { return require_nesting_list = old_value; } @@ -3333,12 +3305,7 @@ } static int -base64_encode_1 (from, to, length, line_break, multibyte) - const char *from; - char *to; - int length; - int line_break; - int multibyte; +base64_encode_1 (const char *from, char *to, int length, int line_break, int multibyte) { int counter = 0, i = 0; char *e = to; @@ -3535,12 +3502,7 @@ characters in *NCHARS_RETURN. */ static int -base64_decode_1 (from, to, length, multibyte, nchars_return) - const char *from; - char *to; - int length; - int multibyte; - int *nchars_return; +base64_decode_1 (const char *from, char *to, int length, int multibyte, int *nchars_return) { int i = 0; char *e = to; @@ -3682,8 +3644,7 @@ Lisp_Hash_Table. Otherwise, signal an error. */ static struct Lisp_Hash_Table * -check_hash_table (obj) - Lisp_Object obj; +check_hash_table (Lisp_Object obj) { CHECK_HASH_TABLE (obj); return XHASH_TABLE (obj); @@ -3694,8 +3655,7 @@ number. */ int -next_almost_prime (n) - int n; +next_almost_prime (int n) { if (n % 2 == 0) n += 1; @@ -3714,11 +3674,7 @@ a DEFUN parameter list. */ static int -get_key_arg (key, nargs, args, used) - Lisp_Object key; - int nargs; - Lisp_Object *args; - char *used; +get_key_arg (Lisp_Object key, int nargs, Lisp_Object *args, char *used) { int i; @@ -3743,10 +3699,7 @@ vector that are not copied from VEC are set to INIT. */ Lisp_Object -larger_vector (vec, new_size, init) - Lisp_Object vec; - int new_size; - Lisp_Object init; +larger_vector (Lisp_Object vec, int new_size, Lisp_Object init) { struct Lisp_Vector *v; int i, old_size; @@ -3774,10 +3727,7 @@ KEY2 are the same. */ static int -cmpfn_eql (h, key1, hash1, key2, hash2) - struct Lisp_Hash_Table *h; - Lisp_Object key1, key2; - unsigned hash1, hash2; +cmpfn_eql (struct Lisp_Hash_Table *h, Lisp_Object key1, unsigned int hash1, Lisp_Object key2, unsigned int hash2) { return (FLOATP (key1) && FLOATP (key2) @@ -3790,10 +3740,7 @@ KEY2 are the same. */ static int -cmpfn_equal (h, key1, hash1, key2, hash2) - struct Lisp_Hash_Table *h; - Lisp_Object key1, key2; - unsigned hash1, hash2; +cmpfn_equal (struct Lisp_Hash_Table *h, Lisp_Object key1, unsigned int hash1, Lisp_Object key2, unsigned int hash2) { return hash1 == hash2 && !NILP (Fequal (key1, key2)); } @@ -3804,10 +3751,7 @@ if KEY1 and KEY2 are the same. */ static int -cmpfn_user_defined (h, key1, hash1, key2, hash2) - struct Lisp_Hash_Table *h; - Lisp_Object key1, key2; - unsigned hash1, hash2; +cmpfn_user_defined (struct Lisp_Hash_Table *h, Lisp_Object key1, unsigned int hash1, Lisp_Object key2, unsigned int hash2) { if (hash1 == hash2) { @@ -3828,9 +3772,7 @@ in a Lisp integer. */ static unsigned -hashfn_eq (h, key) - struct Lisp_Hash_Table *h; - Lisp_Object key; +hashfn_eq (struct Lisp_Hash_Table *h, Lisp_Object key) { unsigned hash = XUINT (key) ^ XTYPE (key); xassert ((hash & ~INTMASK) == 0); @@ -3843,9 +3785,7 @@ in a Lisp integer. */ static unsigned -hashfn_eql (h, key) - struct Lisp_Hash_Table *h; - Lisp_Object key; +hashfn_eql (struct Lisp_Hash_Table *h, Lisp_Object key) { unsigned hash; if (FLOATP (key)) @@ -3862,9 +3802,7 @@ in a Lisp integer. */ static unsigned -hashfn_equal (h, key) - struct Lisp_Hash_Table *h; - Lisp_Object key; +hashfn_equal (struct Lisp_Hash_Table *h, Lisp_Object key) { unsigned hash = sxhash (key, 0); xassert ((hash & ~INTMASK) == 0); @@ -3877,9 +3815,7 @@ guaranteed to fit in a Lisp integer. */ static unsigned -hashfn_user_defined (h, key) - struct Lisp_Hash_Table *h; - Lisp_Object key; +hashfn_user_defined (struct Lisp_Hash_Table *h, Lisp_Object key) { Lisp_Object args[2], hash; @@ -4003,8 +3939,7 @@ only the table itself is. */ Lisp_Object -copy_hash_table (h1) - struct Lisp_Hash_Table *h1; +copy_hash_table (struct Lisp_Hash_Table *h1) { Lisp_Object table; struct Lisp_Hash_Table *h2; @@ -4035,8 +3970,7 @@ because it's already too large, throw an error. */ static INLINE void -maybe_resize_hash_table (h) - struct Lisp_Hash_Table *h; +maybe_resize_hash_table (struct Lisp_Hash_Table *h) { if (NILP (h->next_free)) { @@ -4101,10 +4035,7 @@ matching KEY, or -1 if not found. */ int -hash_lookup (h, key, hash) - struct Lisp_Hash_Table *h; - Lisp_Object key; - unsigned *hash; +hash_lookup (struct Lisp_Hash_Table *h, Lisp_Object key, unsigned int *hash) { unsigned hash_code; int start_of_bucket; @@ -4138,10 +4069,7 @@ Value is the index of the entry in H matching KEY. */ int -hash_put (h, key, value, hash) - struct Lisp_Hash_Table *h; - Lisp_Object key, value; - unsigned hash; +hash_put (struct Lisp_Hash_Table *h, Lisp_Object key, Lisp_Object value, unsigned int hash) { int start_of_bucket, i; @@ -4171,9 +4099,7 @@ /* Remove the entry matching KEY from hash table H, if there is one. */ static void -hash_remove_from_table (h, key) - struct Lisp_Hash_Table *h; - Lisp_Object key; +hash_remove_from_table (struct Lisp_Hash_Table *h, Lisp_Object key) { unsigned hash_code; int start_of_bucket; @@ -4221,8 +4147,7 @@ /* Clear hash table H. */ void -hash_clear (h) - struct Lisp_Hash_Table *h; +hash_clear (struct Lisp_Hash_Table *h) { if (h->count > 0) { @@ -4251,7 +4176,7 @@ ************************************************************************/ void -init_weak_hash_tables () +init_weak_hash_tables (void) { weak_hash_tables = NULL; } @@ -4262,9 +4187,7 @@ non-zero if anything was marked. */ static int -sweep_weak_table (h, remove_entries_p) - struct Lisp_Hash_Table *h; - int remove_entries_p; +sweep_weak_table (struct Lisp_Hash_Table *h, int remove_entries_p) { int bucket, n, marked; @@ -4352,7 +4275,7 @@ from Vweak_hash_tables. Called from gc_sweep. */ void -sweep_weak_hash_tables () +sweep_weak_hash_tables (void) { struct Lisp_Hash_Table *h, *used, *next; int marked; @@ -4420,9 +4343,7 @@ code returned is guaranteed to fit in a Lisp integer. */ static unsigned -sxhash_string (ptr, len) - unsigned char *ptr; - int len; +sxhash_string (unsigned char *ptr, int len) { unsigned char *p = ptr; unsigned char *end = p + len; @@ -4445,9 +4366,7 @@ list. We don't recurse deeper than SXHASH_MAX_DEPTH in it. */ static unsigned -sxhash_list (list, depth) - Lisp_Object list; - int depth; +sxhash_list (Lisp_Object list, int depth) { unsigned hash = 0; int i; @@ -4475,9 +4394,7 @@ the Lisp structure. */ static unsigned -sxhash_vector (vec, depth) - Lisp_Object vec; - int depth; +sxhash_vector (Lisp_Object vec, int depth) { unsigned hash = ASIZE (vec); int i, n; @@ -4496,8 +4413,7 @@ /* Return a hash for bool-vector VECTOR. */ static unsigned -sxhash_bool_vector (vec) - Lisp_Object vec; +sxhash_bool_vector (Lisp_Object vec) { unsigned hash = XBOOL_VECTOR (vec)->size; int i, n; @@ -4514,9 +4430,7 @@ structure. Value is an unsigned integer clipped to INTMASK. */ unsigned -sxhash (obj, depth) - Lisp_Object obj; - int depth; +sxhash (Lisp_Object obj, int depth) { unsigned hash; @@ -5110,7 +5024,7 @@ void -syms_of_fns () +syms_of_fns (void) { /* Hash table stuff. */ Qhash_table_p = intern_c_string ("hash-table-p"); @@ -5286,7 +5200,7 @@ void -init_fns () +init_fns (void) { }
--- a/src/font.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/font.c Sun Jul 04 00:50:25 2010 -0700 @@ -175,7 +175,7 @@ /* Creaters of font-related Lisp object. */ Lisp_Object -font_make_spec () +font_make_spec (void) { Lisp_Object font_spec; struct font_spec *spec @@ -187,7 +187,7 @@ } Lisp_Object -font_make_entity () +font_make_entity (void) { Lisp_Object font_entity; struct font_entity *entity @@ -202,10 +202,7 @@ not nil, copy properties from ENTITY to the font-object. If PIXELSIZE is positive, set the `size' property to PIXELSIZE. */ Lisp_Object -font_make_object (size, entity, pixelsize) - int size; - Lisp_Object entity; - int pixelsize; +font_make_object (int size, Lisp_Object entity, int pixelsize) { Lisp_Object font_object; struct font *font @@ -245,10 +242,7 @@ STR. */ Lisp_Object -font_intern_prop (str, len, force_symbol) - char *str; - int len; - int force_symbol; +font_intern_prop (char *str, int len, int force_symbol) { int i; Lisp_Object tem; @@ -290,9 +284,7 @@ /* Return a pixel size of font-spec SPEC on frame F. */ static int -font_pixel_size (f, spec) - FRAME_PTR f; - Lisp_Object spec; +font_pixel_size (FRAME_PTR f, Lisp_Object spec) { #ifdef HAVE_WINDOW_SYSTEM Lisp_Object size = AREF (spec, FONT_SIZE_INDEX); @@ -327,10 +319,7 @@ VAL is an integer. */ int -font_style_to_value (prop, val, noerror) - enum font_property_index prop; - Lisp_Object val; - int noerror; +font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror) { Lisp_Object table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX); int len = ASIZE (table); @@ -395,10 +384,7 @@ } Lisp_Object -font_style_symbolic (font, prop, for_face) - Lisp_Object font; - enum font_property_index prop; - int for_face; +font_style_symbolic (Lisp_Object font, enum font_property_index prop, int for_face) { Lisp_Object val = AREF (font, prop); Lisp_Object table, elt; @@ -424,8 +410,7 @@ of the font. REPERTORY is a charset symbol or nil. */ Lisp_Object -find_font_encoding (fontname) - Lisp_Object fontname; +find_font_encoding (Lisp_Object fontname) { Lisp_Object tail, elt; @@ -448,9 +433,7 @@ REGISTRY is available, return 0. Otherwise return -1. */ int -font_registry_charsets (registry, encoding, repertory) - Lisp_Object registry; - struct charset **encoding, **repertory; +font_registry_charsets (Lisp_Object registry, struct charset **encoding, struct charset **repertory) { Lisp_Object val; int encoding_id, repertory_id; @@ -516,8 +499,7 @@ static int get_font_prop_index (Lisp_Object); static Lisp_Object -font_prop_validate_symbol (prop, val) - Lisp_Object prop, val; +font_prop_validate_symbol (Lisp_Object prop, Lisp_Object val) { if (STRINGP (val)) val = Fintern (val, Qnil); @@ -530,8 +512,7 @@ static Lisp_Object -font_prop_validate_style (style, val) - Lisp_Object style, val; +font_prop_validate_style (Lisp_Object style, Lisp_Object val) { enum font_property_index prop = (EQ (style, QCweight) ? FONT_WEIGHT_INDEX : EQ (style, QCslant) ? FONT_SLANT_INDEX @@ -565,16 +546,14 @@ } static Lisp_Object -font_prop_validate_non_neg (prop, val) - Lisp_Object prop, val; +font_prop_validate_non_neg (Lisp_Object prop, Lisp_Object val) { return (NATNUMP (val) || (FLOATP (val) && XFLOAT_DATA (val) >= 0) ? val : Qerror); } static Lisp_Object -font_prop_validate_spacing (prop, val) - Lisp_Object prop, val; +font_prop_validate_spacing (Lisp_Object prop, Lisp_Object val) { if (NILP (val) || (NATNUMP (val) && XINT (val) <= FONT_SPACING_CHARCELL)) return val; @@ -595,8 +574,7 @@ } static Lisp_Object -font_prop_validate_otf (prop, val) - Lisp_Object prop, val; +font_prop_validate_otf (Lisp_Object prop, Lisp_Object val) { Lisp_Object tail, tmp; int i; @@ -667,8 +645,7 @@ already known property. */ static int -get_font_prop_index (key) - Lisp_Object key; +get_font_prop_index (Lisp_Object key) { int i; @@ -683,9 +660,7 @@ signal an error. The value is VAL or the regularized one. */ static Lisp_Object -font_prop_validate (idx, prop, val) - int idx; - Lisp_Object prop, val; +font_prop_validate (int idx, Lisp_Object prop, Lisp_Object val) { Lisp_Object validated; @@ -710,8 +685,7 @@ keeping the sorting order. Don't check the validity of VAL. */ Lisp_Object -font_put_extra (font, prop, val) - Lisp_Object font, prop, val; +font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val) { Lisp_Object extra = AREF (font, FONT_EXTRA_INDEX); Lisp_Object slot = (NILP (extra) ? Qnil : assq_no_quit (prop, extra)); @@ -799,8 +773,7 @@ -1. */ static int -parse_matrix (p) - char *p; +parse_matrix (char *p) { double matrix[4]; char *end; @@ -822,9 +795,7 @@ field position by its contents. */ static int -font_expand_wildcards (field, n) - Lisp_Object field[XLFD_LAST_INDEX]; - int n; +font_expand_wildcards (Lisp_Object *field, int n) { /* Copy of FIELD. */ Lisp_Object tmp[XLFD_LAST_INDEX]; @@ -1058,9 +1029,7 @@ a fully specified XLFD. */ int -font_parse_xlfd (name, font) - char *name; - Lisp_Object font; +font_parse_xlfd (char *name, Lisp_Object font) { int len = strlen (name); int i, j, n; @@ -1242,11 +1211,7 @@ 0, use PIXEL_SIZE instead. */ int -font_unparse_xlfd (font, pixel_size, name, nbytes) - Lisp_Object font; - int pixel_size; - char *name; - int nbytes; +font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes) { char *f[XLFD_REGISTRY_INDEX + 1]; Lisp_Object val; @@ -1389,9 +1354,7 @@ This function tries to guess which format it is. */ int -font_parse_fcname (name, font) - char *name; - Lisp_Object font; +font_parse_fcname (char *name, Lisp_Object font) { char *p, *q; char *size_beg = NULL, *size_end = NULL; @@ -1648,11 +1611,7 @@ FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ int -font_unparse_fcname (font, pixel_size, name, nbytes) - Lisp_Object font; - int pixel_size; - char *name; - int nbytes; +font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes) { Lisp_Object family, foundry; Lisp_Object tail, val; @@ -1771,11 +1730,7 @@ size. */ int -font_unparse_gtkname (font, f, name, nbytes) - Lisp_Object font; - struct frame *f; - char *name; - int nbytes; +font_unparse_gtkname (Lisp_Object font, struct frame *f, char *name, int nbytes) { char *p; int len = 1; @@ -1858,9 +1813,7 @@ 0. Otherwise return -1. */ static int -font_parse_name (name, font) - char *name; - Lisp_Object font; +font_parse_name (char *name, Lisp_Object font) { if (name[0] == '-' || index (name, '*') || index (name, '?')) return font_parse_xlfd (name, font); @@ -1873,8 +1826,7 @@ part. */ void -font_parse_family_registry (family, registry, font_spec) - Lisp_Object family, registry, font_spec; +font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Object font_spec) { int len; char *p0, *p1; @@ -2229,8 +2181,7 @@ extern Lisp_Object Vface_font_rescale_alist; static double -font_rescale_ratio (font_entity) - Lisp_Object font_entity; +font_rescale_ratio (Lisp_Object font_entity) { Lisp_Object tail, elt; Lisp_Object name = Qnil; @@ -2277,8 +2228,7 @@ SPEC_PROP. */ static unsigned -font_score (entity, spec_prop) - Lisp_Object entity, *spec_prop; +font_score (Lisp_Object entity, Lisp_Object *spec_prop) { unsigned score = 0; int i; @@ -2352,8 +2302,7 @@ /* The comparison function for qsort. */ static int -font_compare (d1, d2) - const void *d1, *d2; +font_compare (const void *d1, const void *d2) { const struct font_sort_data *data1 = d1; const struct font_sort_data *data2 = d2; @@ -2381,9 +2330,7 @@ such a case. */ static Lisp_Object -font_sort_entities (list, prefer, frame, best_only) - Lisp_Object list, prefer, frame; - int best_only; +font_sort_entities (Lisp_Object list, Lisp_Object prefer, Lisp_Object frame, int best_only) { Lisp_Object prefer_prop[FONT_SPEC_MAX]; int len, maxlen, i; @@ -2488,8 +2435,7 @@ function with font_sort_order after setting up it. */ void -font_update_sort_order (order) - int *order; +font_update_sort_order (int *order) { int i, shift_bits; @@ -2509,8 +2455,7 @@ } static int -font_check_otf_features (script, langsys, features, table) - Lisp_Object script, langsys, features, table; +font_check_otf_features (Lisp_Object script, Lisp_Object langsys, Lisp_Object features, Lisp_Object table) { Lisp_Object val; int negative; @@ -2584,8 +2529,7 @@ specification SPEC. */ int -font_match_p (spec, font) - Lisp_Object spec, font; +font_match_p (Lisp_Object spec, Lisp_Object font) { Lisp_Object prop[FONT_SPEC_MAX], *props; Lisp_Object extra, font_extra; @@ -2708,9 +2652,7 @@ struct font_driver *); static void -font_prepare_cache (f, driver) - FRAME_PTR f; - struct font_driver *driver; +font_prepare_cache (FRAME_PTR f, struct font_driver *driver) { Lisp_Object cache, val; @@ -2732,9 +2674,7 @@ static void -font_finish_cache (f, driver) - FRAME_PTR f; - struct font_driver *driver; +font_finish_cache (FRAME_PTR f, struct font_driver *driver) { Lisp_Object cache, val, tmp; @@ -2755,9 +2695,7 @@ static Lisp_Object -font_get_cache (f, driver) - FRAME_PTR f; - struct font_driver *driver; +font_get_cache (FRAME_PTR f, struct font_driver *driver) { Lisp_Object val = driver->get_cache (f); Lisp_Object type = driver->type; @@ -2773,10 +2711,7 @@ static int num_fonts; static void -font_clear_cache (f, cache, driver) - FRAME_PTR f; - Lisp_Object cache; - struct font_driver *driver; +font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver) { Lisp_Object tail, elt; Lisp_Object tail2, entity; @@ -2830,9 +2765,7 @@ extern Lisp_Object Vface_ignored_fonts; Lisp_Object -font_delete_unmatched (vec, spec, size) - Lisp_Object vec, spec; - int size; +font_delete_unmatched (Lisp_Object vec, Lisp_Object spec, int size) { Lisp_Object entity, val; enum font_property_index prop; @@ -2905,8 +2838,7 @@ same font-driver. */ Lisp_Object -font_list_entities (frame, spec) - Lisp_Object frame, spec; +font_list_entities (Lisp_Object frame, Lisp_Object spec) { FRAME_PTR f = XFRAME (frame); struct font_driver_list *driver_list = f->font_driver_list; @@ -2982,9 +2914,7 @@ font-related attributes. */ static Lisp_Object -font_matching_entity (f, attrs, spec) - FRAME_PTR f; - Lisp_Object *attrs, spec; +font_matching_entity (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec) { struct font_driver_list *driver_list = f->font_driver_list; Lisp_Object ftype, size, entity; @@ -3032,10 +2962,7 @@ opened font object. */ static Lisp_Object -font_open_entity (f, entity, pixel_size) - FRAME_PTR f; - Lisp_Object entity; - int pixel_size; +font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size) { struct font_driver_list *driver_list; Lisp_Object objlist, size, val, font_object; @@ -3111,9 +3038,7 @@ /* Close FONT_OBJECT that is opened on frame F. */ void -font_close_object (f, font_object) - FRAME_PTR f; - Lisp_Object font_object; +font_close_object (FRAME_PTR f, Lisp_Object font_object) { struct font *font = XFONT_OBJECT (font_object); @@ -3134,10 +3059,7 @@ FONT is a font-entity and it must be opened to check. */ int -font_has_char (f, font, c) - FRAME_PTR f; - Lisp_Object font; - int c; +font_has_char (FRAME_PTR f, Lisp_Object font, int c) { struct font *fontp; @@ -3172,9 +3094,7 @@ /* Return the glyph ID of FONT_OBJECT for character C. */ unsigned -font_encode_char (font_object, c) - Lisp_Object font_object; - int c; +font_encode_char (Lisp_Object font_object, int c) { struct font *font; @@ -3187,8 +3107,7 @@ /* Return the name of FONT_OBJECT. */ Lisp_Object -font_get_name (font_object) - Lisp_Object font_object; +font_get_name (Lisp_Object font_object) { font_assert (FONT_OBJECT_P (font_object)); return AREF (font_object, FONT_NAME_INDEX); @@ -3198,8 +3117,7 @@ /* Return the specification of FONT_OBJECT. */ Lisp_Object -font_get_spec (font_object) - Lisp_Object font_object; +font_get_spec (Lisp_Object font_object) { Lisp_Object spec = font_make_spec (); int i; @@ -3216,8 +3134,7 @@ could not be parsed by font_parse_name, return Qnil. */ Lisp_Object -font_spec_from_name (font_name) - Lisp_Object font_name; +font_spec_from_name (Lisp_Object font_name) { Lisp_Object spec = Ffont_spec (0, NULL); @@ -3231,9 +3148,7 @@ void -font_clear_prop (attrs, prop) - Lisp_Object *attrs; - enum font_property_index prop; +font_clear_prop (Lisp_Object *attrs, enum font_property_index prop) { Lisp_Object font = attrs[LFACE_FONT_INDEX]; @@ -3284,9 +3199,7 @@ } void -font_update_lface (f, attrs) - FRAME_PTR f; - Lisp_Object *attrs; +font_update_lface (FRAME_PTR f, Lisp_Object *attrs) { Lisp_Object spec; @@ -3333,9 +3246,7 @@ supports C and matches best with ATTRS and PIXEL_SIZE. */ static Lisp_Object -font_select_entity (frame, entities, attrs, pixel_size, c) - Lisp_Object frame, entities, *attrs; - int pixel_size, c; +font_select_entity (Lisp_Object frame, Lisp_Object entities, Lisp_Object *attrs, int pixel_size, int c) { Lisp_Object font_entity; Lisp_Object prefer; @@ -3380,11 +3291,7 @@ character that the entity must support. */ Lisp_Object -font_find_for_lface (f, attrs, spec, c) - FRAME_PTR f; - Lisp_Object *attrs; - Lisp_Object spec; - int c; +font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c) { Lisp_Object work; Lisp_Object frame, entities, val; @@ -3534,11 +3441,7 @@ Lisp_Object -font_open_for_lface (f, entity, attrs, spec) - FRAME_PTR f; - Lisp_Object entity; - Lisp_Object *attrs; - Lisp_Object spec; +font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_Object spec) { int size; @@ -3581,9 +3484,7 @@ font-object. */ Lisp_Object -font_load_for_lface (f, attrs, spec) - FRAME_PTR f; - Lisp_Object *attrs, spec; +font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec) { Lisp_Object entity, name; @@ -3613,9 +3514,7 @@ /* Make FACE on frame F ready to use the font opened for FACE. */ void -font_prepare_for_face (f, face) - FRAME_PTR f; - struct face *face; +font_prepare_for_face (FRAME_PTR f, struct face *face) { if (face->font->driver->prepare_face) face->font->driver->prepare_face (f, face); @@ -3625,9 +3524,7 @@ /* Make FACE on frame F stop using the font opened for FACE. */ void -font_done_for_face (f, face) - FRAME_PTR f; - struct face *face; +font_done_for_face (FRAME_PTR f, struct face *face) { if (face->font->driver->done_face) face->font->driver->done_face (f, face); @@ -3639,9 +3536,7 @@ font is found, return Qnil. */ Lisp_Object -font_open_by_spec (f, spec) - FRAME_PTR f; - Lisp_Object spec; +font_open_by_spec (FRAME_PTR f, Lisp_Object spec) { Lisp_Object attrs[LFACE_VECTOR_SIZE]; @@ -3665,9 +3560,7 @@ found, return Qnil. */ Lisp_Object -font_open_by_name (f, name) - FRAME_PTR f; - char *name; +font_open_by_name (FRAME_PTR f, char *name) { Lisp_Object args[2]; Lisp_Object spec, ret; @@ -3697,9 +3590,7 @@ (e.g. syms_of_xfont). */ void -register_font_driver (driver, f) - struct font_driver *driver; - FRAME_PTR f; +register_font_driver (struct font_driver *driver, FRAME_PTR f) { struct font_driver_list *root = f ? f->font_driver_list : font_driver_list; struct font_driver_list *prev, *list; @@ -3727,8 +3618,7 @@ } void -free_font_driver_list (f) - FRAME_PTR f; +free_font_driver_list (FRAME_PTR f) { struct font_driver_list *list, *next; @@ -3750,9 +3640,7 @@ F. */ Lisp_Object -font_update_drivers (f, new_drivers) - FRAME_PTR f; - Lisp_Object new_drivers; +font_update_drivers (FRAME_PTR f, Lisp_Object new_drivers) { Lisp_Object active_drivers = Qnil; struct font_driver *driver; @@ -3843,10 +3731,7 @@ } int -font_put_frame_data (f, driver, data) - FRAME_PTR f; - struct font_driver *driver; - void *data; +font_put_frame_data (FRAME_PTR f, struct font_driver *driver, void *data) { struct font_data_list *list, *prev; @@ -3880,9 +3765,7 @@ void * -font_get_frame_data (f, driver) - FRAME_PTR f; - struct font_driver *driver; +font_get_frame_data (FRAME_PTR f, struct font_driver *driver) { struct font_data_list *list; @@ -3901,12 +3784,7 @@ STRING. */ Lisp_Object -font_at (c, pos, face, w, string) - int c; - EMACS_INT pos; - struct face *face; - struct window *w; - Lisp_Object string; +font_at (int c, EMACS_INT pos, struct face *face, struct window *w, Lisp_Object string) { FRAME_PTR f; int multibyte; @@ -3988,11 +3866,7 @@ It is assured that the current buffer (or STRING) is multibyte. */ Lisp_Object -font_range (pos, limit, w, face, string) - EMACS_INT pos, *limit; - struct window *w; - struct face *face; - Lisp_Object string; +font_range (EMACS_INT pos, EMACS_INT *limit, struct window *w, struct face *face, Lisp_Object string) { EMACS_INT pos_byte, ignore; int c; @@ -4535,8 +4409,7 @@ void -font_fill_lglyph_metrics (glyph, font_object) - Lisp_Object glyph, font_object; +font_fill_lglyph_metrics (Lisp_Object glyph, Lisp_Object font_object) { struct font *font = XFONT_OBJECT (font_object); unsigned code; @@ -5118,9 +4991,7 @@ build_style_table ((TBL), sizeof TBL / sizeof (struct table_entry)) static Lisp_Object -build_style_table (entry, nelement) - struct table_entry *entry; - int nelement; +build_style_table (const struct table_entry *entry, int nelement) { int i, j; Lisp_Object table, elt; @@ -5150,9 +5021,7 @@ opening), ARG is the argument for the action, and RESULT is the result of the action. */ void -font_add_log (action, arg, result) - char *action; - Lisp_Object arg, result; +font_add_log (char *action, Lisp_Object arg, Lisp_Object result) { Lisp_Object tail, val; int i; @@ -5238,9 +5107,7 @@ as font_add_log. */ void -font_deferred_log (action, arg, result) - char *action; - Lisp_Object arg, result; +font_deferred_log (char *action, Lisp_Object arg, Lisp_Object result) { if (EQ (Vfont_log, Qt)) return; @@ -5249,17 +5116,17 @@ ASET (Vfont_log_deferred, 2, result); } -extern void syms_of_ftfont (); -extern void syms_of_xfont (); -extern void syms_of_xftfont (); -extern void syms_of_ftxfont (); -extern void syms_of_bdffont (); -extern void syms_of_w32font (); -extern void syms_of_atmfont (); -extern void syms_of_nsfont (); +extern void syms_of_ftfont (void); +extern void syms_of_xfont (void); +extern void syms_of_xftfont (void); +extern void syms_of_ftxfont (void); +extern void syms_of_bdffont (void); +extern void syms_of_w32font (void); +extern void syms_of_atmfont (void); +extern void syms_of_nsfont (void); void -syms_of_font () +syms_of_font (void) { sort_shift_bits[FONT_TYPE_INDEX] = 0; sort_shift_bits[FONT_SLANT_INDEX] = 2; @@ -5446,7 +5313,7 @@ } void -init_font () +init_font (void) { Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; }
--- a/src/fontset.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/fontset.c Sun Jul 04 00:50:25 2010 -0700 @@ -306,9 +306,7 @@ : fontset_ref ((fontset), (c))) static Lisp_Object -fontset_ref (fontset, c) - Lisp_Object fontset; - int c; +fontset_ref (Lisp_Object fontset, int c) { Lisp_Object elt; @@ -343,8 +341,7 @@ : fontset_add ((fontset), (range), (elt), (add))) static Lisp_Object -fontset_add (fontset, range, elt, add) - Lisp_Object fontset, range, elt, add; +fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) { Lisp_Object args[2]; int idx = (EQ (add, Qappend) ? 0 : 1); @@ -376,8 +373,7 @@ } static int -fontset_compare_rfontdef (val1, val2) - const void *val1, *val2; +fontset_compare_rfontdef (const void *val1, const void *val2) { return (RFONT_DEF_SCORE (*(Lisp_Object *) val1) - RFONT_DEF_SCORE (*(Lisp_Object *) val2)); @@ -392,12 +388,10 @@ If PREFERRED_FAMILY is not nil, that family has the higher priority if the encoding charsets or languages in font-specs are the same. */ -extern Lisp_Object Fassoc_string (); +extern Lisp_Object Fassoc_string (Lisp_Object, Lisp_Object, Lisp_Object); static void -reorder_font_vector (font_group, font) - Lisp_Object font_group; - struct font *font; +reorder_font_vector (Lisp_Object font_group, struct font *font) { Lisp_Object vec, font_object; int size; @@ -525,11 +519,7 @@ If FALLBACK is nonzero, search only fallback fonts. */ static Lisp_Object -fontset_find_font (fontset, c, face, id, fallback) - Lisp_Object fontset; - int c; - struct face *face; - int id, fallback; +fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fallback) { Lisp_Object vec, font_group; int i, charset_matched = 0, found_index; @@ -728,11 +718,7 @@ static Lisp_Object -fontset_font (fontset, c, face, id) - Lisp_Object fontset; - int c; - struct face *face; - int id; +fontset_font (Lisp_Object fontset, int c, struct face *face, int id) { Lisp_Object rfont_def, default_rfont_def; Lisp_Object base_fontset; @@ -793,8 +779,7 @@ BASE. */ static Lisp_Object -make_fontset (frame, name, base) - Lisp_Object frame, name, base; +make_fontset (Lisp_Object frame, Lisp_Object name, Lisp_Object base) { Lisp_Object fontset; int size = ASIZE (Vfontset_table); @@ -835,8 +820,7 @@ /* Return the name of the fontset who has ID. */ Lisp_Object -fontset_name (id) - int id; +fontset_name (int id) { Lisp_Object fontset; @@ -848,8 +832,7 @@ /* Return the ASCII font name of the fontset who has ID. */ Lisp_Object -fontset_ascii (id) - int id; +fontset_ascii (int id) { Lisp_Object fontset, elt; @@ -861,9 +844,7 @@ } void -free_realized_fontset (f, fontset) - FRAME_PTR f; - Lisp_Object fontset; +free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) { Lisp_Object tail; @@ -879,9 +860,7 @@ free_realized_face. */ void -free_face_fontset (f, face) - FRAME_PTR f; - struct face *face; +free_face_fontset (FRAME_PTR f, struct face *face) { Lisp_Object fontset; @@ -915,9 +894,7 @@ when C is not an ASCII character. */ int -face_suitable_for_char_p (face, c) - struct face *face; - int c; +face_suitable_for_char_p (struct face *face, int c) { Lisp_Object fontset, rfont_def; @@ -934,11 +911,7 @@ the macro FACE_FOR_CHAR. */ int -face_for_char (f, face, c, pos, object) - FRAME_PTR f; - struct face *face; - int c, pos; - Lisp_Object object; +face_for_char (FRAME_PTR f, struct face *face, int c, int pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int face_id; @@ -1006,10 +979,7 @@ Lisp_Object -font_for_char (face, c, pos, object) - struct face *face; - int c, pos; - Lisp_Object object; +font_for_char (struct face *face, int c, int pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int id; @@ -1059,10 +1029,7 @@ Called from realize_x_face. */ int -make_fontset_for_ascii_face (f, base_fontset_id, face) - FRAME_PTR f; - int base_fontset_id; - struct face *face; +make_fontset_for_ascii_face (FRAME_PTR f, int base_fontset_id, struct face *face) { Lisp_Object base_fontset, fontset, frame; @@ -1096,8 +1063,7 @@ expression corresponding to PATTERN. */ static Lisp_Object -fontset_pattern_regexp (pattern) - Lisp_Object pattern; +fontset_pattern_regexp (Lisp_Object pattern) { if (!index ((char *) SDATA (pattern), '*') && !index ((char *) SDATA (pattern), '?')) @@ -1171,9 +1137,7 @@ */ int -fs_query_fontset (name, name_pattern) - Lisp_Object name; - int name_pattern; +fs_query_fontset (Lisp_Object name, int name_pattern) { Lisp_Object tem; int i; @@ -1246,10 +1210,7 @@ /* Return a list of base fontset names matching PATTERN on frame F. */ Lisp_Object -list_fontsets (f, pattern, size) - FRAME_PTR f; - Lisp_Object pattern; - int size; +list_fontsets (FRAME_PTR f, Lisp_Object pattern, int size) { Lisp_Object frame, regexp, val; int id; @@ -1285,8 +1246,7 @@ /* Free all realized fontsets whose base fontset is BASE. */ static void -free_realized_fontsets (base) - Lisp_Object base; +free_realized_fontsets (Lisp_Object base) { int id; @@ -1343,8 +1303,7 @@ Set *FRAME to the actual frame. */ static Lisp_Object -check_fontset_name (name, frame) - Lisp_Object name, *frame; +check_fontset_name (Lisp_Object name, Lisp_Object *frame) { int id; @@ -1373,8 +1332,7 @@ } static void -accumulate_script_ranges (arg, range, val) - Lisp_Object arg, range, val; +accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) { if (EQ (XCAR (arg), val)) { @@ -1399,8 +1357,7 @@ case. */ static void -set_fontset_font (arg, range) - Lisp_Object arg, range; +set_fontset_font (Lisp_Object arg, Lisp_Object range) { Lisp_Object fontset, font_def, add, ascii, script_range_list; int from = XINT (XCAR (range)), to = XINT (XCDR (range)); @@ -1762,8 +1719,7 @@ user intends to use FONT-OBJECT for Latin characters. */ int -fontset_from_font (font_object) - Lisp_Object font_object; +fontset_from_font (Lisp_Object font_object) { Lisp_Object font_name = font_get_name (font_object); Lisp_Object font_spec = Fcopy_font_spec (font_object); @@ -1819,8 +1775,7 @@ fontset_from_font. */ static void -update_auto_fontset_alist (font_object, fontset) - Lisp_Object font_object, fontset; +update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) { Lisp_Object prev, tail; @@ -2224,7 +2179,7 @@ #endif /* FONTSET_DEBUG */ void -syms_of_fontset () +syms_of_fontset (void) { DEFSYM (Qfontset, "fontset"); Fput (Qfontset, Qchar_table_extra_slots, make_number (9));
--- a/src/frame.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/frame.c Sun Jul 04 00:50:25 2010 -0700 @@ -142,9 +142,7 @@ int focus_follows_mouse; static void -set_menu_bar_lines_1 (window, n) - Lisp_Object window; - int n; +set_menu_bar_lines_1 (Lisp_Object window, int n) { struct window *w = XWINDOW (window); @@ -170,9 +168,7 @@ } void -set_menu_bar_lines (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; int olines = FRAME_MENU_BAR_LINES (f); @@ -202,9 +198,9 @@ Lisp_Object Vframe_list; extern Lisp_Object Vminibuffer_list; -extern Lisp_Object get_minibuffer (); -extern Lisp_Object Fhandle_switch_frame (); -extern Lisp_Object Fredirect_frame_focus (); +extern Lisp_Object get_minibuffer (int); +extern Lisp_Object Fhandle_switch_frame (Lisp_Object event); +extern Lisp_Object Fredirect_frame_focus (Lisp_Object frame, Lisp_Object focus_frame); extern Lisp_Object x_get_focus_frame (); extern Lisp_Object QCname, Qfont_param; @@ -282,8 +278,7 @@ } struct frame * -make_frame (mini_p) - int mini_p; +make_frame (int mini_p) { Lisp_Object frame; register struct frame *f; @@ -433,10 +428,7 @@ default (the global minibuffer). */ struct frame * -make_frame_without_minibuffer (mini_window, kb, display) - register Lisp_Object mini_window; - KBOARD *kb; - Lisp_Object display; +make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lisp_Object display) { register struct frame *f; struct gcpro gcpro1; @@ -485,7 +477,7 @@ /* Make a frame containing only a minibuffer window. */ struct frame * -make_minibuffer_frame () +make_minibuffer_frame (void) { /* First make a frame containing just a root window, no minibuffer. */ @@ -784,9 +776,7 @@ The value of NORECORD is passed as argument to Fselect_window. */ Lisp_Object -do_switch_frame (frame, track, for_deletion, norecord) - Lisp_Object frame, norecord; - int track, for_deletion; +do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object norecord) { struct frame *sf = SELECTED_FRAME (); @@ -1061,9 +1051,7 @@ Otherwise, include all frames. */ static Lisp_Object -next_frame (frame, minibuf) - Lisp_Object frame; - Lisp_Object minibuf; +next_frame (Lisp_Object frame, Lisp_Object minibuf) { Lisp_Object tail; int passed = 0; @@ -1141,9 +1129,7 @@ Otherwise, include all frames. */ static Lisp_Object -prev_frame (frame, minibuf) - Lisp_Object frame; - Lisp_Object minibuf; +prev_frame (Lisp_Object frame, Lisp_Object minibuf) { Lisp_Object tail; Lisp_Object prev; @@ -1261,8 +1247,7 @@ (Exception: if F is the terminal frame, and we are using X, return 1.) */ int -other_visible_frames (f) - FRAME_PTR f; +other_visible_frames (FRAME_PTR f) { /* We know the selected frame is visible, so if F is some other frame, it can't be the sole visible one. */ @@ -1316,11 +1301,11 @@ this. Any other value of FORCE implements the semantics described for Fdelete_frame. */ Lisp_Object -delete_frame (frame, force) +delete_frame (Lisp_Object frame, Lisp_Object force) /* If we use `register' here, gcc-4.0.2 on amd64 using -DUSE_LISP_UNION_TYPE complains further down that we're getting the address of `force'. Go figure. */ - Lisp_Object frame, force; + { struct frame *f; struct frame *sf = SELECTED_FRAME (); @@ -1858,8 +1843,7 @@ and all its descendents. */ static void -make_frame_visible_1 (window) - Lisp_Object window; +make_frame_visible_1 (Lisp_Object window) { struct window *w; @@ -2136,9 +2120,7 @@ /* Return the value of frame parameter PROP in frame FRAME. */ Lisp_Object -get_frame_param (frame, prop) - register struct frame *frame; - Lisp_Object prop; +get_frame_param (register struct frame *frame, Lisp_Object prop) { register Lisp_Object tem; @@ -2151,8 +2133,7 @@ /* Return the buffer-predicate of the selected frame. */ Lisp_Object -frame_buffer_predicate (frame) - Lisp_Object frame; +frame_buffer_predicate (Lisp_Object frame) { return XFRAME (frame)->buffer_predicate; } @@ -2160,8 +2141,7 @@ /* Return the buffer-list of the selected frame. */ Lisp_Object -frame_buffer_list (frame) - Lisp_Object frame; +frame_buffer_list (Lisp_Object frame) { return XFRAME (frame)->buffer_list; } @@ -2169,8 +2149,7 @@ /* Set the buffer-list of the selected frame. */ void -set_frame_buffer_list (frame, list) - Lisp_Object frame, list; +set_frame_buffer_list (Lisp_Object frame, Lisp_Object list) { XFRAME (frame)->buffer_list = list; } @@ -2178,8 +2157,7 @@ /* Discard BUFFER from the buffer-list and buried-buffer-list of each frame. */ void -frames_discard_buffer (buffer) - Lisp_Object buffer; +frames_discard_buffer (Lisp_Object buffer) { Lisp_Object frame, tail; @@ -2196,9 +2174,7 @@ If the alist already has an element for PROP, we change it. */ void -store_in_alist (alistptr, prop, val) - Lisp_Object *alistptr, val; - Lisp_Object prop; +store_in_alist (Lisp_Object *alistptr, Lisp_Object prop, Lisp_Object val) { register Lisp_Object tem; @@ -2210,9 +2186,7 @@ } static int -frame_name_fnn_p (str, len) - char *str; - EMACS_INT len; +frame_name_fnn_p (char *str, EMACS_INT len) { if (len > 1 && str[0] == 'F') { @@ -2230,9 +2204,7 @@ Modeled after x_set_name which is used for WINDOW frames. */ static void -set_term_frame_name (f, name) - struct frame *f; - Lisp_Object name; +set_term_frame_name (struct frame *f, Lisp_Object name) { f->explicit_name = ! NILP (name); @@ -2270,9 +2242,7 @@ } void -store_frame_param (f, prop, val) - struct frame *f; - Lisp_Object prop, val; +store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) { register Lisp_Object old_alist_elt; @@ -2893,12 +2863,7 @@ */ void -x_fullscreen_adjust (f, width, height, top_pos, left_pos) - struct frame *f; - int *width; - int *height; - int *top_pos; - int *left_pos; +x_fullscreen_adjust (struct frame *f, int *width, int *height, int *top_pos, int *left_pos) { int newwidth = FRAME_COLS (f); int newheight = FRAME_LINES (f); @@ -2941,9 +2906,7 @@ to store the new value in the parameter alist. */ void -x_set_frame_parameters (f, alist) - FRAME_PTR f; - Lisp_Object alist; +x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) { Lisp_Object tail; @@ -3217,9 +3180,7 @@ param_alist need to be considered here. */ void -x_report_frame_params (f, alistptr) - struct frame *f; - Lisp_Object *alistptr; +x_report_frame_params (struct frame *f, Lisp_Object *alistptr) { char buf[16]; Lisp_Object tem; @@ -3288,9 +3249,7 @@ the previous value of that parameter, NEW_VALUE is the new value. */ void -x_set_fullscreen (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_fullscreen (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { if (NILP (new_value)) f->want_fullscreen = FULLSCREEN_NONE; @@ -3312,9 +3271,7 @@ the previous value of that parameter, NEW_VALUE is the new value. */ void -x_set_line_spacing (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_line_spacing (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { if (NILP (new_value)) f->extra_line_spacing = 0; @@ -3331,9 +3288,7 @@ the previous value of that parameter, NEW_VALUE is the new value. */ void -x_set_screen_gamma (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { Lisp_Object bgcolor; @@ -3363,9 +3318,7 @@ void -x_set_font (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { Lisp_Object frame, font_object, font_param = Qnil; int fontset = -1; @@ -3462,9 +3415,7 @@ void -x_set_font_backend (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { if (! NILP (new_value) && !CONSP (new_value)) @@ -3520,17 +3471,13 @@ void -x_set_fringe_width (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_fringe_width (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { compute_fringe_widths (f, 1); } void -x_set_border_width (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { CHECK_NUMBER (arg); @@ -3544,9 +3491,7 @@ } void -x_set_internal_border_width (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int old = FRAME_INTERNAL_BORDER_WIDTH (f); @@ -3574,9 +3519,7 @@ } void -x_set_visibility (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_visibility (struct frame *f, Lisp_Object value, Lisp_Object oldval) { Lisp_Object frame; XSETFRAME (frame, f); @@ -3590,33 +3533,25 @@ } void -x_set_autoraise (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_autoraise (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { f->auto_raise = !EQ (Qnil, arg); } void -x_set_autolower (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_autolower (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { f->auto_lower = !EQ (Qnil, arg); } void -x_set_unsplittable (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_unsplittable (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { f->no_split = !NILP (arg); } void -x_set_vertical_scroll_bars (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_vertical_scroll_bars (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { if ((EQ (arg, Qleft) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) || (EQ (arg, Qright) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) @@ -3647,9 +3582,7 @@ } void -x_set_scroll_bar_width (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_scroll_bar_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int wid = FRAME_COLUMN_WIDTH (f); @@ -3684,8 +3617,7 @@ /* Return non-nil if frame F wants a bitmap icon. */ Lisp_Object -x_icon_type (f) - FRAME_PTR f; +x_icon_type (FRAME_PTR f) { Lisp_Object tem; @@ -3697,9 +3629,7 @@ } void -x_set_alpha (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { double alpha = 1.0; double newval[2]; @@ -3757,7 +3687,7 @@ Fix it up, or set it to `emacs' if it is too hopeless. */ void -validate_x_resource_name () +validate_x_resource_name (void) { int len = 0; /* Number of valid characters in the resource name. */ @@ -3832,9 +3762,7 @@ See Fx_get_resource below for other parameters. */ static Lisp_Object -xrdb_get_resource (rdb, attribute, class, component, subclass) - XrmDatabase rdb; - Lisp_Object attribute, class, component, subclass; +xrdb_get_resource (XrmDatabase rdb, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) { register char *value; char *name_key; @@ -3919,9 +3847,7 @@ /* Get an X resource, like Fx_get_resource, but for display DPYINFO. */ Lisp_Object -display_x_get_resource (dpyinfo, attribute, class, component, subclass) - Display_Info *dpyinfo; - Lisp_Object attribute, class, component, subclass; +display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) { return xrdb_get_resource (dpyinfo->xrdb, attribute, class, component, subclass); @@ -3931,8 +3857,7 @@ /* Used when C code wants a resource value. */ /* Called from oldXMenu/Create.c. */ char * -x_get_resource_string (attribute, class) - char *attribute, *class; +x_get_resource_string (char *attribute, char *class) { char *name_key; char *class_key; @@ -3965,12 +3890,7 @@ and don't let it get stored in any Lisp-visible variables! */ Lisp_Object -x_get_arg (dpyinfo, alist, param, attribute, class, type) - Display_Info *dpyinfo; - Lisp_Object alist, param; - char *attribute; - char *class; - enum resource_types type; +x_get_arg (Display_Info *dpyinfo, Lisp_Object alist, Lisp_Object param, char *attribute, char *class, enum resource_types type) { register Lisp_Object tem; @@ -4068,12 +3988,7 @@ } Lisp_Object -x_frame_get_arg (f, alist, param, attribute, class, type) - struct frame *f; - Lisp_Object alist, param; - char *attribute; - char *class; - enum resource_types type; +x_frame_get_arg (struct frame *f, Lisp_Object alist, Lisp_Object param, char *attribute, char *class, enum resource_types type) { return x_get_arg (FRAME_X_DISPLAY_INFO (f), alist, param, attribute, class, type); @@ -4082,12 +3997,7 @@ /* Like x_frame_get_arg, but also record the value in f->param_alist. */ Lisp_Object -x_frame_get_and_record_arg (f, alist, param, attribute, class, type) - struct frame *f; - Lisp_Object alist, param; - char *attribute; - char *class; - enum resource_types type; +x_frame_get_and_record_arg (struct frame *f, Lisp_Object alist, Lisp_Object param, char *attribute, char *class, enum resource_types type) { Lisp_Object value; @@ -4107,14 +4017,7 @@ If that is not found either, use the value DEFLT. */ Lisp_Object -x_default_parameter (f, alist, prop, deflt, xprop, xclass, type) - struct frame *f; - Lisp_Object alist; - Lisp_Object prop; - Lisp_Object deflt; - char *xprop; - char *xclass; - enum resource_types type; +x_default_parameter (struct frame *f, Lisp_Object alist, Lisp_Object prop, Lisp_Object deflt, char *xprop, char *xclass, enum resource_types type) { Lisp_Object tem; @@ -4208,10 +4111,7 @@ #define DEFAULT_COLS 80 int -x_figure_window_size (f, parms, toolbar_p) - struct frame *f; - Lisp_Object parms; - int toolbar_p; +x_figure_window_size (struct frame *f, Lisp_Object parms, int toolbar_p) { register Lisp_Object tem0, tem1, tem2; long window_prompting = 0; @@ -4386,7 +4286,7 @@ #endif /* HAVE_WINDOW_SYSTEM */ void -frame_make_pointer_invisible () +frame_make_pointer_invisible (void) { if (! NILP (Vmake_pointer_invisible)) { @@ -4406,7 +4306,7 @@ } void -frame_make_pointer_visible () +frame_make_pointer_visible (void) { /* We don't check Vmake_pointer_invisible here in case the pointer was invisible when Vmake_pointer_invisible was set to nil. */ @@ -4431,7 +4331,7 @@ ***********************************************************************/ void -syms_of_frame () +syms_of_frame (void) { Qframep = intern_c_string ("framep"); staticpro (&Qframep);
--- a/src/fringe.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/fringe.c Sun Jul 04 00:50:25 2010 -0700 @@ -490,8 +490,7 @@ Return 0 if not a bitmap. */ int -lookup_fringe_bitmap (bitmap) - Lisp_Object bitmap; +lookup_fringe_bitmap (Lisp_Object bitmap) { int bn; @@ -517,8 +516,7 @@ Return BN if not found in Vfringe_bitmaps. */ static Lisp_Object -get_fringe_bitmap_name (bn) - int bn; +get_fringe_bitmap_name (int bn) { Lisp_Object bitmaps; Lisp_Object num; @@ -550,11 +548,7 @@ */ static void -draw_fringe_bitmap_1 (w, row, left_p, overlay, which) - struct window *w; - struct glyph_row *row; - int left_p, overlay; - int which; +draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int overlay, int which) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct draw_fringe_bitmap_params p; @@ -690,9 +684,7 @@ } static int -get_logical_cursor_bitmap (w, cursor) - struct window *w; - Lisp_Object cursor; +get_logical_cursor_bitmap (struct window *w, Lisp_Object cursor) { Lisp_Object cmap, bm = Qnil; @@ -715,10 +707,7 @@ } static int -get_logical_fringe_bitmap (w, bitmap, right_p, partial_p) - struct window *w; - Lisp_Object bitmap; - int right_p, partial_p; +get_logical_fringe_bitmap (struct window *w, Lisp_Object bitmap, int right_p, int partial_p) { Lisp_Object cmap, bm1 = Qnil, bm2 = Qnil, bm; int ln1 = 0, ln2 = 0; @@ -818,10 +807,7 @@ void -draw_fringe_bitmap (w, row, left_p) - struct window *w; - struct glyph_row *row; - int left_p; +draw_fringe_bitmap (struct window *w, struct glyph_row *row, int left_p) { int overlay = 0; @@ -874,9 +860,7 @@ function with input blocked. */ void -draw_row_fringe_bitmaps (w, row) - struct window *w; - struct glyph_row *row; +draw_row_fringe_bitmaps (struct window *w, struct glyph_row *row) { xassert (interrupt_input_blocked); @@ -904,9 +888,7 @@ */ int -draw_window_fringes (w, no_fringe) - struct window *w; - int no_fringe; +draw_window_fringes (struct window *w, int no_fringe) { struct glyph_row *row; int yb = window_text_bottom_y (w); @@ -944,9 +926,7 @@ If KEEP_CURRENT_P is 0, update current_matrix too. */ int -update_window_fringes (w, keep_current_p) - struct window *w; - int keep_current_p; +update_window_fringes (struct window *w, int keep_current_p) { struct glyph_row *row, *cur = 0; int yb = window_text_bottom_y (w); @@ -1188,9 +1168,7 @@ */ void -compute_fringe_widths (f, redraw) - struct frame *f; - int redraw; +compute_fringe_widths (struct frame *f, int redraw) { int o_left = FRAME_LEFT_FRINGE_WIDTH (f); int o_right = FRAME_RIGHT_FRINGE_WIDTH (f); @@ -1272,8 +1250,7 @@ /* Free resources used by a user-defined bitmap. */ void -destroy_fringe_bitmap (n) - int n; +destroy_fringe_bitmap (int n) { struct fringe_bitmap **fbp; @@ -1342,10 +1319,7 @@ #endif /* HAVE_X_WINDOWS */ void -init_fringe_bitmap (which, fb, once_p) - int which; - struct fringe_bitmap *fb; - int once_p; +init_fringe_bitmap (int which, struct fringe_bitmap *fb, int once_p) { if (once_p || fb->dynamic) { @@ -1620,7 +1594,7 @@ ***********************************************************************/ void -syms_of_fringe () +syms_of_fringe (void) { Qtruncation = intern_c_string ("truncation"); staticpro (&Qtruncation); @@ -1657,7 +1631,7 @@ /* Garbage collection hook */ void -mark_fringe_data () +mark_fringe_data (void) { int i; @@ -1669,7 +1643,7 @@ /* Initialize this module when Emacs starts. */ void -init_fringe_once () +init_fringe_once (void) { int bt; @@ -1678,7 +1652,7 @@ } void -init_fringe () +init_fringe (void) { int i;
--- a/src/ftfont.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ftfont.c Sun Jul 04 00:50:25 2010 -0700 @@ -188,9 +188,7 @@ } static Lisp_Object -ftfont_pattern_entity (p, extra) - FcPattern *p; - Lisp_Object extra; +ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) { Lisp_Object key, cache, entity; char *file, *str; @@ -289,9 +287,7 @@ static Lisp_Object ftfont_generic_family_list; static Lisp_Object -ftfont_resolve_generic_family (family, pattern) - Lisp_Object family; - FcPattern *pattern; +ftfont_resolve_generic_family (Lisp_Object family, FcPattern *pattern) { Lisp_Object slot; FcPattern *match; @@ -348,9 +344,7 @@ }; static Lisp_Object -ftfont_lookup_cache (key, cache_for) - Lisp_Object key; - enum ftfont_cache_for cache_for; +ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for) { Lisp_Object cache, val, entity; struct ftfont_cache_data *cache_data; @@ -450,8 +444,7 @@ } FcCharSet * -ftfont_get_fc_charset (entity) - Lisp_Object entity; +ftfont_get_fc_charset (Lisp_Object entity) { Lisp_Object val, cache; struct ftfont_cache_data *cache_data; @@ -559,15 +552,13 @@ extern Lisp_Object QCname; static Lisp_Object -ftfont_get_cache (f) - FRAME_PTR f; +ftfont_get_cache (FRAME_PTR f) { return freetype_font_cache; } static int -ftfont_get_charset (registry) - Lisp_Object registry; +ftfont_get_charset (Lisp_Object registry) { char *str = (char *) SDATA (SYMBOL_NAME (registry)); char *re = alloca (SBYTES (SYMBOL_NAME (registry)) * 2 + 1); @@ -710,11 +701,7 @@ char **langname); static FcPattern * -ftfont_spec_pattern (spec, otlayout, otspec, langname) - Lisp_Object spec; - char *otlayout; - struct OpenTypeSpec **otspec; - char **langname; +ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **otspec, char **langname) { Lisp_Object tmp, extra; FcPattern *pattern = NULL; @@ -871,8 +858,7 @@ } static Lisp_Object -ftfont_list (frame, spec) - Lisp_Object frame, spec; +ftfont_list (Lisp_Object frame, Lisp_Object spec) { Lisp_Object val = Qnil, family, adstyle; int i; @@ -1069,8 +1055,7 @@ } static Lisp_Object -ftfont_match (frame, spec) - Lisp_Object frame, spec; +ftfont_match (Lisp_Object frame, Lisp_Object spec) { Lisp_Object entity = Qnil; FcPattern *pattern, *match = NULL; @@ -1120,8 +1105,7 @@ } static Lisp_Object -ftfont_list_family (frame) - Lisp_Object frame; +ftfont_list_family (Lisp_Object frame) { Lisp_Object list = Qnil; FcPattern *pattern = NULL; @@ -1164,10 +1148,7 @@ static Lisp_Object -ftfont_open (f, entity, pixel_size) - FRAME_PTR f; - Lisp_Object entity; - int pixel_size; +ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) { struct ftfont_info *ftfont_info; struct font *font; @@ -1307,9 +1288,7 @@ } static void -ftfont_close (f, font) - FRAME_PTR f; - struct font *font; +ftfont_close (FRAME_PTR f, struct font *font) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; Lisp_Object val, cache; @@ -1335,9 +1314,7 @@ } static int -ftfont_has_char (font, c) - Lisp_Object font; - int c; +ftfont_has_char (Lisp_Object font, int c) { struct charset *cs = NULL; @@ -1367,9 +1344,7 @@ } static unsigned -ftfont_encode_char (font, c) - struct font *font; - int c; +ftfont_encode_char (struct font *font, int c) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; FT_Face ft_face = ftfont_info->ft_size->face; @@ -1380,11 +1355,7 @@ } static int -ftfont_text_extents (font, code, nglyphs, metrics) - struct font *font; - unsigned *code; - int nglyphs; - struct font_metrics *metrics; +ftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct font_metrics *metrics) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; FT_Face ft_face = ftfont_info->ft_size->face; @@ -1439,11 +1410,7 @@ } static int -ftfont_get_bitmap (font, code, bitmap, bits_per_pixel) - struct font *font; - unsigned code; - struct font_bitmap *bitmap; - int bits_per_pixel; +ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bitmap, int bits_per_pixel) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; FT_Face ft_face = ftfont_info->ft_size->face; @@ -1487,11 +1454,7 @@ } static int -ftfont_anchor_point (font, code, index, x, y) - struct font *font; - unsigned code; - int index; - int *x, *y; +ftfont_anchor_point (struct font *font, unsigned int code, int index, int *x, int *y) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; FT_Face ft_face = ftfont_info->ft_size->face; @@ -2677,9 +2640,7 @@ }; static void -ftfont_filter_properties (font, alist) - Lisp_Object font; - Lisp_Object alist; +ftfont_filter_properties (Lisp_Object font, Lisp_Object alist) { Lisp_Object it; int i; @@ -2721,7 +2682,7 @@ void -syms_of_ftfont () +syms_of_ftfont (void) { DEFSYM (Qfreetype, "freetype"); DEFSYM (Qmonospace, "monospace");
--- a/src/ftxfont.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ftxfont.c Sun Jul 04 00:50:25 2010 -0700 @@ -61,9 +61,7 @@ /* Return an array of 6 GCs for antialiasing. */ static GC * -ftxfont_get_gcs (f, foreground, background) - FRAME_PTR f; - unsigned long foreground, background; +ftxfont_get_gcs (FRAME_PTR f, long unsigned int foreground, long unsigned int background) { XColor color; XGCValues xgcv; @@ -140,15 +138,7 @@ } static int -ftxfont_draw_bitmap (f, gc_fore, gcs, font, code, x, y, p, size, n, flush) - FRAME_PTR f; - GC gc_fore, *gcs; - struct font *font; - unsigned code; - int x, y; - XPoint *p; - int size, *n; - int flush; +ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsigned int code, int x, int y, XPoint *p, int size, int *n, int flush) { struct font_bitmap bitmap; unsigned char *b; @@ -224,11 +214,7 @@ } static void -ftxfont_draw_backgrond (f, font, gc, x, y, width) - FRAME_PTR f; - struct font *font; - GC gc; - int x, y, width; +ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) { XGCValues xgcv; @@ -250,9 +236,7 @@ struct font_driver ftxfont_driver; static Lisp_Object -ftxfont_list (frame, spec) - Lisp_Object frame; - Lisp_Object spec; +ftxfont_list (Lisp_Object frame, Lisp_Object spec) { Lisp_Object list = ftfont_driver.list (frame, spec), tail; @@ -262,9 +246,7 @@ } static Lisp_Object -ftxfont_match (frame, spec) - Lisp_Object frame; - Lisp_Object spec; +ftxfont_match (Lisp_Object frame, Lisp_Object spec) { Lisp_Object entity = ftfont_driver.match (frame, spec); @@ -274,10 +256,7 @@ } static Lisp_Object -ftxfont_open (f, entity, pixel_size) - FRAME_PTR f; - Lisp_Object entity; - int pixel_size; +ftxfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) { Lisp_Object font_object; struct font *font; @@ -291,17 +270,13 @@ } static void -ftxfont_close (f, font) - FRAME_PTR f; - struct font *font; +ftxfont_close (FRAME_PTR f, struct font *font) { ftfont_driver.close (f, font); } static int -ftxfont_draw (s, from, to, x, y, with_background) - struct glyph_string *s; - int from, to, x, y, with_background; +ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_background) { FRAME_PTR f = s->f; struct face *face = s->face; @@ -372,8 +347,7 @@ } static int -ftxfont_end_for_frame (f) - FRAME_PTR f; +ftxfont_end_for_frame (FRAME_PTR f) { struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver); @@ -396,7 +370,7 @@ void -syms_of_ftxfont () +syms_of_ftxfont (void) { DEFSYM (Qftx, "ftx");
--- a/src/gtkutil.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/gtkutil.c Sun Jul 04 00:50:25 2010 -0700 @@ -85,9 +85,7 @@ W can be a GtkMenu or a GtkWindow widget. */ static void -xg_set_screen (w, f) - GtkWidget *w; - FRAME_PTR f; +xg_set_screen (GtkWidget *w, FRAME_PTR f) { if (FRAME_X_DISPLAY (f) != GDK_DISPLAY ()) { @@ -110,9 +108,7 @@ multipe displays. */ void -xg_display_open (display_name, dpy) - char *display_name; - Display **dpy; +xg_display_open (char *display_name, Display **dpy) { GdkDisplay *gdpy; @@ -180,7 +176,7 @@ Return a pointer to the allocated structure. */ widget_value * -malloc_widget_value () +malloc_widget_value (void) { widget_value *wv; if (widget_value_free_list) @@ -202,8 +198,7 @@ by malloc_widget_value, and no substructures. */ void -free_widget_value (wv) - widget_value *wv; +free_widget_value (widget_value *wv) { if (wv->free_list) abort (); @@ -227,8 +222,7 @@ scroll bars on display DPY. */ GdkCursor * -xg_create_default_cursor (dpy) - Display *dpy; +xg_create_default_cursor (Display *dpy) { GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy); return gdk_cursor_new_for_display (gdpy, GDK_LEFT_PTR); @@ -237,10 +231,7 @@ /* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */ static GdkPixbuf * -xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) - GdkPixmap *gpix; - GdkPixmap *gmask; - GdkColormap *cmap; +xg_get_pixbuf_from_pix_and_mask (GdkPixmap *gpix, GdkPixmap *gmask, GdkColormap *cmap) { int width, height; GdkPixbuf *icon_buf, *tmp_buf; @@ -291,8 +282,7 @@ } static Lisp_Object -file_for_image (image) - Lisp_Object image; +file_for_image (Lisp_Object image) { Lisp_Object specified_file = Qnil; Lisp_Object tail; @@ -319,11 +309,7 @@ If OLD_WIDGET is not NULL, that widget is modified. */ static GtkWidget * -xg_get_image_for_pixmap (f, img, widget, old_widget) - FRAME_PTR f; - struct image *img; - GtkWidget *widget; - GtkImage *old_widget; +xg_get_image_for_pixmap (FRAME_PTR f, struct image *img, GtkWidget *widget, GtkImage *old_widget) { GdkPixmap *gpix; GdkPixmap *gmask; @@ -391,9 +377,7 @@ and it is those widgets that are visible. */ static void -xg_set_cursor (w, cursor) - GtkWidget *w; - GdkCursor *cursor; +xg_set_cursor (GtkWidget *w, GdkCursor *cursor) { GdkWindow *window = gtk_widget_get_window(w); GList *children = gdk_window_peek_children (window); @@ -446,8 +430,7 @@ with g_free. */ static char * -get_utf8_string (str) - char *str; +get_utf8_string (char *str) { char *utf8_str = str; @@ -526,8 +509,7 @@ F is the frame we shall set geometry for. */ static void -xg_set_geometry (f) - FRAME_PTR f; +xg_set_geometry (FRAME_PTR f) { if (f->size_hint_flags & (USPosition | PPosition)) { @@ -558,8 +540,7 @@ and use a GtkFixed widget, this doesn't happen automatically. */ static void -xg_clear_under_internal_border (f) - FRAME_PTR f; +xg_clear_under_internal_border (FRAME_PTR f) { if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0) { @@ -597,9 +578,7 @@ PIXELWIDTH, PIXELHEIGHT is the new size in pixels. */ void -xg_frame_resized (f, pixelwidth, pixelheight) - FRAME_PTR f; - int pixelwidth, pixelheight; +xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight) { int rows, columns; @@ -635,10 +614,7 @@ COLUMNS/ROWS is the size the edit area shall have after the resize. */ void -xg_frame_set_char_size (f, cols, rows) - FRAME_PTR f; - int cols; - int rows; +xg_frame_set_char_size (FRAME_PTR f, int cols, int rows) { int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); @@ -700,8 +676,7 @@ The policy is to keep the number of editable lines. */ static void -xg_height_changed (f) - FRAME_PTR f; +xg_height_changed (FRAME_PTR f) { gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f)); @@ -716,9 +691,7 @@ Return 0 if no widget match WDESC. */ GtkWidget * -xg_win_to_widget (dpy, wdesc) - Display *dpy; - Window wdesc; +xg_win_to_widget (Display *dpy, Window wdesc) { gpointer gdkwin; GtkWidget *gwdesc = 0; @@ -742,10 +715,7 @@ W is the widget that color will be used for. Used to find colormap. */ static void -xg_pix_to_gcolor (w, pixel, c) - GtkWidget *w; - unsigned long pixel; - GdkColor *c; +xg_pix_to_gcolor (GtkWidget *w, long unsigned int pixel, GdkColor *c) { GdkColormap *map = gtk_widget_get_colormap (w); gdk_colormap_query_color (map, pixel, c); @@ -755,8 +725,7 @@ Return 0 if creation failed, non-zero otherwise. */ int -xg_create_frame_widgets (f) - FRAME_PTR f; +xg_create_frame_widgets (FRAME_PTR f) { GtkWidget *wtop; GtkWidget *wvbox; @@ -882,10 +851,7 @@ flag (this is useful when FLAGS is 0). */ void -x_wm_set_size_hint (f, flags, user_position) - FRAME_PTR f; - long flags; - int user_position; +x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position) { /* Must use GTK routines here, otherwise GTK resets the size hints to its own defaults. */ @@ -981,9 +947,7 @@ BG is the pixel value to change to. */ void -xg_set_background_color (f, bg) - FRAME_PTR f; - unsigned long bg; +xg_set_background_color (FRAME_PTR f, long unsigned int bg) { if (FRAME_GTK_WIDGET (f)) { @@ -1001,10 +965,7 @@ functions so GTK does not overwrite the icon. */ void -xg_set_frame_icon (f, icon_pixmap, icon_mask) - FRAME_PTR f; - Pixmap icon_pixmap; - Pixmap icon_mask; +xg_set_frame_icon (FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask) { GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); @@ -1064,10 +1025,7 @@ Returns TRUE to end propagation of event. */ static gboolean -dialog_delete_callback (w, event, user_data) - GtkWidget *w; - GdkEvent *event; - gpointer user_data; +dialog_delete_callback (GtkWidget *w, GdkEvent *event, gpointer user_data) { gtk_widget_unmap (w); return TRUE; @@ -1081,10 +1039,7 @@ Returns the GTK dialog widget. */ static GtkWidget * -create_dialog (wv, select_cb, deactivate_cb) - widget_value *wv; - GCallback select_cb; - GCallback deactivate_cb; +create_dialog (widget_value *wv, GCallback select_cb, GCallback deactivate_cb) { char *title = get_dialog_title (wv->name[0]); int total_buttons = wv->name[1] - '0'; @@ -1215,8 +1170,7 @@ /* Destroy the dialog. This makes it pop down. */ static Lisp_Object -pop_down_dialog (arg) - Lisp_Object arg; +pop_down_dialog (Lisp_Object arg) { struct Lisp_Save_Value *p = XSAVE_VALUE (arg); struct xg_dialog_data *dd = (struct xg_dialog_data *) p->pointer; @@ -1237,8 +1191,7 @@ We pass in DATA as gpointer* so we can use this as a callback. */ static gboolean -xg_maybe_add_timer (data) - gpointer data; +xg_maybe_add_timer (gpointer data) { struct xg_dialog_data *dd = (struct xg_dialog_data *) data; EMACS_TIME next_time = timer_check (1); @@ -1262,10 +1215,7 @@ The dialog W is not destroyed when this function returns. */ static int -xg_dialog_run (f, w) - FRAME_PTR f; - GtkWidget *w; - +xg_dialog_run (FRAME_PTR f, GtkWidget *w) { int count = SPECPDL_INDEX (); struct xg_dialog_data dd; @@ -1308,7 +1258,7 @@ Return zero if not. */ int -xg_uses_old_file_dialog () +xg_uses_old_file_dialog (void) { #ifdef HAVE_GTK_FILE_SELECTION_NEW extern int x_gtk_use_old_file_dialog; @@ -1325,8 +1275,7 @@ The returned string must be free:d. */ static char * -xg_get_file_name_from_chooser (w) - GtkWidget *w; +xg_get_file_name_from_chooser (GtkWidget *w) { return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w)); } @@ -1335,9 +1284,7 @@ WIDGET is the toggle widget, DATA is the file chooser dialog. */ static void -xg_toggle_visibility_cb (widget, data) - GtkWidget *widget; - gpointer data; +xg_toggle_visibility_cb (GtkWidget *widget, gpointer data) { GtkFileChooser *dialog = GTK_FILE_CHOOSER (data); gboolean visible; @@ -1353,10 +1300,7 @@ changes that property by right clicking in the file list. */ static void -xg_toggle_notify_cb (gobject, arg1, user_data) - GObject *gobject; - GParamSpec *arg1; - gpointer user_data; +xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data) { extern int x_gtk_show_hidden_files; @@ -1503,8 +1447,7 @@ The returned string must be free:d. */ static char * -xg_get_file_name_from_selector (w) - GtkWidget *w; +xg_get_file_name_from_selector (GtkWidget *w) { GtkFileSelection *filesel = GTK_FILE_SELECTION (w); return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); @@ -1565,11 +1508,7 @@ The returned string must be freed by the caller. */ char * -xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) - FRAME_PTR f; - char *prompt; - char *default_filename; - int mustmatch_p, only_dir_p; +xg_get_file_name (FRAME_PTR f, char *prompt, char *default_filename, int mustmatch_p, int only_dir_p) { GtkWidget *w = 0; char *fn = 0; @@ -1623,9 +1562,7 @@ DEFAULT_NAME, if non-zero, is the default font name. */ char * -xg_get_font_name (f, default_name) - FRAME_PTR f; - char *default_name; +xg_get_font_name (FRAME_PTR f, char *default_name) { GtkWidget *w; char *fontname = NULL; @@ -1690,10 +1627,7 @@ allocated xg_menu_cb_data if CL_DATA is NULL. */ static xg_menu_cb_data * -make_cl_data (cl_data, f, highlight_cb) - xg_menu_cb_data *cl_data; - FRAME_PTR f; - GCallback highlight_cb; +make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb) { if (! cl_data) { @@ -1724,10 +1658,7 @@ creating the menu bar. */ static void -update_cl_data (cl_data, f, highlight_cb) - xg_menu_cb_data *cl_data; - FRAME_PTR f; - GCallback highlight_cb; +update_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb) { if (cl_data) { @@ -1742,8 +1673,7 @@ If reference count is zero, free CL_DATA. */ static void -unref_cl_data (cl_data) - xg_menu_cb_data *cl_data; +unref_cl_data (xg_menu_cb_data *cl_data) { if (cl_data && cl_data->ref_count > 0) { @@ -1759,7 +1689,7 @@ /* Function that marks all lisp data during GC. */ void -xg_mark_data () +xg_mark_data (void) { xg_list_node *iter; @@ -1781,9 +1711,7 @@ CLIENT_DATA points to the xg_menu_item_cb_data associated with the W. */ static void -menuitem_destroy_callback (w, client_data) - GtkWidget *w; - gpointer client_data; +menuitem_destroy_callback (GtkWidget *w, gpointer client_data) { if (client_data) { @@ -1801,10 +1729,7 @@ Returns FALSE to tell GTK to keep processing this event. */ static gboolean -menuitem_highlight_callback (w, event, client_data) - GtkWidget *w; - GdkEventCrossing *event; - gpointer client_data; +menuitem_highlight_callback (GtkWidget *w, GdkEventCrossing *event, gpointer client_data) { GdkEvent ev; GtkWidget *subwidget; @@ -1832,9 +1757,7 @@ CLIENT_DATA points to the xg_menu_cb_data associated with W. */ static void -menu_destroy_callback (w, client_data) - GtkWidget *w; - gpointer client_data; +menu_destroy_callback (GtkWidget *w, gpointer client_data) { unref_cl_data ((xg_menu_cb_data*) client_data); } @@ -1845,9 +1768,7 @@ Returns the GtkHBox. */ static GtkWidget * -make_widget_for_menu_item (utf8_label, utf8_key) - char *utf8_label; - char *utf8_key; +make_widget_for_menu_item (char *utf8_label, char *utf8_key) { GtkWidget *wlbl; GtkWidget *wkey; @@ -1885,11 +1806,7 @@ but the MacOS X version doesn't either, so I guess that is OK. */ static GtkWidget * -make_menu_item (utf8_label, utf8_key, item, group) - char *utf8_label; - char *utf8_key; - widget_value *item; - GSList **group; +make_menu_item (char *utf8_label, char *utf8_key, widget_value *item, GSList **group) { GtkWidget *w; GtkWidget *wtoadd = 0; @@ -1984,7 +1901,7 @@ /* Returns non-zero if there are detached menus. */ int -xg_have_tear_offs () +xg_have_tear_offs (void) { return xg_detached_menus > 0; } @@ -1995,9 +1912,7 @@ CLIENT_DATA is not used. */ static void -tearoff_remove (widget, client_data) - GtkWidget *widget; - gpointer client_data; +tearoff_remove (GtkWidget *widget, gpointer client_data) { if (xg_detached_menus > 0) --xg_detached_menus; } @@ -2008,9 +1923,7 @@ CLIENT_DATA is not used. */ static void -tearoff_activate (widget, client_data) - GtkWidget *widget; - gpointer client_data; +tearoff_activate (GtkWidget *widget, gpointer client_data) { GtkWidget *menu = gtk_widget_get_parent (widget); if (gtk_menu_get_tearoff_state (GTK_MENU (menu))) @@ -2038,13 +1951,7 @@ Returns the created GtkWidget. */ static GtkWidget * -xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) - widget_value *item; - FRAME_PTR f; - GCallback select_cb; - GCallback highlight_cb; - xg_menu_cb_data *cl_data; - GSList **group; +xg_create_one_menuitem (widget_value *item, FRAME_PTR f, GCallback select_cb, GCallback highlight_cb, xg_menu_cb_data *cl_data, GSList **group) { char *utf8_label; char *utf8_key; @@ -2317,8 +2224,7 @@ /* Return the label for menu item WITEM. */ static const char * -xg_get_menu_item_label (witem) - GtkMenuItem *witem; +xg_get_menu_item_label (GtkMenuItem *witem) { GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); return gtk_label_get_label (wlabel); @@ -2327,9 +2233,7 @@ /* Return non-zero if the menu item WITEM has the text LABEL. */ static int -xg_item_label_same_p (witem, label) - GtkMenuItem *witem; - char *label; +xg_item_label_same_p (GtkMenuItem *witem, char *label) { int is_same = 0; char *utf8_label = get_utf8_string (label); @@ -2348,8 +2252,7 @@ /* Destroy widgets in LIST. */ static void -xg_destroy_widgets (list) - GList *list; +xg_destroy_widgets (GList *list) { GList *iter; @@ -2561,12 +2464,7 @@ CL_DATA is the data to set in the widget for menu invocation. */ static void -xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) - widget_value *val; - GtkWidget *w; - GCallback select_cb; - GCallback highlight_cb; - xg_menu_cb_data *cl_data; +xg_update_menu_item (widget_value *val, GtkWidget *w, GCallback select_cb, GCallback highlight_cb, xg_menu_cb_data *cl_data) { GtkWidget *wchild; GtkLabel *wlbl = 0; @@ -2666,9 +2564,7 @@ /* Update the toggle menu item W so it corresponds to VAL. */ static void -xg_update_toggle_item (val, w) - widget_value *val; - GtkWidget *w; +xg_update_toggle_item (widget_value *val, GtkWidget *w) { gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); } @@ -2676,9 +2572,7 @@ /* Update the radio menu item W so it corresponds to VAL. */ static void -xg_update_radio_item (val, w) - widget_value *val; - GtkWidget *w; +xg_update_radio_item (widget_value *val, GtkWidget *w) { gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); } @@ -2915,8 +2809,7 @@ changed. Value is non-zero if widgets were updated. */ int -xg_update_frame_menubar (f) - FRAME_PTR f; +xg_update_frame_menubar (FRAME_PTR f) { struct x_output *x = f->output_data.x; GtkRequisition req; @@ -2946,8 +2839,7 @@ This is used when deleting a frame, and when turning off the menu bar. */ void -free_frame_menubar (f) - FRAME_PTR f; +free_frame_menubar (FRAME_PTR f) { struct x_output *x = f->output_data.x; @@ -2995,8 +2887,7 @@ /* Store the widget pointer W in id_to_widget and return the integer index. */ static int -xg_store_widget_in_map (w) - GtkWidget *w; +xg_store_widget_in_map (GtkWidget *w) { int i; @@ -3034,8 +2925,7 @@ Called when scroll bar is destroyed. */ static void -xg_remove_widget_from_map (idx) - int idx; +xg_remove_widget_from_map (int idx) { if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) { @@ -3047,8 +2937,7 @@ /* Get the widget pointer at IDX from id_to_widget. */ static GtkWidget * -xg_get_widget_from_map (idx) - int idx; +xg_get_widget_from_map (int idx) { if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) return id_to_widget.widgets[idx]; @@ -3060,9 +2949,7 @@ Return -1 if WID not in id_to_widget. */ int -xg_get_scroll_id_for_window (dpy, wid) - Display *dpy; - Window wid; +xg_get_scroll_id_for_window (Display *dpy, Window wid) { int idx; GtkWidget *w; @@ -3084,9 +2971,7 @@ We free pointer to last scroll bar values here and remove the index. */ static void -xg_gtk_scroll_destroy (widget, data) - GtkWidget *widget; - gpointer data; +xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data) { int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ xg_remove_widget_from_map (id); @@ -3101,11 +2986,7 @@ to set resources for the widget. */ void -xg_create_scroll_bar (f, bar, scroll_callback, end_callback, scroll_bar_name) - FRAME_PTR f; - struct scroll_bar *bar; - GCallback scroll_callback, end_callback; - char *scroll_bar_name; +xg_create_scroll_bar (FRAME_PTR f, struct scroll_bar *bar, GCallback scroll_callback, GCallback end_callback, char *scroll_bar_name) { GtkWidget *wscroll; GtkWidget *webox; @@ -3158,9 +3039,7 @@ /* Remove the scroll bar represented by SCROLLBAR_ID from the frame F. */ void -xg_remove_scroll_bar (f, scrollbar_id) - FRAME_PTR f; - int scrollbar_id; +xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id) { GtkWidget *w = xg_get_widget_from_map (scrollbar_id); if (w) @@ -3178,13 +3057,7 @@ WIDTH, HEIGHT is the size in pixels the bar shall have. */ void -xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) - FRAME_PTR f; - int scrollbar_id; - int top; - int left; - int width; - int height; +xg_update_scrollbar_pos (FRAME_PTR f, int scrollbar_id, int top, int left, int width, int height) { GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id); @@ -3245,9 +3118,7 @@ displaying PORTION out of a whole WHOLE, and our position POSITION. */ void -xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) - struct scroll_bar *bar; - int portion, position, whole; +xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int position, int whole) { GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window); @@ -3329,9 +3200,7 @@ Return non-zero if the event is for a scroll bar, zero otherwise. */ int -xg_event_is_for_scrollbar (f, event) - FRAME_PTR f; - XEvent *event; +xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event) { int retval = 0; @@ -3386,10 +3255,7 @@ tool bar. 0 is the first button. */ static gboolean -xg_tool_bar_button_cb (widget, event, user_data) - GtkWidget *widget; - GdkEventButton *event; - gpointer user_data; +xg_tool_bar_button_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { /* Casts to avoid warnings when gpointer is 64 bits and int is 32 bits */ gpointer ptr = (gpointer) (EMACS_INT) event->state; @@ -3404,9 +3270,7 @@ tool bar. 0 is the first button. */ static void -xg_tool_bar_callback (w, client_data) - GtkWidget *w; - gpointer client_data; +xg_tool_bar_callback (GtkWidget *w, gpointer client_data) { /* The EMACS_INT cast avoids a warning. */ int idx = (int) (EMACS_INT) client_data; @@ -3455,9 +3319,7 @@ tool bar. 0 is the first button. */ static void -xg_tool_bar_proxy_callback (w, client_data) - GtkWidget *w; - gpointer client_data; +xg_tool_bar_proxy_callback (GtkWidget *w, gpointer client_data) { GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_PROXY_BUTTON)); @@ -3474,10 +3336,7 @@ the detached tool bar when the detached tool bar it is not expanded. */ static gboolean -xg_tool_bar_proxy_help_callback (w, event, client_data) - GtkWidget *w; - GdkEventCrossing *event; - gpointer client_data; +xg_tool_bar_proxy_help_callback (GtkWidget *w, GdkEventCrossing *event, gpointer client_data) { GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_PROXY_BUTTON)); @@ -3503,9 +3362,7 @@ blank. */ static gboolean -xg_tool_bar_menu_proxy (toolitem, user_data) - GtkToolItem *toolitem; - gpointer user_data; +xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data) { GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem)); GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox))); @@ -3615,10 +3472,7 @@ CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ static void -xg_tool_bar_detach_callback (wbox, w, client_data) - GtkHandleBox *wbox; - GtkWidget *w; - gpointer client_data; +xg_tool_bar_detach_callback (GtkHandleBox *wbox, GtkWidget *w, gpointer client_data) { FRAME_PTR f = (FRAME_PTR) client_data; extern int x_gtk_whole_detached_tool_bar; @@ -3646,10 +3500,7 @@ CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ static void -xg_tool_bar_attach_callback (wbox, w, client_data) - GtkHandleBox *wbox; - GtkWidget *w; - gpointer client_data; +xg_tool_bar_attach_callback (GtkHandleBox *wbox, GtkWidget *w, gpointer client_data) { FRAME_PTR f = (FRAME_PTR) client_data; g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); @@ -3676,10 +3527,7 @@ Returns FALSE to tell GTK to keep processing this event. */ static gboolean -xg_tool_bar_help_callback (w, event, client_data) - GtkWidget *w; - GdkEventCrossing *event; - gpointer client_data; +xg_tool_bar_help_callback (GtkWidget *w, GdkEventCrossing *event, gpointer client_data) { /* The EMACS_INT cast avoids a warning. */ int idx = (int) (EMACS_INT) client_data; @@ -3718,10 +3566,7 @@ Returns FALSE to tell GTK to keep processing this event. */ static gboolean -xg_tool_bar_item_expose_callback (w, event, client_data) - GtkWidget *w; - GdkEventExpose *event; - gpointer client_data; +xg_tool_bar_item_expose_callback (GtkWidget *w, GdkEventExpose *event, gpointer client_data) { gint width, height; @@ -3742,8 +3587,7 @@ /* Attach a tool bar to frame F. */ static void -xg_pack_tool_bar (f) - FRAME_PTR f; +xg_pack_tool_bar (FRAME_PTR f) { struct x_output *x = f->output_data.x; int vbox_pos = x->menubar_widget ? 1 : 0; @@ -3777,8 +3621,7 @@ #endif static void -xg_create_tool_bar (f) - FRAME_PTR f; +xg_create_tool_bar (FRAME_PTR f) { struct x_output *x = f->output_data.x; @@ -3799,10 +3642,7 @@ Returns IMAGE if RTL is not found. */ static Lisp_Object -find_rtl_image (f, image, rtl) - FRAME_PTR f; - Lisp_Object image; - Lisp_Object rtl; +find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl) { int i; Lisp_Object file, rtl_name; @@ -3955,8 +3795,7 @@ extern Lisp_Object Qx_gtk_map_stock; void -update_frame_tool_bar (f) - FRAME_PTR f; +update_frame_tool_bar (FRAME_PTR f) { int i; GtkRequisition old_req, new_req; @@ -4237,8 +4076,7 @@ Remove the tool bar. */ void -free_frame_tool_bar (f) - FRAME_PTR f; +free_frame_tool_bar (FRAME_PTR f) { struct x_output *x = f->output_data.x; @@ -4269,7 +4107,7 @@ Initializing ***********************************************************************/ void -xg_initialize () +xg_initialize (void) { GtkBindingSet *binding_set;
--- a/src/indent.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/indent.c Sun Jul 04 00:50:25 2010 -0700 @@ -72,7 +72,7 @@ /* Get the display table to use for the current buffer. */ struct Lisp_Char_Table * -buffer_display_table () +buffer_display_table (void) { Lisp_Object thisbuf; @@ -89,9 +89,7 @@ /* Return the width of character C under display table DP. */ static int -character_width (c, dp) - int c; - struct Lisp_Char_Table *dp; +character_width (int c, struct Lisp_Char_Table *dp) { Lisp_Object elt; @@ -125,9 +123,7 @@ invalidate the buffer's width_run_cache. */ int -disptab_matches_widthtab (disptab, widthtab) - struct Lisp_Char_Table *disptab; - struct Lisp_Vector *widthtab; +disptab_matches_widthtab (struct Lisp_Char_Table *disptab, struct Lisp_Vector *widthtab) { int i; @@ -145,9 +141,7 @@ /* Recompute BUF's width table, using the display table DISPTAB. */ void -recompute_width_table (buf, disptab) - struct buffer *buf; - struct Lisp_Char_Table *disptab; +recompute_width_table (struct buffer *buf, struct Lisp_Char_Table *disptab) { int i; struct Lisp_Vector *widthtab; @@ -166,7 +160,7 @@ state of current_buffer's cache_long_line_scans variable. */ static void -width_run_cache_on_off () +width_run_cache_on_off (void) { if (NILP (current_buffer->cache_long_line_scans) /* And, for the moment, this feature doesn't work on multibyte @@ -217,11 +211,7 @@ will equal the return value. */ EMACS_INT -skip_invisible (pos, next_boundary_p, to, window) - EMACS_INT pos; - EMACS_INT *next_boundary_p; - EMACS_INT to; - Lisp_Object window; +skip_invisible (EMACS_INT pos, EMACS_INT *next_boundary_p, EMACS_INT to, Lisp_Object window) { Lisp_Object prop, position, overlay_limit, proplimit; Lisp_Object buffer, tmp; @@ -332,13 +322,13 @@ /* Cancel any recorded value of the horizontal position. */ void -invalidate_current_column () +invalidate_current_column (void) { last_known_column_point = 0; } double -current_column () +current_column (void) { register int col; register unsigned char *ptr, *stop; @@ -723,7 +713,7 @@ due to text properties or overlays. */ static double -current_column_1 () +current_column_1 (void) { EMACS_INT col = MOST_POSITIVE_FIXNUM; EMACS_INT opoint = PT; @@ -887,8 +877,7 @@ } static double -position_indentation (pos_byte) - register int pos_byte; +position_indentation (register int pos_byte) { register EMACS_INT column = 0; register EMACS_INT tab_width = XINT (current_buffer->tab_width); @@ -977,9 +966,7 @@ preceding line. */ int -indented_beyond_p (pos, pos_byte, column) - int pos, pos_byte; - double column; +indented_beyond_p (int pos, int pos_byte, double column) { double val; int opoint = PT, opoint_byte = PT_BYTE; @@ -1137,12 +1124,7 @@ the scroll bars if they are turned on. */ struct position * -compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win) - EMACS_INT from, fromvpos, fromhpos, to, tovpos, tohpos; - int did_motion; - EMACS_INT width; - EMACS_INT hscroll, tab_offset; - struct window *win; +compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_motion, EMACS_INT to, EMACS_INT tovpos, EMACS_INT tohpos, EMACS_INT width, EMACS_INT hscroll, EMACS_INT tab_offset, struct window *win) { register EMACS_INT hpos = fromhpos; register EMACS_INT vpos = fromvpos; @@ -1856,9 +1838,7 @@ struct position val_vmotion; struct position * -vmotion (from, vtarget, w) - register EMACS_INT from, vtarget; - struct window *w; +vmotion (register EMACS_INT from, register EMACS_INT vtarget, struct window *w) { EMACS_INT hscroll = XINT (w->hscroll); struct position pos; @@ -2183,7 +2163,7 @@ /* File's initialization. */ void -syms_of_indent () +syms_of_indent (void) { DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode, doc: /* *Indentation can insert tabs if this is non-nil. */);
--- a/src/insdel.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/insdel.c Sun Jul 04 00:50:25 2010 -0700 @@ -51,7 +51,7 @@ EMACS_INT, EMACS_INT, EMACS_INT); static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes); -Lisp_Object Fcombine_after_change_execute (); +Lisp_Object Fcombine_after_change_execute (void); /* Non-nil means don't call the after-change-functions right away, just record an element in combine_after_change_list. */ @@ -85,7 +85,7 @@ else void -check_markers () +check_markers (void) { register struct Lisp_Marker *tail; int multibyte = ! NILP (current_buffer->enable_multibyte_characters); @@ -2132,8 +2132,7 @@ NO-ERROR-FLAG is nil if there was an error, anything else meaning no error (so this function does nothing). */ Lisp_Object -reset_var_on_error (val) - Lisp_Object val; +reset_var_on_error (Lisp_Object val) { if (NILP (XCDR (val))) Fset (XCAR (val), Qnil); @@ -2297,8 +2296,7 @@ } Lisp_Object -Fcombine_after_change_execute_1 (val) - Lisp_Object val; +Fcombine_after_change_execute_1 (Lisp_Object val) { Vcombine_after_change_calls = val; return val; @@ -2390,7 +2388,7 @@ } void -syms_of_insdel () +syms_of_insdel (void) { staticpro (&combine_after_change_list); staticpro (&combine_after_change_buffer);
--- a/src/intervals.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/intervals.c Sun Jul 04 00:50:25 2010 -0700 @@ -52,7 +52,7 @@ #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) -Lisp_Object merge_properties_sticky (); +Lisp_Object merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright); static INTERVAL reproduce_tree (INTERVAL, INTERVAL); static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); @@ -62,8 +62,7 @@ /* Create the root interval of some object, a buffer or string. */ INTERVAL -create_root_interval (parent) - Lisp_Object parent; +create_root_interval (Lisp_Object parent) { INTERVAL new; @@ -95,8 +94,7 @@ /* Make the interval TARGET have exactly the properties of SOURCE */ void -copy_properties (source, target) - register INTERVAL source, target; +copy_properties (register INTERVAL source, register INTERVAL target) { if (DEFAULT_INTERVAL_P (source) && DEFAULT_INTERVAL_P (target)) return; @@ -110,8 +108,7 @@ is added to TARGET if TARGET has no such property as yet. */ static void -merge_properties (source, target) - register INTERVAL source, target; +merge_properties (register INTERVAL source, register INTERVAL target) { register Lisp_Object o, sym, val; @@ -149,8 +146,7 @@ 0 otherwise. */ int -intervals_equal (i0, i1) - INTERVAL i0, i1; +intervals_equal (INTERVAL i0, INTERVAL i1) { register Lisp_Object i0_cdr, i0_sym; register Lisp_Object i1_cdr, i1_val; @@ -206,10 +202,7 @@ Pass FUNCTION two args: an interval, and ARG. */ void -traverse_intervals_noorder (tree, function, arg) - INTERVAL tree; - void (* function) (INTERVAL, Lisp_Object); - Lisp_Object arg; +traverse_intervals_noorder (INTERVAL tree, void (*function) (INTERVAL, Lisp_Object), Lisp_Object arg) { /* Minimize stack usage. */ while (!NULL_INTERVAL_P (tree)) @@ -229,11 +222,7 @@ Pass FUNCTION two args: an interval, and ARG. */ void -traverse_intervals (tree, position, function, arg) - INTERVAL tree; - int position; - void (* function) (INTERVAL, Lisp_Object); - Lisp_Object arg; +traverse_intervals (INTERVAL tree, int position, void (*function) (INTERVAL, Lisp_Object), Lisp_Object arg) { while (!NULL_INTERVAL_P (tree)) { @@ -323,8 +312,7 @@ */ static INLINE INTERVAL -rotate_right (interval) - INTERVAL interval; +rotate_right (INTERVAL interval) { INTERVAL i; INTERVAL B = interval->left; @@ -371,8 +359,7 @@ */ static INLINE INTERVAL -rotate_left (interval) - INTERVAL interval; +rotate_left (INTERVAL interval) { INTERVAL i; INTERVAL B = interval->right; @@ -413,8 +400,7 @@ themselves are already balanced. */ static INTERVAL -balance_an_interval (i) - INTERVAL i; +balance_an_interval (INTERVAL i) { register int old_diff, new_diff; @@ -451,8 +437,7 @@ Lisp Object. */ static INLINE INTERVAL -balance_possible_root_interval (interval) - register INTERVAL interval; +balance_possible_root_interval (register INTERVAL interval) { Lisp_Object parent; int have_parent = 0; @@ -482,8 +467,7 @@ (the amount of text). */ static INTERVAL -balance_intervals_internal (tree) - register INTERVAL tree; +balance_intervals_internal (register INTERVAL tree) { /* Balance within each side. */ if (tree->left) @@ -496,8 +480,7 @@ /* Advertised interface to balance intervals. */ INTERVAL -balance_intervals (tree) - INTERVAL tree; +balance_intervals (INTERVAL tree) { if (tree == NULL_INTERVAL) return NULL_INTERVAL; @@ -519,9 +502,7 @@ it is still a root after this operation. */ INTERVAL -split_interval_right (interval, offset) - INTERVAL interval; - int offset; +split_interval_right (INTERVAL interval, int offset) { INTERVAL new = make_interval (); int position = interval->position; @@ -566,9 +547,7 @@ it is still a root after this operation. */ INTERVAL -split_interval_left (interval, offset) - INTERVAL interval; - int offset; +split_interval_left (INTERVAL interval, int offset) { INTERVAL new = make_interval (); int new_length = offset; @@ -608,8 +587,7 @@ of another interval! */ int -interval_start_pos (source) - INTERVAL source; +interval_start_pos (INTERVAL source) { Lisp_Object parent; @@ -635,9 +613,7 @@ will update this cache based on the result of find_interval. */ INTERVAL -find_interval (tree, position) - register INTERVAL tree; - register int position; +find_interval (register INTERVAL tree, register int position) { /* The distance from the left edge of the subtree at TREE to POSITION. */ @@ -691,8 +667,7 @@ find_interval). */ INTERVAL -next_interval (interval) - register INTERVAL interval; +next_interval (register INTERVAL interval) { register INTERVAL i = interval; register int next_position; @@ -731,8 +706,7 @@ find_interval). */ INTERVAL -previous_interval (interval) - register INTERVAL interval; +previous_interval (register INTERVAL interval) { register INTERVAL i; @@ -771,9 +745,7 @@ To speed up the process, we assume that the ->position of I and all its parents is already uptodate. */ INTERVAL -update_interval (i, pos) - register INTERVAL i; - int pos; +update_interval (register INTERVAL i, int pos) { if (NULL_INTERVAL_P (i)) return NULL_INTERVAL; @@ -892,9 +864,7 @@ this text, and make it have the merged properties of both ends. */ static INTERVAL -adjust_intervals_for_insertion (tree, position, length) - INTERVAL tree; - int position, length; +adjust_intervals_for_insertion (INTERVAL tree, int position, int length) { register INTERVAL i; register INTERVAL temp; @@ -1119,8 +1089,7 @@ */ Lisp_Object -merge_properties_sticky (pleft, pright) - Lisp_Object pleft, pright; +merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright) { register Lisp_Object props, front, rear; Lisp_Object lfront, lrear, rfront, rrear; @@ -1256,8 +1225,7 @@ storing the resulting subtree into its parent. */ static INTERVAL -delete_node (i) - register INTERVAL i; +delete_node (register INTERVAL i) { register INTERVAL migrate, this; register int migrate_amt; @@ -1290,8 +1258,7 @@ for the length of I. */ void -delete_interval (i) - register INTERVAL i; +delete_interval (register INTERVAL i) { register INTERVAL parent; int amt = LENGTH (i); @@ -1345,9 +1312,7 @@ deleting the appropriate amount of text. */ static int -interval_deletion_adjustment (tree, from, amount) - register INTERVAL tree; - register int from, amount; +interval_deletion_adjustment (register INTERVAL tree, register int from, register int amount) { register int relative_position = from; @@ -1407,9 +1372,7 @@ buffer position, i.e. origin 1). */ static void -adjust_intervals_for_deletion (buffer, start, length) - struct buffer *buffer; - int start, length; +adjust_intervals_for_deletion (struct buffer *buffer, int start, int length) { register int left_to_delete = length; register INTERVAL tree = BUF_INTERVALS (buffer); @@ -1460,9 +1423,7 @@ of LENGTH. */ INLINE void -offset_intervals (buffer, start, length) - struct buffer *buffer; - int start, length; +offset_intervals (struct buffer *buffer, int start, int length) { if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0) return; @@ -1483,8 +1444,7 @@ interval. */ INTERVAL -merge_interval_right (i) - register INTERVAL i; +merge_interval_right (register INTERVAL i) { register int absorb = LENGTH (i); register INTERVAL successor; @@ -1540,8 +1500,7 @@ The caller must verify that this is not the first (leftmost) interval. */ INTERVAL -merge_interval_left (i) - register INTERVAL i; +merge_interval_left (register INTERVAL i) { register int absorb = LENGTH (i); register INTERVAL predecessor; @@ -1595,8 +1554,7 @@ the pointers of the copy. */ static INTERVAL -reproduce_tree (source, parent) - INTERVAL source, parent; +reproduce_tree (INTERVAL source, INTERVAL parent) { register INTERVAL t = make_interval (); @@ -1612,9 +1570,7 @@ } static INTERVAL -reproduce_tree_obj (source, parent) - INTERVAL source; - Lisp_Object parent; +reproduce_tree_obj (INTERVAL source, Lisp_Object parent) { register INTERVAL t = make_interval (); @@ -1714,11 +1670,7 @@ text... */ void -graft_intervals_into_buffer (source, position, length, buffer, inherit) - INTERVAL source; - int position, length; - struct buffer *buffer; - int inherit; +graft_intervals_into_buffer (INTERVAL source, int position, int length, struct buffer *buffer, int inherit) { register INTERVAL under, over, this, prev; register INTERVAL tree; @@ -1876,18 +1828,13 @@ and for PROP appearing on the default-text-properties list. */ Lisp_Object -textget (plist, prop) - Lisp_Object plist; - register Lisp_Object prop; +textget (Lisp_Object plist, register Lisp_Object prop) { return lookup_char_property (plist, prop, 1); } Lisp_Object -lookup_char_property (plist, prop, textprop) - Lisp_Object plist; - register Lisp_Object prop; - int textprop; +lookup_char_property (Lisp_Object plist, register Lisp_Object prop, int textprop) { register Lisp_Object tail, fallback = Qnil; @@ -1974,8 +1921,7 @@ if the invisible property comes from an overlay. */ static int -adjust_for_invis_intang (pos, test_offs, adj, test_intang) - int pos, test_offs, adj, test_intang; +adjust_for_invis_intang (int pos, int test_offs, int adj, int test_intang) { Lisp_Object invis_propval, invis_overlay; Lisp_Object test_pos; @@ -2237,8 +2183,7 @@ segment that reaches all the way to point. */ void -move_if_not_intangible (position) - int position; +move_if_not_intangible (int position) { Lisp_Object pos; Lisp_Object intangible_propval; @@ -2301,11 +2246,7 @@ nil means the current buffer. */ int -get_property_and_range (pos, prop, val, start, end, object) - int pos; - Lisp_Object prop, *val; - EMACS_INT *start, *end; - Lisp_Object object; +get_property_and_range (int pos, Lisp_Object prop, Lisp_Object *val, EMACS_INT *start, EMACS_INT *end, Lisp_Object object) { INTERVAL i, prev, next; @@ -2348,10 +2289,7 @@ POSITION must be in the accessible part of BUFFER. */ Lisp_Object -get_local_map (position, buffer, type) - register int position; - register struct buffer *buffer; - Lisp_Object type; +get_local_map (register int position, register struct buffer *buffer, Lisp_Object type) { Lisp_Object prop, lispy_position, lispy_buffer; int old_begv, old_zv, old_begv_byte, old_zv_byte; @@ -2404,9 +2342,7 @@ The new interval tree has no parent and has a starting-position of 0. */ INTERVAL -copy_intervals (tree, start, length) - INTERVAL tree; - int start, length; +copy_intervals (INTERVAL tree, int start, int length) { register INTERVAL i, new, t; register int got, prevlen; @@ -2447,10 +2383,7 @@ /* Give STRING the properties of BUFFER from POSITION to LENGTH. */ INLINE void -copy_intervals_to_string (string, buffer, position, length) - Lisp_Object string; - struct buffer *buffer; - int position, length; +copy_intervals_to_string (Lisp_Object string, struct buffer *buffer, int position, int length) { INTERVAL interval_copy = copy_intervals (BUF_INTERVALS (buffer), position, length); @@ -2465,8 +2398,7 @@ Assume they have identical characters. */ int -compare_string_intervals (s1, s2) - Lisp_Object s1, s2; +compare_string_intervals (Lisp_Object s1, Lisp_Object s2) { INTERVAL i1, i2; int pos = 0; @@ -2504,10 +2436,7 @@ START_BYTE ... END_BYTE in bytes. */ static void -set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte) - INTERVAL i; - int multi_flag; - int start, start_byte, end, end_byte; +set_intervals_multibyte_1 (INTERVAL i, int multi_flag, int start, int start_byte, int end, int end_byte) { /* Fix the length of this interval. */ if (multi_flag) @@ -2617,8 +2546,7 @@ or to fit them as non-multibyte (if MULTI_FLAG is 0). */ void -set_intervals_multibyte (multi_flag) - int multi_flag; +set_intervals_multibyte (int multi_flag) { if (BUF_INTERVALS (current_buffer)) set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag,
--- a/src/keymap.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/keymap.c Sun Jul 04 00:50:25 2010 -0700 @@ -183,19 +183,13 @@ initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark"); */ void -initial_define_key (keymap, key, defname) - Lisp_Object keymap; - int key; - char *defname; +initial_define_key (Lisp_Object keymap, int key, char *defname) { store_in_keymap (keymap, make_number (key), intern_c_string (defname)); } void -initial_define_lispy_key (keymap, keyname, defname) - Lisp_Object keymap; - char *keyname; - char *defname; +initial_define_lispy_key (Lisp_Object keymap, char *keyname, char *defname) { store_in_keymap (keymap, intern_c_string (keyname), intern_c_string (defname)); } @@ -255,9 +249,7 @@ do_autoload which can GC. */ Lisp_Object -get_keymap (object, error, autoload) - Lisp_Object object; - int error, autoload; +get_keymap (Lisp_Object object, int error, int autoload) { Lisp_Object tem; @@ -309,9 +301,7 @@ We assume that KEYMAP is a valid keymap. */ Lisp_Object -keymap_parent (keymap, autoload) - Lisp_Object keymap; - int autoload; +keymap_parent (Lisp_Object keymap, int autoload) { Lisp_Object list; @@ -340,8 +330,7 @@ /* Check whether MAP is one of MAPS parents. */ int -keymap_memberp (map, maps) - Lisp_Object map, maps; +keymap_memberp (Lisp_Object map, Lisp_Object maps) { if (NILP (map)) return 0; while (KEYMAPP (maps) && !EQ (map, maps)) @@ -437,8 +426,7 @@ make sure that SUBMAP inherits that definition as its own parent. */ static void -fix_submap_inheritance (map, event, submap) - Lisp_Object map, event, submap; +fix_submap_inheritance (Lisp_Object map, Lisp_Object event, Lisp_Object submap) { Lisp_Object map_parent, parent_entry; @@ -500,12 +488,7 @@ If NOINHERIT, don't accept a subkeymap found in an inherited keymap. */ Lisp_Object -access_keymap (map, idx, t_ok, noinherit, autoload) - Lisp_Object map; - Lisp_Object idx; - int t_ok; - int noinherit; - int autoload; +access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload) { Lisp_Object val; @@ -634,10 +617,7 @@ } static void -map_keymap_item (fun, args, key, val, data) - map_keymap_function_t fun; - Lisp_Object args, key, val; - void *data; +map_keymap_item (map_keymap_function_t fun, Lisp_Object args, Lisp_Object key, Lisp_Object val, void *data) { /* We should maybe try to detect bindings shadowed by previous ones and things like that. */ @@ -647,8 +627,7 @@ } static void -map_keymap_char_table_item (args, key, val) - Lisp_Object args, key, val; +map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val) { if (!NILP (val)) { @@ -707,9 +686,7 @@ } static void -map_keymap_call (key, val, fun, dummy) - Lisp_Object key, val, fun; - void *dummy; +map_keymap_call (Lisp_Object key, Lisp_Object val, Lisp_Object fun, void *dummy) { call2 (fun, key, val); } @@ -717,11 +694,7 @@ /* Same as map_keymap_internal, but doesn't traverses parent keymaps as well. A non-zero AUTOLOAD indicates that autoloaded keymaps should be loaded. */ void -map_keymap (map, fun, args, data, autoload) - map_keymap_function_t fun; - Lisp_Object map, args; - void *data; - int autoload; +map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data, int autoload) { struct gcpro gcpro1; GCPRO1 (args); @@ -739,10 +712,7 @@ /* Same as map_keymap, but does it right, properly eliminating duplicate bindings due to inheritance. */ void -map_keymap_canonical (map, fun, args, data) - map_keymap_function_t fun; - Lisp_Object map, args; - void *data; +map_keymap_canonical (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data) { struct gcpro gcpro1; GCPRO1 (args); @@ -804,9 +774,7 @@ This can GC because menu_item_eval_property calls Feval. */ Lisp_Object -get_keyelt (object, autoload) - Lisp_Object object; - int autoload; +get_keyelt (Lisp_Object object, int autoload) { while (1) { @@ -886,10 +854,7 @@ } static Lisp_Object -store_in_keymap (keymap, idx, def) - Lisp_Object keymap; - register Lisp_Object idx; - Lisp_Object def; +store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def) { /* Flush any reverse-map cache. */ where_is_cache = Qnil; @@ -1044,8 +1009,7 @@ EXFUN (Fcopy_keymap, 1); Lisp_Object -copy_keymap_item (elt) - Lisp_Object elt; +copy_keymap_item (Lisp_Object elt) { Lisp_Object res, tem; @@ -1118,8 +1082,7 @@ } static void -copy_keymap_1 (chartable, idx, elt) - Lisp_Object chartable, idx, elt; +copy_keymap_1 (Lisp_Object chartable, Lisp_Object idx, Lisp_Object elt) { Fset_char_table_range (chartable, idx, copy_keymap_item (elt)); } @@ -1412,8 +1375,7 @@ Return the keymap. */ static Lisp_Object -define_as_prefix (keymap, c) - Lisp_Object keymap, c; +define_as_prefix (Lisp_Object keymap, Lisp_Object c) { Lisp_Object cmd; @@ -1430,8 +1392,7 @@ /* Append a key to the end of a key sequence. We always make a vector. */ Lisp_Object -append_key (key_sequence, key) - Lisp_Object key_sequence, key; +append_key (Lisp_Object key_sequence, Lisp_Object key) { Lisp_Object args[2]; @@ -1445,8 +1406,7 @@ signal an error if is a mistake such as RET or M-RET or C-DEL, etc. */ static void -silly_event_symbol_error (c) - Lisp_Object c; +silly_event_symbol_error (Lisp_Object c) { Lisp_Object parsed, base, name, assoc; int modifiers; @@ -1515,8 +1475,7 @@ list, let the key sequence be read, and hope some other piece of code signals the error. */ int -current_minor_maps (modeptr, mapptr) - Lisp_Object **modeptr, **mapptr; +current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) { int i = 0; int list_number = 0; @@ -2128,10 +2087,10 @@ }; static void -accessible_keymaps_1 (key, cmd, args, data) - Lisp_Object key, cmd, args; +accessible_keymaps_1 (Lisp_Object key, Lisp_Object cmd, Lisp_Object args, void *data) + /* Use void* to be compatible with map_keymap_function_t. */ - void *data; + { struct accessible_keymaps_data *d = data; /* Cast! */ Lisp_Object maps = d->maps; @@ -2389,10 +2348,7 @@ char * -push_key_description (c, p, force_multibyte) - register unsigned int c; - register char *p; - int force_multibyte; +push_key_description (register unsigned int c, register char *p, int force_multibyte) { unsigned c2; @@ -2549,9 +2505,7 @@ } char * -push_text_char_description (c, p) - register unsigned int c; - register char *p; +push_text_char_description (register unsigned int c, register char *p) { if (c >= 0200) { @@ -2611,8 +2565,7 @@ Else, return 2 if SEQ uses the where_is_preferred_modifier, and 1 otherwise. */ static int -preferred_sequence_p (seq) - Lisp_Object seq; +preferred_sequence_p (Lisp_Object seq) { int i; int len = XINT (Flength (seq)); @@ -2982,9 +2935,7 @@ /* This function can GC because get_keyelt can. */ static void -where_is_internal_1 (key, binding, args, data) - Lisp_Object key, binding, args; - void *data; +where_is_internal_1 (Lisp_Object key, Lisp_Object binding, Lisp_Object args, void *data) { struct where_is_internal_data *d = data; /* Cast! */ Lisp_Object definition = d->definition; @@ -3342,8 +3293,7 @@ static int previous_description_column; static void -describe_command (definition, args) - Lisp_Object definition, args; +describe_command (Lisp_Object definition, Lisp_Object args) { register Lisp_Object tem1; int column = (int) current_column (); /* iftc */ @@ -3379,8 +3329,7 @@ } static void -describe_translation (definition, args) - Lisp_Object definition, args; +describe_translation (Lisp_Object definition, Lisp_Object args) { register Lisp_Object tem1; @@ -3413,8 +3362,7 @@ the event field. */ static int -describe_map_compare (aa, bb) - const void *aa, *bb; +describe_map_compare (const void *aa, const void *bb) { const struct describe_map_elt *a = aa, *b = bb; if (INTEGERP (a->event) && INTEGERP (b->event)) @@ -3624,8 +3572,7 @@ } static void -describe_vector_princ (elt, fun) - Lisp_Object elt, fun; +describe_vector_princ (Lisp_Object elt, Lisp_Object fun) { Findent_to (make_number (16), make_number (1)); call1 (fun, elt); @@ -3893,8 +3840,7 @@ static Lisp_Object apropos_accumulate; static void -apropos_accum (symbol, string) - Lisp_Object symbol, string; +apropos_accum (Lisp_Object symbol, Lisp_Object string) { register Lisp_Object tem; @@ -3925,7 +3871,7 @@ } void -syms_of_keymap () +syms_of_keymap (void) { Qkeymap = intern_c_string ("keymap"); staticpro (&Qkeymap); @@ -4119,7 +4065,7 @@ } void -keys_of_keymap () +keys_of_keymap (void) { initial_define_key (global_map, 033, "ESC-prefix"); initial_define_key (global_map, Ctl ('X'), "Control-X-prefix");
--- a/src/lread.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/lread.c Sun Jul 04 00:50:25 2010 -0700 @@ -230,7 +230,7 @@ static Lisp_Object load_descriptor_unwind (Lisp_Object); static void invalid_syntax (const char *, int) NO_RETURN; -static void end_of_file_error () NO_RETURN; +static void end_of_file_error (void) NO_RETURN; /* Functions that read one byte from the current source READCHARFUN @@ -262,9 +262,7 @@ static int unread_char; static int -readchar (readcharfun, multibyte) - Lisp_Object readcharfun; - int *multibyte; +readchar (Lisp_Object readcharfun, int *multibyte) { Lisp_Object tem; register int c; @@ -435,9 +433,7 @@ If the stream is a user function, call it with the char as argument. */ static void -unreadchar (readcharfun, c) - Lisp_Object readcharfun; - int c; +unreadchar (Lisp_Object readcharfun, int c) { readchar_count--; if (c == -1) @@ -501,18 +497,14 @@ } static int -readbyte_for_lambda (c, readcharfun) - int c; - Lisp_Object readcharfun; +readbyte_for_lambda (int c, Lisp_Object readcharfun) { return read_bytecode_char (c >= 0); } static int -readbyte_from_file (c, readcharfun) - int c; - Lisp_Object readcharfun; +readbyte_from_file (int c, Lisp_Object readcharfun) { if (c >= 0) { @@ -543,9 +535,7 @@ } static int -readbyte_from_string (c, readcharfun) - int c; - Lisp_Object readcharfun; +readbyte_from_string (int c, Lisp_Object readcharfun) { Lisp_Object string = XCAR (readcharfun); @@ -573,10 +563,7 @@ extern char emacs_mule_bytes[256]; static int -read_emacs_mule_char (c, readbyte, readcharfun) - int c; - int (*readbyte) (int, Lisp_Object); - Lisp_Object readcharfun; +read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) { /* Emacs-mule coding uses at most 4-byte for one character. */ unsigned char buf[4]; @@ -871,8 +858,7 @@ because of an incompatible change in the byte compiler. */ static int -safe_to_load_p (fd) - int fd; +safe_to_load_p (int fd) { char buf[512]; int nbytes, i; @@ -909,8 +895,7 @@ after loading a file successfully. */ static Lisp_Object -record_load_unwind (old) - Lisp_Object old; +record_load_unwind (Lisp_Object old) { return Vloads_in_progress = old; } @@ -918,15 +903,13 @@ /* This handler function is used via internal_condition_case_1. */ static Lisp_Object -load_error_handler (data) - Lisp_Object data; +load_error_handler (Lisp_Object data) { return Qnil; } static Lisp_Object -load_warn_old_style_backquotes (file) - Lisp_Object file; +load_warn_old_style_backquotes (Lisp_Object file) { if (!NILP (Vold_style_backquotes)) { @@ -1299,8 +1282,8 @@ } static Lisp_Object -load_unwind (arg) /* used as unwind-protect function in load */ - Lisp_Object arg; +load_unwind (Lisp_Object arg) /* used as unwind-protect function in load */ + { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; if (stream != NULL) @@ -1313,8 +1296,7 @@ } static Lisp_Object -load_descriptor_unwind (oldlist) - Lisp_Object oldlist; +load_descriptor_unwind (Lisp_Object oldlist) { load_descriptor_list = oldlist; return Qnil; @@ -1324,7 +1306,7 @@ This is used when starting a subprocess. */ void -close_load_descs () +close_load_descs (void) { #ifndef WINDOWSNT Lisp_Object tail; @@ -1334,8 +1316,7 @@ } static int -complete_filename_p (pathname) - Lisp_Object pathname; +complete_filename_p (Lisp_Object pathname) { register const unsigned char *s = SDATA (pathname); return (IS_DIRECTORY_SEP (s[0]) @@ -1383,11 +1364,7 @@ but store the found remote file name in *STOREPTR. */ int -openp (path, str, suffixes, storeptr, predicate) - Lisp_Object path, str; - Lisp_Object suffixes; - Lisp_Object *storeptr; - Lisp_Object predicate; +openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *storeptr, Lisp_Object predicate) { register int fd; int fn_size = 100; @@ -1539,9 +1516,7 @@ ENTIRE is 1 if loading that entire file, 0 if evaluating part of it. */ static void -build_load_history (filename, entire) - Lisp_Object filename; - int entire; +build_load_history (Lisp_Object filename, int entire) { register Lisp_Object tail, prev, newelt; register Lisp_Object tem, tem2; @@ -1601,16 +1576,15 @@ } Lisp_Object -unreadpure (junk) /* Used as unwind-protect function in readevalloop */ - Lisp_Object junk; +unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */ + { read_pure = 0; return Qnil; } static Lisp_Object -readevalloop_1 (old) - Lisp_Object old; +readevalloop_1 (Lisp_Object old) { load_convert_to_unibyte = ! NILP (old); return Qnil; @@ -1620,7 +1594,7 @@ information. */ static void -end_of_file_error () +end_of_file_error (void) { if (STRINGP (Vload_file_name)) xsignal1 (Qend_of_file, Vload_file_name); @@ -1924,10 +1898,10 @@ /* Function to set up the global context we need in toplevel read calls. */ static Lisp_Object -read_internal_start (stream, start, end) - Lisp_Object stream; - Lisp_Object start; /* Only used when stream is a string. */ - Lisp_Object end; /* Only used when stream is a string. */ +read_internal_start (Lisp_Object stream, Lisp_Object start, Lisp_Object end) + + /* Only used when stream is a string. */ + /* Only used when stream is a string. */ { Lisp_Object retval; @@ -1985,9 +1959,7 @@ S is error string of length N (if > 0) */ static void -invalid_syntax (s, n) - const char *s; - int n; +invalid_syntax (const char *s, int n) { if (!n) n = strlen (s); @@ -1999,8 +1971,7 @@ are not allowed. */ static Lisp_Object -read0 (readcharfun) - Lisp_Object readcharfun; +read0 (Lisp_Object readcharfun) { register Lisp_Object val; int c; @@ -2020,9 +1991,7 @@ If the escape sequence forces unibyte, return eight-bit char. */ static int -read_escape (readcharfun, stringp) - Lisp_Object readcharfun; - int stringp; +read_escape (Lisp_Object readcharfun, int stringp) { register int c = READCHAR; /* \u allows up to four hex digits, \U up to eight. Default to the @@ -2236,9 +2205,7 @@ range. */ static Lisp_Object -read_integer (readcharfun, radix) - Lisp_Object readcharfun; - int radix; +read_integer (Lisp_Object readcharfun, int radix) { int ndigits = 0, invalid_p, c, sign = 0; /* We use a floating point number because */ @@ -2303,10 +2270,7 @@ FIRST_IN_LIST is nonzero if this is the first element of a list. */ static Lisp_Object -read1 (readcharfun, pch, first_in_list) - register Lisp_Object readcharfun; - int *pch; - int first_in_list; +read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) { register int c; int uninterned_symbol = 0; @@ -3110,9 +3074,7 @@ static Lisp_Object seen_list; static void -substitute_object_in_subtree (object, placeholder) - Lisp_Object object; - Lisp_Object placeholder; +substitute_object_in_subtree (Lisp_Object object, Lisp_Object placeholder) { Lisp_Object check_object; @@ -3147,10 +3109,7 @@ } while (0) static Lisp_Object -substitute_object_recurse (object, placeholder, subtree) - Lisp_Object object; - Lisp_Object placeholder; - Lisp_Object subtree; +substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Object subtree) { /* If we find the placeholder, return the target object. */ if (EQ (placeholder, subtree)) @@ -3225,9 +3184,7 @@ /* Helper function for substitute_object_recurse. */ static void -substitute_in_interval (interval, arg) - INTERVAL interval; - Lisp_Object arg; +substitute_in_interval (INTERVAL interval, Lisp_Object arg) { Lisp_Object object = Fcar (arg); Lisp_Object placeholder = Fcdr (arg); @@ -3243,9 +3200,7 @@ #define EXP_INT 16 int -isfloat_string (cp, ignore_trailing) - register char *cp; - int ignore_trailing; +isfloat_string (register char *cp, int ignore_trailing) { register int state; @@ -3310,9 +3265,7 @@ static Lisp_Object -read_vector (readcharfun, bytecodeflag) - Lisp_Object readcharfun; - int bytecodeflag; +read_vector (Lisp_Object readcharfun, int bytecodeflag) { register int i; register int size; @@ -3395,9 +3348,7 @@ and make structure pure. */ static Lisp_Object -read_list (flag, readcharfun) - int flag; - register Lisp_Object readcharfun; +read_list (int flag, register Lisp_Object readcharfun) { /* -1 means check next element for defun, 0 means don't check, @@ -3585,14 +3536,13 @@ int oblookup_last_bucket_number; -static int hash_string (); +static int hash_string (const unsigned char *ptr, int len); /* Get an error if OBARRAY is not an obarray. If it is one, return it. */ Lisp_Object -check_obarray (obarray) - Lisp_Object obarray; +check_obarray (Lisp_Object obarray) { if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) { @@ -3607,8 +3557,7 @@ interned in the current obarray. */ Lisp_Object -intern (str) - const char *str; +intern (const char *str) { Lisp_Object tem; int len = strlen (str); @@ -3649,8 +3598,7 @@ /* Create an uninterned symbol with name STR. */ Lisp_Object -make_symbol (str) - char *str; +make_symbol (char *str) { int len = strlen (str); @@ -3812,10 +3760,7 @@ Also store the bucket number in oblookup_last_bucket_number. */ Lisp_Object -oblookup (obarray, ptr, size, size_byte) - Lisp_Object obarray; - register const char *ptr; - int size, size_byte; +oblookup (Lisp_Object obarray, register const char *ptr, int size, int size_byte) { int hash; int obsize; @@ -3852,9 +3797,7 @@ } static int -hash_string (ptr, len) - const unsigned char *ptr; - int len; +hash_string (const unsigned char *ptr, int len) { register const unsigned char *p = ptr; register const unsigned char *end = p + len; @@ -3871,10 +3814,7 @@ } void -map_obarray (obarray, fn, arg) - Lisp_Object obarray; - void (*fn) (Lisp_Object, Lisp_Object); - Lisp_Object arg; +map_obarray (Lisp_Object obarray, void (*fn) (Lisp_Object, Lisp_Object), Lisp_Object arg) { register int i; register Lisp_Object tail; @@ -3894,8 +3834,7 @@ } void -mapatoms_1 (sym, function) - Lisp_Object sym, function; +mapatoms_1 (Lisp_Object sym, Lisp_Object function) { call1 (function, sym); } @@ -3916,7 +3855,7 @@ #define OBARRAY_SIZE 1511 void -init_obarray () +init_obarray (void) { Lisp_Object oblength; @@ -3957,8 +3896,7 @@ } void -defsubr (sname) - struct Lisp_Subr *sname; +defsubr (struct Lisp_Subr *sname) { Lisp_Object sym; sym = intern_c_string (sname->symbol_name); @@ -4053,7 +3991,7 @@ static Lisp_Object dump_path; void -init_lread () +init_lread (void) { char *normal; int turn_off_warning = 0; @@ -4246,9 +4184,7 @@ does not exist. Print it on stderr and put it in *Messages*. */ void -dir_warning (format, dirname) - char *format; - Lisp_Object dirname; +dir_warning (char *format, Lisp_Object dirname) { char *buffer = (char *) alloca (SCHARS (dirname) + strlen (format) + 5); @@ -4261,7 +4197,7 @@ } void -syms_of_lread () +syms_of_lread (void) { defsubr (&Sread); defsubr (&Sread_from_string);
--- a/src/macros.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/macros.c Sun Jul 04 00:50:25 2010 -0700 @@ -53,7 +53,7 @@ extern Lisp_Object real_this_command; -Lisp_Object Fexecute_kbd_macro (); +Lisp_Object Fexecute_kbd_macro (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc); DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P", doc: /* Record subsequent keyboard input, defining a keyboard macro. @@ -140,7 +140,7 @@ /* Finish defining the current keyboard macro. */ void -end_kbd_macro () +end_kbd_macro (void) { current_kboard->defining_kbd_macro = Qnil; update_mode_lines++; @@ -194,8 +194,7 @@ /* Store character c into kbd macro being defined */ void -store_kbd_macro_char (c) - Lisp_Object c; +store_kbd_macro_char (Lisp_Object c) { struct kboard *kb = current_kboard; @@ -223,7 +222,7 @@ really belong to it. This is done in between editor commands. */ void -finalize_kbd_macro_chars () +finalize_kbd_macro_chars (void) { current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; } @@ -286,8 +285,7 @@ Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */ static Lisp_Object -pop_kbd_macro (info) - Lisp_Object info; +pop_kbd_macro (Lisp_Object info) { Lisp_Object tem; Vexecuting_kbd_macro = XCAR (info); @@ -367,14 +365,14 @@ } void -init_macros () +init_macros (void) { Vexecuting_kbd_macro = Qnil; executing_kbd_macro = Qnil; } void -syms_of_macros () +syms_of_macros (void) { Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro"); staticpro (&Qexecute_kbd_macro);
--- a/src/marker.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/marker.c Sun Jul 04 00:50:25 2010 -0700 @@ -39,8 +39,7 @@ static int byte_debug_flag; void -clear_charpos_cache (b) - struct buffer *b; +clear_charpos_cache (struct buffer *b) { if (cached_buffer == b) cached_buffer = 0; @@ -100,9 +99,7 @@ } static void -byte_char_debug_check (b, charpos, bytepos) - struct buffer *b; - int charpos, bytepos; +byte_char_debug_check (struct buffer *b, int charpos, int bytepos) { int nchars = 0; @@ -122,16 +119,13 @@ } int -charpos_to_bytepos (charpos) - int charpos; +charpos_to_bytepos (int charpos) { return buf_charpos_to_bytepos (current_buffer, charpos); } int -buf_charpos_to_bytepos (b, charpos) - struct buffer *b; - int charpos; +buf_charpos_to_bytepos (struct buffer *b, int charpos) { struct Lisp_Marker *tail; int best_above, best_above_byte; @@ -254,8 +248,7 @@ in the simplest, most reliable way. */ int -verify_bytepos (charpos) - int charpos; +verify_bytepos (int charpos) { int below = 1; int below_byte = 1; @@ -315,16 +308,13 @@ } int -bytepos_to_charpos (bytepos) - int bytepos; +bytepos_to_charpos (int bytepos) { return buf_bytepos_to_charpos (current_buffer, bytepos); } int -buf_bytepos_to_charpos (b, bytepos) - struct buffer *b; - int bytepos; +buf_bytepos_to_charpos (struct buffer *b, int bytepos) { struct Lisp_Marker *tail; int best_above, best_above_byte; @@ -556,8 +546,7 @@ be outside the visible part. */ Lisp_Object -set_marker_restricted (marker, pos, buffer) - Lisp_Object marker, pos, buffer; +set_marker_restricted (Lisp_Object marker, Lisp_Object pos, Lisp_Object buffer) { register int charno, bytepos; register struct buffer *b; @@ -632,9 +621,7 @@ character position and the corresponding byte position. */ Lisp_Object -set_marker_both (marker, buffer, charpos, bytepos) - Lisp_Object marker, buffer; - int charpos, bytepos; +set_marker_both (Lisp_Object marker, Lisp_Object buffer, int charpos, int bytepos) { register struct buffer *b; register struct Lisp_Marker *m; @@ -682,9 +669,7 @@ be outside the visible part. */ Lisp_Object -set_marker_restricted_both (marker, buffer, charpos, bytepos) - Lisp_Object marker, buffer; - int charpos, bytepos; +set_marker_restricted_both (Lisp_Object marker, Lisp_Object buffer, int charpos, int bytepos) { register struct buffer *b; register struct Lisp_Marker *m; @@ -745,8 +730,7 @@ including those in chain fields of markers. */ void -unchain_marker (marker) - register struct Lisp_Marker *marker; +unchain_marker (register struct Lisp_Marker *marker) { register struct Lisp_Marker *tail, *prev, *next; register struct buffer *b; @@ -796,8 +780,7 @@ /* Return the char position of marker MARKER, as a C integer. */ int -marker_position (marker) - Lisp_Object marker; +marker_position (Lisp_Object marker) { register struct Lisp_Marker *m = XMARKER (marker); register struct buffer *buf = m->buffer; @@ -811,8 +794,7 @@ /* Return the byte position of marker MARKER, as a C integer. */ int -marker_byte_position (marker) - Lisp_Object marker; +marker_byte_position (Lisp_Object marker) { register struct Lisp_Marker *m = XMARKER (marker); register struct buffer *buf = m->buffer; @@ -898,8 +880,7 @@ /* For debugging -- count the markers in buffer BUF. */ int -count_markers (buf) - struct buffer *buf; +count_markers (struct buffer *buf) { int total = 0; struct Lisp_Marker *tail; @@ -911,7 +892,7 @@ } void -syms_of_marker () +syms_of_marker (void) { defsubr (&Smarker_position); defsubr (&Smarker_buffer);
--- a/src/md5.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/md5.c Sun Jul 04 00:50:25 2010 -0700 @@ -71,8 +71,7 @@ /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ void -md5_init_ctx (ctx) - struct md5_ctx *ctx; +md5_init_ctx (struct md5_ctx *ctx) { ctx->A = 0x67452301; ctx->B = 0xefcdab89; @@ -89,9 +88,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ void * -md5_read_ctx (ctx, resbuf) - const struct md5_ctx *ctx; - void *resbuf; +md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) { ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A); ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B); @@ -107,9 +104,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ void * -md5_finish_ctx (ctx, resbuf) - struct md5_ctx *ctx; - void *resbuf; +md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) { /* Take yet unprocessed bytes into account. */ md5_uint32 bytes = ctx->buflen; @@ -138,9 +133,7 @@ resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ int -md5_stream (stream, resblock) - FILE *stream; - void *resblock; +md5_stream (FILE *stream, void *resblock) { /* Important: BLOCKSIZE must be a multiple of 64. */ #define BLOCKSIZE 4096 @@ -195,10 +188,7 @@ output yields to the wanted ASCII representation of the message digest. */ void * -md5_buffer (buffer, len, resblock) - const char *buffer; - size_t len; - void *resblock; +md5_buffer (const char *buffer, size_t len, void *resblock) { struct md5_ctx ctx; @@ -214,10 +204,7 @@ void -md5_process_bytes (buffer, len, ctx) - const void *buffer; - size_t len; - struct md5_ctx *ctx; +md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) { /* const void aligned_buffer = buffer; */ @@ -287,10 +274,7 @@ It is assumed that LEN % 64 == 0. */ void -md5_process_block (buffer, len, ctx) - const void *buffer; - size_t len; - struct md5_ctx *ctx; +md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx) { md5_uint32 correct_words[16]; const md5_uint32 *words = buffer;
--- a/src/menu.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/menu.c Sun Jul 04 00:50:25 2010 -0700 @@ -87,7 +87,7 @@ static int menu_items_submenu_depth; void -init_menu_items () +init_menu_items (void) { if (!NILP (menu_items_inuse)) error ("Trying to use a menu from within a menu-entry"); @@ -107,13 +107,12 @@ /* Call at the end of generating the data in menu_items. */ void -finish_menu_items () +finish_menu_items (void) { } Lisp_Object -unuse_menu_items (dummy) - Lisp_Object dummy; +unuse_menu_items (Lisp_Object dummy) { return menu_items_inuse = Qnil; } @@ -122,7 +121,7 @@ in menu_items. */ void -discard_menu_items () +discard_menu_items (void) { /* Free the structure if it is especially large. Otherwise, hold on to it, to save time. */ @@ -145,8 +144,7 @@ mechanism. */ static Lisp_Object -restore_menu_items (saved) - Lisp_Object saved; +restore_menu_items (Lisp_Object saved) { menu_items = XCAR (saved); menu_items_inuse = (! NILP (menu_items) ? Qt : Qnil); @@ -164,7 +162,7 @@ It will be restored when the specpdl is unwound. */ void -save_menu_items () +save_menu_items (void) { Lisp_Object saved = list4 (!NILP (menu_items_inuse) ? menu_items : Qnil, make_number (menu_items_used), @@ -179,7 +177,7 @@ /* Make the menu_items vector twice as large. */ static void -grow_menu_items () +grow_menu_items (void) { menu_items_allocated *= 2; menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); @@ -188,7 +186,7 @@ /* Begin a submenu. */ static void -push_submenu_start () +push_submenu_start (void) { if (menu_items_used + 1 > menu_items_allocated) grow_menu_items (); @@ -200,7 +198,7 @@ /* End a submenu. */ static void -push_submenu_end () +push_submenu_end (void) { if (menu_items_used + 1 > menu_items_allocated) grow_menu_items (); @@ -212,7 +210,7 @@ /* Indicate boundary between left and right. */ static void -push_left_right_boundary () +push_left_right_boundary (void) { if (menu_items_used + 1 > menu_items_allocated) grow_menu_items (); @@ -224,8 +222,7 @@ NAME is the pane name. PREFIX_VEC is a prefix key for this pane. */ static void -push_menu_pane (name, prefix_vec) - Lisp_Object name, prefix_vec; +push_menu_pane (Lisp_Object name, Lisp_Object prefix_vec) { if (menu_items_used + MENU_ITEMS_PANE_LENGTH > menu_items_allocated) grow_menu_items (); @@ -246,8 +243,7 @@ item, one of nil, `toggle' or `radio'. */ static void -push_menu_item (name, enable, key, def, equiv, type, selected, help) - Lisp_Object name, enable, key, def, equiv, type, selected, help; +push_menu_item (Lisp_Object name, Lisp_Object enable, Lisp_Object key, Lisp_Object def, Lisp_Object equiv, Lisp_Object type, Lisp_Object selected, Lisp_Object help) { if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated) grow_menu_items (); @@ -332,9 +328,7 @@ If we encounter submenus deeper than SKP->MAXDEPTH levels, ignore them. */ static void -single_menu_item (key, item, dummy, skp_v) - Lisp_Object key, item, dummy; - void *skp_v; +single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *skp_v) { Lisp_Object map, item_string, enabled; struct gcpro gcpro1, gcpro2; @@ -456,9 +450,7 @@ and generate menu panes for them in menu_items. */ static void -keymap_panes (keymaps, nmaps) - Lisp_Object *keymaps; - int nmaps; +keymap_panes (Lisp_Object *keymaps, int nmaps) { int mapno; @@ -477,8 +469,7 @@ /* Push the items in a single pane defined by the alist PANE. */ static void -list_of_items (pane) - Lisp_Object pane; +list_of_items (Lisp_Object pane) { Lisp_Object tail, item, item1; @@ -505,8 +496,7 @@ alist-of-alists MENU. This handles old-fashioned calls to x-popup-menu. */ void -list_of_panes (menu) - Lisp_Object menu; +list_of_panes (Lisp_Object menu) { Lisp_Object tail; @@ -531,8 +521,7 @@ whose event type is ITEM_KEY (with string ITEM_NAME) and whose contents come from the list of keymaps MAPS. */ int -parse_single_submenu (item_key, item_name, maps) - Lisp_Object item_key, item_name, maps; +parse_single_submenu (Lisp_Object item_key, Lisp_Object item_name, Lisp_Object maps) { Lisp_Object length; int len; @@ -583,7 +572,7 @@ /* Allocate a widget_value, blocking input. */ widget_value * -xmalloc_widget_value () +xmalloc_widget_value (void) { widget_value *value; @@ -600,8 +589,7 @@ must be left alone. */ void -free_menubar_widget_value_tree (wv) - widget_value *wv; +free_menubar_widget_value_tree (widget_value *wv) { if (! wv) return; @@ -627,8 +615,7 @@ in menu_items starting at index START, up to index END. */ widget_value * -digest_single_submenu (start, end, top_level_items) - int start, end, top_level_items; +digest_single_submenu (int start, int end, int top_level_items) { widget_value *wv, *prev_wv, *save_wv, *first_wv; int i; @@ -856,8 +843,7 @@ tree is constructed, and small strings are relocated. So we must wait until no GC can happen before storing pointers into lisp values. */ void -update_submenu_strings (first_wv) - widget_value *first_wv; +update_submenu_strings (widget_value *first_wv) { widget_value *wv; @@ -891,11 +877,7 @@ VECTOR is an array of menu events for the whole menu. */ void -find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data) - FRAME_PTR f; - int menu_bar_items_used; - Lisp_Object vector; - void *client_data; +find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object vector, void *client_data) { Lisp_Object prefix, entry; Lisp_Object *subprefix_stack; @@ -1368,7 +1350,7 @@ } void -syms_of_menu () +syms_of_menu (void) { staticpro (&menu_items); menu_items = Qnil;
--- a/src/minibuf.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/minibuf.c Sun Jul 04 00:50:25 2010 -0700 @@ -154,7 +154,7 @@ or when a minibuffer exits. */ void -choose_minibuf_frame () +choose_minibuf_frame (void) { if (FRAMEP (selected_frame) && FRAME_LIVE_P (XFRAME (selected_frame)) @@ -193,8 +193,7 @@ } Lisp_Object -choose_minibuf_frame_1 (ignore) - Lisp_Object ignore; +choose_minibuf_frame_1 (Lisp_Object ignore) { choose_minibuf_frame (); return Qnil; @@ -239,8 +238,7 @@ string, and DEFALT is a string, read from DEFALT instead of VAL. */ static Lisp_Object -string_to_object (val, defalt) - Lisp_Object val, defalt; +string_to_object (Lisp_Object val, Lisp_Object defalt) { struct gcpro gcpro1, gcpro2; Lisp_Object expr_and_pos; @@ -839,12 +837,11 @@ used for nonrecursive minibuffer invocations */ Lisp_Object -get_minibuffer (depth) - int depth; +get_minibuffer (int depth) { Lisp_Object tail, num, buf; char name[24]; - extern Lisp_Object nconc2 (); + extern Lisp_Object nconc2 (Lisp_Object, Lisp_Object); XSETFASTINT (num, depth); tail = Fnthcdr (num, Vminibuffer_list); @@ -884,8 +881,7 @@ } static Lisp_Object -run_exit_minibuf_hook (data) - Lisp_Object data; +run_exit_minibuf_hook (Lisp_Object data) { if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound) && !NILP (Vrun_hooks)) @@ -898,8 +894,7 @@ not, and it restores the current window, buffer, etc. */ static Lisp_Object -read_minibuf_unwind (data) - Lisp_Object data; +read_minibuf_unwind (Lisp_Object data) { Lisp_Object old_deactivate_mark; Lisp_Object window; @@ -1249,8 +1244,7 @@ } static Lisp_Object -minibuf_conform_representation (string, basis) - Lisp_Object string, basis; +minibuf_conform_representation (Lisp_Object string, Lisp_Object basis) { if (STRING_MULTIBYTE (string) == STRING_MULTIBYTE (basis)) return string; @@ -1843,7 +1837,7 @@ RETURN_UNGCPRO (unbind_to (count, val)); } -Lisp_Object Fassoc_string (); +Lisp_Object Fassoc_string (register Lisp_Object key, Lisp_Object list, Lisp_Object case_fold); /* Test whether TXT is an exact completion. */ DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0, @@ -2061,14 +2055,14 @@ void -init_minibuf_once () +init_minibuf_once (void) { Vminibuffer_list = Qnil; staticpro (&Vminibuffer_list); } void -syms_of_minibuf () +syms_of_minibuf (void) { minibuf_level = 0; minibuf_prompt = Qnil;
--- a/src/prefix-args.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/prefix-args.c Sun Jul 04 00:50:25 2010 -0700 @@ -54,9 +54,7 @@ #include <stdlib.h> int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { char *progname; char *prefix;
--- a/src/print.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/print.c Sun Jul 04 00:50:25 2010 -0700 @@ -168,7 +168,7 @@ extern int minibuffer_auto_raise; -void print_interval (); +void print_interval (INTERVAL interval, Lisp_Object printcharfun); /* GDB resets this to zero on W32 to disable OutputDebugString calls. */ int print_output_debug_flag = 1; @@ -287,8 +287,7 @@ when there is a recursive call to print. */ static Lisp_Object -print_unwind (saved_text) - Lisp_Object saved_text; +print_unwind (Lisp_Object saved_text) { bcopy (SDATA (saved_text), print_buffer, SCHARS (saved_text)); return Qnil; @@ -301,9 +300,7 @@ argument. */ static void -printchar (ch, fun) - unsigned int ch; - Lisp_Object fun; +printchar (unsigned int ch, Lisp_Object fun) { if (!NILP (fun) && !EQ (fun, Qt)) call1 (fun, make_number (ch)); @@ -353,11 +350,7 @@ to data in a Lisp string. Otherwise that is not safe. */ static void -strout (ptr, size, size_byte, printcharfun, multibyte) - char *ptr; - int size, size_byte; - Lisp_Object printcharfun; - int multibyte; +strout (char *ptr, int size, int size_byte, Lisp_Object printcharfun, int multibyte) { if (size < 0) size_byte = size = strlen (ptr); @@ -440,9 +433,7 @@ because printing one char can relocate. */ static void -print_string (string, printcharfun) - Lisp_Object string; - Lisp_Object printcharfun; +print_string (Lisp_Object string, Lisp_Object printcharfun) { if (EQ (printcharfun, Qt) || NILP (printcharfun)) { @@ -549,9 +540,7 @@ Do not use this on the contents of a Lisp string. */ void -write_string (data, size) - char *data; - int size; +write_string (char *data, int size) { PRINTDECLARE; Lisp_Object printcharfun; @@ -568,10 +557,7 @@ Do not use this on the contents of a Lisp string. */ void -write_string_1 (data, size, printcharfun) - char *data; - int size; - Lisp_Object printcharfun; +write_string_1 (char *data, int size, Lisp_Object printcharfun) { PRINTDECLARE; @@ -582,8 +568,7 @@ void -temp_output_buffer_setup (bufname) - const char *bufname; +temp_output_buffer_setup (const char *bufname) { int count = SPECPDL_INDEX (); register struct buffer *old = current_buffer; @@ -616,10 +601,7 @@ } Lisp_Object -internal_with_output_to_temp_buffer (bufname, function, args) - const char *bufname; - Lisp_Object (*function) (Lisp_Object); - Lisp_Object args; +internal_with_output_to_temp_buffer (const char *bufname, Lisp_Object (*function) (Lisp_Object), Lisp_Object args) { int count = SPECPDL_INDEX (); Lisp_Object buf, val; @@ -695,10 +677,10 @@ } -static void print (); -static void print_preprocess (); -static void print_preprocess_string (); -static void print_object (); +static void print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); +static void print_preprocess (Lisp_Object obj); +static void print_preprocess_string (INTERVAL interval, Lisp_Object arg); +static void print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0, doc: /* Output a newline to stream PRINTCHARFUN. @@ -919,8 +901,7 @@ print_output_debug_flag from being optimized away. */ void -debug_output_compilation_hack (x) - int x; +debug_output_compilation_hack (int x) { print_output_debug_flag = x; } @@ -974,16 +955,14 @@ /* This is the interface for debugging printing. */ void -debug_print (arg) - Lisp_Object arg; +debug_print (Lisp_Object arg) { Fprin1 (arg, Qexternal_debugging_output); fprintf (stderr, "\r\n"); } void -safe_debug_print (arg) - Lisp_Object arg; +safe_debug_print (Lisp_Object arg) { int valid = valid_lisp_object_p (arg); @@ -1037,10 +1016,7 @@ CALLER is the Lisp function inside which the error was signaled. */ void -print_error_message (data, stream, context, caller) - Lisp_Object data, stream; - char *context; - Lisp_Object caller; +print_error_message (Lisp_Object data, Lisp_Object stream, char *context, Lisp_Object caller) { Lisp_Object errname, errmsg, file_error, tail; struct gcpro gcpro1; @@ -1125,9 +1101,7 @@ */ void -float_to_string (buf, data) - unsigned char *buf; - double data; +float_to_string (unsigned char *buf, double data) { unsigned char *cp; int width; @@ -1250,10 +1224,7 @@ static void -print (obj, printcharfun, escapeflag) - Lisp_Object obj; - register Lisp_Object printcharfun; - int escapeflag; +print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag) { new_backquote_output = 0; @@ -1312,8 +1283,7 @@ The status fields of Vprint_number_table mean whether each object appears more than once in OBJ: Qnil at the first time, and Qt after that . */ static void -print_preprocess (obj) - Lisp_Object obj; +print_preprocess (Lisp_Object obj) { int i; EMACS_INT size; @@ -1433,9 +1403,7 @@ } static void -print_preprocess_string (interval, arg) - INTERVAL interval; - Lisp_Object arg; +print_preprocess_string (INTERVAL interval, Lisp_Object arg) { print_preprocess (interval->plist); } @@ -1445,7 +1413,7 @@ Lisp_Object Vprint_charset_text_property; extern Lisp_Object Qdefault; -static void print_check_string_charset_prop (); +static void print_check_string_charset_prop (INTERVAL interval, Lisp_Object string); #define PRINT_STRING_NON_CHARSET_FOUND 1 #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 @@ -1454,9 +1422,7 @@ static int print_check_string_result; static void -print_check_string_charset_prop (interval, string) - INTERVAL interval; - Lisp_Object string; +print_check_string_charset_prop (INTERVAL interval, Lisp_Object string) { Lisp_Object val; @@ -1503,8 +1469,7 @@ static Lisp_Object print_prune_charset_plist; static Lisp_Object -print_prune_string_charset (string) - Lisp_Object string; +print_prune_string_charset (Lisp_Object string) { print_check_string_result = 0; traverse_intervals (STRING_INTERVALS (string), 0, @@ -1528,10 +1493,7 @@ } static void -print_object (obj, printcharfun, escapeflag) - Lisp_Object obj; - register Lisp_Object printcharfun; - int escapeflag; +print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag) { char buf[40]; @@ -2307,9 +2269,7 @@ This is part of printing a string that has text properties. */ void -print_interval (interval, printcharfun) - INTERVAL interval; - Lisp_Object printcharfun; +print_interval (INTERVAL interval, Lisp_Object printcharfun) { if (NILP (interval->plist)) return; @@ -2324,7 +2284,7 @@ void -syms_of_print () +syms_of_print (void) { Qtemp_buffer_setup_hook = intern_c_string ("temp-buffer-setup-hook"); staticpro (&Qtemp_buffer_setup_hook);
--- a/src/ralloc.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/ralloc.c Sun Jul 04 00:50:25 2010 -0700 @@ -40,11 +40,11 @@ /* Declared in dispnew.c, this version doesn't screw up if regions overlap. */ -extern void safe_bcopy (); +extern void safe_bcopy (const char *, char *, int); #ifdef DOUG_LEA_MALLOC #define M_TOP_PAD -2 -extern int mallopt (); +extern int mallopt (int, int); #else /* not DOUG_LEA_MALLOC */ #ifndef SYSTEM_MALLOC extern size_t __malloc_extra_blocks; @@ -81,7 +81,7 @@ static int r_alloc_initialized = 0; -static void r_alloc_init (); +static void r_alloc_init (void); /* Declarations for working with the malloc, ralloc, and system breaks. */ @@ -210,8 +210,7 @@ /* Find the heap that ADDRESS falls within. */ static heap_ptr -find_heap (address) - POINTER address; +find_heap (POINTER address) { heap_ptr heap; @@ -243,9 +242,7 @@ allocate the memory. */ static POINTER -obtain (address, size) - POINTER address; - SIZE size; +obtain (POINTER address, SIZE size) { heap_ptr heap; SIZE already_available; @@ -326,7 +323,7 @@ it can also eliminate the last heap entirely. */ static void -relinquish () +relinquish (void) { register heap_ptr h; long excess = 0; @@ -385,7 +382,7 @@ above where malloc gets space. */ long -r_alloc_size_in_use () +r_alloc_size_in_use (void) { return (char *) break_value - (char *) virtual_break_value; } @@ -396,8 +393,7 @@ to that block. */ static bloc_ptr -find_bloc (ptr) - POINTER *ptr; +find_bloc (POINTER *ptr) { register bloc_ptr p = first_bloc; @@ -422,8 +418,7 @@ memory for the new block. */ static bloc_ptr -get_bloc (size) - SIZE size; +get_bloc (SIZE size) { register bloc_ptr new_bloc; register heap_ptr heap; @@ -478,10 +473,7 @@ Do not touch the contents of blocs or break_value. */ static int -relocate_blocs (bloc, heap, address) - bloc_ptr bloc; - heap_ptr heap; - POINTER address; +relocate_blocs (bloc_ptr bloc, heap_ptr heap, POINTER address) { register bloc_ptr b = bloc; @@ -541,8 +533,7 @@ before that of BEFORE. */ static void -reorder_bloc (bloc, before) - bloc_ptr bloc, before; +reorder_bloc (bloc_ptr bloc, bloc_ptr before) { bloc_ptr prev, next; @@ -570,9 +561,7 @@ with heap HEAP and bloc BLOC. */ static void -update_heap_bloc_correspondence (bloc, heap) - bloc_ptr bloc; - heap_ptr heap; +update_heap_bloc_correspondence (bloc_ptr bloc, heap_ptr heap) { register bloc_ptr b; @@ -634,9 +623,7 @@ that come after BLOC in memory. */ static int -resize_bloc (bloc, size) - bloc_ptr bloc; - SIZE size; +resize_bloc (bloc_ptr bloc, SIZE size) { register bloc_ptr b; heap_ptr heap; @@ -733,8 +720,7 @@ This may return space to the system. */ static void -free_bloc (bloc) - bloc_ptr bloc; +free_bloc (bloc_ptr bloc) { heap_ptr heap = bloc->heap; @@ -800,8 +786,7 @@ GNU malloc package. */ POINTER -r_alloc_sbrk (size) - long size; +r_alloc_sbrk (long int size) { register bloc_ptr b; POINTER address; @@ -952,9 +937,7 @@ return zero. */ POINTER -r_alloc (ptr, size) - POINTER *ptr; - SIZE size; +r_alloc (POINTER *ptr, SIZE size) { register bloc_ptr new_bloc; @@ -977,8 +960,7 @@ Store 0 in *PTR to show there's no block allocated. */ void -r_alloc_free (ptr) - register POINTER *ptr; +r_alloc_free (register POINTER *ptr) { register bloc_ptr dead_bloc; @@ -1012,9 +994,7 @@ return zero. */ POINTER -r_re_alloc (ptr, size) - POINTER *ptr; - SIZE size; +r_re_alloc (POINTER *ptr, SIZE size) { register bloc_ptr bloc; @@ -1075,8 +1055,7 @@ malloc must return a null pointer. */ void -r_alloc_freeze (size) - long size; +r_alloc_freeze (long int size) { if (! r_alloc_initialized) r_alloc_init (); @@ -1093,7 +1072,7 @@ } void -r_alloc_thaw () +r_alloc_thaw (void) { if (! r_alloc_initialized) @@ -1122,7 +1101,7 @@ /* Reinitialize the morecore hook variables after restarting a dumped Emacs. This is needed when using Doug Lea's malloc from GNU libc. */ void -r_alloc_reinit () +r_alloc_reinit (void) { /* Only do this if the hook has been reset, so that we don't get an infinite loop, in case Emacs was linked statically. */ @@ -1235,8 +1214,7 @@ is checked to ensure that memory corruption does not occur due to misuse. */ void -r_alloc_reset_variable (old, new) - POINTER *old, *new; +r_alloc_reset_variable (POINTER *old, POINTER *new) { bloc_ptr bloc = first_bloc; @@ -1266,7 +1244,7 @@ /* Initialize various things for memory allocation. */ static void -r_alloc_init () +r_alloc_init (void) { if (r_alloc_initialized) return;
--- a/src/regex.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/regex.c Sun Jul 04 00:50:25 2010 -0700 @@ -1321,8 +1321,7 @@ defined in regex.h. We return the old syntax. */ reg_syntax_t -re_set_syntax (syntax) - reg_syntax_t syntax; +re_set_syntax (reg_syntax_t syntax) { reg_syntax_t ret = re_syntax_options; @@ -1335,8 +1334,7 @@ static re_char *whitespace_regexp; void -re_set_whitespace_regexp (regexp) - const char *regexp; +re_set_whitespace_regexp (const char *regexp) { whitespace_regexp = (re_char *) regexp; } @@ -2149,8 +2147,7 @@ /* Map a string to the char class it names (if any). */ re_wctype_t -re_wctype (str) - re_char *str; +re_wctype (const re_char *str) { const char *string = str; if (STREQ (string, "alnum")) return RECC_ALNUM; @@ -2175,9 +2172,7 @@ /* True if CH is in the char class CC. */ boolean -re_iswctype (ch, cc) - int ch; - re_wctype_t cc; +re_iswctype (int ch, re_wctype_t cc) { switch (cc) { @@ -2207,8 +2202,7 @@ /* Return a bit-pattern to use in the range-table bits to match multibyte chars of class CC. */ static int -re_wctype_to_bit (cc) - re_wctype_t cc; +re_wctype_to_bit (re_wctype_t cc) { switch (cc) { @@ -2232,8 +2226,7 @@ /* Actually extend the space in WORK_AREA. */ static void -extend_range_table_work_area (work_area) - struct range_table_work_area *work_area; +extend_range_table_work_area (struct range_table_work_area *work_area) { work_area->allocated += 16 * sizeof (int); if (work_area->table) @@ -2557,11 +2550,7 @@ } while (0) static reg_errcode_t -regex_compile (pattern, size, syntax, bufp) - re_char *pattern; - size_t size; - reg_syntax_t syntax; - struct re_pattern_buffer *bufp; +regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct re_pattern_buffer *bufp) { /* We fetch characters from PATTERN here. */ register re_wchar_t c, c1; @@ -3875,10 +3864,7 @@ /* Store OP at LOC followed by two-byte integer parameter ARG. */ static void -store_op1 (op, loc, arg) - re_opcode_t op; - unsigned char *loc; - int arg; +store_op1 (re_opcode_t op, unsigned char *loc, int arg) { *loc = (unsigned char) op; STORE_NUMBER (loc + 1, arg); @@ -3888,10 +3874,7 @@ /* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */ static void -store_op2 (op, loc, arg1, arg2) - re_opcode_t op; - unsigned char *loc; - int arg1, arg2; +store_op2 (re_opcode_t op, unsigned char *loc, int arg1, int arg2) { *loc = (unsigned char) op; STORE_NUMBER (loc + 1, arg1); @@ -3903,11 +3886,7 @@ for OP followed by two-byte integer parameter ARG. */ static void -insert_op1 (op, loc, arg, end) - re_opcode_t op; - unsigned char *loc; - int arg; - unsigned char *end; +insert_op1 (re_opcode_t op, unsigned char *loc, int arg, unsigned char *end) { register unsigned char *pfrom = end; register unsigned char *pto = end + 3; @@ -3922,11 +3901,7 @@ /* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */ static void -insert_op2 (op, loc, arg1, arg2, end) - re_opcode_t op; - unsigned char *loc; - int arg1, arg2; - unsigned char *end; +insert_op2 (re_opcode_t op, unsigned char *loc, int arg1, int arg2, unsigned char *end) { register unsigned char *pfrom = end; register unsigned char *pto = end + 5; @@ -3943,9 +3918,7 @@ least one character before the ^. */ static boolean -at_begline_loc_p (pattern, p, syntax) - re_char *pattern, *p; - reg_syntax_t syntax; +at_begline_loc_p (const re_char *pattern, const re_char *p, reg_syntax_t syntax) { re_char *prev = p - 2; boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\'; @@ -3967,9 +3940,7 @@ at least one character after the $, i.e., `P < PEND'. */ static boolean -at_endline_loc_p (p, pend, syntax) - re_char *p, *pend; - reg_syntax_t syntax; +at_endline_loc_p (const re_char *p, const re_char *pend, reg_syntax_t syntax) { re_char *next = p; boolean next_backslash = *next == '\\'; @@ -3989,9 +3960,7 @@ false if it's not. */ static boolean -group_in_compile_stack (compile_stack, regnum) - compile_stack_type compile_stack; - regnum_t regnum; +group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) { int this_element; @@ -4015,10 +3984,7 @@ Return -1 if fastmap was not updated accurately. */ static int -analyse_first (p, pend, fastmap, multibyte) - re_char *p, *pend; - char *fastmap; - const int multibyte; +analyse_first (const re_char *p, const re_char *pend, char *fastmap, const const int multibyte) { int j, k; boolean not; @@ -4330,8 +4296,7 @@ Returns 0 if we succeed, -2 if an internal error. */ int -re_compile_fastmap (bufp) - struct re_pattern_buffer *bufp; +re_compile_fastmap (struct re_pattern_buffer *bufp) { char *fastmap = bufp->fastmap; int analysis; @@ -4361,11 +4326,7 @@ freeing the old data. */ void -re_set_registers (bufp, regs, num_regs, starts, ends) - struct re_pattern_buffer *bufp; - struct re_registers *regs; - unsigned num_regs; - regoff_t *starts, *ends; +re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs, unsigned int num_regs, regoff_t *starts, regoff_t *ends) { if (num_regs) { @@ -4389,11 +4350,7 @@ doesn't let you say where to stop matching. */ int -re_search (bufp, string, size, startpos, range, regs) - struct re_pattern_buffer *bufp; - const char *string; - int size, startpos, range; - struct re_registers *regs; +re_search (struct re_pattern_buffer *bufp, const char *string, int size, int startpos, int range, struct re_registers *regs) { return re_search_2 (bufp, NULL, 0, string, size, startpos, range, regs, size); @@ -4434,14 +4391,7 @@ stack overflow). */ int -re_search_2 (bufp, str1, size1, str2, size2, startpos, range, regs, stop) - struct re_pattern_buffer *bufp; - const char *str1, *str2; - int size1, size2; - int startpos; - int range; - struct re_registers *regs; - int stop; +re_search_2 (struct re_pattern_buffer *bufp, const char *str1, int size1, const char *str2, int size2, int startpos, int range, struct re_registers *regs, int stop) { int val; re_char *string1 = (re_char*) str1; @@ -4775,8 +4725,7 @@ /* If the operation is a match against one or more chars, return a pointer to the next operation, else return NULL. */ static re_char * -skip_one_char (p) - re_char *p; +skip_one_char (const re_char *p) { switch (SWITCH_ENUM_CAST (*p++)) { @@ -4818,8 +4767,7 @@ /* Jump over non-matching operations. */ static re_char * -skip_noops (p, pend) - re_char *p, *pend; +skip_noops (const re_char *p, const re_char *pend) { int mcnt; while (p < pend) @@ -4846,9 +4794,7 @@ /* Non-zero if "p1 matches something" implies "p2 fails". */ static int -mutually_exclusive_p (bufp, p1, p2) - struct re_pattern_buffer *bufp; - re_char *p1, *p2; +mutually_exclusive_p (struct re_pattern_buffer *bufp, const re_char *p1, const re_char *p2) { re_opcode_t op2; const boolean multibyte = RE_MULTIBYTE_P (bufp); @@ -5086,13 +5032,7 @@ matched substring. */ int -re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int size1, size2; - int pos; - struct re_registers *regs; - int stop; +re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int pos, struct re_registers *regs, int stop) { int result; @@ -5114,13 +5054,7 @@ /* This is a separate function so that we can force an alloca cleanup afterwards. */ static int -re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) - struct re_pattern_buffer *bufp; - re_char *string1, *string2; - int size1, size2; - int pos; - struct re_registers *regs; - int stop; +re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int size1, const re_char *string2, int size2, int pos, struct re_registers *regs, int stop) { /* General temporaries. */ int mcnt; @@ -6451,11 +6385,7 @@ bytes; nonzero otherwise. */ static int -bcmp_translate (s1, s2, len, translate, target_multibyte) - re_char *s1, *s2; - register int len; - RE_TRANSLATE_TYPE translate; - const int target_multibyte; +bcmp_translate (const re_char *s1, const re_char *s2, register int len, Lisp_Object translate, const const int target_multibyte) { register re_char *p1 = s1, *p2 = s2; re_char *p1_end = s1 + len; @@ -6496,10 +6426,7 @@ We call regex_compile to do the actual compilation. */ const char * -re_compile_pattern (pattern, length, bufp) - const char *pattern; - size_t length; - struct re_pattern_buffer *bufp; +re_compile_pattern (const char *pattern, size_t length, struct re_pattern_buffer *bufp) { reg_errcode_t ret;
--- a/src/region-cache.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/region-cache.c Sun Jul 04 00:50:25 2010 -0700 @@ -122,13 +122,13 @@ preserve that information, instead of throwing it away. */ #define PRESERVE_THRESHOLD (500) -static void revalidate_region_cache (); +static void revalidate_region_cache (struct buffer *buf, struct region_cache *c); /* Interface: Allocating, initializing, and disposing of region caches. */ struct region_cache * -new_region_cache () +new_region_cache (void) { struct region_cache *c = (struct region_cache *) xmalloc (sizeof (struct region_cache)); @@ -156,8 +156,7 @@ } void -free_region_cache (c) - struct region_cache *c; +free_region_cache (struct region_cache *c) { xfree (c->boundaries); xfree (c); @@ -174,9 +173,7 @@ entries. It would be nice if it took advantage of locality of reference, too, by searching entries near the last entry found. */ static int -find_cache_boundary (c, pos) - struct region_cache *c; - int pos; +find_cache_boundary (struct region_cache *c, int pos) { int low = 0, high = c->cache_len; @@ -210,10 +207,7 @@ /* Move the gap of cache C to index POS, and make sure it has space for at least MIN_SIZE boundaries. */ static void -move_cache_gap (c, pos, min_size) - struct region_cache *c; - int pos; - int min_size; +move_cache_gap (struct region_cache *c, int pos, int min_size) { /* Copy these out of the cache and into registers. */ int gap_start = c->gap_start; @@ -298,10 +292,7 @@ /* Insert a new boundary in cache C; it will have cache index INDEX, and have the specified POS and VALUE. */ static void -insert_cache_boundary (c, index, pos, value) - struct region_cache *c; - int index; - int pos, value; +insert_cache_boundary (struct region_cache *c, int index, int pos, int value) { /* index must be a valid cache index. */ if (index < 0 || index > c->cache_len) @@ -337,9 +328,7 @@ /* Delete the i'th entry from cache C if START <= i < END. */ static void -delete_cache_boundaries (c, start, end) - struct region_cache *c; - int start, end; +delete_cache_boundaries (struct region_cache *c, int start, int end) { int len = end - start; @@ -391,10 +380,7 @@ /* Set the value in cache C for the region START..END to VALUE. */ static void -set_cache_region (c, start, end, value) - struct region_cache *c; - int start, end; - int value; +set_cache_region (struct region_cache *c, int start, int end, int value) { if (start > end) abort (); @@ -495,10 +481,7 @@ buffer positions in the presence of insertions and deletions; the args to pass are the same before and after such an operation.) */ void -invalidate_region_cache (buf, c, head, tail) - struct buffer *buf; - struct region_cache *c; - int head, tail; +invalidate_region_cache (struct buffer *buf, struct region_cache *c, int head, int tail) { /* Let chead = c->beg_unchanged, and ctail = c->end_unchanged. @@ -576,9 +559,7 @@ the cache, and causes cache gap motion. */ static void -revalidate_region_cache (buf, c) - struct buffer *buf; - struct region_cache *c; +revalidate_region_cache (struct buffer *buf, struct region_cache *c) { /* The boundaries now in the cache are expressed relative to the buffer_beg and buffer_end values stored in the cache. Now, @@ -706,10 +687,7 @@ buffer positions) is "known," for the purposes of CACHE (e.g. "has no newlines", in the case of the line cache). */ void -know_region_cache (buf, c, start, end) - struct buffer *buf; - struct region_cache *c; - int start, end; +know_region_cache (struct buffer *buf, struct region_cache *c, int start, int end) { revalidate_region_cache (buf, c); @@ -723,11 +701,7 @@ the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position after POS where the knownness changes. */ int -region_cache_forward (buf, c, pos, next) - struct buffer *buf; - struct region_cache *c; - int pos; - int *next; +region_cache_forward (struct buffer *buf, struct region_cache *c, int pos, int *next) { revalidate_region_cache (buf, c); @@ -762,11 +736,7 @@ /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position before POS where the knownness changes. */ -int region_cache_backward (buf, c, pos, next) - struct buffer *buf; - struct region_cache *c; - int pos; - int *next; +int region_cache_backward (struct buffer *buf, struct region_cache *c, int pos, int *next) { revalidate_region_cache (buf, c); @@ -804,8 +774,7 @@ /* Debugging: pretty-print a cache to the standard error output. */ void -pp_cache (c) - struct region_cache *c; +pp_cache (struct region_cache *c) { int i; int beg_u = c->buffer_beg + c->beg_unchanged;
--- a/src/scroll.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/scroll.c Sun Jul 04 00:50:25 2010 -0700 @@ -244,12 +244,7 @@ of lines. */ static void -do_scrolling (frame, current_matrix, matrix, window_size, unchanged_at_top) - struct frame *frame; - struct glyph_matrix *current_matrix; - struct matrix_elt *matrix; - int window_size; - int unchanged_at_top; +do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct matrix_elt *matrix, int window_size, int unchanged_at_top) { struct matrix_elt *p; int i, j, k; @@ -854,9 +849,7 @@ such a line will have little weight. */ int -scrolling_max_lines_saved (start, end, oldhash, newhash, cost) - int start, end; - int *oldhash, *newhash, *cost; +scrolling_max_lines_saved (int start, int end, int *oldhash, int *newhash, int *cost) { struct { int hash; int count; } lines[01000]; register int i, h; @@ -909,9 +902,7 @@ to scroll_frame_lines to perform this scrolling. */ int -scroll_cost (frame, from, to, amount) - FRAME_PTR frame; - int from, to, amount; +scroll_cost (FRAME_PTR frame, int from, int to, int amount) { /* Compute how many lines, at bottom of frame, will not be involved in actual motion. */ @@ -948,11 +939,7 @@ overhead and multiply factor values */ static void -line_ins_del (frame, ov1, pf1, ovn, pfn, ov, mf) - FRAME_PTR frame; - int ov1, ovn; - int pf1, pfn; - register int *ov, *mf; +line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn, register int *ov, register int *mf) { register int i; register int frame_lines = FRAME_LINES (frame);
--- a/src/search.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/search.c Sun Jul 04 00:50:25 2010 -0700 @@ -110,10 +110,10 @@ static EMACS_INT search_buffer (Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int, int, Lisp_Object, Lisp_Object, int); -static void matcher_overflow () NO_RETURN; +static void matcher_overflow (void) NO_RETURN; static void -matcher_overflow () +matcher_overflow (void) { error ("Stack overflow in regexp matcher"); } @@ -132,12 +132,7 @@ The behavior also depends on Vsearch_spaces_regexp. */ static void -compile_pattern_1 (cp, pattern, translate, regp, posix) - struct regexp_cache *cp; - Lisp_Object pattern; - Lisp_Object translate; - struct re_registers *regp; - int posix; +compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, struct re_registers *regp, int posix) { char *val; reg_syntax_t old; @@ -187,7 +182,7 @@ This is called from garbage collection. */ void -shrink_regexp_cache () +shrink_regexp_cache (void) { struct regexp_cache *cp; @@ -205,7 +200,7 @@ automagically manages the memory in each re_pattern_buffer struct, based on its `allocated' and `buffer' values. */ void -clear_regexp_cache () +clear_regexp_cache (void) { int i; @@ -229,11 +224,7 @@ for this pattern. 0 means backtrack only enough to get a valid match. */ struct re_pattern_buffer * -compile_pattern (pattern, regp, translate, posix, multibyte) - Lisp_Object pattern; - struct re_registers *regp; - Lisp_Object translate; - int posix, multibyte; +compile_pattern (Lisp_Object pattern, struct re_registers *regp, Lisp_Object translate, int posix, int multibyte) { struct regexp_cache *cp, **cpp; @@ -290,9 +281,7 @@ static Lisp_Object -looking_at_1 (string, posix) - Lisp_Object string; - int posix; +looking_at_1 (Lisp_Object string, int posix) { Lisp_Object val; unsigned char *p1, *p2; @@ -392,9 +381,7 @@ } static Lisp_Object -string_match_1 (regexp, string, start, posix) - Lisp_Object regexp, string, start; - int posix; +string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int posix) { int val; struct re_pattern_buffer *bufp; @@ -499,8 +486,7 @@ This does not clobber the match data. */ int -fast_string_match (regexp, string) - Lisp_Object regexp, string; +fast_string_match (Lisp_Object regexp, Lisp_Object string) { int val; struct re_pattern_buffer *bufp; @@ -525,9 +511,7 @@ extern Lisp_Object Vascii_downcase_table; int -fast_c_string_match_ignore_case (regexp, string) - Lisp_Object regexp; - const char *string; +fast_c_string_match_ignore_case (Lisp_Object regexp, const char *string) { int val; struct re_pattern_buffer *bufp; @@ -547,8 +531,7 @@ /* Like fast_string_match but ignore case. */ int -fast_string_match_ignore_case (regexp, string) - Lisp_Object regexp, string; +fast_string_match_ignore_case (Lisp_Object regexp, Lisp_Object string) { int val; struct re_pattern_buffer *bufp; @@ -572,10 +555,7 @@ data. */ EMACS_INT -fast_looking_at (regexp, pos, pos_byte, limit, limit_byte, string) - Lisp_Object regexp; - EMACS_INT pos, pos_byte, limit, limit_byte; - Lisp_Object string; +fast_looking_at (Lisp_Object regexp, EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT limit, EMACS_INT limit_byte, Lisp_Object string) { int multibyte; struct re_pattern_buffer *buf; @@ -640,8 +620,7 @@ This is our cheezy way of associating an action with the change of state of a buffer-local variable. */ static void -newline_cache_on_off (buf) - struct buffer *buf; +newline_cache_on_off (struct buffer *buf) { if (NILP (buf->cache_long_line_scans)) { @@ -682,12 +661,7 @@ except when inside redisplay. */ int -scan_buffer (target, start, end, count, shortage, allow_quit) - register int target; - EMACS_INT start, end; - int count; - int *shortage; - int allow_quit; +scan_buffer (register int target, EMACS_INT start, EMACS_INT end, int count, int *shortage, int allow_quit) { struct region_cache *newline_cache; int direction; @@ -879,11 +853,7 @@ except in special cases. */ int -scan_newline (start, start_byte, limit, limit_byte, count, allow_quit) - EMACS_INT start, start_byte; - EMACS_INT limit, limit_byte; - register int count; - int allow_quit; +scan_newline (EMACS_INT start, EMACS_INT start_byte, EMACS_INT limit, EMACS_INT limit_byte, register int count, int allow_quit) { int direction = ((count > 0) ? 1 : -1); @@ -977,9 +947,7 @@ } int -find_next_newline_no_quit (from, cnt) - EMACS_INT from; - int cnt; +find_next_newline_no_quit (EMACS_INT from, int cnt) { return scan_buffer ('\n', from, 0, cnt, (int *) 0, 0); } @@ -989,9 +957,7 @@ find_next_newline (...)-1, because you might hit TO. */ int -find_before_next_newline (from, to, cnt) - EMACS_INT from, to; - int cnt; +find_before_next_newline (EMACS_INT from, EMACS_INT to, int cnt) { int shortage; int pos = scan_buffer ('\n', from, to, cnt, &shortage, 1); @@ -1005,11 +971,7 @@ /* Subroutines of Lisp buffer search functions. */ static Lisp_Object -search_command (string, bound, noerror, count, direction, RE, posix) - Lisp_Object string, bound, noerror, count; - int direction; - int RE; - int posix; +search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count, int direction, int RE, int posix) { register int np; int lim, lim_byte; @@ -1086,8 +1048,7 @@ /* Return 1 if REGEXP it matches just one constant string. */ static int -trivial_regexp_p (regexp) - Lisp_Object regexp; +trivial_regexp_p (Lisp_Object regexp) { int len = SBYTES (regexp); unsigned char *s = SDATA (regexp); @@ -1504,13 +1465,7 @@ boyer_moore cannot work. */ static EMACS_INT -simple_search (n, pat, len, len_byte, trt, pos, pos_byte, lim, lim_byte) - int n; - unsigned char *pat; - int len, len_byte; - Lisp_Object trt; - EMACS_INT pos, pos_byte; - EMACS_INT lim, lim_byte; +simple_search (int n, unsigned char *pat, int len, int len_byte, Lisp_Object trt, EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT lim, EMACS_INT lim_byte) { int multibyte = ! NILP (current_buffer->enable_multibyte_characters); int forward = n > 0; @@ -2127,8 +2082,7 @@ Also clear out the match data for registers 1 and up. */ static void -set_search_regs (beg_byte, nbytes) - EMACS_INT beg_byte, nbytes; +set_search_regs (EMACS_INT beg_byte, EMACS_INT nbytes) { int i; @@ -2162,9 +2116,7 @@ need not match a word boundary unless it ends in whitespace. */ static Lisp_Object -wordify (string, lax) - Lisp_Object string; - int lax; +wordify (Lisp_Object string, int lax) { register unsigned char *p, *o; register int i, i_byte, len, punct_count = 0, word_count = 0; @@ -2886,9 +2838,7 @@ } static Lisp_Object -match_limit (num, beginningp) - Lisp_Object num; - int beginningp; +match_limit (Lisp_Object num, int beginningp) { register int n; @@ -3171,7 +3121,7 @@ /* Called from Flooking_at, Fstring_match, search_buffer, Fstore_match_data if asynchronous code (filter or sentinel) is running. */ static void -save_search_regs () +save_search_regs (void) { if (!search_regs_saved) { @@ -3190,7 +3140,7 @@ /* Called upon exit from filters and sentinels. */ void -restore_search_regs () +restore_search_regs (void) { if (search_regs_saved) { @@ -3209,8 +3159,7 @@ } static Lisp_Object -unwind_set_match_data (list) - Lisp_Object list; +unwind_set_match_data (Lisp_Object list) { /* It is NOT ALWAYS safe to free (evaporate) the markers immediately. */ return Fset_match_data (list, Qt); @@ -3218,7 +3167,7 @@ /* Called to unwind protect the match data. */ void -record_unwind_save_match_data () +record_unwind_save_match_data (void) { record_unwind_protect (unwind_set_match_data, Fmatch_data (Qnil, Qnil, Qnil)); @@ -3262,7 +3211,7 @@ } void -syms_of_search () +syms_of_search (void) { register int i;
--- a/src/sound.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/sound.c Sun Jul 04 00:50:25 2010 -0700 @@ -328,8 +328,7 @@ /* Like perror, but signals an error. */ static void -sound_perror (msg) - char *msg; +sound_perror (char *msg) { int saved_errno = errno; @@ -347,8 +346,7 @@ /* Display a warning message. */ static void -sound_warning (msg) - char *msg; +sound_warning (char *msg) { message (msg); } @@ -381,9 +379,7 @@ range [0, 1]. */ static int -parse_sound (sound, attrs) - Lisp_Object sound; - Lisp_Object *attrs; +parse_sound (Lisp_Object sound, Lisp_Object *attrs) { /* SOUND must be a list starting with the symbol `sound'. */ if (!CONSP (sound) || !EQ (XCAR (sound), Qsound)) @@ -452,8 +448,7 @@ S is the sound file structure to fill in. */ static void -find_sound_type (s) - struct sound *s; +find_sound_type (struct sound *s) { if (!wav_init (s) && !au_init (s)) error ("Unknown sound format"); @@ -463,8 +458,7 @@ /* Function installed by play-sound-internal with record_unwind_protect. */ static Lisp_Object -sound_cleanup (arg) - Lisp_Object arg; +sound_cleanup (Lisp_Object arg) { if (current_sound_device->close) current_sound_device->close (current_sound_device); @@ -484,8 +478,7 @@ to host byte-order. */ static u_int32_t -le2hl (value) - u_int32_t value; +le2hl (u_int32_t value) { #ifdef WORDS_BIG_ENDIAN unsigned char *p = (unsigned char *) &value; @@ -499,8 +492,7 @@ to host byte-order. */ static u_int16_t -le2hs (value) - u_int16_t value; +le2hs (u_int16_t value) { #ifdef WORDS_BIG_ENDIAN unsigned char *p = (unsigned char *) &value; @@ -514,8 +506,7 @@ to host byte-order. */ static u_int32_t -be2hl (value) - u_int32_t value; +be2hl (u_int32_t value) { #ifndef WORDS_BIG_ENDIAN unsigned char *p = (unsigned char *) &value; @@ -554,8 +545,7 @@ Value is non-zero if the file is a WAV file. */ static int -wav_init (s) - struct sound *s; +wav_init (struct sound *s) { struct wav_header *header = (struct wav_header *) s->header; @@ -590,9 +580,7 @@ /* Play RIFF-WAVE audio file S on sound device SD. */ static void -wav_play (s, sd) - struct sound *s; - struct sound_device *sd; +wav_play (struct sound *s, struct sound_device *sd) { struct wav_header *header = (struct wav_header *) s->header; @@ -665,8 +653,7 @@ Value is non-zero if the file is an AU file. */ static int -au_init (s) - struct sound *s; +au_init (struct sound *s) { struct au_header *header = (struct au_header *) s->header; @@ -692,9 +679,7 @@ /* Play Sun audio file S on sound device SD. */ static void -au_play (s, sd) - struct sound *s; - struct sound_device *sd; +au_play (struct sound *s, struct sound_device *sd) { struct au_header *header = (struct au_header *) s->header; @@ -740,8 +725,7 @@ otherwise use a default device name. */ static void -vox_open (sd) - struct sound_device *sd; +vox_open (struct sound_device *sd) { char *file; @@ -760,8 +744,7 @@ /* Configure device SD from parameters in it. */ static void -vox_configure (sd) - struct sound_device *sd; +vox_configure (struct sound_device *sd) { int val; @@ -814,8 +797,7 @@ /* Close device SD if it is open. */ static void -vox_close (sd) - struct sound_device *sd; +vox_close (struct sound_device *sd) { if (sd->fd >= 0) { @@ -845,9 +827,7 @@ /* Choose device-dependent format for device SD from sound file S. */ static void -vox_choose_format (sd, s) - struct sound_device *sd; - struct sound *s; +vox_choose_format (struct sound_device *sd, struct sound *s) { if (s->type == RIFF) { @@ -890,8 +870,7 @@ structure. */ static int -vox_init (sd) - struct sound_device *sd; +vox_init (struct sound_device *sd) { char *file; int fd; @@ -921,10 +900,7 @@ /* Write NBYTES bytes from BUFFER to device SD. */ static void -vox_write (sd, buffer, nbytes) - struct sound_device *sd; - const char *buffer; - int nbytes; +vox_write (struct sound_device *sd, const char *buffer, int nbytes) { int nwritten = emacs_write (sd->fd, buffer, nbytes); if (nwritten < 0) @@ -939,9 +915,7 @@ /* This driver is available on GNU/Linux. */ static void -alsa_sound_perror (msg, err) - char *msg; - int err; +alsa_sound_perror (char *msg, int err) { error ("%s: %s", msg, snd_strerror (err)); } @@ -958,8 +932,7 @@ otherwise use a default device name. */ static void -alsa_open (sd) - struct sound_device *sd; +alsa_open (struct sound_device *sd) { char *file; struct alsa_params *p; @@ -986,8 +959,7 @@ } static int -alsa_period_size (sd) - struct sound_device *sd; +alsa_period_size (struct sound_device *sd) { struct alsa_params *p = (struct alsa_params *) sd->data; int fact = snd_pcm_format_size (sd->format, 1) * sd->channels; @@ -995,8 +967,7 @@ } static void -alsa_configure (sd) - struct sound_device *sd; +alsa_configure (struct sound_device *sd) { int val, err, dir; unsigned uval; @@ -1115,8 +1086,7 @@ /* Close device SD if it is open. */ static void -alsa_close (sd) - struct sound_device *sd; +alsa_close (struct sound_device *sd) { struct alsa_params *p = (struct alsa_params *) sd->data; if (p) @@ -1137,9 +1107,7 @@ /* Choose device-dependent format for device SD from sound file S. */ static void -alsa_choose_format (sd, s) - struct sound_device *sd; - struct sound *s; +alsa_choose_format (struct sound_device *sd, struct sound *s) { struct alsa_params *p = (struct alsa_params *) sd->data; if (s->type == RIFF) @@ -1194,10 +1162,7 @@ /* Write NBYTES bytes from BUFFER to device SD. */ static void -alsa_write (sd, buffer, nbytes) - struct sound_device *sd; - const char *buffer; - int nbytes; +alsa_write (struct sound_device *sd, const char *buffer, int nbytes) { struct alsa_params *p = (struct alsa_params *) sd->data; @@ -1244,12 +1209,7 @@ } static void -snd_error_quiet (file, line, function, err, fmt) - const char *file; - int line; - const char *function; - int err; - const char *fmt; +snd_error_quiet (const char *file, int line, const char *function, int err, const char *fmt) { } @@ -1257,8 +1217,7 @@ structure. */ static int -alsa_init (sd) - struct sound_device *sd; +alsa_init (struct sound_device *sd) { char *file; snd_pcm_t *handle; @@ -1524,7 +1483,7 @@ ***********************************************************************/ void -syms_of_sound () +syms_of_sound (void) { QCdevice = intern_c_string(":device"); staticpro (&QCdevice); @@ -1540,7 +1499,7 @@ void -init_sound () +init_sound (void) { }
--- a/src/strftime.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/strftime.c Sun Jul 04 00:50:25 2010 -0700 @@ -367,11 +367,7 @@ size_t len LOCALE_PARAM_PROTO); static CHAR_T * -memcpy_lowcase (dest, src, len LOCALE_PARAM) - CHAR_T *dest; - const CHAR_T *src; - size_t len; - LOCALE_PARAM_DECL +memcpy_lowcase (char *dest, const char *src, size_t len) { while (len-- > 0) dest[len] = TOLOWER ((UCHAR_T) src[len], loc); @@ -382,11 +378,7 @@ size_t len LOCALE_PARAM_PROTO); static CHAR_T * -memcpy_uppcase (dest, src, len LOCALE_PARAM) - CHAR_T *dest; - const CHAR_T *src; - size_t len; - LOCALE_PARAM_DECL +memcpy_uppcase (char *dest, const char *src, size_t len) { while (len-- > 0) dest[len] = TOUPPER ((UCHAR_T) src[len], loc); @@ -437,9 +429,7 @@ __inline__ #endif static int -iso_week_days (yday, wday) - int yday; - int wday; +iso_week_days (int yday, int wday) { /* Add enough to the first operand of % to make it nonnegative. */ int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7; @@ -1474,12 +1464,7 @@ /* For Emacs we have a separate interface which corresponds to the normal strftime function plus the ut argument, but without the ns argument. */ size_t -emacs_strftimeu (s, maxsize, format, tp, ut) - char *s; - size_t maxsize; - const char *format; - const struct tm *tp; - int ut; +emacs_strftimeu (char *s, size_t maxsize, const char *format, const struct tm *tp, int ut) { return my_strftime (s, maxsize, format, tp, ut, 0); }
--- a/src/syntax.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/syntax.c Sun Jul 04 00:50:25 2010 -0700 @@ -109,7 +109,7 @@ struct gl_state_s gl_state; /* Global state of syntax parser. */ -INTERVAL interval_of (); +INTERVAL interval_of (int, Lisp_Object); #define INTERVALS_AT_ONCE 10 /* 1 + max-number of intervals to scan to property-change. */ @@ -127,9 +127,7 @@ start/end of OBJECT. */ void -update_syntax_table (charpos, count, init, object) - int charpos, count, init; - Lisp_Object object; +update_syntax_table (int charpos, int count, int init, Lisp_Object object) { Lisp_Object tmp_table; int cnt = 0, invalidate = 1; @@ -318,8 +316,7 @@ We assume that BYTEPOS is not at the end of the buffer. */ INLINE EMACS_INT -inc_bytepos (bytepos) - EMACS_INT bytepos; +inc_bytepos (EMACS_INT bytepos) { if (NILP (current_buffer->enable_multibyte_characters)) return bytepos + 1; @@ -332,8 +329,7 @@ We assume that BYTEPOS is not at the start of the buffer. */ INLINE EMACS_INT -dec_bytepos (bytepos) - EMACS_INT bytepos; +dec_bytepos (EMACS_INT bytepos) { if (NILP (current_buffer->enable_multibyte_characters)) return bytepos - 1; @@ -357,8 +353,7 @@ update the global data. */ static EMACS_INT -find_defun_start (pos, pos_byte) - EMACS_INT pos, pos_byte; +find_defun_start (EMACS_INT pos, EMACS_INT pos_byte) { EMACS_INT opoint = PT, opoint_byte = PT_BYTE; @@ -422,8 +417,7 @@ /* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE. */ static int -prev_char_comend_first (pos, pos_byte) - int pos, pos_byte; +prev_char_comend_first (int pos, int pos_byte) { int c, val; @@ -465,10 +459,7 @@ the returned value (or at FROM, if the search was not successful). */ static int -back_comment (from, from_byte, stop, comnested, comstyle, charpos_ptr, bytepos_ptr) - EMACS_INT from, from_byte, stop; - int comnested, comstyle; - EMACS_INT *charpos_ptr, *bytepos_ptr; +back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested, int comstyle, EMACS_INT *charpos_ptr, EMACS_INT *bytepos_ptr) { /* Look back, counting the parity of string-quotes, and recording the comment-starters seen. @@ -740,8 +731,7 @@ } static void -check_syntax_table (obj) - Lisp_Object obj; +check_syntax_table (Lisp_Object obj) { CHECK_TYPE (CHAR_TABLE_P (obj) && EQ (XCHAR_TABLE (obj)->purpose, Qsyntax_table), Qsyntax_table_p, obj); @@ -1185,8 +1175,7 @@ COUNT negative means scan backward and stop at word beginning. */ int -scan_words (from, count) - register int from, count; +scan_words (register int from, register int count) { register int beg = BEGV; register int end = ZV; @@ -1395,10 +1384,7 @@ } static Lisp_Object -skip_chars (forwardp, string, lim, handle_iso_classes) - int forwardp; - Lisp_Object string, lim; - int handle_iso_classes; +skip_chars (int forwardp, Lisp_Object string, Lisp_Object lim, int handle_iso_classes) { register unsigned int c; unsigned char fastmap[0400]; @@ -1892,9 +1878,7 @@ static Lisp_Object -skip_syntaxes (forwardp, string, lim) - int forwardp; - Lisp_Object string, lim; +skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim) { register unsigned int c; unsigned char fastmap[0400]; @@ -2067,9 +2051,7 @@ integer which is its type according to re_wctype. */ static int -in_classes (c, iso_classes) - int c; - Lisp_Object iso_classes; +in_classes (int c, Lisp_Object iso_classes) { int fits_class = 0; @@ -2422,10 +2404,7 @@ ? SYNTAX (c) : Ssymbol) static Lisp_Object -scan_lists (from, count, depth, sexpflag) - register EMACS_INT from; - EMACS_INT count, depth; - int sexpflag; +scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpflag) { Lisp_Object val; register EMACS_INT stop = count > 0 ? ZV : BEGV; @@ -3324,7 +3303,7 @@ } void -init_syntax_once () +init_syntax_once (void) { register int i, c; Lisp_Object temp; @@ -3414,7 +3393,7 @@ } void -syms_of_syntax () +syms_of_syntax (void) { Qsyntax_table_p = intern_c_string ("syntax-table-p"); staticpro (&Qsyntax_table_p);
--- a/src/sysdep.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/sysdep.c Sun Jul 04 00:50:25 2010 -0700 @@ -254,7 +254,7 @@ /* Discard pending input on all input descriptors. */ void -discard_tty_input () +discard_tty_input (void) { #ifndef WINDOWSNT struct emacs_tty buf; @@ -353,8 +353,7 @@ /*ARGSUSED*/ void -set_exclusive_use (fd) - int fd; +set_exclusive_use (int fd) { #ifdef FIOCLEX ioctl (fd, FIOCLEX, 0); @@ -376,15 +375,14 @@ (at least for bsd). */ SIGTYPE -wait_for_termination_signal () +wait_for_termination_signal (void) {} /* Wait for subprocess with process id `pid' to terminate and make sure it will get eliminated (not remain forever as a zombie) */ void -wait_for_termination (pid) - int pid; +wait_for_termination (int pid) { while (1) { @@ -438,8 +436,7 @@ */ void -flush_pending_output (channel) - int channel; +flush_pending_output (int channel) { #ifdef HAVE_TERMIOS /* If we try this, we get hit with SIGTTIN, because @@ -465,8 +462,7 @@ in Emacs. No padding needed for insertion into an Emacs buffer. */ void -child_setup_tty (out) - int out; +child_setup_tty (int out) { #ifndef DOS_NT struct emacs_tty s; @@ -570,7 +566,7 @@ /* Suspend the Emacs process; give terminal to its superior. */ void -sys_suspend () +sys_suspend (void) { #if defined (SIGTSTP) && !defined (MSDOS) @@ -591,7 +587,7 @@ /* Fork a subshell. */ void -sys_subshell () +sys_subshell (void) { #ifdef DOS_NT /* Demacs 1.1.2 91/10/20 Manabu Higashida */ int st; @@ -719,8 +715,7 @@ } static void -save_signal_handlers (saved_handlers) - struct save_signal *saved_handlers; +save_signal_handlers (struct save_signal *saved_handlers) { while (saved_handlers->code) { @@ -731,8 +726,7 @@ } static void -restore_signal_handlers (saved_handlers) - struct save_signal *saved_handlers; +restore_signal_handlers (struct save_signal *saved_handlers) { while (saved_handlers->code) { @@ -769,8 +763,7 @@ int old_fcntl_flags[MAXDESC]; void -init_sigio (fd) - int fd; +init_sigio (int fd) { #ifdef FASYNC old_fcntl_flags[fd] = fcntl (fd, F_GETFL, 0) & ~FASYNC; @@ -780,8 +773,7 @@ } void -reset_sigio (fd) - int fd; +reset_sigio (int fd) { #ifdef FASYNC fcntl (fd, F_SETFL, old_fcntl_flags[fd]); @@ -793,7 +785,7 @@ /* XXX Yeah, but you need it for SIGIO, don't you? */ void -request_sigio () +request_sigio (void) { if (noninteractive) return; @@ -857,9 +849,7 @@ Return zero if all's well, or -1 if we ran into an error we couldn't deal with. */ int -emacs_get_tty (fd, settings) - int fd; - struct emacs_tty *settings; +emacs_get_tty (int fd, struct emacs_tty *settings) { /* Retrieve the primary parameters - baud rate, character size, etcetera. */ #ifdef HAVE_TCATTR @@ -906,10 +896,7 @@ Return 0 if all went well, and -1 if anything failed. */ int -emacs_set_tty (fd, settings, flushp) - int fd; - struct emacs_tty *settings; - int flushp; +emacs_set_tty (int fd, struct emacs_tty *settings, int flushp) { /* Set the primary parameters - baud rate, character size, etcetera. */ #ifdef HAVE_TCATTR @@ -1021,8 +1008,7 @@ /* Initialize the terminal mode on the given tty device. */ void -init_sys_modes (tty_out) - struct tty_display_info *tty_out; +init_sys_modes (struct tty_display_info *tty_out) { struct emacs_tty tty; @@ -1365,8 +1351,7 @@ to HEIGHT and WIDTH. This is used mainly with ptys. */ int -set_window_size (fd, height, width) - int fd, height, width; +set_window_size (int fd, int height, int width) { #ifdef TIOCSWINSZ @@ -1414,8 +1399,7 @@ bottom of the frame, turn off interrupt-driven I/O, etc. */ void -reset_sys_modes (tty_out) - struct tty_display_info *tty_out; +reset_sys_modes (struct tty_display_info *tty_out) { if (noninteractive) { @@ -1490,8 +1474,7 @@ /* Set up the proper status flags for use of a pty. */ void -setup_pty (fd) - int fd; +setup_pty (int fd) { /* I'm told that TOICREMOTE does not mean control chars "can't be sent" but rather that they don't have @@ -1540,7 +1523,7 @@ #if !(defined (__NetBSD__) && defined (__ELF__)) #ifndef HAVE_TEXT_START char * -start_of_text () +start_of_text (void) { #ifdef TEXT_START return ((char *) TEXT_START); @@ -1580,7 +1563,7 @@ #ifndef start_of_data char * -start_of_data () +start_of_data (void) { #ifdef DATA_START return ((char *) DATA_START); @@ -1621,7 +1604,7 @@ #endif /* TRY_AGAIN */ void -init_system_name () +init_system_name (void) { #ifndef HAVE_GETHOSTNAME struct utsname uts; @@ -2077,7 +2060,7 @@ #endif void -init_signals () +init_signals (void) { sigemptyset (&empty_mask); sigfillset (&full_mask); @@ -2283,8 +2266,7 @@ #endif /* !RAND_BITS */ void -seed_random (arg) - long arg; +seed_random (long int arg) { #ifdef HAVE_RANDOM srandom ((unsigned int)arg); @@ -2302,7 +2284,7 @@ * This suffices even for a 64-bit architecture with a 15-bit rand. */ long -get_random () +get_random (void) { long val = random (); #if VALBITS > RAND_BITS @@ -2337,9 +2319,7 @@ #endif /* ! HAVE_STRERROR */ int -emacs_open (path, oflag, mode) - const char *path; - int oflag, mode; +emacs_open (const char *path, int oflag, int mode) { register int rtnval; @@ -2350,8 +2330,7 @@ } int -emacs_close (fd) - int fd; +emacs_close (int fd) { int did_retry = 0; register int rtnval; @@ -2370,10 +2349,7 @@ } int -emacs_read (fildes, buf, nbyte) - int fildes; - char *buf; - unsigned int nbyte; +emacs_read (int fildes, char *buf, unsigned int nbyte) { register int rtnval; @@ -2384,10 +2360,7 @@ } int -emacs_write (fildes, buf, nbyte) - int fildes; - const char *buf; - unsigned int nbyte; +emacs_write (int fildes, const char *buf, unsigned int nbyte) { register int rtnval, bytes_written; @@ -2574,8 +2547,7 @@ */ void -croak (badfunc) - char *badfunc; +croak (char *badfunc) { printf ("%s not yet implemented\r\n", badfunc); reset_all_sys_modes (); @@ -2607,9 +2579,7 @@ int -set_file_times (filename, atime, mtime) - const char *filename; - EMACS_TIME atime, mtime; +set_file_times (const char *filename, struct timeval atime, struct timeval mtime) { #ifdef HAVE_UTIMES struct timeval tv[2]; @@ -2993,7 +2963,7 @@ /* Process enumeration and access via /proc. */ Lisp_Object -list_system_processes () +list_system_processes (void) { Lisp_Object procdir, match, proclist, next; struct gcpro gcpro1, gcpro2;
--- a/src/termcap.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/termcap.c Sun Jul 04 00:50:25 2010 -0700 @@ -127,15 +127,14 @@ for tgetnum, tgetflag and tgetstr to find. */ static char *term_entry; -static char *tgetst1 (); +static char *tgetst1 (char *ptr, char **area); /* Search entry BP for capability CAP. Return a pointer to the capability (in BP) if found, 0 if not found. */ static char * -find_capability (bp, cap) - register char *bp, *cap; +find_capability (register char *bp, register char *cap) { for (; *bp; bp++) if (bp[0] == ':' @@ -146,8 +145,7 @@ } int -tgetnum (cap) - char *cap; +tgetnum (char *cap) { register char *ptr = find_capability (term_entry, cap); if (!ptr || ptr[-1] != '#') @@ -156,8 +154,7 @@ } int -tgetflag (cap) - char *cap; +tgetflag (char *cap) { register char *ptr = find_capability (term_entry, cap); return ptr && ptr[-1] == ':'; @@ -169,9 +166,7 @@ If AREA is null, space is allocated with `malloc'. */ char * -tgetstr (cap, area) - char *cap; - char **area; +tgetstr (char *cap, char **area) { register char *ptr = find_capability (term_entry, cap); if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~')) @@ -209,9 +204,7 @@ or NULL if PTR is NULL. */ static char * -tgetst1 (ptr, area) - char *ptr; - char **area; +tgetst1 (char *ptr, char **area) { register char *p, *r; register int c; @@ -357,10 +350,7 @@ #endif /* not emacs */ void -tputs (str, nlines, outfun) - register char *str; - int nlines; - register int (*outfun) (); +tputs (register char *str, int nlines, register int (*outfun) (/* ??? */)) { register int padcount = 0; register int speed; @@ -432,10 +422,10 @@ /* Forward declarations of static functions. */ -static int scan_file (); -static char *gobble_line (); -static int compare_contin (); -static int name_match (); +static int scan_file (char *str, int fd, register struct termcap_buffer *bufp); +static char *gobble_line (int fd, register struct termcap_buffer *bufp, char *append_end); +static int compare_contin (register char *str1, register char *str2); +static int name_match (char *line, char *name); #ifdef MSDOS /* MW, May 1993 */ static int @@ -460,8 +450,7 @@ in it, and some other value otherwise. */ int -tgetent (bp, name) - char *bp, *name; +tgetent (char *bp, char *name) { register char *termcap_name; register int fd; @@ -625,10 +614,7 @@ or 0 if no entry is found in the file. */ static int -scan_file (str, fd, bufp) - char *str; - int fd; - register struct termcap_buffer *bufp; +scan_file (char *str, int fd, register struct termcap_buffer *bufp) { register char *end; @@ -665,8 +651,7 @@ by termcap entry LINE. */ static int -name_match (line, name) - char *line, *name; +name_match (char *line, char *name) { register char *tem; @@ -681,8 +666,7 @@ } static int -compare_contin (str1, str2) - register char *str1, *str2; +compare_contin (register char *str1, register char *str2) { register int c1, c2; while (1) @@ -722,10 +706,7 @@ thing as one line. The caller decides when a line is continued. */ static char * -gobble_line (fd, bufp, append_end) - int fd; - register struct termcap_buffer *bufp; - char *append_end; +gobble_line (int fd, register struct termcap_buffer *bufp, char *append_end) { register char *end; register int nread;
--- a/src/terminal.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/terminal.c Sun Jul 04 00:50:25 2010 -0700 @@ -435,9 +435,7 @@ /* Return the value of terminal parameter PARAM in terminal T. */ Lisp_Object -get_terminal_param (t, param) - struct terminal *t; - Lisp_Object param; +get_terminal_param (struct terminal *t, Lisp_Object param) { Lisp_Object tem = Fassq (param, t->param_alist); if (EQ (tem, Qnil)) @@ -449,10 +447,7 @@ Return the previous value. */ Lisp_Object -store_terminal_param (t, parameter, value) - struct terminal *t; - Lisp_Object parameter; - Lisp_Object value; +store_terminal_param (struct terminal *t, Lisp_Object parameter, Lisp_Object value) { Lisp_Object old_alist_elt = Fassq (parameter, t->param_alist); if (EQ (old_alist_elt, Qnil)) @@ -552,7 +547,7 @@ } void -syms_of_terminal () +syms_of_terminal (void) { DEFVAR_LISP ("ring-bell-function", &Vring_bell_function,
--- a/src/terminfo.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/terminfo.c Sun Jul 04 00:50:25 2010 -0700 @@ -35,13 +35,10 @@ */ char * -tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) - char *string; - char *outstring; - int len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9; +tparam (char *string, char *outstring, int len, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { char *temp; - extern char *tparm(); + extern char *tparm(/* ??? */); temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (outstring == 0)
--- a/src/textprop.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/textprop.c Sun Jul 04 00:50:25 2010 -0700 @@ -85,8 +85,7 @@ to capture that error in GDB by putting a breakpoint on it. */ static void -text_read_only (propval) - Lisp_Object propval; +text_read_only (Lisp_Object propval) { if (STRINGP (propval)) xsignal1 (Qtext_read_only, propval); @@ -123,9 +122,7 @@ #define hard 1 INTERVAL -validate_interval_range (object, begin, end, force) - Lisp_Object object, *begin, *end; - int force; +validate_interval_range (Lisp_Object object, Lisp_Object *begin, Lisp_Object *end, int force) { register INTERVAL i; int searchpos; @@ -191,8 +188,7 @@ is even numbered and thus suitable as a plist. */ static Lisp_Object -validate_plist (list) - Lisp_Object list; +validate_plist (Lisp_Object list) { if (NILP (list)) return Qnil; @@ -218,9 +214,7 @@ with the same values, of list PLIST. */ static int -interval_has_all_properties (plist, i) - Lisp_Object plist; - INTERVAL i; +interval_has_all_properties (Lisp_Object plist, INTERVAL i) { register Lisp_Object tail1, tail2, sym1; register int found; @@ -256,9 +250,7 @@ properties of PLIST, regardless of their values. */ static INLINE int -interval_has_some_properties (plist, i) - Lisp_Object plist; - INTERVAL i; +interval_has_some_properties (Lisp_Object plist, INTERVAL i) { register Lisp_Object tail1, tail2, sym; @@ -280,9 +272,7 @@ property names in LIST, regardless of their values. */ static INLINE int -interval_has_some_properties_list (list, i) - Lisp_Object list; - INTERVAL i; +interval_has_some_properties_list (Lisp_Object list, INTERVAL i) { register Lisp_Object tail1, tail2, sym; @@ -305,8 +295,7 @@ /* Return the value of PROP in property-list PLIST, or Qunbound if it has none. */ static Lisp_Object -property_value (plist, prop) - Lisp_Object plist, prop; +property_value (Lisp_Object plist, Lisp_Object prop) { Lisp_Object value; @@ -324,9 +313,7 @@ OBJECT is the string or buffer that INTERVAL belongs to. */ static void -set_properties (properties, interval, object) - Lisp_Object properties, object; - INTERVAL interval; +set_properties (Lisp_Object properties, INTERVAL interval, Lisp_Object object) { Lisp_Object sym, value; @@ -372,10 +359,7 @@ are actually added to I's plist) */ static int -add_properties (plist, i, object) - Lisp_Object plist; - INTERVAL i; - Lisp_Object object; +add_properties (Lisp_Object plist, INTERVAL i, Lisp_Object object) { Lisp_Object tail1, tail2, sym1, val1; register int changed = 0; @@ -451,10 +435,7 @@ OBJECT is the string or buffer containing I. */ static int -remove_properties (plist, list, i, object) - Lisp_Object plist, list; - INTERVAL i; - Lisp_Object object; +remove_properties (Lisp_Object plist, Lisp_Object list, INTERVAL i, Lisp_Object object) { register Lisp_Object tail1, tail2, sym, current_plist; register int changed = 0; @@ -535,9 +516,7 @@ POSITION is BEG-based. */ INTERVAL -interval_of (position, object) - int position; - Lisp_Object object; +interval_of (int position, Lisp_Object object) { register INTERVAL i; int beg, end; @@ -623,10 +602,7 @@ window-specific overlays are considered only if they are associated with OBJECT. */ Lisp_Object -get_char_property_and_overlay (position, prop, object, overlay) - Lisp_Object position, object; - register Lisp_Object prop; - Lisp_Object *overlay; +get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop, Lisp_Object object, Lisp_Object *overlay) { struct window *w = 0; @@ -1020,8 +996,7 @@ /* Return 1 if there's a change in some property between BEG and END. */ int -property_change_between_p (beg, end) - int beg, end; +property_change_between_p (int beg, int end) { register INTERVAL i, next; Lisp_Object object, pos; @@ -1353,8 +1328,7 @@ otherwise. */ Lisp_Object -set_text_properties (start, end, properties, object, coherent_change_p) - Lisp_Object start, end, properties, object, coherent_change_p; +set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object, Lisp_Object coherent_change_p) { register INTERVAL i; Lisp_Object ostart, oend; @@ -1418,9 +1392,7 @@ START and END can be in any order. */ void -set_text_properties_1 (start, end, properties, buffer, i) - Lisp_Object start, end, properties, buffer; - INTERVAL i; +set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object buffer, INTERVAL i) { register INTERVAL prev_changed = NULL_INTERVAL; register int s, len; @@ -1777,8 +1749,7 @@ BUFFER can be either a buffer or nil (meaning current buffer). */ int -text_property_stickiness (prop, pos, buffer) - Lisp_Object prop, pos, buffer; +text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) { Lisp_Object prev_pos, front_sticky; int is_rear_sticky = 1, is_front_sticky = 0; /* defaults */ @@ -1851,8 +1822,7 @@ /* Note this can GC when DEST is a buffer. */ Lisp_Object -copy_text_properties (start, end, src, pos, dest, prop) - Lisp_Object start, end, src, pos, dest, prop; +copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src, Lisp_Object pos, Lisp_Object dest, Lisp_Object prop) { INTERVAL i; Lisp_Object res; @@ -1944,8 +1914,7 @@ doesn't contain text properties between START and END. */ Lisp_Object -text_property_list (object, start, end, prop) - Lisp_Object object, start, end, prop; +text_property_list (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object prop) { struct interval *i; Lisp_Object result; @@ -2002,8 +1971,7 @@ non-zero if OBJECT was modified. */ int -add_text_properties_from_list (object, list, delta) - Lisp_Object object, list, delta; +add_text_properties_from_list (Lisp_Object object, Lisp_Object list, Lisp_Object delta) { struct gcpro gcpro1, gcpro2; int modified_p = 0; @@ -2036,8 +2004,7 @@ end-points to NEW_END. */ Lisp_Object -extend_property_ranges (list, new_end) - Lisp_Object list, new_end; +extend_property_ranges (Lisp_Object list, Lisp_Object new_end) { Lisp_Object prev = Qnil, head = list; int max = XINT (new_end); @@ -2072,8 +2039,7 @@ /* Call the modification hook functions in LIST, each with START and END. */ static void -call_mod_hooks (list, start, end) - Lisp_Object list, start, end; +call_mod_hooks (Lisp_Object list, Lisp_Object start, Lisp_Object end) { struct gcpro gcpro1; GCPRO1 (list); @@ -2094,9 +2060,7 @@ those hooks in order, with START and END - 1 as arguments. */ void -verify_interval_modification (buf, start, end) - struct buffer *buf; - int start, end; +verify_interval_modification (struct buffer *buf, int start, int end) { register INTERVAL intervals = BUF_INTERVALS (buf); register INTERVAL i; @@ -2274,8 +2238,7 @@ so it can indicate the range of inserted text. */ void -report_interval_modification (start, end) - Lisp_Object start, end; +report_interval_modification (Lisp_Object start, Lisp_Object end) { if (! NILP (interval_insert_behind_hooks)) call_mod_hooks (interval_insert_behind_hooks, start, end); @@ -2286,7 +2249,7 @@ } void -syms_of_textprop () +syms_of_textprop (void) { DEFVAR_LISP ("default-text-properties", &Vdefault_text_properties, doc: /* Property-list used as default values.
--- a/src/tparam.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/tparam.c Sun Jul 04 00:50:25 2010 -0700 @@ -90,15 +90,11 @@ The fourth and following args to tparam serve as the parameter values. */ -static char *tparam1 (); +static char *tparam1 (char *string, char *outstring, int len, char *up, char *left, register int *argp); /* VARARGS 2 */ char * -tparam (string, outstring, len, arg0, arg1, arg2, arg3) - char *string; - char *outstring; - int len; - int arg0, arg1, arg2, arg3; +tparam (char *string, char *outstring, int len, int arg0, int arg1, int arg2, int arg3) { int arg[4]; @@ -115,9 +111,7 @@ static char tgoto_buf[50]; char * -tgoto (cm, hpos, vpos) - char *cm; - int hpos, vpos; +tgoto (char *cm, int hpos, int vpos) { int args[2]; if (!cm) @@ -128,12 +122,7 @@ } static char * -tparam1 (string, outstring, len, up, left, argp) - char *string; - char *outstring; - int len; - char *up, *left; - register int *argp; +tparam1 (char *string, char *outstring, int len, char *up, char *left, register int *argp) { register int c; register char *p = string;
--- a/src/undo.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/undo.c Sun Jul 04 00:50:25 2010 -0700 @@ -67,8 +67,7 @@ undo record that will be added just after this command terminates. */ static void -record_point (pt) - int pt; +record_point (int pt) { int at_boundary; @@ -130,8 +129,7 @@ because we don't need to record the contents.) */ void -record_insert (beg, length) - int beg, length; +record_insert (int beg, int length) { Lisp_Object lbeg, lend; @@ -166,9 +164,7 @@ of the characters in STRING, at location BEG. */ void -record_delete (beg, string) - int beg; - Lisp_Object string; +record_delete (int beg, Lisp_Object string) { Lisp_Object sbeg; @@ -196,9 +192,7 @@ won't be inverted automatically by undoing the buffer modification. */ void -record_marker_adjustment (marker, adjustment) - Lisp_Object marker; - int adjustment; +record_marker_adjustment (Lisp_Object marker, int adjustment) { if (EQ (current_buffer->undo_list, Qt)) return; @@ -221,8 +215,7 @@ The replacement must not change the number of characters. */ void -record_change (beg, length) - int beg, length; +record_change (int beg, int length) { record_delete (beg, make_buffer_string (beg, beg + length, 1)); record_insert (beg, length); @@ -233,7 +226,7 @@ we can tell whether it is obsolete because the file was saved again. */ void -record_first_change () +record_first_change (void) { Lisp_Object high, low; struct buffer *base_buffer = current_buffer; @@ -257,9 +250,7 @@ for LENGTH characters starting at position BEG in BUFFER. */ void -record_property_change (beg, length, prop, value, buffer) - int beg, length; - Lisp_Object prop, value, buffer; +record_property_change (int beg, int length, Lisp_Object prop, Lisp_Object value, Lisp_Object buffer) { Lisp_Object lbeg, lend, entry; struct buffer *obuf = current_buffer, *buf = XBUFFER (buffer); @@ -328,8 +319,7 @@ In some cases this works by calling undo-outer-limit-function. */ void -truncate_undo_list (b) - struct buffer *b; +truncate_undo_list (struct buffer *b) { Lisp_Object list; Lisp_Object prev, next, last_boundary; @@ -665,7 +655,7 @@ } void -syms_of_undo () +syms_of_undo (void) { Qinhibit_read_only = intern_c_string ("inhibit-read-only"); staticpro (&Qinhibit_read_only);
--- a/src/unexelf.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/unexelf.c Sun Jul 04 00:50:25 2010 -0700 @@ -594,8 +594,7 @@ /* Round X up to a multiple of Y. */ static ElfW(Addr) -round_up (x, y) - ElfW(Addr) x, y; +round_up (Elf32_Addr x, Elf32_Addr y) { int rem = x % y; if (rem == 0) @@ -611,13 +610,7 @@ if NOERROR is 0; we return -1 if NOERROR is nonzero. */ static int -find_section (name, section_names, file_name, old_file_h, old_section_h, noerror) - char *name; - char *section_names; - char *file_name; - ElfW(Ehdr) *old_file_h; - ElfW(Shdr) *old_section_h; - int noerror; +find_section (char *name, char *section_names, char *file_name, Elf32_Ehdr *old_file_h, Elf32_Shdr *old_section_h, int noerror) { int idx; @@ -652,9 +645,7 @@ * */ void -unexec (new_name, old_name, data_start, bss_start, entry_address) - char *new_name, *old_name; - unsigned data_start, bss_start, entry_address; +unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address) { int new_file, old_file, new_file_size;
--- a/src/window.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/window.c Sun Jul 04 00:50:25 2010 -0700 @@ -220,7 +220,7 @@ } Lisp_Object -make_window () +make_window (void) { Lisp_Object val; register struct window *p; @@ -483,8 +483,7 @@ static struct window * -decode_window (window) - register Lisp_Object window; +decode_window (register Lisp_Object window) { if (NILP (window)) return XWINDOW (selected_window); @@ -494,8 +493,7 @@ } static struct window * -decode_any_window (window) - register Lisp_Object window; +decode_any_window (register Lisp_Object window) { if (NILP (window)) return XWINDOW (selected_window); @@ -799,9 +797,7 @@ X and Y are frame relative pixel coordinates. */ static enum window_part -coordinates_in_window (w, x, y) - register struct window *w; - register int *x, *y; +coordinates_in_window (register struct window *w, register int *x, register int *y) { struct frame *f = XFRAME (WINDOW_FRAME (w)); int left_x, right_x, top_y, bottom_y; @@ -1084,9 +1080,7 @@ }; static int -check_window_containing (w, user_data) - struct window *w; - void *user_data; +check_window_containing (struct window *w, void *user_data) { struct check_window_data *cw = (struct check_window_data *) user_data; enum window_part found; @@ -1124,12 +1118,7 @@ case. */ Lisp_Object -window_from_coordinates (f, x, y, part, wx, wy, tool_bar_p) - struct frame *f; - int x, y; - enum window_part *part; - int *wx, *wy; - int tool_bar_p; +window_from_coordinates (struct frame *f, int x, int y, enum window_part *part, int *wx, int *wy, int tool_bar_p) { Lisp_Object window; struct check_window_data cw; @@ -1469,8 +1458,7 @@ return 0. */ struct Lisp_Char_Table * -window_display_table (w) - struct window *w; +window_display_table (struct window *w) { struct Lisp_Char_Table *dp = NULL; @@ -1504,8 +1492,7 @@ /* Record info on buffer window w is displaying when it is about to cease to display that buffer. */ static void -unshow_buffer (w) - register struct window *w; +unshow_buffer (register struct window *w) { Lisp_Object buf; struct buffer *b; @@ -1553,8 +1540,7 @@ /* Put replacement into the window structure in place of old. */ static void -replace_window (old, replacement) - Lisp_Object old, replacement; +replace_window (Lisp_Object old, Lisp_Object replacement) { register Lisp_Object tem; register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); @@ -1628,8 +1614,7 @@ } void -delete_window (window) - register Lisp_Object window; +delete_window (register Lisp_Object window) { register Lisp_Object tem, parent, sib; register struct window *p; @@ -1843,9 +1828,7 @@ function window_list. */ static int -add_window_to_list (w, user_data) - struct window *w; - void *user_data; +add_window_to_list (struct window *w, void *user_data) { Lisp_Object *list = (Lisp_Object *) user_data; Lisp_Object window; @@ -1860,7 +1843,7 @@ list, cache it in Vwindow_list, and return that. */ static Lisp_Object -window_list () +window_list (void) { if (!CONSP (Vwindow_list)) { @@ -1901,8 +1884,7 @@ a frame means consider windows on that frame, only. */ static int -candidate_window_p (window, owindow, minibuf, all_frames) - Lisp_Object window, owindow, minibuf, all_frames; +candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf, Lisp_Object all_frames) { struct window *w = XWINDOW (window); struct frame *f = XFRAME (w->frame); @@ -1967,8 +1949,7 @@ ALL_FRAMES. */ static void -decode_next_window_args (window, minibuf, all_frames) - Lisp_Object *window, *minibuf, *all_frames; +decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object *all_frames) { if (NILP (*window)) *window = selected_window; @@ -2014,9 +1995,7 @@ ALL_FRAMES. */ static Lisp_Object -next_window (window, minibuf, all_frames, next_p) - Lisp_Object window, minibuf, all_frames; - int next_p; +next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, int next_p) { decode_next_window_args (&window, &minibuf, &all_frames); @@ -2200,8 +2179,7 @@ for `next-window'. */ static Lisp_Object -window_list_1 (window, minibuf, all_frames) - Lisp_Object window, minibuf, all_frames; +window_list_1 (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames) { Lisp_Object tail, list, rest; @@ -2249,10 +2227,7 @@ }; static Lisp_Object -window_loop (type, obj, mini, frames) - enum window_loop type; - Lisp_Object obj, frames; - int mini; +window_loop (enum window_loop type, Lisp_Object obj, int mini, Lisp_Object frames) { Lisp_Object window, windows, best_window, frame_arg; struct frame *f; @@ -2479,7 +2454,7 @@ /* Used for debugging. Abort if any window has a dead buffer. */ void -check_all_windows () +check_all_windows (void) { window_loop (CHECK_ALL_WINDOWS, Qnil, 1, Qt); } @@ -2690,8 +2665,7 @@ of all frames, even those on other keyboards. */ void -replace_buffer_in_all_windows (buffer) - Lisp_Object buffer; +replace_buffer_in_all_windows (Lisp_Object buffer) { Lisp_Object tail, frame; @@ -2720,9 +2694,7 @@ minimum allowable size. */ void -check_frame_size (frame, rows, cols) - FRAME_PTR frame; - int *rows, *cols; +check_frame_size (FRAME_PTR frame, int *rows, int *cols) { /* For height, we have to see: how many windows the frame has at minimum (one or two), @@ -2748,9 +2720,7 @@ either. */ static int -window_fixed_size_p (w, width_p, check_siblings_p) - struct window *w; - int width_p, check_siblings_p; +window_fixed_size_p (struct window *w, int width_p, int check_siblings_p) { int fixed_p; struct window *c; @@ -2850,9 +2820,7 @@ minibuffer window, always return 1. */ static int -window_min_size_2 (w, width_p, safe_p) - struct window *w; - int width_p, safe_p; +window_min_size_2 (struct window *w, int width_p, int safe_p) { /* We should consider buffer-local values of window_min_height and window_min_width here. */ @@ -2886,9 +2854,7 @@ sizes of W's children. */ static int -window_min_size_1 (w, width_p, safe_p) - struct window *w; - int width_p, safe_p; +window_min_size_1 (struct window *w, int width_p, int safe_p) { struct window *c; int size; @@ -2963,9 +2929,7 @@ to 1 if W is fixed-size unless FIXED is null. */ static int -window_min_size (w, width_p, safe_p, ignore_fixed_p, fixed) - struct window *w; - int width_p, safe_p, ignore_fixed_p, *fixed; +window_min_size (struct window *w, int width_p, int safe_p, int ignore_fixed_p, int *fixed) { int size, fixed_p; @@ -2991,8 +2955,7 @@ is still too narrow. */ static int -adjust_window_margins (w) - struct window *w; +adjust_window_margins (struct window *w) { int box_cols = (WINDOW_TOTAL_COLS (w) - WINDOW_FRINGE_COLS (w) @@ -3190,10 +3153,7 @@ This should give better behavior when resizing frames. */ static void -size_window (window, size, width_p, nodelete_p, first_only, last_only) - Lisp_Object window; - int size, width_p, nodelete_p; - int first_only, last_only; +size_window (Lisp_Object window, int size, int width_p, int nodelete_p, int first_only, int last_only) { struct window *w = XWINDOW (window); struct window *c; @@ -3384,10 +3344,7 @@ displayed correctly. */ void -set_window_height (window, height, nodelete) - Lisp_Object window; - int height; - int nodelete; +set_window_height (Lisp_Object window, int height, int nodelete) { size_window (window, height, 0, nodelete, 0, 0); } @@ -3401,10 +3358,7 @@ displayed correctly. */ void -set_window_width (window, width, nodelete) - Lisp_Object window; - int width; - int nodelete; +set_window_width (Lisp_Object window, int width, int nodelete) { size_window (window, width, 1, nodelete, 0, 0); } @@ -3412,9 +3366,7 @@ /* Change window heights in windows rooted in WINDOW by N lines. */ void -change_window_heights (window, n) - Lisp_Object window; - int n; +change_window_heights (Lisp_Object window, int n) { struct window *w = XWINDOW (window); @@ -3510,9 +3462,7 @@ reset from the buffer's local settings. */ void -set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) - Lisp_Object window, buffer; - int run_hooks_p, keep_margins_p; +set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int keep_margins_p) { struct window *w = XWINDOW (window); struct buffer *b = XBUFFER (buffer); @@ -3743,24 +3693,21 @@ } static Lisp_Object -select_window_norecord (window) - Lisp_Object window; +select_window_norecord (Lisp_Object window) { return WINDOW_LIVE_P (window) ? Fselect_window (window, Qt) : selected_window; } static Lisp_Object -select_frame_norecord (frame) - Lisp_Object frame; +select_frame_norecord (Lisp_Object frame) { return FRAME_LIVE_P (XFRAME (frame)) ? Fselect_frame (frame, Qt) : selected_frame; } Lisp_Object -display_buffer (buffer, not_this_window_p, override_frame) - Lisp_Object buffer, not_this_window_p, override_frame; +display_buffer (Lisp_Object buffer, Lisp_Object not_this_window_p, Lisp_Object override_frame) { return call3 (Qdisplay_buffer, buffer, not_this_window_p, override_frame); } @@ -3811,8 +3758,7 @@ void -temp_output_buffer_show (buf) - register Lisp_Object buf; +temp_output_buffer_show (register Lisp_Object buf) { register struct buffer *old = current_buffer; register Lisp_Object window; @@ -3872,8 +3818,7 @@ } static void -make_dummy_parent (window) - Lisp_Object window; +make_dummy_parent (Lisp_Object window) { Lisp_Object new; register struct window *o, *p; @@ -4087,16 +4032,14 @@ } int -window_height (window) - Lisp_Object window; +window_height (Lisp_Object window) { register struct window *p = XWINDOW (window); return WINDOW_TOTAL_LINES (p); } int -window_width (window) - Lisp_Object window; +window_width (Lisp_Object window) { register struct window *p = XWINDOW (window); return WINDOW_TOTAL_COLS (p); @@ -4118,9 +4061,7 @@ deleted. */ static void -enlarge_window (window, delta, horiz_flag) - Lisp_Object window; - int delta, horiz_flag; +enlarge_window (Lisp_Object window, int delta, int horiz_flag) { Lisp_Object parent, next, prev; struct window *p; @@ -4396,9 +4337,7 @@ are not deleted; instead, we signal an error. */ static void -adjust_window_trailing_edge (window, delta, horiz_flag) - Lisp_Object window; - int delta, horiz_flag; +adjust_window_trailing_edge (Lisp_Object window, int delta, int horiz_flag) { Lisp_Object parent, child; struct window *p; @@ -4570,9 +4509,7 @@ from lowest windows first. */ static void -shrink_window_lowest_first (w, height) - struct window *w; - int height; +shrink_window_lowest_first (struct window *w, int height) { struct window *c; Lisp_Object child; @@ -4654,9 +4591,7 @@ stored in orig_top_line and orig_total_lines for all windows. */ static int -save_restore_orig_size (w, action) - struct window *w; - enum save_restore_action action; +save_restore_orig_size (struct window *w, enum save_restore_action action) { int success_p = 1; @@ -4711,9 +4646,7 @@ without deleting other windows. */ void -grow_mini_window (w, delta) - struct window *w; - int delta; +grow_mini_window (struct window *w, int delta) { struct frame *f = XFRAME (w->frame); struct window *root; @@ -4762,8 +4695,7 @@ line. */ void -shrink_mini_window (w) - struct window *w; +shrink_mini_window (struct window *w) { struct frame *f = XFRAME (w->frame); struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); @@ -4793,8 +4725,7 @@ the frame are cleared. */ void -mark_window_cursors_off (w) - struct window *w; +mark_window_cursors_off (struct window *w) { while (w) { @@ -4813,8 +4744,7 @@ /* Return number of lines of text (not counting mode lines) in W. */ int -window_internal_height (w) - struct window *w; +window_internal_height (struct window *w) { int ht = XFASTINT (w->total_lines); @@ -4841,8 +4771,7 @@ separating W from the sibling to its right. */ int -window_box_text_cols (w) - struct window *w; +window_box_text_cols (struct window *w) { struct frame *f = XFRAME (WINDOW_FRAME (w)); int width = XINT (w->total_cols); @@ -4879,11 +4808,7 @@ respectively. */ static void -window_scroll (window, n, whole, noerror) - Lisp_Object window; - int n; - int whole; - int noerror; +window_scroll (Lisp_Object window, int n, int whole, int noerror) { immediate_quit = 1; @@ -4903,11 +4828,7 @@ descriptions. */ static void -window_scroll_pixel_based (window, n, whole, noerror) - Lisp_Object window; - int n; - int whole; - int noerror; +window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) { struct it it; struct window *w = XWINDOW (window); @@ -5253,11 +5174,7 @@ See the comment of window_scroll for parameter descriptions. */ static void -window_scroll_line_based (window, n, whole, noerror) - Lisp_Object window; - int n; - int whole; - int noerror; +window_scroll_line_based (Lisp_Object window, int n, int whole, int noerror) { register struct window *w = XWINDOW (window); register int opoint = PT, opoint_byte = PT_BYTE; @@ -5415,9 +5332,7 @@ up. This is the guts of Fscroll_up and Fscroll_down. */ static void -scroll_command (n, direction) - Lisp_Object n; - int direction; +scroll_command (Lisp_Object n, int direction) { int count = SPECPDL_INDEX (); @@ -5644,8 +5559,7 @@ as opposed to its height. */ static int -displayed_window_lines (w) - struct window *w; +displayed_window_lines (struct window *w) { struct it it; struct text_pos start; @@ -6390,8 +6304,7 @@ by setting their buffers to nil. */ void -delete_all_subwindows (w) - register struct window *w; +delete_all_subwindows (register struct window *w) { if (!NILP (w->next)) delete_all_subwindows (XWINDOW (w->next)); @@ -6417,8 +6330,7 @@ } static int -count_windows (window) - register struct window *window; +count_windows (register struct window *window) { register int count = 1; if (!NILP (window->next)) @@ -6435,10 +6347,7 @@ Value is last index + 1. */ static int -get_leaf_windows (w, flat, i) - struct window *w; - struct window **flat; - int i; +get_leaf_windows (struct window *w, struct window **flat, int i) { while (w) { @@ -6461,8 +6370,7 @@ can be returned. */ struct glyph * -get_phys_cursor_glyph (w) - struct window *w; +get_phys_cursor_glyph (struct window *w) { struct glyph_row *row; struct glyph *glyph; @@ -6481,10 +6389,7 @@ static int -save_window_save (window, vector, i) - Lisp_Object window; - struct Lisp_Vector *vector; - int i; +save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i) { register struct saved_window *p; register struct window *w; @@ -6642,8 +6547,7 @@ ***********************************************************************/ static Lisp_Object -window_tree (w) - struct window *w; +window_tree (struct window *w) { Lisp_Object tail = Qnil; Lisp_Object result = Qnil; @@ -7010,10 +6914,7 @@ additional argument USER_DATA. Stops when FN returns 0. */ void -foreach_window (f, fn, user_data) - struct frame *f; - int (* fn) (struct window *, void *); - void *user_data; +foreach_window (struct frame *f, int (*fn) (struct window *, void *), void *user_data) { /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ if (WINDOWP (FRAME_ROOT_WINDOW (f))) @@ -7027,10 +6928,7 @@ Stop when FN returns 0. Value is 0 if stopped by FN. */ static int -foreach_window_1 (w, fn, user_data) - struct window *w; - int (* fn) (struct window *, void *); - void *user_data; +foreach_window_1 (struct window *w, int (*fn) (struct window *, void *), void *user_data) { int cont; @@ -7055,9 +6953,7 @@ the window start. */ static int -freeze_window_start (w, freeze_p) - struct window *w; - void *freeze_p; +freeze_window_start (struct window *w, void *freeze_p) { if (MINI_WINDOW_P (w) || (WINDOWP (selected_window) /* Can be nil in corner cases. */ @@ -7077,9 +6973,7 @@ means freeze the window start. */ void -freeze_window_starts (f, freeze_p) - struct frame *f; - int freeze_p; +freeze_window_starts (struct frame *f, int freeze_p) { foreach_window (f, freeze_window_start, (void *) (freeze_p ? f : 0)); } @@ -7093,9 +6987,7 @@ describe the same state of affairs. This is used by Fequal. */ int -compare_window_configurations (c1, c2, ignore_positions) - Lisp_Object c1, c2; - int ignore_positions; +compare_window_configurations (Lisp_Object c1, Lisp_Object c2, int ignore_positions) { register struct save_window_data *d1, *d2; struct Lisp_Vector *sw1, *sw2; @@ -7221,7 +7113,7 @@ } void -init_window_once () +init_window_once (void) { struct frame *f = make_initial_frame (); XSETFRAME (selected_frame, f); @@ -7234,13 +7126,13 @@ } void -init_window () +init_window (void) { Vwindow_list = Qnil; } void -syms_of_window () +syms_of_window (void) { Qscroll_up = intern_c_string ("scroll-up"); staticpro (&Qscroll_up); @@ -7449,7 +7341,7 @@ } void -keys_of_window () +keys_of_window (void) { initial_define_key (control_x_map, '1', "delete-other-windows"); initial_define_key (control_x_map, '2', "split-window");
--- a/src/xfaces.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xfaces.c Sun Jul 04 00:50:25 2010 -0700 @@ -656,10 +656,7 @@ is called. */ void -x_free_colors (f, pixels, npixels) - struct frame *f; - unsigned long *pixels; - int npixels; +x_free_colors (struct frame *f, long unsigned int *pixels, int npixels) { int class = FRAME_X_DISPLAY_INFO (f)->visual->class; @@ -681,12 +678,7 @@ is called. */ void -x_free_dpy_colors (dpy, screen, cmap, pixels, npixels) - Display *dpy; - Screen *screen; - Colormap cmap; - unsigned long *pixels; - int npixels; +x_free_dpy_colors (Display *dpy, Screen *screen, Colormap cmap, long unsigned int *pixels, int npixels) { struct x_display_info *dpyinfo = x_display_info_for_display (dpy); int class = dpyinfo->visual->class; @@ -707,10 +699,7 @@ are given by XGCV and MASK. */ static INLINE GC -x_create_gc (f, mask, xgcv) - struct frame *f; - unsigned long mask; - XGCValues *xgcv; +x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv) { GC gc; BLOCK_INPUT; @@ -724,9 +713,7 @@ /* Free GC which was used on frame F. */ static INLINE void -x_free_gc (f, gc) - struct frame *f; - GC gc; +x_free_gc (struct frame *f, GC gc) { eassert (interrupt_input_blocked); IF_DEBUG (xassert (--ngcs >= 0)); @@ -794,8 +781,7 @@ are in ISO8859-1. */ int -xstrcasecmp (s1, s2) - const unsigned char *s1, *s2; +xstrcasecmp (const unsigned char *s1, const unsigned char *s2) { while (*s1 && *s2) { @@ -819,9 +805,7 @@ Lisp function definitions. */ static INLINE struct frame * -frame_or_selected_frame (frame, nparam) - Lisp_Object frame; - int nparam; +frame_or_selected_frame (Lisp_Object frame, int nparam) { if (NILP (frame)) frame = selected_frame; @@ -838,8 +822,7 @@ /* Initialize face cache and basic faces for frame F. */ void -init_frame_faces (f) - struct frame *f; +init_frame_faces (struct frame *f) { /* Make a face cache, if F doesn't have one. */ if (FRAME_FACE_CACHE (f) == NULL) @@ -877,8 +860,7 @@ /* Free face cache of frame F. Called from delete_frame. */ void -free_frame_faces (f) - struct frame *f; +free_frame_faces (struct frame *f) { struct face_cache *face_cache = FRAME_FACE_CACHE (f); @@ -909,8 +891,7 @@ of named faces. */ void -recompute_basic_faces (f) - struct frame *f; +recompute_basic_faces (struct frame *f) { if (FRAME_FACE_CACHE (f)) { @@ -925,8 +906,7 @@ try to free unused fonts, too. */ void -clear_face_cache (clear_fonts_p) - int clear_fonts_p; +clear_face_cache (int clear_fonts_p) { #ifdef HAVE_WINDOW_SYSTEM Lisp_Object tail, frame; @@ -1045,10 +1025,7 @@ if these pointers are not null. */ static int -load_pixmap (f, name, w_ptr, h_ptr) - FRAME_PTR f; - Lisp_Object name; - unsigned int *w_ptr, *h_ptr; +load_pixmap (FRAME_PTR f, Lisp_Object name, unsigned int *w_ptr, unsigned int *h_ptr) { int bitmap_id; @@ -1117,9 +1094,7 @@ Return 0 if there's a problem with RGB_LIST, otherwise return 1. */ static int -parse_rgb_list (rgb_list, color) - Lisp_Object rgb_list; - XColor *color; +parse_rgb_list (Lisp_Object rgb_list, XColor *color) { #define PARSE_RGB_LIST_FIELD(field) \ if (CONSP (rgb_list) && INTEGERP (XCAR (rgb_list))) \ @@ -1144,10 +1119,7 @@ returned in it. */ static int -tty_lookup_color (f, color, tty_color, std_color) - struct frame *f; - Lisp_Object color; - XColor *tty_color, *std_color; +tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, XColor *std_color) { Lisp_Object frame, color_desc; @@ -1207,11 +1179,7 @@ /* A version of defined_color for non-X frames. */ int -tty_defined_color (f, color_name, color_def, alloc) - struct frame *f; - char *color_name; - XColor *color_def; - int alloc; +tty_defined_color (struct frame *f, char *color_name, XColor *color_def, int alloc) { int status = 1; @@ -1246,11 +1214,7 @@ This does the right thing for any type of frame. */ int -defined_color (f, color_name, color_def, alloc) - struct frame *f; - char *color_name; - XColor *color_def; - int alloc; +defined_color (struct frame *f, char *color_name, XColor *color_def, int alloc) { if (!FRAME_WINDOW_P (f)) return tty_defined_color (f, color_name, color_def, alloc); @@ -1275,9 +1239,7 @@ Lisp string. */ Lisp_Object -tty_color_name (f, idx) - struct frame *f; - int idx; +tty_color_name (struct frame *f, int idx) { if (idx >= 0 && !NILP (Ffboundp (Qtty_color_by_index))) { @@ -1312,9 +1274,7 @@ The criterion implemented here is not a terribly sophisticated one. */ static int -face_color_gray_p (f, color_name) - struct frame *f; - char *color_name; +face_color_gray_p (struct frame *f, char *color_name) { XColor color; int gray_p; @@ -1341,10 +1301,7 @@ color. */ static int -face_color_supported_p (f, color_name, background_p) - struct frame *f; - char *color_name; - int background_p; +face_color_supported_p (struct frame *f, char *color_name, int background_p) { Lisp_Object frame; XColor not_used; @@ -1419,11 +1376,7 @@ these colors. */ unsigned long -load_color (f, face, name, target_index) - struct frame *f; - struct face *face; - Lisp_Object name; - enum lface_attribute_index target_index; +load_color (struct frame *f, struct face *face, Lisp_Object name, enum lface_attribute_index target_index) { XColor color; @@ -1494,10 +1447,7 @@ try to emulate gray colors with a stipple from Vface_default_stipple. */ static void -load_face_colors (f, face, attrs) - struct frame *f; - struct face *face; - Lisp_Object *attrs; +load_face_colors (struct frame *f, struct face *face, Lisp_Object *attrs) { Lisp_Object fg, bg; @@ -1533,9 +1483,7 @@ /* Free color PIXEL on frame F. */ void -unload_color (f, pixel) - struct frame *f; - unsigned long pixel; +unload_color (struct frame *f, long unsigned int pixel) { #ifdef HAVE_X_WINDOWS if (pixel != -1) @@ -1551,9 +1499,7 @@ /* Free colors allocated for FACE. */ static void -free_face_colors (f, face) - struct frame *f; - struct face *face; +free_face_colors (struct frame *f, struct face *face) { /* PENDING(NS): need to do something here? */ #ifdef HAVE_X_WINDOWS @@ -1693,8 +1639,7 @@ static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; static int -compare_fonts_by_sort_order (v1, v2) - const void *v1, *v2; +compare_fonts_by_sort_order (const void *v1, const void *v2) { Lisp_Object font1 = *(Lisp_Object *) v1; Lisp_Object font2 = *(Lisp_Object *) v2; @@ -2150,9 +2095,7 @@ Return default face in case of errors. */ static Lisp_Object -resolve_face_name (face_name, signal_p) - Lisp_Object face_name; - int signal_p; +resolve_face_name (Lisp_Object face_name, int signal_p) { Lisp_Object orig_face; Lisp_Object tortoise, hare; @@ -2198,10 +2141,7 @@ signal an error if FACE_NAME is not a valid face name. If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face name. */ static INLINE Lisp_Object -lface_from_face_name_no_resolve (f, face_name, signal_p) - struct frame *f; - Lisp_Object face_name; - int signal_p; +lface_from_face_name_no_resolve (struct frame *f, Lisp_Object face_name, int signal_p) { Lisp_Object lface; @@ -2229,10 +2169,7 @@ If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face name. */ static INLINE Lisp_Object -lface_from_face_name (f, face_name, signal_p) - struct frame *f; - Lisp_Object face_name; - int signal_p; +lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p) { face_name = resolve_face_name (face_name, signal_p); return lface_from_face_name_no_resolve (f, face_name, signal_p); @@ -2246,11 +2183,7 @@ Otherwise, value is zero if FACE_NAME is not a face. */ static INLINE int -get_lface_attributes_no_remap (f, face_name, attrs, signal_p) - struct frame *f; - Lisp_Object face_name; - Lisp_Object *attrs; - int signal_p; +get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p) { Lisp_Object lface; @@ -2271,12 +2204,7 @@ Otherwise, value is zero if FACE_NAME is not a face. */ static INLINE int -get_lface_attributes (f, face_name, attrs, signal_p, named_merge_points) - struct frame *f; - Lisp_Object face_name; - Lisp_Object *attrs; - int signal_p; - struct named_merge_point *named_merge_points; +get_lface_attributes (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p, struct named_merge_point *named_merge_points) { Lisp_Object face_remapping; @@ -2312,8 +2240,7 @@ specified, i.e. are non-nil. */ static int -lface_fully_specified_p (attrs) - Lisp_Object *attrs; +lface_fully_specified_p (Lisp_Object *attrs) { int i; @@ -2333,10 +2260,7 @@ of FORCE_P. */ static int -set_lface_from_font (f, lface, font_object, force_p) - struct frame *f; - Lisp_Object lface, font_object; - int force_p; +set_lface_from_font (struct frame *f, Lisp_Object lface, Lisp_Object font_object, int force_p) { Lisp_Object val; struct font *font = XFONT_OBJECT (font_object); @@ -2397,8 +2321,7 @@ unless both FROM and TO are relative. */ Lisp_Object -merge_face_heights (from, to, invalid) - Lisp_Object from, to, invalid; +merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid) { Lisp_Object result = invalid; @@ -2447,10 +2370,7 @@ other places. */ static INLINE void -merge_face_vectors (f, from, to, named_merge_points) - struct frame *f; - Lisp_Object *from, *to; - struct named_merge_point *named_merge_points; +merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to, struct named_merge_point *named_merge_points) { int i; @@ -2517,11 +2437,7 @@ merging succeeded. */ static int -merge_named_face (f, face_name, to, named_merge_points) - struct frame *f; - Lisp_Object face_name; - Lisp_Object *to; - struct named_merge_point *named_merge_points; +merge_named_face (struct frame *f, Lisp_Object face_name, Lisp_Object *to, struct named_merge_point *named_merge_points) { struct named_merge_point named_merge_point; @@ -2571,12 +2487,7 @@ specifications. */ static int -merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) - struct frame *f; - Lisp_Object face_ref; - Lisp_Object *to; - int err_msgs; - struct named_merge_point *named_merge_points; +merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to, int err_msgs, struct named_merge_point *named_merge_points) { int ok = 1; /* Succeed without an error? */ @@ -3494,9 +3405,7 @@ has been assigned the value NEW_VALUE. */ void -update_face_from_frame_parameter (f, param, new_value) - struct frame *f; - Lisp_Object param, new_value; +update_face_from_frame_parameter (struct frame *f, Lisp_Object param, Lisp_Object new_value) { Lisp_Object face = Qnil; Lisp_Object lface; @@ -3575,8 +3484,7 @@ font-object set in `default' face attributes LFACE. */ static void -set_font_frame_param (frame, lface) - Lisp_Object frame, lface; +set_font_frame_param (Lisp_Object frame, Lisp_Object lface) { struct frame *f = XFRAME (frame); Lisp_Object font; @@ -3627,9 +3535,7 @@ error; if SIGNAL_P is zero, return 0. */ static Lisp_Object -face_boolean_x_resource_value (value, signal_p) - Lisp_Object value; - int signal_p; +face_boolean_x_resource_value (Lisp_Object value, int signal_p) { Lisp_Object result = make_number (0); @@ -4075,8 +3981,7 @@ is called quite often. */ static INLINE int -face_attr_equal_p (v1, v2) - Lisp_Object v1, v2; +face_attr_equal_p (Lisp_Object v1, Lisp_Object v2) { /* Type can differ, e.g. when one attribute is unspecified, i.e. nil, and the other is specified. */ @@ -4109,8 +4014,7 @@ is called quite often. */ static INLINE int -lface_equal_p (v1, v2) - Lisp_Object *v1, *v2; +lface_equal_p (Lisp_Object *v1, Lisp_Object *v2) { int i, equal_p = 1; @@ -4198,8 +4102,7 @@ below in computing a hash value for a Lisp face. */ static INLINE unsigned -hash_string_case_insensitive (string) - Lisp_Object string; +hash_string_case_insensitive (Lisp_Object string) { const unsigned char *s; unsigned hash = 0; @@ -4213,8 +4116,7 @@ /* Return a hash code for face attribute vector V. */ static INLINE unsigned -lface_hash (v) - Lisp_Object *v; +lface_hash (Lisp_Object *v) { return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX]) @@ -4233,8 +4135,7 @@ LFACE1 and LFACE2 must be fully-specified. */ static INLINE int -lface_same_font_attributes_p (lface1, lface2) - Lisp_Object *lface1, *lface2; +lface_same_font_attributes_p (Lisp_Object *lface1, Lisp_Object *lface2) { xassert (lface_fully_specified_p (lface1) && lface_fully_specified_p (lface2)); @@ -4265,8 +4166,7 @@ vector ATTR. */ static struct face * -make_realized_face (attr) - Lisp_Object *attr; +make_realized_face (Lisp_Object *attr) { struct face *face = (struct face *) xmalloc (sizeof *face); bzero (face, sizeof *face); @@ -4280,9 +4180,7 @@ be null. */ void -free_realized_face (f, face) - struct frame *f; - struct face *face; +free_realized_face (struct frame *f, struct face *face) { if (face) { @@ -4317,9 +4215,7 @@ by clearing the face cache. */ void -prepare_face_for_display (f, face) - struct frame *f; - struct face *face; +prepare_face_for_display (struct frame *f, struct face *face) { #ifdef HAVE_WINDOW_SYSTEM xassert (FRAME_WINDOW_P (f)); @@ -4356,8 +4252,7 @@ /* Returns the `distance' between the colors X and Y. */ static int -color_distance (x, y) - XColor *x, *y; +color_distance (XColor *x, XColor *y) { /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. Quoting from that paper: @@ -4415,8 +4310,7 @@ /* Return a new face cache for frame F. */ static struct face_cache * -make_face_cache (f) - struct frame *f; +make_face_cache (struct frame *f) { struct face_cache *c; int size; @@ -4439,8 +4333,7 @@ keeping too many graphics contexts that are no longer needed. */ static void -clear_face_gcs (c) - struct face_cache *c; +clear_face_gcs (struct face_cache *c) { if (c && FRAME_WINDOW_P (c->f)) { @@ -4470,8 +4363,7 @@ event doesn't try to use faces we destroyed. */ static void -free_realized_faces (c) - struct face_cache *c; +free_realized_faces (struct face_cache *c) { if (c && c->used) { @@ -4511,9 +4403,7 @@ /* Free all realized faces that are using FONTSET on frame F. */ void -free_realized_faces_for_fontset (f, fontset) - struct frame *f; - int fontset; +free_realized_faces_for_fontset (struct frame *f, int fontset) { struct face_cache *cache = FRAME_FACE_CACHE (f); struct face *face; @@ -4554,8 +4444,7 @@ because we can't tell which realized faces depend on that face. */ void -free_all_realized_faces (frame) - Lisp_Object frame; +free_all_realized_faces (Lisp_Object frame) { if (NILP (frame)) { @@ -4571,8 +4460,7 @@ /* Free face cache C and faces in it, including their X resources. */ static void -free_face_cache (c) - struct face_cache *c; +free_face_cache (struct face_cache *c) { if (c) { @@ -4592,10 +4480,7 @@ that a requested face is not cached. */ static void -cache_face (c, face, hash) - struct face_cache *c; - struct face *face; - unsigned hash; +cache_face (struct face_cache *c, struct face *face, unsigned int hash) { int i = hash % FACE_CACHE_BUCKETS_SIZE; @@ -4672,9 +4557,7 @@ /* Remove face FACE from cache C. */ static void -uncache_face (c, face) - struct face_cache *c; - struct face *face; +uncache_face (struct face_cache *c, struct face *face) { int i = face->hash % FACE_CACHE_BUCKETS_SIZE; @@ -4698,9 +4581,7 @@ realize a new one. */ INLINE int -lookup_face (f, attr) - struct frame *f; - Lisp_Object *attr; +lookup_face (struct frame *f, Lisp_Object *attr) { struct face_cache *cache = FRAME_FACE_CACHE (f); unsigned hash; @@ -4746,10 +4627,7 @@ suitable face is found, realize a new one. */ int -face_for_font (f, font_object, base_face) - struct frame *f; - Lisp_Object font_object; - struct face *base_face; +face_for_font (struct frame *f, Lisp_Object font_object, struct face *base_face) { struct face_cache *cache = FRAME_FACE_CACHE (f); unsigned hash; @@ -4784,10 +4662,7 @@ face isn't realized and cannot be realized. */ int -lookup_named_face (f, symbol, signal_p) - struct frame *f; - Lisp_Object symbol; - int signal_p; +lookup_named_face (struct frame *f, Lisp_Object symbol, int signal_p) { Lisp_Object attrs[LFACE_VECTOR_SIZE]; Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; @@ -4819,9 +4694,7 @@ rather than signal an error. */ int -lookup_basic_face (f, face_id) - struct frame *f; - int face_id; +lookup_basic_face (struct frame *f, int face_id) { Lisp_Object name, mapping; int remapped_face_id; @@ -4868,9 +4741,7 @@ LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ int -ascii_face_of_lisp_face (f, lface_id) - struct frame *f; - int lface_id; +ascii_face_of_lisp_face (struct frame *f, int lface_id) { int face_id; @@ -4891,9 +4762,7 @@ STEPS < 0 means larger. Value is the id of the face. */ int -smaller_face (f, face_id, steps) - struct frame *f; - int face_id, steps; +smaller_face (struct frame *f, int face_id, int steps) { #ifdef HAVE_WINDOW_SYSTEM struct face *face; @@ -4952,10 +4821,7 @@ FACE_ID on frame F, but has height HEIGHT. */ int -face_with_height (f, face_id, height) - struct frame *f; - int face_id; - int height; +face_with_height (struct frame *f, int face_id, int height) { #ifdef HAVE_WINDOW_SYSTEM struct face *face; @@ -4984,11 +4850,7 @@ default face. FACE_ID is assumed to be already realized. */ int -lookup_derived_face (f, symbol, face_id, signal_p) - struct frame *f; - Lisp_Object symbol; - int face_id; - int signal_p; +lookup_derived_face (struct frame *f, Lisp_Object symbol, int face_id, int signal_p) { Lisp_Object attrs[LFACE_VECTOR_SIZE]; Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; @@ -5045,10 +4907,7 @@ \(2) `close in spirit' to what the attributes specify, if not exact. */ static int -x_supports_face_attributes_p (f, attrs, def_face) - struct frame *f; - Lisp_Object *attrs; - struct face *def_face; +x_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, struct face *def_face) { Lisp_Object *def_attrs = def_face->lface; @@ -5149,10 +5008,7 @@ substitution of a `dim' face for italic. */ static int -tty_supports_face_attributes_p (f, attrs, def_face) - struct frame *f; - Lisp_Object *attrs; - struct face *def_face; +tty_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, struct face *def_face) { int weight; Lisp_Object val, fg, bg; @@ -5532,8 +5388,7 @@ attribute of ATTRS doesn't name a fontset. */ static int -face_fontset (attrs) - Lisp_Object *attrs; +face_fontset (Lisp_Object *attrs) { Lisp_Object name; @@ -5556,8 +5411,7 @@ face. */ static int -realize_basic_faces (f) - struct frame *f; +realize_basic_faces (struct frame *f) { int success_p = 0; int count = SPECPDL_INDEX (); @@ -5605,8 +5459,7 @@ that are not explicitly specified are taken from frame parameters. */ static int -realize_default_face (f) - struct frame *f; +realize_default_face (struct frame *f) { struct face_cache *c = FRAME_FACE_CACHE (f); Lisp_Object lface; @@ -5729,10 +5582,7 @@ have. The default face must have been realized already. */ static void -realize_named_face (f, symbol, id) - struct frame *f; - Lisp_Object symbol; - int id; +realize_named_face (struct frame *f, Lisp_Object symbol, int id) { struct face_cache *c = FRAME_FACE_CACHE (f); Lisp_Object lface = lface_from_face_name (f, symbol, 0); @@ -5768,10 +5618,7 @@ face. Value is a pointer to the newly created realized face. */ static struct face * -realize_face (cache, attrs, former_face_id) - struct face_cache *cache; - Lisp_Object *attrs; - int former_face_id; +realize_face (struct face_cache *cache, Lisp_Object *attrs, int former_face_id) { struct face *face; @@ -5812,10 +5659,7 @@ no-font. */ static struct face * -realize_non_ascii_face (f, font_object, base_face) - struct frame *f; - Lisp_Object font_object; - struct face *base_face; +realize_non_ascii_face (struct frame *f, Lisp_Object font_object, struct face *base_face) { struct face_cache *cache = FRAME_FACE_CACHE (f); struct face *face; @@ -5849,9 +5693,7 @@ created realized face. */ static struct face * -realize_x_face (cache, attrs) - struct face_cache *cache; - Lisp_Object *attrs; +realize_x_face (struct face_cache *cache, Lisp_Object *attrs) { struct face *face = NULL; #ifdef HAVE_WINDOW_SYSTEM @@ -6058,11 +5900,7 @@ default foreground/background colors. */ static void -map_tty_color (f, face, idx, defaulted) - struct frame *f; - struct face *face; - enum lface_attribute_index idx; - int *defaulted; +map_tty_color (struct frame *f, struct face *face, enum lface_attribute_index idx, int *defaulted) { Lisp_Object frame, color, def; int foreground_p = idx == LFACE_FOREGROUND_INDEX; @@ -6139,9 +5977,7 @@ Value is a pointer to the newly created realized face. */ static struct face * -realize_tty_face (cache, attrs) - struct face_cache *cache; - Lisp_Object *attrs; +realize_tty_face (struct face_cache *cache, Lisp_Object *attrs) { struct face *face; int weight, slant; @@ -6222,10 +6058,7 @@ property PROP on frame F in current_buffer. */ int -compute_char_face (f, ch, prop) - struct frame *f; - int ch; - Lisp_Object prop; +compute_char_face (struct frame *f, int ch, Lisp_Object prop) { int face_id; @@ -6559,10 +6392,7 @@ */ int -merge_faces (f, face_name, face_id, base_face_id) - struct frame *f; - Lisp_Object face_name; - int face_id, base_face_id; +merge_faces (struct frame *f, Lisp_Object face_name, int face_id, int base_face_id) { Lisp_Object attrs[LFACE_VECTOR_SIZE]; struct face *base_face; @@ -6751,7 +6581,7 @@ ***********************************************************************/ void -syms_of_xfaces () +syms_of_xfaces (void) { Qface = intern_c_string ("face"); staticpro (&Qface);
--- a/src/xfns.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xfns.c Sun Jul 04 00:50:25 2010 -0700 @@ -218,7 +218,7 @@ /* Error if we are not connected to X. */ void -check_x () +check_x (void) { if (! x_in_use) error ("X windows are not in use or not initialized"); @@ -228,7 +228,7 @@ You should not call this unless HAVE_MENUS is defined. */ int -have_menus_p () +have_menus_p (void) { return x_in_use; } @@ -237,8 +237,7 @@ and checking validity for X. */ FRAME_PTR -check_x_frame (frame) - Lisp_Object frame; +check_x_frame (Lisp_Object frame) { FRAME_PTR f; @@ -257,8 +256,7 @@ the first X display on the list. */ struct x_display_info * -check_x_display_info (object) - Lisp_Object object; +check_x_display_info (Lisp_Object object) { struct x_display_info *dpyinfo = NULL; @@ -300,9 +298,7 @@ /* This function can be called during GC, so use GC_xxx type test macros. */ struct frame * -x_window_to_frame (dpyinfo, wdesc) - struct x_display_info *dpyinfo; - int wdesc; +x_window_to_frame (struct x_display_info *dpyinfo, int wdesc) { Lisp_Object tail, frame; struct frame *f; @@ -350,9 +346,7 @@ windows. */ struct frame * -x_any_window_to_frame (dpyinfo, wdesc) - struct x_display_info *dpyinfo; - int wdesc; +x_any_window_to_frame (struct x_display_info *dpyinfo, int wdesc) { Lisp_Object tail, frame; struct frame *f, *found; @@ -403,9 +397,7 @@ /* Likewise, but consider only the menu bar widget. */ struct frame * -x_menubar_window_to_frame (dpyinfo, wdesc) - struct x_display_info *dpyinfo; - int wdesc; +x_menubar_window_to_frame (struct x_display_info *dpyinfo, int wdesc) { Lisp_Object tail, frame; struct frame *f; @@ -449,9 +441,7 @@ If WDESC is some other (smaller) window, we return 0. */ struct frame * -x_top_window_to_frame (dpyinfo, wdesc) - struct x_display_info *dpyinfo; - int wdesc; +x_top_window_to_frame (struct x_display_info *dpyinfo, int wdesc) { Lisp_Object tail, frame; struct frame *f; @@ -533,9 +523,7 @@ not Emacs's own window. */ void -x_real_positions (f, xptr, yptr) - FRAME_PTR f; - int *xptr, *yptr; +x_real_positions (FRAME_PTR f, int *xptr, int *yptr) { int win_x, win_y, outer_x, outer_y; int real_x = 0, real_y = 0; @@ -653,9 +641,7 @@ /* Gamma-correct COLOR on frame F. */ void -gamma_correct (f, color) - struct frame *f; - XColor *color; +gamma_correct (struct frame *f, XColor *color) { if (f->gamma) { @@ -672,11 +658,7 @@ no color could be allocated. */ int -x_defined_color (f, color_name, color, alloc_p) - struct frame *f; - char *color_name; - XColor *color; - int alloc_p; +x_defined_color (struct frame *f, char *color_name, XColor *color, int alloc_p) { int success_p; Display *dpy = FRAME_X_DISPLAY (f); @@ -697,10 +679,7 @@ Signal an error if color can't be allocated. */ int -x_decode_color (f, color_name, mono_color) - FRAME_PTR f; - Lisp_Object color_name; - int mono_color; +x_decode_color (FRAME_PTR f, Lisp_Object color_name, int mono_color) { XColor cdef; @@ -734,9 +713,7 @@ See also the comment of wait_for_wm in struct x_output. */ static void -x_set_wait_for_wm (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_wait_for_wm (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { f->output_data.x->wait_for_wm = !NILP (new_value); } @@ -747,9 +724,7 @@ may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */ int -xg_set_icon (f, file) - FRAME_PTR f; - Lisp_Object file; +xg_set_icon (FRAME_PTR f, Lisp_Object file) { int result = 0; Lisp_Object found; @@ -783,9 +758,7 @@ } int -xg_set_icon_from_xpm_data (f, data) - FRAME_PTR f; - char **data; +xg_set_icon_from_xpm_data (FRAME_PTR f, char **data) { int result = 0; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) data); @@ -809,9 +782,7 @@ in the standard place; do not attempt to change the window. */ void -x_set_foreground_color (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { struct x_output *x = f->output_data.x; unsigned long fg, old_fg; @@ -847,9 +818,7 @@ } void -x_set_background_color (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { struct x_output *x = f->output_data.x; unsigned long bg; @@ -895,8 +864,7 @@ } static Cursor -make_invisible_cursor (f) - struct frame *f; +make_invisible_cursor (struct frame *f) { Display *dpy = FRAME_X_DISPLAY (f); static char const no_data[] = { 0 }; @@ -924,9 +892,7 @@ } void -x_set_mouse_color (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { struct x_output *x = f->output_data.x; Display *dpy = FRAME_X_DISPLAY (f); @@ -1071,9 +1037,7 @@ } void -x_set_cursor_color (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { unsigned long fore_pixel, pixel; int fore_pixel_allocated_p = 0, pixel_allocated_p = 0; @@ -1144,9 +1108,7 @@ F has an x-window. */ void -x_set_border_pixel (f, pix) - struct frame *f; - int pix; +x_set_border_pixel (struct frame *f, int pix) { unload_color (f, f->output_data.x->border_pixel); f->output_data.x->border_pixel = pix; @@ -1175,9 +1137,7 @@ and so emacs' border colors may be overridden. */ void -x_set_border_color (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int pix; @@ -1189,9 +1149,7 @@ void -x_set_cursor_type (f, arg, oldval) - FRAME_PTR f; - Lisp_Object arg, oldval; +x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval) { set_frame_cursor_types (f, arg); @@ -1200,9 +1158,7 @@ } void -x_set_icon_type (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int result; @@ -1234,9 +1190,7 @@ } void -x_set_icon_name (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; +x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int result; @@ -1274,9 +1228,7 @@ void -x_set_menu_bar_lines (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) @@ -1366,9 +1318,7 @@ The frame's height doesn't change. */ void -x_set_tool_bar_lines (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int delta, nlines, root_height; Lisp_Object root_window; @@ -1463,9 +1413,7 @@ the frame parameter. */ void -x_set_scroll_bar_foreground (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_scroll_bar_foreground (struct frame *f, Lisp_Object value, Lisp_Object oldval) { unsigned long pixel; @@ -1498,9 +1446,7 @@ parameter. */ void -x_set_scroll_bar_background (f, value, oldval) - struct frame *f; - Lisp_Object value, oldval; +x_set_scroll_bar_background (struct frame *f, Lisp_Object value, Lisp_Object oldval) { unsigned long pixel; @@ -1563,11 +1509,7 @@ the result should be `COMPOUND_TEXT'. */ static unsigned char * -x_encode_text (string, coding_system, selectionp, text_bytes, stringp, freep) - Lisp_Object string, coding_system; - int *text_bytes, *stringp; - int selectionp; - int *freep; +x_encode_text (Lisp_Object string, Lisp_Object coding_system, int selectionp, int *text_bytes, int *stringp, int *freep) { int result = string_xstring_p (string); struct coding_system coding; @@ -1601,9 +1543,7 @@ icon name to NAME. */ static void -x_set_name_internal (f, name) - FRAME_PTR f; - Lisp_Object name; +x_set_name_internal (FRAME_PTR f, Lisp_Object name) { if (FRAME_X_WINDOW (f)) { @@ -1691,10 +1631,7 @@ F->explicit_name is set, ignore the new name; otherwise, set it. */ void -x_set_name (f, name, explicit) - struct frame *f; - Lisp_Object name; - int explicit; +x_set_name (struct frame *f, Lisp_Object name, int explicit) { /* Make sure that requests from lisp code override requests from Emacs redisplay code. */ @@ -1741,9 +1678,7 @@ specified a name for the frame; the name will override any set by the redisplay code. */ void -x_explicitly_set_name (f, arg, oldval) - FRAME_PTR f; - Lisp_Object arg, oldval; +x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval) { x_set_name (f, arg, 1); } @@ -1752,9 +1687,7 @@ name; names set this way will never override names set by the user's lisp code. */ void -x_implicitly_set_name (f, arg, oldval) - FRAME_PTR f; - Lisp_Object arg, oldval; +x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval) { x_set_name (f, arg, 0); } @@ -1763,9 +1696,7 @@ If NAME is nil, use the frame name as the title. */ void -x_set_title (f, name, old_name) - struct frame *f; - Lisp_Object name, old_name; +x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name) { /* Don't change the title if it's already NAME. */ if (EQ (name, f->title)) @@ -1784,8 +1715,7 @@ } void -x_set_scroll_bar_default_width (f) - struct frame *f; +x_set_scroll_bar_default_width (struct frame *f) { int wid = FRAME_COLUMN_WIDTH (f); @@ -1966,9 +1896,7 @@ /* Create an Xt fontset spec from the name of a base font. If `motif' is True use the Motif syntax. */ char * -xic_create_fontsetname (base_fontname, motif) - char *base_fontname; - Bool motif; +xic_create_fontsetname (char *base_fontname, int motif) { const char *sep = motif ? ";" : ","; char *fontsetname; @@ -2114,8 +2042,7 @@ #endif static XFontSet -xic_create_xfontset (f) - struct frame *f; +xic_create_xfontset (struct frame *f) { XFontSet xfs = NULL; struct font *font = FRAME_FONT (f); @@ -2214,8 +2141,7 @@ /* Free the X fontset of frame F if it is the last frame using it. */ void -xic_free_xfontset (f) - struct frame *f; +xic_free_xfontset (struct frame *f) { Lisp_Object rest, frame; int shared_p = 0; @@ -2252,9 +2178,7 @@ input method XIM. */ static XIMStyle -best_xim_style (user, xim) - XIMStyles *user; - XIMStyles *xim; +best_xim_style (XIMStyles *user, XIMStyles *xim) { int i, j; @@ -2272,8 +2196,7 @@ static XIMStyle xic_style; void -create_frame_xic (f) - struct frame *f; +create_frame_xic (struct frame *f) { XIM xim; XIC xic = NULL; @@ -2348,8 +2271,7 @@ /* Destroy XIC and free XIC fontset of frame F, if any. */ void -free_frame_xic (f) - struct frame *f; +free_frame_xic (struct frame *f) { if (FRAME_XIC (f) == NULL) return; @@ -2365,9 +2287,7 @@ pixel position X/Y. X and Y are relative to window W. */ void -xic_set_preeditarea (w, x, y) - struct window *w; - int x, y; +xic_set_preeditarea (struct window *w, int x, int y) { struct frame *f = XFRAME (w->frame); XVaNestedList attr; @@ -2384,8 +2304,7 @@ /* Place status area for XIC in bottom right corner of frame F.. */ void -xic_set_statusarea (f) - struct frame *f; +xic_set_statusarea (struct frame *f) { XIC xic = FRAME_XIC (f); XVaNestedList attr; @@ -2429,9 +2348,7 @@ BASE_FONTNAME. Called when a new Emacs fontset is chosen. */ void -xic_set_xfontset (f, base_fontname) - struct frame *f; - char *base_fontname; +xic_set_xfontset (struct frame *f, char *base_fontname) { XVaNestedList attr; XFontSet xfs; @@ -2706,8 +2623,7 @@ #else /* not USE_X_TOOLKIT */ #ifdef USE_GTK void -x_window (f) - FRAME_PTR f; +x_window (FRAME_PTR f) { if (! xg_create_frame_widgets (f)) error ("Unable to create window"); @@ -2854,9 +2770,7 @@ /* Verify that the icon position args for this window are valid. */ static void -x_icon_verify (f, parms) - struct frame *f; - Lisp_Object parms; +x_icon_verify (struct frame *f, Lisp_Object parms) { Lisp_Object icon_x, icon_y; @@ -2878,9 +2792,7 @@ well. */ static void -x_icon (f, parms) - struct frame *f; - Lisp_Object parms; +x_icon (struct frame *f, Lisp_Object parms) { Lisp_Object icon_x, icon_y; #if 0 @@ -2926,8 +2838,7 @@ mouse cursor and the gray border tile. */ static void -x_make_gc (f) - struct frame *f; +x_make_gc (struct frame *f) { XGCValues gc_values; @@ -2986,8 +2897,7 @@ /* Free what was allocated in x_make_gc. */ void -x_free_gcs (f) - struct frame *f; +x_free_gcs (struct frame *f) { Display *dpy = FRAME_X_DISPLAY (f); @@ -3026,8 +2936,7 @@ constructed. */ static Lisp_Object -unwind_create_frame (frame) - Lisp_Object frame; +unwind_create_frame (Lisp_Object frame) { struct frame *f = XFRAME (frame); @@ -3059,9 +2968,7 @@ static void -x_default_font_parameter (f, parms) - struct frame *f; - Lisp_Object parms; +x_default_font_parameter (struct frame *f, Lisp_Object parms) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Lisp_Object font_param = x_get_arg (dpyinfo, parms, Qfont, NULL, NULL, @@ -3611,8 +3518,7 @@ know about that structure. */ Lisp_Object -x_get_focus_frame (frame) - struct frame *frame; +x_get_focus_frame (struct frame *frame) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (frame); Lisp_Object xfocus; @@ -3994,36 +3900,31 @@ } int -x_pixel_width (f) - register struct frame *f; +x_pixel_width (register struct frame *f) { return FRAME_PIXEL_WIDTH (f); } int -x_pixel_height (f) - register struct frame *f; +x_pixel_height (register struct frame *f) { return FRAME_PIXEL_HEIGHT (f); } int -x_char_width (f) - register struct frame *f; +x_char_width (register struct frame *f) { return FRAME_COLUMN_WIDTH (f); } int -x_char_height (f) - register struct frame *f; +x_char_height (register struct frame *f) { return FRAME_LINE_HEIGHT (f); } int -x_screen_planes (f) - register struct frame *f; +x_screen_planes (register struct frame *f) { return FRAME_X_DISPLAY_INFO (f)->n_planes; } @@ -4080,8 +3981,7 @@ members of DPYINFO appropriately. Called from x_term_init. */ void -select_visual (dpyinfo) - struct x_display_info *dpyinfo; +select_visual (struct x_display_info *dpyinfo) { Display *dpy = dpyinfo->display; Screen *screen = dpyinfo->screen; @@ -4154,8 +4054,7 @@ Open a new connection if necessary. */ struct x_display_info * -x_display_info_for_name (name) - Lisp_Object name; +x_display_info_for_name (Lisp_Object name) { Lisp_Object names; struct x_display_info *dpyinfo; @@ -4302,8 +4201,7 @@ /* Wait for responses to all X commands issued so far for frame F. */ void -x_sync (f) - FRAME_PTR f; +x_sync (FRAME_PTR f) { BLOCK_INPUT; XSync (FRAME_X_DISPLAY (f), False); @@ -4565,8 +4463,7 @@ shown on the frames. */ void -show_hourglass (timer) - struct atimer *timer; +show_hourglass (struct atimer *timer) { /* The timer implementation will cancel this timer automatically after this function has run. Set hourglass_atimer to null @@ -4630,7 +4527,7 @@ shown. */ void -hide_hourglass () +hide_hourglass (void) { if (hourglass_shown_p) { @@ -4691,8 +4588,7 @@ static Lisp_Object -unwind_create_tip_frame (frame) - Lisp_Object frame; +unwind_create_tip_frame (Lisp_Object frame) { Lisp_Object deleted; @@ -4717,9 +4613,7 @@ when this happens. */ static Lisp_Object -x_create_tip_frame (dpyinfo, parms, text) - struct x_display_info *dpyinfo; - Lisp_Object parms, text; +x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms, Lisp_Object text) { struct frame *f; Lisp_Object frame, tem; @@ -5034,11 +4928,7 @@ the display in *ROOT_X, and *ROOT_Y. */ static void -compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y) - struct frame *f; - Lisp_Object parms, dx, dy; - int width, height; - int *root_x, *root_y; +compute_tip_xy (struct frame *f, Lisp_Object parms, Lisp_Object dx, Lisp_Object dy, int width, int height, int *root_x, int *root_y) { Lisp_Object left, top; int win_x, win_y; @@ -5594,8 +5484,7 @@ #ifdef USE_GTK static Lisp_Object -clean_up_dialog (arg) - Lisp_Object arg; +clean_up_dialog (Lisp_Object arg) { x_menu_set_in_use (0); @@ -5891,7 +5780,7 @@ }; void -syms_of_xfns () +syms_of_xfns (void) { /* This is zero if not using X windows. */ x_in_use = 0;
--- a/src/xfont.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xfont.c Sun Jul 04 00:50:25 2010 -0700 @@ -55,9 +55,7 @@ is not contained in the font. */ static XCharStruct * -xfont_get_pcm (xfont, char2b) - XFontStruct *xfont; - XChar2b *char2b; +xfont_get_pcm (XFontStruct *xfont, XChar2b *char2b) { /* The result metric information. */ XCharStruct *pcm = NULL; @@ -159,8 +157,7 @@ extern Lisp_Object QCname; static Lisp_Object -xfont_get_cache (f) - FRAME_PTR f; +xfont_get_cache (FRAME_PTR f) { Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -497,8 +494,7 @@ } static Lisp_Object -xfont_list (frame, spec) - Lisp_Object frame, spec; +xfont_list (Lisp_Object frame, Lisp_Object spec) { FRAME_PTR f = XFRAME (frame); Display *display = FRAME_X_DISPLAY_INFO (f)->display; @@ -577,8 +573,7 @@ } static Lisp_Object -xfont_match (frame, spec) - Lisp_Object frame, spec; +xfont_match (Lisp_Object frame, Lisp_Object spec) { FRAME_PTR f = XFRAME (frame); Display *display = FRAME_X_DISPLAY_INFO (f)->display; @@ -636,8 +631,7 @@ } static Lisp_Object -xfont_list_family (frame) - Lisp_Object frame; +xfont_list_family (Lisp_Object frame) { FRAME_PTR f = XFRAME (frame); Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -696,10 +690,7 @@ extern Lisp_Object QCavgwidth; static Lisp_Object -xfont_open (f, entity, pixel_size) - FRAME_PTR f; - Lisp_Object entity; - int pixel_size; +xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) { Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Display *display = dpyinfo->display; @@ -911,9 +902,7 @@ } static void -xfont_close (f, font) - FRAME_PTR f; - struct font *font; +xfont_close (FRAME_PTR f, struct font *font) { BLOCK_INPUT; XFreeFont (FRAME_X_DISPLAY (f), ((struct xfont_info *) font)->xfont); @@ -921,9 +910,7 @@ } static int -xfont_prepare_face (f, face) - FRAME_PTR f; - struct face *face; +xfont_prepare_face (FRAME_PTR f, struct face *face) { BLOCK_INPUT; XSetFont (FRAME_X_DISPLAY (f), face->gc, @@ -934,9 +921,7 @@ } static int -xfont_has_char (font, c) - Lisp_Object font; - int c; +xfont_has_char (Lisp_Object font, int c) { Lisp_Object registry = AREF (font, FONT_REGISTRY_INDEX); struct charset *encoding; @@ -965,9 +950,7 @@ } static unsigned -xfont_encode_char (font, c) - struct font *font; - int c; +xfont_encode_char (struct font *font, int c) { XFontStruct *xfont = ((struct xfont_info *) font)->xfont; struct charset *charset; @@ -990,11 +973,7 @@ } static int -xfont_text_extents (font, code, nglyphs, metrics) - struct font *font; - unsigned *code; - int nglyphs; - struct font_metrics *metrics; +xfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct font_metrics *metrics) { XFontStruct *xfont = ((struct xfont_info *) font)->xfont; int width = 0; @@ -1046,9 +1025,7 @@ } static int -xfont_draw (s, from, to, x, y, with_background) - struct glyph_string *s; - int from, to, x, y, with_background; +xfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_background) { XFontStruct *xfont = ((struct xfont_info *) s->font)->xfont; int len = to - from; @@ -1123,9 +1100,7 @@ } static int -xfont_check (f, font) - FRAME_PTR f; - struct font *font; +xfont_check (FRAME_PTR f, struct font *font) { struct xfont_info *xfont = (struct xfont_info *) font; @@ -1134,7 +1109,7 @@ void -syms_of_xfont () +syms_of_xfont (void) { staticpro (&xfont_scripts_cache); { /* Here we rely on the fact that syms_of_xfont (via syms_of_font)
--- a/src/xftfont.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xftfont.c Sun Jul 04 00:50:25 2010 -0700 @@ -80,12 +80,7 @@ may be NULL. */ static void -xftfont_get_colors (f, face, gc, xftface_info, fg, bg) - FRAME_PTR f; - struct face *face; - GC gc; - struct xftface_info *xftface_info; - XftColor *fg, *bg; +xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *xftface_info, XftColor *fg, XftColor *bg) { if (xftface_info && face->gc == gc) { @@ -157,9 +152,7 @@ struct font_driver xftfont_driver; static Lisp_Object -xftfont_list (frame, spec) - Lisp_Object frame; - Lisp_Object spec; +xftfont_list (Lisp_Object frame, Lisp_Object spec) { Lisp_Object list = ftfont_driver.list (frame, spec), tail; @@ -169,9 +162,7 @@ } static Lisp_Object -xftfont_match (frame, spec) - Lisp_Object frame; - Lisp_Object spec; +xftfont_match (Lisp_Object frame, Lisp_Object spec) { Lisp_Object entity = ftfont_driver.match (frame, spec); @@ -187,8 +178,7 @@ static FcChar8 ascii_printable[95]; static void -xftfont_fix_match (pat, match) - FcPattern *pat, *match; +xftfont_fix_match (FcPattern *pat, FcPattern *match) { /* These values are not used for matching (except antialias), but for rendering, so make sure they are carried over to the match. @@ -238,9 +228,7 @@ } static void -xftfont_add_rendering_parameters (pat, entity) - FcPattern *pat; - Lisp_Object entity; +xftfont_add_rendering_parameters (FcPattern *pat, Lisp_Object entity) { Lisp_Object tail; int ival; @@ -288,10 +276,7 @@ } static Lisp_Object -xftfont_open (f, entity, pixel_size) - FRAME_PTR f; - Lisp_Object entity; - int pixel_size; +xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) { FcResult result; Display *display = FRAME_X_DISPLAY (f); @@ -510,9 +495,7 @@ } static void -xftfont_close (f, font) - FRAME_PTR f; - struct font *font; +xftfont_close (FRAME_PTR f, struct font *font) { struct xftfont_info *xftfont_info = (struct xftfont_info *) font; @@ -527,9 +510,7 @@ } static int -xftfont_prepare_face (f, face) - FRAME_PTR f; - struct face *face; +xftfont_prepare_face (FRAME_PTR f, struct face *face) { struct xftface_info *xftface_info; @@ -552,9 +533,7 @@ } static void -xftfont_done_face (f, face) - FRAME_PTR f; - struct face *face; +xftfont_done_face (FRAME_PTR f, struct face *face) { struct xftface_info *xftface_info; @@ -576,9 +555,7 @@ extern Lisp_Object Qja, Qko; static int -xftfont_has_char (font, c) - Lisp_Object font; - int c; +xftfont_has_char (Lisp_Object font, int c) { struct xftfont_info *xftfont_info; struct charset *cs = NULL; @@ -600,9 +577,7 @@ } static unsigned -xftfont_encode_char (font, c) - struct font *font; - int c; +xftfont_encode_char (struct font *font, int c) { struct xftfont_info *xftfont_info = (struct xftfont_info *) font; unsigned code = XftCharIndex (xftfont_info->display, xftfont_info->xftfont, @@ -612,11 +587,7 @@ } static int -xftfont_text_extents (font, code, nglyphs, metrics) - struct font *font; - unsigned *code; - int nglyphs; - struct font_metrics *metrics; +xftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct font_metrics *metrics) { struct xftfont_info *xftfont_info = (struct xftfont_info *) font; XGlyphInfo extents; @@ -637,8 +608,7 @@ } static XftDraw * -xftfont_get_xft_draw (f) - FRAME_PTR f; +xftfont_get_xft_draw (FRAME_PTR f) { XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver); @@ -658,9 +628,7 @@ } static int -xftfont_draw (s, from, to, x, y, with_background) - struct glyph_string *s; - int from, to, x, y, with_background; +xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_background) { FRAME_PTR f = s->f; struct face *face = s->face; @@ -703,8 +671,7 @@ } static int -xftfont_end_for_frame (f) - FRAME_PTR f; +xftfont_end_for_frame (FRAME_PTR f) { XftDraw *xft_draw; @@ -724,11 +691,7 @@ } static int -xftfont_cached_font_ok (f, font_object, entity) - struct frame *f; - Lisp_Object font_object; - Lisp_Object entity; - +xftfont_cached_font_ok (struct frame *f, Lisp_Object font_object, Lisp_Object entity) { struct xftfont_info *info = (struct xftfont_info *) XFONT_OBJECT (font_object); FcPattern *oldpat = info->xftfont->pattern; @@ -771,7 +734,7 @@ } void -syms_of_xftfont () +syms_of_xftfont (void) { DEFSYM (Qxft, "xft"); DEFSYM (QChinting, ":hinting");
--- a/src/xgselect.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xgselect.c Sun Jul 04 00:50:25 2010 -0700 @@ -29,12 +29,7 @@ static int gfds_size; int -xg_select (max_fds, rfds, wfds, efds, timeout) - int max_fds; - SELECT_TYPE *rfds; - SELECT_TYPE *wfds; - SELECT_TYPE *efds; - EMACS_TIME *timeout; +xg_select (int max_fds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) { SELECT_TYPE all_rfds, all_wfds; EMACS_TIME tmo, *tmop = timeout; @@ -147,7 +142,7 @@ #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ void -xgselect_initialize () +xgselect_initialize (void) { #if defined (USE_GTK) || defined (HAVE_GCONF) gfds_size = 128;
--- a/src/xmenu.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xmenu.c Sun Jul 04 00:50:25 2010 -0700 @@ -196,10 +196,7 @@ the scroll bar or the edit window. Fx_popup_menu needs to be sure it is the edit window. */ void -mouse_position_for_popup (f, x, y) - FRAME_PTR f; - int *x; - int *y; +mouse_position_for_popup (FRAME_PTR f, int *x, int *y) { Window root, dummy_window; int dummy; @@ -391,8 +388,7 @@ /* Set menu_items_inuse so no other popup menu or dialog is created. */ void -x_menu_set_in_use (in_use) - int in_use; +x_menu_set_in_use (int in_use) { menu_items_inuse = in_use ? Qt : Qnil; popup_activated_flag = in_use; @@ -638,9 +634,7 @@ Used for popup menus and dialogs. */ static void -popup_widget_loop (do_timers, widget) - int do_timers; - GtkWidget *widget; +popup_widget_loop (int do_timers, GtkWidget *widget) { ++popup_activated_flag; @@ -668,8 +662,7 @@ execute Lisp code. */ void -x_activate_menubar (f) - FRAME_PTR f; +x_activate_menubar (FRAME_PTR f) { if (! FRAME_X_P (f)) abort (); @@ -724,9 +717,7 @@ #ifdef USE_GTK static void -popup_deactivate_callback (widget, client_data) - GtkWidget *widget; - gpointer client_data; +popup_deactivate_callback (GtkWidget *widget, gpointer client_data) { popup_activated_flag = 0; } @@ -746,10 +737,7 @@ for that widget. F is the frame if known, or NULL if not known. */ static void -show_help_event (f, widget, help) - FRAME_PTR f; - xt_or_gtk_widget widget; - Lisp_Object help; +show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help) { Lisp_Object frame; @@ -787,9 +775,7 @@ #ifdef USE_GTK void -menu_highlight_callback (widget, call_data) - GtkWidget *widget; - gpointer call_data; +menu_highlight_callback (GtkWidget *widget, gpointer call_data) { xg_menu_item_cb_data *cb_data; Lisp_Object help; @@ -839,9 +825,7 @@ Figure out what the user chose and put the appropriate events into the keyboard buffer. */ static void -menubar_selection_callback (widget, client_data) - GtkWidget *widget; - gpointer client_data; +menubar_selection_callback (GtkWidget *widget, gpointer client_data) { xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; @@ -903,8 +887,7 @@ changed. Value is non-zero if widgets were updated. */ static int -update_frame_menubar (f) - FRAME_PTR f; +update_frame_menubar (FRAME_PTR f) { #ifdef USE_GTK return xg_update_frame_menubar (f); @@ -995,10 +978,7 @@ it is set the first time this is called, from initialize_frame_menubar. */ void -set_frame_menubar (f, first_time, deep_p) - FRAME_PTR f; - int first_time; - int deep_p; +set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) { xt_or_gtk_widget menubar_widget; #ifdef USE_X_TOOLKIT @@ -1347,8 +1327,7 @@ is visible. */ void -initialize_frame_menubar (f) - FRAME_PTR f; +initialize_frame_menubar (FRAME_PTR f) { /* This function is called before the first chance to redisplay the frame. It has to be, so the frame will have the right size. */ @@ -1458,12 +1437,7 @@ Here only X and Y are used. */ static void -menu_position_func (menu, x, y, push_in, user_data) - GtkMenu *menu; - gint *x; - gint *y; - gboolean *push_in; - gpointer user_data; +menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) { struct next_popup_x_y* data = (struct next_popup_x_y*)user_data; GtkRequisition req; @@ -1484,9 +1458,7 @@ } static void -popup_selection_callback (widget, client_data) - GtkWidget *widget; - gpointer client_data; +popup_selection_callback (GtkWidget *widget, gpointer client_data) { xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data*) client_data; @@ -1495,8 +1467,7 @@ } static Lisp_Object -pop_down_menu (arg) - Lisp_Object arg; +pop_down_menu (Lisp_Object arg) { struct Lisp_Save_Value *p = XSAVE_VALUE (arg); @@ -1511,13 +1482,7 @@ menu pops down. menu_item_selection will be set to the selection. */ static void -create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp) - FRAME_PTR f; - widget_value *first_wv; - int x; - int y; - int for_click; - EMACS_UINT timestamp; +create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, EMACS_UINT timestamp) { int i; GtkWidget *menu; @@ -1977,9 +1942,7 @@ #ifdef USE_GTK static void -dialog_selection_callback (widget, client_data) - GtkWidget *widget; - gpointer client_data; +dialog_selection_callback (GtkWidget *widget, gpointer client_data) { /* The EMACS_INT cast avoids a warning. There's no problem as long as pointers have enough bits to hold small integers. */ @@ -1993,9 +1956,7 @@ dialog pops down. menu_item_selection will be set to the selection. */ static void -create_and_show_dialog (f, first_wv) - FRAME_PTR f; - widget_value *first_wv; +create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) { GtkWidget *menu; @@ -2092,11 +2053,7 @@ "button6", "button7", "button8", "button9", "button10" }; static Lisp_Object -xdialog_show (f, keymaps, title, header, error_name) - FRAME_PTR f; - int keymaps; - Lisp_Object title, header; - char **error_name; +xdialog_show (FRAME_PTR f, int keymaps, Lisp_Object title, Lisp_Object header, char **error_name) { int i, nb_buttons=0; char dialog_name[6]; @@ -2658,7 +2615,7 @@ /* Detect if a dialog or menu has been posted. */ int -popup_activated () +popup_activated (void) { return popup_activated_flag; } @@ -2677,7 +2634,7 @@ } void -syms_of_xmenu () +syms_of_xmenu (void) { Qdebug_on_next_call = intern_c_string ("debug-on-next-call"); staticpro (&Qdebug_on_next_call);
--- a/src/xrdb.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xrdb.c Sun Jul 04 00:50:25 2010 -0700 @@ -50,7 +50,7 @@ #include "lisp.h" -extern char *getenv (); +extern char *getenv (const char *); /* This does cause trouble on AIX. I'm going to take the comment at face value. */ @@ -64,8 +64,8 @@ extern struct passwd *getpwuid (uid_t); extern struct passwd *getpwnam (const char *); #else -extern struct passwd *getpwuid (); -extern struct passwd *getpwnam (); +extern struct passwd *getpwuid (uid_t); +extern struct passwd *getpwnam (const char *); #endif extern char *get_system_name (); @@ -82,8 +82,8 @@ #define free xfree #endif -char *x_get_string_resource (); -static int file_p (); +char *x_get_string_resource (XrmDatabase rdb, char *name, char *class); +static int file_p (char *filename); /* X file search path processing. */ @@ -98,9 +98,7 @@ resource, for later use in search path decoding. If we find no such resource, return zero. */ char * -x_get_customization_string (db, name, class) - XrmDatabase db; - char *name, *class; +x_get_customization_string (XrmDatabase db, char *name, char *class) { char *full_name = (char *) alloca (strlen (name) + sizeof ("customization") + 3); @@ -155,10 +153,7 @@ Return NULL otherwise. */ static char * -magic_file_p (string, string_len, class, escaped_suffix, suffix) - char *string; - int string_len; - char *class, *escaped_suffix, *suffix; +magic_file_p (char *string, int string_len, char *class, char *escaped_suffix, char *suffix) { char *lang = getenv ("LANG"); @@ -281,7 +276,7 @@ static char * -gethomedir () +gethomedir (void) { struct passwd *pw; char *ptr; @@ -311,8 +306,7 @@ static int -file_p (filename) - char *filename; +file_p (char *filename) { struct stat status; @@ -327,8 +321,7 @@ the path name of the one we found otherwise. */ static char * -search_magic_path (search_path, class, escaped_suffix, suffix) - char *search_path, *class, *escaped_suffix, *suffix; +search_magic_path (char *search_path, char *class, char *escaped_suffix, char *suffix) { register char *s, *p; @@ -363,8 +356,7 @@ /* Producing databases for individual sources. */ static XrmDatabase -get_system_app (class) - char *class; +get_system_app (char *class) { XrmDatabase db = NULL; char *path; @@ -384,16 +376,14 @@ static XrmDatabase -get_fallback (display) - Display *display; +get_fallback (Display *display) { return NULL; } static XrmDatabase -get_user_app (class) - char *class; +get_user_app (char *class) { char *path; char *file = 0; @@ -428,8 +418,7 @@ static XrmDatabase -get_user_db (display) - Display *display; +get_user_db (Display *display) { XrmDatabase db; char *xdefs; @@ -470,7 +459,7 @@ } static XrmDatabase -get_environ_db () +get_environ_db (void) { XrmDatabase db; char *p; @@ -505,9 +494,7 @@ /* Load X resources based on the display and a possible -xrm option. */ XrmDatabase -x_load_resources (display, xrm_string, myname, myclass) - Display *display; - char *xrm_string, *myname, *myclass; +x_load_resources (Display *display, char *xrm_string, char *myname, char *myclass) { XrmDatabase user_database; XrmDatabase rdb; @@ -641,11 +628,7 @@ and of type TYPE from database RDB. The value is returned in RET_VALUE. */ int -x_get_resource (rdb, name, class, expected_type, ret_value) - XrmDatabase rdb; - char *name, *class; - XrmRepresentation expected_type; - XrmValue *ret_value; +x_get_resource (XrmDatabase rdb, char *name, char *class, XrmRepresentation expected_type, XrmValue *ret_value) { XrmValue value; XrmName namelist[100]; @@ -673,9 +656,7 @@ database RDB. */ char * -x_get_string_resource (rdb, name, class) - XrmDatabase rdb; - char *name, *class; +x_get_string_resource (XrmDatabase rdb, char *name, char *class) { XrmValue value;
--- a/src/xselect.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xselect.c Sun Jul 04 00:50:25 2010 -0700 @@ -183,8 +183,7 @@ /* Queue up an SELECTION_REQUEST_EVENT *EVENT, to be processed later. */ static void -x_queue_event (event) - struct input_event *event; +x_queue_event (struct input_event *event) { struct selection_event_queue *queue_tmp; @@ -215,7 +214,7 @@ /* Start queuing SELECTION_REQUEST_EVENT events. */ static void -x_start_queuing_selection_requests () +x_start_queuing_selection_requests (void) { if (x_queue_selection_requests) abort (); @@ -227,7 +226,7 @@ /* Stop queuing SELECTION_REQUEST_EVENT events. */ static void -x_stop_queuing_selection_requests () +x_stop_queuing_selection_requests (void) { TRACE1 ("x_stop_queuing_selection_requests %d", x_queue_selection_requests); --x_queue_selection_requests; @@ -250,10 +249,7 @@ roundtrip whenever possible. */ static Atom -symbol_to_x_atom (dpyinfo, display, sym) - struct x_display_info *dpyinfo; - Display *display; - Lisp_Object sym; +symbol_to_x_atom (struct x_display_info *dpyinfo, Display *display, Lisp_Object sym) { Atom val; if (NILP (sym)) return 0; @@ -297,9 +293,7 @@ and calls to intern whenever possible. */ static Lisp_Object -x_atom_to_symbol (dpy, atom) - Display *dpy; - Atom atom; +x_atom_to_symbol (Display *dpy, Atom atom) { struct x_display_info *dpyinfo; char *str; @@ -382,8 +376,7 @@ our selection. */ static void -x_own_selection (selection_name, selection_value) - Lisp_Object selection_name, selection_value; +x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value) { struct frame *sf = SELECTED_FRAME (); Window selecting_window; @@ -449,9 +442,7 @@ This calls random Lisp code, and may signal or gc. */ static Lisp_Object -x_get_local_selection (selection_symbol, target_type, local_request) - Lisp_Object selection_symbol, target_type; - int local_request; +x_get_local_selection (Lisp_Object selection_symbol, Lisp_Object target_type, int local_request) { Lisp_Object local_value; Lisp_Object handler_fn, value, type, check; @@ -561,8 +552,7 @@ meaning we were unable to do what they wanted. */ static void -x_decline_selection_request (event) - struct input_event *event; +x_decline_selection_request (struct input_event *event) { XSelectionEvent reply; @@ -597,8 +587,7 @@ before we throw to top-level or go into the debugger or whatever. */ static Lisp_Object -x_selection_request_lisp_error (ignore) - Lisp_Object ignore; +x_selection_request_lisp_error (Lisp_Object ignore) { if (x_selection_current_request != 0 && selection_request_dpyinfo->display) @@ -607,8 +596,7 @@ } static Lisp_Object -x_catch_errors_unwind (dummy) - Lisp_Object dummy; +x_catch_errors_unwind (Lisp_Object dummy) { BLOCK_INPUT; x_uncatch_errors (); @@ -634,10 +622,10 @@ struct prop_location *next; }; -static struct prop_location *expect_property_change (); -static void wait_for_property_change (); -static void unexpect_property_change (); -static int waiting_for_other_props_on_window (); +static struct prop_location *expect_property_change (Display *display, Window window, Atom property, int state); +static void wait_for_property_change (struct prop_location *location); +static void unexpect_property_change (struct prop_location *location); +static int waiting_for_other_props_on_window (Display *display, Window window); static int prop_location_identifier; @@ -648,8 +636,7 @@ static struct prop_location *property_change_wait_list; static Lisp_Object -queue_selection_requests_unwind (tem) - Lisp_Object tem; +queue_selection_requests_unwind (Lisp_Object tem) { x_stop_queuing_selection_requests (); return Qnil; @@ -659,8 +646,7 @@ Return nil if there is none. */ static Lisp_Object -some_frame_on_display (dpyinfo) - struct x_display_info *dpyinfo; +some_frame_on_display (struct x_display_info *dpyinfo) { Lisp_Object list, frame; @@ -684,11 +670,7 @@ #endif /* TRACE_SELECTION */ static void -x_reply_selection_request (event, format, data, size, type) - struct input_event *event; - int format, size; - unsigned char *data; - Atom type; +x_reply_selection_request (struct input_event *event, int format, unsigned char *data, int size, Atom type) { XSelectionEvent reply; Display *display = SELECTION_EVENT_DISPLAY (event); @@ -881,8 +863,7 @@ This is called from keyboard.c when such an event is found in the queue. */ static void -x_handle_selection_request (event) - struct input_event *event; +x_handle_selection_request (struct input_event *event) { struct gcpro gcpro1, gcpro2, gcpro3; Lisp_Object local_selection_data; @@ -1002,8 +983,7 @@ This is called from keyboard.c when such an event is found in the queue. */ static void -x_handle_selection_clear (event) - struct input_event *event; +x_handle_selection_clear (struct input_event *event) { Display *display = SELECTION_EVENT_DISPLAY (event); Atom selection = SELECTION_EVENT_SELECTION (event); @@ -1085,8 +1065,7 @@ } void -x_handle_selection_event (event) - struct input_event *event; +x_handle_selection_event (struct input_event *event) { TRACE0 ("x_handle_selection_event"); @@ -1106,8 +1085,7 @@ We do this when about to delete a frame. */ void -x_clear_frame_selections (f) - FRAME_PTR f; +x_clear_frame_selections (FRAME_PTR f) { Lisp_Object frame; Lisp_Object rest; @@ -1168,9 +1146,7 @@ are on the list of what we are waiting for. */ static int -waiting_for_other_props_on_window (display, window) - Display *display; - Window window; +waiting_for_other_props_on_window (Display *display, Window window) { struct prop_location *rest = property_change_wait_list; while (rest) @@ -1187,11 +1163,7 @@ this awaited property change. */ static struct prop_location * -expect_property_change (display, window, property, state) - Display *display; - Window window; - Atom property; - int state; +expect_property_change (Display *display, Window window, Atom property, int state) { struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl); pl->identifier = ++prop_location_identifier; @@ -1209,8 +1181,7 @@ IDENTIFIER is the number that uniquely identifies the entry. */ static void -unexpect_property_change (location) - struct prop_location *location; +unexpect_property_change (struct prop_location *location) { struct prop_location *prev = 0, *rest = property_change_wait_list; while (rest) @@ -1232,8 +1203,7 @@ /* Remove the property change expectation element for IDENTIFIER. */ static Lisp_Object -wait_for_property_change_unwind (loc) - Lisp_Object loc; +wait_for_property_change_unwind (Lisp_Object loc) { struct prop_location *location = XSAVE_VALUE (loc)->pointer; @@ -1247,8 +1217,7 @@ IDENTIFIER should be the value that expect_property_change returned. */ static void -wait_for_property_change (location) - struct prop_location *location; +wait_for_property_change (struct prop_location *location) { int secs, usecs; int count = SPECPDL_INDEX (); @@ -1286,8 +1255,7 @@ /* Called from XTread_socket in response to a PropertyNotify event. */ void -x_handle_property_notify (event) - XPropertyEvent *event; +x_handle_property_notify (XPropertyEvent *event) { struct prop_location *prev = 0, *rest = property_change_wait_list; @@ -1378,8 +1346,7 @@ Converts this to Lisp data and returns it. */ static Lisp_Object -x_get_foreign_selection (selection_symbol, target_type, time_stamp) - Lisp_Object selection_symbol, target_type, time_stamp; +x_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type, Lisp_Object time_stamp) { struct frame *sf = SELECTED_FRAME (); Window requestor_window; @@ -1809,11 +1776,7 @@ static Lisp_Object -selection_data_to_lisp_data (display, data, size, type, format) - Display *display; - unsigned char *data; - Atom type; - int size, format; +selection_data_to_lisp_data (Display *display, unsigned char *data, int size, Atom type, int format) { struct x_display_info *dpyinfo = x_display_info_for_display (display); @@ -2071,8 +2034,7 @@ } static Lisp_Object -clean_local_selection_data (obj) - Lisp_Object obj; +clean_local_selection_data (Lisp_Object obj) { if (CONSP (obj) && INTEGERP (XCAR (obj)) @@ -2112,8 +2074,7 @@ We store t there if the reply is successful, lambda if not. */ void -x_handle_selection_notify (event) - XSelectionEvent *event; +x_handle_selection_notify (XSelectionEvent *event) { if (event->requestor != reading_selection_window) return; @@ -2254,8 +2215,7 @@ This is used when we kill a buffer. */ void -x_disown_buffer_selections (buffer) - Lisp_Object buffer; +x_disown_buffer_selections (Lisp_Object buffer) { Lisp_Object tail; struct buffer *buf = XBUFFER (buffer); @@ -2332,9 +2292,7 @@ /* Ensure that all 8 cut buffers exist. ICCCM says we gotta... */ static void -initialize_cut_buffers (display, window) - Display *display; - Window window; +initialize_cut_buffers (Display *display, Window window) { unsigned char *data = (unsigned char *) ""; BLOCK_INPUT; @@ -2530,8 +2488,7 @@ bit parts of a 32 bit number). */ int -x_check_property_data (data) - Lisp_Object data; +x_check_property_data (Lisp_Object data) { Lisp_Object iter; int size = 0; @@ -2564,11 +2521,7 @@ XClientMessageEvent). */ void -x_fill_property_data (dpy, data, ret, format) - Display *dpy; - Lisp_Object data; - void *ret; - int format; +x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) { long val; long *d32 = (long *) ret; @@ -2620,12 +2573,7 @@ Also see comment for selection_data_to_lisp_data above. */ Lisp_Object -x_property_data_to_lisp (f, data, type, format, size) - struct frame *f; - unsigned char *data; - Atom type; - int format; - unsigned long size; +x_property_data_to_lisp (struct frame *f, unsigned char *data, Atom type, int format, long unsigned int size) { return selection_data_to_lisp_data (FRAME_X_DISPLAY (f), data, size*format/8, type, format); @@ -2634,10 +2582,7 @@ /* Get the mouse position in frame relative coordinates. */ static void -mouse_position_for_drop (f, x, y) - FRAME_PTR f; - int *x; - int *y; +mouse_position_for_drop (FRAME_PTR f, int *x, int *y) { Window root, dummy_window; int dummy; @@ -2759,11 +2704,7 @@ /* Convert an XClientMessageEvent to a Lisp event of type DRAG_N_DROP_EVENT. */ int -x_handle_dnd_message (f, event, dpyinfo, bufp) - struct frame *f; - XClientMessageEvent *event; - struct x_display_info *dpyinfo; - struct input_event *bufp; +x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct x_display_info *dpyinfo, struct input_event *bufp) { Lisp_Object vec; Lisp_Object frame; @@ -2935,7 +2876,7 @@ void -syms_of_xselect () +syms_of_xselect (void) { defsubr (&Sx_get_selection_internal); defsubr (&Sx_own_selection_internal);
--- a/src/xsettings.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xsettings.c Sun Jul 04 00:50:25 2010 -0700 @@ -54,9 +54,7 @@ static void -store_config_changed_event (arg, display_name) - Lisp_Object arg; - Lisp_Object display_name; +store_config_changed_event (Lisp_Object arg, Lisp_Object display_name) { struct input_event event; EVENT_INIT (event); @@ -102,11 +100,7 @@ that is SYSTEM_MONO_FONT. */ static void -something_changedCB (client, cnxn_id, entry, user_data) - GConfClient *client; - guint cnxn_id; - GConfEntry *entry; - gpointer user_data; +something_changedCB (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { GConfValue *v = gconf_entry_get_value (entry); @@ -156,8 +150,7 @@ /* Find the window that contains the XSETTINGS property values. */ static void -get_prop_window (dpyinfo) - struct x_display_info *dpyinfo; +get_prop_window (struct x_display_info *dpyinfo) { Display *dpy = dpyinfo->display; @@ -229,10 +222,7 @@ */ static int -parse_settings (prop, bytes, settings) - unsigned char *prop; - unsigned long bytes; - struct xsettings *settings; +parse_settings (unsigned char *prop, long unsigned int bytes, struct xsettings *settings) { Lisp_Object byteorder = Fbyteorder (); int my_bo = XFASTINT (byteorder) == 'B' ? MSBFirst : LSBFirst; @@ -402,9 +392,7 @@ } static int -read_settings (dpyinfo, settings) - struct x_display_info *dpyinfo; - struct xsettings *settings; +read_settings (struct x_display_info *dpyinfo, struct xsettings *settings) { long long_len; Atom act_type; @@ -435,10 +423,7 @@ static void -apply_xft_settings (dpyinfo, send_event_p, settings) - struct x_display_info *dpyinfo; - int send_event_p; - struct xsettings *settings; +apply_xft_settings (struct x_display_info *dpyinfo, int send_event_p, struct xsettings *settings) { #ifdef HAVE_XFT FcPattern *pat; @@ -546,9 +531,7 @@ } static void -read_and_apply_settings (dpyinfo, send_event_p) - struct x_display_info *dpyinfo; - int send_event_p; +read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p) { struct xsettings settings; Lisp_Object dpyname = XCAR (dpyinfo->name_list_element); @@ -592,9 +575,7 @@ } void -xft_settings_event (dpyinfo, event) - struct x_display_info *dpyinfo; - XEvent *event; +xft_settings_event (struct x_display_info *dpyinfo, XEvent *event) { int check_window_p = 0; int apply_settings = 0; @@ -636,7 +617,7 @@ static void -init_gconf () +init_gconf (void) { #if defined (HAVE_GCONF) && defined (HAVE_XFT) int i; @@ -669,8 +650,7 @@ } static void -init_xsettings (dpyinfo) - struct x_display_info *dpyinfo; +init_xsettings (struct x_display_info *dpyinfo) { char sel[64]; Display *dpy = dpyinfo->display; @@ -696,8 +676,7 @@ } void -xsettings_initialize (dpyinfo) - struct x_display_info *dpyinfo; +xsettings_initialize (struct x_display_info *dpyinfo) { if (first_dpyinfo == NULL) first_dpyinfo = dpyinfo; init_gconf (); @@ -705,13 +684,13 @@ } const char * -xsettings_get_system_font () +xsettings_get_system_font (void) { return current_mono_font; } const char * -xsettings_get_system_normal_font () +xsettings_get_system_normal_font (void) { return current_font; } @@ -755,7 +734,7 @@ } void -syms_of_xsettings () +syms_of_xsettings (void) { current_mono_font = NULL; current_font = NULL;
--- a/src/xsmfns.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xsmfns.c Sun Jul 04 00:50:25 2010 -0700 @@ -95,7 +95,7 @@ #define CHDIR_OPT "--chdir=" static void -ice_connection_closed () +ice_connection_closed (void) { if (ice_fd >= 0) delete_keyboard_wait_descriptor (ice_fd); @@ -108,8 +108,7 @@ Otherwise returns 1 if SAVE_SESSION_EVENT is stored in buffer BUFP. */ int -x_session_check_input (bufp) - struct input_event *bufp; +x_session_check_input (struct input_event *bufp) { SELECT_TYPE read_fds; EMACS_TIME tmout; @@ -160,7 +159,7 @@ /* Return non-zero if we have a connection to a session manager. */ int -x_session_have_connection () +x_session_have_connection (void) { return ice_fd != -1; } @@ -170,9 +169,7 @@ Then lisp code can interact with the user. */ static void -smc_interact_CB (smcConn, clientData) - SmcConn smcConn; - SmPointer clientData; +smc_interact_CB (SmcConn smcConn, SmPointer clientData) { doing_interact = True; emacs_event.kind = SAVE_SESSION_EVENT; @@ -311,9 +308,7 @@ /* According to the SM specification, this shall close the connection. */ static void -smc_die_CB (smcConn, clientData) - SmcConn smcConn; - SmPointer clientData; +smc_die_CB (SmcConn smcConn, SmPointer clientData) { SmcCloseConnection (smcConn, 0, 0); ice_connection_closed (); @@ -326,17 +321,13 @@ even seem necessary. */ static void -smc_save_complete_CB (smcConn, clientData) - SmcConn smcConn; - SmPointer clientData; +smc_save_complete_CB (SmcConn smcConn, SmPointer clientData) { /* Empty */ } static void -smc_shutdown_cancelled_CB (smcConn, clientData) - SmcConn smcConn; - SmPointer clientData; +smc_shutdown_cancelled_CB (SmcConn smcConn, SmPointer clientData) { /* Empty */ } @@ -384,8 +375,7 @@ static void -ice_io_error_handler (iceConn) - IceConn iceConn; +ice_io_error_handler (IceConn iceConn) { /* Connection probably gone. */ ice_connection_closed (); @@ -395,11 +385,7 @@ uses ICE as it transport protocol. */ static void -ice_conn_watch_CB (iceConn, clientData, opening, watchData) - IceConn iceConn; - IcePointer clientData; - Bool opening; - IcePointer *watchData; +ice_conn_watch_CB (IceConn iceConn, IcePointer clientData, int opening, IcePointer *watchData) { if (! opening) { @@ -423,9 +409,7 @@ /* Create the client leader window. */ static void -create_client_leader_window (dpyinfo, client_id) - struct x_display_info *dpyinfo; - char *client_id; +create_client_leader_window (struct x_display_info *dpyinfo, char *client_id) { Window w; XClassHint class_hints; @@ -451,8 +435,7 @@ /* Try to open a connection to the session manager. */ void -x_session_initialize (dpyinfo) - struct x_display_info *dpyinfo; +x_session_initialize (struct x_display_info *dpyinfo) { #define SM_ERRORSTRING_LEN 512 char errorstring[SM_ERRORSTRING_LEN]; @@ -532,7 +515,7 @@ /* Ensure that the session manager is not contacted again. */ void -x_session_close () +x_session_close (void) { ice_connection_closed (); } @@ -575,7 +558,7 @@ Initialization ***********************************************************************/ void -syms_of_xsmfns () +syms_of_xsmfns (void) { DEFVAR_LISP ("x-session-id", &Vx_session_id, doc: /* The session id Emacs got from the session manager for this session.
--- a/src/xterm.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/xterm.c Sun Jul 04 00:50:25 2010 -0700 @@ -385,8 +385,7 @@ /* Flush display of frame F, or of all frames if F is null. */ static void -x_flush (f) - struct frame *f; +x_flush (struct frame *f) { /* Don't call XFlush when it is not safe to redisplay; the X connection may be broken. */ @@ -455,8 +454,7 @@ /* Return the struct x_display_info corresponding to DPY. */ struct x_display_info * -x_display_info_for_display (dpy) - Display *dpy; +x_display_info_for_display (Display *dpy) { struct x_display_info *dpyinfo; @@ -471,8 +469,7 @@ #define OPACITY "_NET_WM_WINDOW_OPACITY" void -x_set_frame_alpha (f) - struct frame *f; +x_set_frame_alpha (struct frame *f) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Display *dpy = FRAME_X_DISPLAY (f); @@ -538,15 +535,13 @@ } int -x_display_pixel_height (dpyinfo) - struct x_display_info *dpyinfo; +x_display_pixel_height (struct x_display_info *dpyinfo) { return HeightOfScreen (dpyinfo->screen); } int -x_display_pixel_width (dpyinfo) - struct x_display_info *dpyinfo; +x_display_pixel_width (struct x_display_info *dpyinfo) { return WidthOfScreen (dpyinfo->screen); } @@ -563,8 +558,7 @@ because all interesting stuff is done on a window basis. */ static void -x_update_begin (f) - struct frame *f; +x_update_begin (struct frame *f) { /* Nothing to do. */ } @@ -575,8 +569,7 @@ position of W. */ static void -x_update_window_begin (w) - struct window *w; +x_update_window_begin (struct window *w) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct x_display_info *display_info = FRAME_X_DISPLAY_INFO (f); @@ -604,9 +597,7 @@ /* Draw a vertical window border from (x,y0) to (x,y1) */ static void -x_draw_vertical_window_border (w, x, y0, y1) - struct window *w; - int x, y0, y1; +x_draw_vertical_window_border (struct window *w, int x, int y0, int y1) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct face *face; @@ -634,9 +625,7 @@ here. */ static void -x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p) - struct window *w; - int cursor_on_p, mouse_face_overwritten_p; +x_update_window_end (struct window *w, int cursor_on_p, int mouse_face_overwritten_p) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (XFRAME (w->frame)); @@ -672,8 +661,7 @@ update_end. */ static void -x_update_end (f) - struct frame *f; +x_update_end (struct frame *f) { /* Mouse highlight may be displayed again. */ FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; @@ -691,8 +679,7 @@ updated_window is not available here. */ static void -XTframe_up_to_date (f) - struct frame *f; +XTframe_up_to_date (struct frame *f) { if (FRAME_X_P (f)) { @@ -721,8 +708,7 @@ between bitmaps to be drawn between current row and DESIRED_ROW. */ static void -x_after_update_window_line (desired_row) - struct glyph_row *desired_row; +x_after_update_window_line (struct glyph_row *desired_row) { struct window *w = updated_window; struct frame *f; @@ -760,10 +746,7 @@ } static void -x_draw_fringe_bitmap (w, row, p) - struct window *w; - struct glyph_row *row; - struct draw_fringe_bitmap_params *p; +x_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fringe_bitmap_params *p) { struct frame *f = XFRAME (WINDOW_FRAME (w)); Display *display = FRAME_X_DISPLAY (f); @@ -969,8 +952,7 @@ face. */ static void -x_set_cursor_gc (s) - struct glyph_string *s; +x_set_cursor_gc (struct glyph_string *s) { if (s->font == FRAME_FONT (s->f) && s->face->background == FRAME_BACKGROUND_PIXEL (s->f) @@ -1021,8 +1003,7 @@ /* Set up S->gc of glyph string S for drawing text in mouse face. */ static void -x_set_mouse_face_gc (s) - struct glyph_string *s; +x_set_mouse_face_gc (struct glyph_string *s) { int face_id; struct face *face; @@ -1073,8 +1054,7 @@ matrix was built, so there isn't much to do, here. */ static INLINE void -x_set_mode_line_face_gc (s) - struct glyph_string *s; +x_set_mode_line_face_gc (struct glyph_string *s) { s->gc = s->face->gc; } @@ -1085,8 +1065,7 @@ pattern. */ static INLINE void -x_set_glyph_string_gc (s) - struct glyph_string *s; +x_set_glyph_string_gc (struct glyph_string *s) { PREPARE_FACE_FOR_DISPLAY (s->f, s->face); @@ -1131,8 +1110,7 @@ line or menu if we don't have X toolkit support. */ static INLINE void -x_set_glyph_string_clipping (s) - struct glyph_string *s; +x_set_glyph_string_clipping (struct glyph_string *s) { XRectangle *r = s->clip; int n = get_glyph_string_clip_rects (s, r, 2); @@ -1148,8 +1126,7 @@ the area of SRC. */ static void -x_set_glyph_string_clipping_exactly (src, dst) - struct glyph_string *src, *dst; +x_set_glyph_string_clipping_exactly (struct glyph_string *src, struct glyph_string *dst) { XRectangle r; @@ -1167,8 +1144,7 @@ Compute left and right overhang of glyph string S. */ static void -x_compute_glyph_string_overhangs (s) - struct glyph_string *s; +x_compute_glyph_string_overhangs (struct glyph_string *s) { if (s->cmp == NULL && (s->first_glyph->type == CHAR_GLYPH @@ -1207,9 +1183,7 @@ /* Fill rectangle X, Y, W, H with background color of glyph string S. */ static INLINE void -x_clear_glyph_string_rect (s, x, y, w, h) - struct glyph_string *s; - int x, y, w, h; +x_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h) { XGCValues xgcv; XGetGCValues (s->display, s->gc, GCForeground | GCBackground, &xgcv); @@ -1226,9 +1200,7 @@ contains the first component of a composition. */ static void -x_draw_glyph_string_background (s, force_p) - struct glyph_string *s; - int force_p; +x_draw_glyph_string_background (struct glyph_string *s, int force_p) { /* Nothing to do if background has already been drawn or if it shouldn't be drawn in the first place. */ @@ -1264,8 +1236,7 @@ /* Draw the foreground of glyph string S. */ static void -x_draw_glyph_string_foreground (s) - struct glyph_string *s; +x_draw_glyph_string_foreground (struct glyph_string *s) { int i, x; @@ -1313,8 +1284,7 @@ /* Draw the foreground of composite glyph string S. */ static void -x_draw_composite_glyph_string_foreground (s) - struct glyph_string *s; +x_draw_composite_glyph_string_foreground (struct glyph_string *s) { int i, j, x; struct font *font = s->font; @@ -1639,9 +1609,7 @@ say a 24-bit TrueColor map. */ static const XColor * -x_color_cells (dpy, ncells) - Display *dpy; - int *ncells; +x_color_cells (Display *dpy, int *ncells) { struct x_display_info *dpyinfo = x_display_info_for_display (dpy); @@ -1672,10 +1640,7 @@ colors in COLORS. Use cached information, if available. */ void -x_query_colors (f, colors, ncolors) - struct frame *f; - XColor *colors; - int ncolors; +x_query_colors (struct frame *f, XColor *colors, int ncolors) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -1699,9 +1664,7 @@ COLOR. Use cached information, if available. */ void -x_query_color (f, color) - struct frame *f; - XColor *color; +x_query_color (struct frame *f, XColor *color) { x_query_colors (f, color, 1); } @@ -1713,10 +1676,7 @@ allocated. */ static int -x_alloc_nearest_color_1 (dpy, cmap, color) - Display *dpy; - Colormap cmap; - XColor *color; +x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color) { int rc; @@ -1786,10 +1746,7 @@ allocated. */ int -x_alloc_nearest_color (f, cmap, color) - struct frame *f; - Colormap cmap; - XColor *color; +x_alloc_nearest_color (struct frame *f, Colormap cmap, XColor *color) { gamma_correct (f, color); return x_alloc_nearest_color_1 (FRAME_X_DISPLAY (f), cmap, color); @@ -1801,9 +1758,7 @@ get color reference counts right. */ unsigned long -x_copy_color (f, pixel) - struct frame *f; - unsigned long pixel; +x_copy_color (struct frame *f, long unsigned int pixel) { XColor color; @@ -1824,10 +1779,7 @@ get color reference counts right. */ unsigned long -x_copy_dpy_color (dpy, cmap, pixel) - Display *dpy; - Colormap cmap; - unsigned long pixel; +x_copy_dpy_color (Display *dpy, Colormap cmap, long unsigned int pixel) { XColor color; @@ -1865,13 +1817,7 @@ Value is non-zero if successful. */ static int -x_alloc_lighter_color (f, display, cmap, pixel, factor, delta) - struct frame *f; - Display *display; - Colormap cmap; - unsigned long *pixel; - double factor; - int delta; +x_alloc_lighter_color (struct frame *f, Display *display, Colormap cmap, long unsigned int *pixel, double factor, int delta) { XColor color, new; long bright; @@ -1947,12 +1893,7 @@ be allocated, use DEFAULT_PIXEL, instead. */ static void -x_setup_relief_color (f, relief, factor, delta, default_pixel) - struct frame *f; - struct relief *relief; - double factor; - int delta; - unsigned long default_pixel; +x_setup_relief_color (struct frame *f, struct relief *relief, double factor, int delta, long unsigned int default_pixel) { XGCValues xgcv; struct x_output *di = f->output_data.x; @@ -2000,8 +1941,7 @@ /* Set up colors for the relief lines around glyph string S. */ static void -x_setup_relief_colors (s) - struct glyph_string *s; +x_setup_relief_colors (struct glyph_string *s) { struct x_output *di = s->f->output_data.x; unsigned long color; @@ -2143,8 +2083,7 @@ /* Draw a box around glyph string S. */ static void -x_draw_glyph_string_box (s) - struct glyph_string *s; +x_draw_glyph_string_box (struct glyph_string *s) { int width, left_x, right_x, top_y, bottom_y, last_x, raised_p; int left_p, right_p; @@ -2195,8 +2134,7 @@ /* Draw foreground of image glyph string S. */ static void -x_draw_image_foreground (s) - struct glyph_string *s; +x_draw_image_foreground (struct glyph_string *s) { int x = s->x; int y = s->ybase - image_ascent (s->img, s->face, &s->slice); @@ -2286,8 +2224,7 @@ /* Draw a relief around the image glyph string S. */ static void -x_draw_image_relief (s) - struct glyph_string *s; +x_draw_image_relief (struct glyph_string *s) { int x0, y0, x1, y1, thick, raised_p, extra; XRectangle r; @@ -2342,9 +2279,7 @@ /* Draw the foreground of image glyph string S to PIXMAP. */ static void -x_draw_image_foreground_1 (s, pixmap) - struct glyph_string *s; - Pixmap pixmap; +x_draw_image_foreground_1 (struct glyph_string *s, Pixmap pixmap) { int x = 0; int y = s->ybase - s->y - image_ascent (s->img, s->face, &s->slice); @@ -2420,9 +2355,7 @@ give the rectangle to draw. */ static void -x_draw_glyph_string_bg_rect (s, x, y, w, h) - struct glyph_string *s; - int x, y, w, h; +x_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) { if (s->stippled_p) { @@ -2451,8 +2384,7 @@ */ static void -x_draw_image_glyph_string (s) - struct glyph_string *s; +x_draw_image_glyph_string (struct glyph_string *s) { int box_line_hwidth = eabs (s->face->box_line_width); int box_line_vwidth = max (s->face->box_line_width, 0); @@ -2556,8 +2488,7 @@ /* Draw stretch glyph string S. */ static void -x_draw_stretch_glyph_string (s) - struct glyph_string *s; +x_draw_stretch_glyph_string (struct glyph_string *s) { xassert (s->first_glyph->type == STRETCH_GLYPH); @@ -2640,8 +2571,7 @@ /* Draw glyph string S. */ static void -x_draw_glyph_string (s) - struct glyph_string *s; +x_draw_glyph_string (struct glyph_string *s) { int relief_drawn_p = 0; @@ -2895,9 +2825,7 @@ /* Shift display to make room for inserted glyphs. */ void -x_shift_glyphs_for_insert (f, x, y, width, height, shift_by) - struct frame *f; - int x, y, width, height, shift_by; +x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by) { XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f), f->output_data.x->normal_gc, @@ -2909,9 +2837,7 @@ for X frames. */ static void -x_delete_glyphs (f, n) - struct frame *f; - register int n; +x_delete_glyphs (struct frame *f, register int n) { abort (); } @@ -2921,12 +2847,7 @@ If they are <= 0, this is probably an error. */ void -x_clear_area (dpy, window, x, y, width, height, exposures) - Display *dpy; - Window window; - int x, y; - int width, height; - int exposures; +x_clear_area (Display *dpy, Window window, int x, int y, int width, int height, int exposures) { xassert (width > 0 && height > 0); XClearArea (dpy, window, x, y, width, height, exposures); @@ -2978,8 +2899,7 @@ *RESULT. Return 1 if the difference is negative, otherwise 0. */ static int -timeval_subtract (result, x, y) - struct timeval *result, x, y; +timeval_subtract (struct timeval *result, struct timeval x, struct timeval y) { /* Perform the carry for the later subtraction by updating y. This is safer because on some systems the tv_sec member is unsigned. */ @@ -3008,8 +2928,7 @@ } void -XTflash (f) - struct frame *f; +XTflash (struct frame *f) { BLOCK_INPUT; @@ -3164,9 +3083,7 @@ static void -XTtoggle_invisible_pointer (f, invisible) - FRAME_PTR f; - int invisible; +XTtoggle_invisible_pointer (FRAME_PTR f, int invisible) { BLOCK_INPUT; if (invisible) @@ -3186,7 +3103,7 @@ /* Make audible bell. */ void -XTring_bell () +XTring_bell (void) { struct frame *f = SELECTED_FRAME (); @@ -3213,8 +3130,7 @@ that is bounded by calls to x_update_begin and x_update_end. */ static void -XTset_terminal_window (n) - register int n; +XTset_terminal_window (register int n) { /* This function intentionally left blank. */ } @@ -3229,9 +3145,7 @@ lines or deleting -N lines at vertical position VPOS. */ static void -x_ins_del_lines (f, vpos, n) - struct frame *f; - int vpos, n; +x_ins_del_lines (struct frame *f, int vpos, int n) { abort (); } @@ -3240,9 +3154,7 @@ /* Scroll part of the display as described by RUN. */ static void -x_scroll_run (w, run) - struct window *w; - struct run *run; +x_scroll_run (struct window *w, struct run *run) { struct frame *f = XFRAME (w->frame); int x, y, width, height, from_y, to_y, bottom_y; @@ -3299,8 +3211,7 @@ static void -frame_highlight (f) - struct frame *f; +frame_highlight (struct frame *f) { /* We used to only do this if Vx_no_window_manager was non-nil, but the ICCCM (section 4.1.6) says that the window's border pixmap @@ -3315,8 +3226,7 @@ } static void -frame_unhighlight (f) - struct frame *f; +frame_unhighlight (struct frame *f) { /* We used to only do this if Vx_no_window_manager was non-nil, but the ICCCM (section 4.1.6) says that the window's border pixmap @@ -3337,9 +3247,7 @@ Lisp code can tell when the switch took place by examining the events. */ static void -x_new_focus_frame (dpyinfo, frame) - struct x_display_info *dpyinfo; - struct frame *frame; +x_new_focus_frame (struct x_display_info *dpyinfo, struct frame *frame) { struct frame *old_focus = dpyinfo->x_focus_frame; @@ -3366,12 +3274,7 @@ a FOCUS_IN_EVENT into *BUFP. */ static void -x_focus_changed (type, state, dpyinfo, frame, bufp) - int type; - int state; - struct x_display_info *dpyinfo; - struct frame *frame; - struct input_event *bufp; +x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct frame *frame, struct input_event *bufp) { if (type == FocusIn) { @@ -3423,10 +3326,7 @@ Returns FOCUS_IN_EVENT event in *BUFP. */ static void -x_detect_focus_change (dpyinfo, event, bufp) - struct x_display_info *dpyinfo; - XEvent *event; - struct input_event *bufp; +x_detect_focus_change (struct x_display_info *dpyinfo, XEvent *event, struct input_event *bufp) { struct frame *frame; @@ -3475,8 +3375,7 @@ /* Handle an event saying the mouse has moved out of an Emacs frame. */ void -x_mouse_leave (dpyinfo) - struct x_display_info *dpyinfo; +x_mouse_leave (struct x_display_info *dpyinfo) { x_new_focus_frame (dpyinfo, dpyinfo->x_focus_event_frame); } @@ -3490,15 +3389,13 @@ the appropriate X display info. */ static void -XTframe_rehighlight (frame) - struct frame *frame; +XTframe_rehighlight (struct frame *frame) { x_frame_rehighlight (FRAME_X_DISPLAY_INFO (frame)); } static void -x_frame_rehighlight (dpyinfo) - struct x_display_info *dpyinfo; +x_frame_rehighlight (struct x_display_info *dpyinfo) { struct frame *old_highlight = dpyinfo->x_highlight_frame; @@ -3532,8 +3429,7 @@ /* Initialize mode_switch_bit and modifier_meaning. */ static void -x_find_modifier_meanings (dpyinfo) - struct x_display_info *dpyinfo; +x_find_modifier_meanings (struct x_display_info *dpyinfo) { int min_code, max_code; KeySym *syms; @@ -3644,9 +3540,7 @@ Emacs uses. */ unsigned int -x_x_to_emacs_modifiers (dpyinfo, state) - struct x_display_info *dpyinfo; - unsigned int state; +x_x_to_emacs_modifiers (struct x_display_info *dpyinfo, unsigned int state) { EMACS_UINT mod_meta = meta_modifier; EMACS_UINT mod_alt = alt_modifier; @@ -3673,9 +3567,7 @@ } static unsigned int -x_emacs_to_x_modifiers (dpyinfo, state) - struct x_display_info *dpyinfo; - unsigned int state; +x_emacs_to_x_modifiers (struct x_display_info *dpyinfo, unsigned int state) { EMACS_UINT mod_meta = meta_modifier; EMACS_UINT mod_alt = alt_modifier; @@ -3705,8 +3597,7 @@ /* Convert a keysym to its name. */ char * -x_get_keysym_name (keysym) - KeySym keysym; +x_get_keysym_name (KeySym keysym) { char *value; @@ -3727,10 +3618,7 @@ the mouse. */ static Lisp_Object -construct_mouse_click (result, event, f) - struct input_event *result; - XButtonEvent *event; - struct frame *f; +construct_mouse_click (struct input_event *result, XButtonEvent *event, struct frame *f) { /* Make the event type NO_EVENT; we'll change that when we decide otherwise. */ @@ -3763,9 +3651,7 @@ static Lisp_Object last_mouse_motion_frame; static int -note_mouse_movement (frame, event) - FRAME_PTR frame; - XMotionEvent *event; +note_mouse_movement (FRAME_PTR frame, XMotionEvent *event) { last_mouse_movement_time = event->time; last_mouse_motion_event = *event; @@ -3809,7 +3695,7 @@ ************************************************************************/ static void -redo_mouse_highlight () +redo_mouse_highlight (void) { if (!NILP (last_mouse_motion_frame) && FRAME_LIVE_P (XFRAME (last_mouse_motion_frame))) @@ -3841,13 +3727,7 @@ movement. */ static void -XTmouse_position (fp, insist, bar_window, part, x, y, time) - FRAME_PTR *fp; - int insist; - Lisp_Object *bar_window; - enum scroll_bar_part *part; - Lisp_Object *x, *y; - unsigned long *time; +XTmouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, long unsigned int *time) { FRAME_PTR f1; @@ -4049,9 +3929,7 @@ bits. */ static struct scroll_bar * -x_window_to_scroll_bar (display, window_id) - Display *display; - Window window_id; +x_window_to_scroll_bar (Display *display, Window window_id) { Lisp_Object tail; @@ -4222,9 +4100,7 @@ amount to scroll of a whole of WHOLE. */ static void -x_send_scroll_bar_event (window, part, portion, whole) - Lisp_Object window; - int part, portion, whole; +x_send_scroll_bar_event (Lisp_Object window, int part, int portion, int whole) { XEvent event; XClientMessageEvent *ev = (XClientMessageEvent *) &event; @@ -4286,9 +4162,7 @@ in *IEVENT. */ static void -x_scroll_bar_to_input_event (event, ievent) - XEvent *event; - struct input_event *ievent; +x_scroll_bar_to_input_event (XEvent *event, struct input_event *ievent) { XClientMessageEvent *ev = (XClientMessageEvent *) event; Lisp_Object window; @@ -4572,9 +4446,7 @@ #ifdef USE_GTK static void -x_create_toolkit_scroll_bar (f, bar) - struct frame *f; - struct scroll_bar *bar; +x_create_toolkit_scroll_bar (struct frame *f, struct scroll_bar *bar) { char *scroll_bar_name = SCROLL_BAR_NAME; @@ -4790,9 +4662,7 @@ #ifdef USE_GTK static void -x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) - struct scroll_bar *bar; - int portion, position, whole; +x_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int position, int whole) { xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole); } @@ -4916,9 +4786,7 @@ scroll bar. */ static struct scroll_bar * -x_scroll_bar_create (w, top, left, width, height) - struct window *w; - int top, left, width, height; +x_scroll_bar_create (struct window *w, int top, int left, int width, int height) { struct frame *f = XFRAME (w->frame); struct scroll_bar *bar @@ -5133,8 +5001,7 @@ nil. */ static void -x_scroll_bar_remove (bar) - struct scroll_bar *bar; +x_scroll_bar_remove (struct scroll_bar *bar) { struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); BLOCK_INPUT; @@ -5162,9 +5029,7 @@ create one. */ static void -XTset_vertical_scroll_bar (w, portion, whole, position) - struct window *w; - int portion, whole, position; +XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int position) { struct frame *f = XFRAME (w->frame); struct scroll_bar *bar; @@ -5381,8 +5246,7 @@ `*redeem_scroll_bar_hook' is applied to its window before the judgment. */ static void -XTcondemn_scroll_bars (frame) - FRAME_PTR frame; +XTcondemn_scroll_bars (FRAME_PTR frame) { /* Transfer all the scroll bars to FRAME_CONDEMNED_SCROLL_BARS. */ while (! NILP (FRAME_SCROLL_BARS (frame))) @@ -5403,8 +5267,7 @@ Note that WINDOW isn't necessarily condemned at all. */ static void -XTredeem_scroll_bar (window) - struct window *window; +XTredeem_scroll_bar (struct window *window) { struct scroll_bar *bar; struct frame *f; @@ -5449,8 +5312,7 @@ last call to `*condemn_scroll_bars_hook'. */ static void -XTjudge_scroll_bars (f) - FRAME_PTR f; +XTjudge_scroll_bars (FRAME_PTR f) { Lisp_Object bar, next; @@ -5527,10 +5389,7 @@ static void -x_scroll_bar_handle_click (bar, event, emacs_event) - struct scroll_bar *bar; - XEvent *event; - struct input_event *emacs_event; +x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_event *emacs_event) { if (! WINDOWP (bar->window)) abort (); @@ -5620,12 +5479,7 @@ on the scroll bar. */ static void -x_scroll_bar_report_motion (fp, bar_window, part, x, y, time) - FRAME_PTR *fp; - Lisp_Object *bar_window; - enum scroll_bar_part *part; - Lisp_Object *x, *y; - unsigned long *time; +x_scroll_bar_report_motion (FRAME_PTR *fp, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, long unsigned int *time) { struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar); Window w = bar->x_window; @@ -5697,8 +5551,7 @@ redraw them. */ void -x_scroll_bar_clear (f) - FRAME_PTR f; +x_scroll_bar_clear (FRAME_PTR f) { #ifndef USE_TOOLKIT_SCROLL_BARS Lisp_Object bar; @@ -5784,9 +5637,7 @@ #ifdef HAVE_X_I18N static int -x_filter_event (dpyinfo, event) - struct x_display_info *dpyinfo; - XEvent *event; +x_filter_event (struct x_display_info *dpyinfo, XEvent *event) { /* XFilterEvent returns non-zero if the input method has consumed the event. We pass the frame's X window to @@ -5809,10 +5660,7 @@ It is invoked before the XEvent is translated to a GdkEvent, so we have a chance to act on the event before GTK. */ static GdkFilterReturn -event_handler_gdk (gxev, ev, data) - GdkXEvent *gxev; - GdkEvent *ev; - gpointer data; +event_handler_gdk (GdkXEvent *gxev, GdkEvent *ev, gpointer data) { XEvent *xev = (XEvent *) gxev; @@ -5865,11 +5713,7 @@ We return the number of characters stored into the buffer. */ static int -handle_one_xevent (dpyinfo, eventp, finish, hold_quit) - struct x_display_info *dpyinfo; - XEvent *eventp; - int *finish; - struct input_event *hold_quit; +handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventp, int *finish, struct input_event *hold_quit) { union { struct input_event ie; @@ -7096,9 +6940,7 @@ Returns the value handle_one_xevent sets in the finish argument. */ int -x_dispatch_event (event, display) - XEvent *event; - Display *display; +x_dispatch_event (XEvent *event, Display *display) { struct x_display_info *dpyinfo; int finish = X_EVENT_NORMAL; @@ -7124,10 +6966,7 @@ EXPECTED is nonzero if the caller knows input is available. */ static int -XTread_socket (terminal, expected, hold_quit) - struct terminal *terminal; - int expected; - struct input_event *hold_quit; +XTread_socket (struct terminal *terminal, int expected, struct input_event *hold_quit) { int count = 0; XEvent event; @@ -7278,11 +7117,7 @@ mode lines must be clipped to the whole window. */ static void -x_clip_to_row (w, row, area, gc) - struct window *w; - struct glyph_row *row; - int area; - GC gc; +x_clip_to_row (struct window *w, struct glyph_row *row, int area, GC gc) { struct frame *f = XFRAME (WINDOW_FRAME (w)); XRectangle clip_rect; @@ -7303,9 +7138,7 @@ /* Draw a hollow box cursor on window W in glyph row ROW. */ static void -x_draw_hollow_cursor (w, row) - struct window *w; - struct glyph_row *row; +x_draw_hollow_cursor (struct window *w, struct glyph_row *row) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -7350,11 +7183,7 @@ --gerd. */ static void -x_draw_bar_cursor (w, row, width, kind) - struct window *w; - struct glyph_row *row; - int width; - enum text_cursor_kinds kind; +x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text_cursor_kinds kind) { struct frame *f = XFRAME (w->frame); struct glyph *cursor_glyph; @@ -7445,9 +7274,7 @@ /* RIF: Define cursor CURSOR on frame F. */ static void -x_define_frame_cursor (f, cursor) - struct frame *f; - Cursor cursor; +x_define_frame_cursor (struct frame *f, Cursor cursor) { if (!f->pointer_invisible && f->output_data.x->current_cursor != cursor) @@ -7459,9 +7286,7 @@ /* RIF: Clear area on frame F. */ static void -x_clear_frame_area (f, x, y, width, height) - struct frame *f; - int x, y, width, height; +x_clear_frame_area (struct frame *f, int x, int y, int width, int height) { x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), x, y, width, height, False); @@ -7476,12 +7301,7 @@ /* RIF: Draw cursor on window W. */ static void -x_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, active_p) - struct window *w; - struct glyph_row *glyph_row; - int x, y; - int cursor_type, cursor_width; - int on_p, active_p; +x_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x, int y, int cursor_type, int cursor_width, int on_p, int active_p) { struct frame *f = XFRAME (WINDOW_FRAME (w)); @@ -7545,9 +7365,7 @@ /* Make the x-window of frame F use the gnu icon bitmap. */ int -x_bitmap_icon (f, file) - struct frame *f; - Lisp_Object file; +x_bitmap_icon (struct frame *f, Lisp_Object file) { int bitmap_id; @@ -7624,9 +7442,7 @@ Use ICON_NAME as the text. */ int -x_text_icon (f, icon_name) - struct frame *f; - char *icon_name; +x_text_icon (struct frame *f, char *icon_name) { if (FRAME_X_WINDOW (f) == 0) return 1; @@ -7669,9 +7485,7 @@ x_catch_errors is in effect. */ static void -x_error_catcher (display, error) - Display *display; - XErrorEvent *error; +x_error_catcher (Display *display, XErrorEvent *error) { XGetErrorText (display, error->error_code, x_error_message->string, @@ -7691,11 +7505,10 @@ Calling x_uncatch_errors resumes the normal error handling. */ -void x_check_errors (); +void x_check_errors (Display *dpy, char *format); void -x_catch_errors (dpy) - Display *dpy; +x_catch_errors (Display *dpy) { struct x_error_message_stack *data = xmalloc (sizeof (*data)); @@ -7712,7 +7525,7 @@ DPY should be the display that was passed to x_catch_errors. */ void -x_uncatch_errors () +x_uncatch_errors (void) { struct x_error_message_stack *tmp; @@ -7734,9 +7547,7 @@ sprintf (a buffer, FORMAT, the x error message text) as the text. */ void -x_check_errors (dpy, format) - Display *dpy; - char *format; +x_check_errors (Display *dpy, char *format) { /* Make sure to catch any errors incurred so far. */ XSync (dpy, False); @@ -7754,8 +7565,7 @@ since we did x_catch_errors on DPY. */ int -x_had_errors_p (dpy) - Display *dpy; +x_had_errors_p (Display *dpy) { /* Make sure to catch any errors incurred so far. */ XSync (dpy, False); @@ -7766,8 +7576,7 @@ /* Forget about any errors we have had, since we did x_catch_errors on DPY. */ void -x_clear_errors (dpy) - Display *dpy; +x_clear_errors (Display *dpy) { x_error_message->string[0] = 0; } @@ -7787,7 +7596,7 @@ /* Nonzero if x_catch_errors has been done and not yet canceled. */ int -x_catching_errors () +x_catching_errors (void) { return x_error_message != 0; } @@ -7808,8 +7617,8 @@ which will do the appropriate cleanup for us. */ static SIGTYPE -x_connection_signal (signalnum) /* If we don't have an argument, */ - int signalnum; /* some compilers complain in signal calls. */ +x_connection_signal (int signalnum) /* If we don't have an argument, */ + /* some compilers complain in signal calls. */ { #ifdef USG /* USG systems forget handlers when they are used; @@ -7832,7 +7641,7 @@ instead of dumping core when XtCloseDisplay fails. */ static void -x_fatal_error_signal () +x_fatal_error_signal (void) { fprintf (stderr, "%s\n", error_msg); exit (70); @@ -7842,9 +7651,7 @@ the text of an error message that lead to the connection loss. */ static SIGTYPE -x_connection_closed (dpy, error_message) - Display *dpy; - char *error_message; +x_connection_closed (Display *dpy, char *error_message) { struct x_display_info *dpyinfo = x_display_info_for_display (dpy); Lisp_Object frame, tail; @@ -7986,9 +7793,7 @@ It calls x_error_quitter or x_error_catcher. */ static int -x_error_handler (display, error) - Display *display; - XErrorEvent *error; +x_error_handler (Display *display, XErrorEvent *error) { if (x_error_message) x_error_catcher (display, error); @@ -8019,9 +7824,7 @@ after x_error_handler prevents inlining into the former. */ static void NO_INLINE -x_error_quitter (display, error) - Display *display; - XErrorEvent *error; +x_error_quitter (Display *display, XErrorEvent *error) { char buf[256], buf1[356]; @@ -8046,8 +7849,7 @@ If that was the only one, it prints an error message and kills Emacs. */ static int -x_io_error_quitter (display) - Display *display; +x_io_error_quitter (Display *display) { char buf[256]; @@ -8064,10 +7866,7 @@ FONT-OBJECT. */ Lisp_Object -x_new_font (f, font_object, fontset) - struct frame *f; - Lisp_Object font_object; - int fontset; +x_new_font (struct frame *f, Lisp_Object font_object, int fontset) { struct font *font = XFONT_OBJECT (font_object); @@ -8136,10 +7935,7 @@ pointer to the x_display_info structure corresponding to XIM. */ static void -xim_destroy_callback (xim, client_data, call_data) - XIM xim; - XPointer client_data; - XPointer call_data; +xim_destroy_callback (XIM xim, XPointer client_data, XPointer call_data) { struct x_display_info *dpyinfo = (struct x_display_info *) client_data; Lisp_Object frame, tail; @@ -8174,9 +7970,7 @@ RESOURCE_NAME is the resource name Emacs uses. */ static void -xim_open_dpy (dpyinfo, resource_name) - struct x_display_info *dpyinfo; - char *resource_name; +xim_open_dpy (struct x_display_info *dpyinfo, char *resource_name) { XIM xim; @@ -8220,10 +8014,7 @@ when the callback was registered. */ static void -xim_instantiate_callback (display, client_data, call_data) - Display *display; - XPointer client_data; - XPointer call_data; +xim_instantiate_callback (Display *display, XPointer client_data, XPointer call_data) { struct xim_inst_t *xim_inst = (struct xim_inst_t *) client_data; struct x_display_info *dpyinfo = xim_inst->dpyinfo; @@ -8273,9 +8064,7 @@ in the XIM instantiate callback function. */ static void -xim_initialize (dpyinfo, resource_name) - struct x_display_info *dpyinfo; - char *resource_name; +xim_initialize (struct x_display_info *dpyinfo, char *resource_name) { dpyinfo->xim = NULL; #ifdef HAVE_XIM @@ -8309,8 +8098,7 @@ /* Close the connection to the XIM server on display DPYINFO. */ static void -xim_close_dpy (dpyinfo) - struct x_display_info *dpyinfo; +xim_close_dpy (struct x_display_info *dpyinfo) { #ifdef HAVE_XIM if (use_xim) @@ -8339,8 +8127,7 @@ from its current recorded position values and gravity. */ void -x_calc_absolute_position (f) - struct frame *f; +x_calc_absolute_position (struct frame *f) { int flags = f->size_hint_flags; @@ -8392,10 +8179,7 @@ which means, do adjust for borders but don't change the gravity. */ void -x_set_offset (f, xoff, yoff, change_gravity) - struct frame *f; - register int xoff, yoff; - int change_gravity; +x_set_offset (struct frame *f, register int xoff, register int yoff, int change_gravity) { int modified_top, modified_left; @@ -8464,9 +8248,7 @@ http://freedesktop.org/wiki/Specifications/wm-spec. */ static int -wm_supports (f, atomname) - struct frame *f; - const char *atomname; +wm_supports (struct frame *f, const char *atomname) { Atom actual_type; unsigned long actual_size, bytes_remaining; @@ -8555,11 +8337,7 @@ } static void -set_wm_state (frame, add, what, what2) - Lisp_Object frame; - int add; - const char *what; - const char *what2; +set_wm_state (Lisp_Object frame, int add, const char *what, const char *what2) { const char *atom = "_NET_WM_STATE"; Fx_send_client_event (frame, make_number (0), frame, @@ -8577,9 +8355,7 @@ } void -x_set_sticky (f, new_value, old_value) - struct frame *f; - Lisp_Object new_value, old_value; +x_set_sticky (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) { Lisp_Object frame; @@ -8591,8 +8367,7 @@ /* Do fullscreen as specified in extended window manager hints */ static int -do_ewmh_fullscreen (f) - struct frame *f; +do_ewmh_fullscreen (struct frame *f) { int have_net_atom = wm_supports (f, "_NET_WM_STATE"); @@ -8640,8 +8415,7 @@ } static void -XTfullscreen_hook (f) - FRAME_PTR f; +XTfullscreen_hook (FRAME_PTR f) { if (f->async_visible) { @@ -8654,9 +8428,7 @@ static void -x_handle_net_wm_state (f, event) - struct frame *f; - XPropertyEvent *event; +x_handle_net_wm_state (struct frame *f, XPropertyEvent *event) { Atom actual_type; unsigned long actual_size, bytes_remaining; @@ -8736,8 +8508,7 @@ /* Check if we need to resize the frame due to a fullscreen request. If so needed, resize the frame. */ static void -x_check_fullscreen (f) - struct frame *f; +x_check_fullscreen (struct frame *f) { if (do_ewmh_fullscreen (f)) return; @@ -8783,10 +8554,7 @@ compensate by moving the window right and down by the proper amount. */ static void -x_check_expected_move (f, expected_left, expected_top) - struct frame *f; - int expected_left; - int expected_top; +x_check_expected_move (struct frame *f, int expected_left, int expected_top) { int current_left = 0, current_top = 0; @@ -8831,9 +8599,7 @@ of an exact comparison. */ static void -x_sync_with_move (f, left, top, fuzzy) - struct frame *f; - int left, top, fuzzy; +x_sync_with_move (struct frame *f, int left, int top, int fuzzy) { int count = 0; @@ -8870,9 +8636,7 @@ /* Wait for an event on frame F matching EVENTTYPE. */ void -x_wait_for_event (f, eventtype) - struct frame *f; - int eventtype; +x_wait_for_event (struct frame *f, int eventtype) { int level = interrupt_input_blocked; @@ -8917,10 +8681,7 @@ size changes. Otherwise we leave the window gravity unchanged. */ static void -x_set_window_size_1 (f, change_gravity, cols, rows) - struct frame *f; - int change_gravity; - int cols, rows; +x_set_window_size_1 (struct frame *f, int change_gravity, int cols, int rows) { int pixelwidth, pixelheight; @@ -8985,10 +8746,7 @@ Otherwise we leave the window gravity unchanged. */ void -x_set_window_size (f, change_gravity, cols, rows) - struct frame *f; - int change_gravity; - int cols, rows; +x_set_window_size (struct frame *f, int change_gravity, int cols, int rows) { BLOCK_INPUT; @@ -9044,9 +8802,7 @@ /* Mouse warping. */ void -x_set_mouse_position (f, x, y) - struct frame *f; - int x, y; +x_set_mouse_position (struct frame *f, int x, int y) { int pix_x, pix_y; @@ -9069,9 +8825,7 @@ /* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F. */ void -x_set_mouse_pixel_position (f, pix_x, pix_y) - struct frame *f; - int pix_x, pix_y; +x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) { BLOCK_INPUT; @@ -9083,8 +8837,7 @@ /* focus shifting, raising and lowering. */ void -x_focus_on_frame (f) - struct frame *f; +x_focus_on_frame (struct frame *f) { #if 0 /* I don't think that the ICCCM allows programs to do things like this @@ -9096,8 +8849,7 @@ } void -x_unfocus_frame (f) - struct frame *f; +x_unfocus_frame (struct frame *f) { #if 0 /* Look at the remarks in x_focus_on_frame. */ @@ -9110,8 +8862,7 @@ /* Raise frame F. */ void -x_raise_frame (f) - struct frame *f; +x_raise_frame (struct frame *f) { BLOCK_INPUT; if (f->async_visible) @@ -9124,8 +8875,7 @@ /* Lower frame F. */ void -x_lower_frame (f) - struct frame *f; +x_lower_frame (struct frame *f) { if (f->async_visible) { @@ -9139,8 +8889,7 @@ /* Activate frame with Extended Window Manager Hints */ void -x_ewmh_activate_frame (f) - FRAME_PTR f; +x_ewmh_activate_frame (FRAME_PTR f) { /* See Window Manager Specification/Extended Window Manager Hints at http://freedesktop.org/wiki/Specifications/wm-spec */ @@ -9160,9 +8909,7 @@ } static void -XTframe_raise_lower (f, raise_flag) - FRAME_PTR f; - int raise_flag; +XTframe_raise_lower (FRAME_PTR f, int raise_flag) { if (raise_flag) x_raise_frame (f); @@ -9173,9 +8920,7 @@ /* XEmbed implementation. */ void -xembed_set_info (f, flags) - struct frame *f; - enum xembed_info flags; +xembed_set_info (struct frame *f, enum xembed_info flags) { Atom atom; unsigned long data[2]; @@ -9190,13 +8935,7 @@ } void -xembed_send_message (f, time, message, detail, data1, data2) - struct frame *f; - Time time; - enum xembed_message message; - long detail; - long data1; - long data2; +xembed_send_message (struct frame *f, Time time, enum xembed_message message, long int detail, long int data1, long int data2) { XEvent event; @@ -9225,8 +8964,7 @@ finishes with it. */ void -x_make_frame_visible (f) - struct frame *f; +x_make_frame_visible (struct frame *f) { Lisp_Object type; int original_top, original_left; @@ -9389,8 +9127,7 @@ /* Make the frame visible (mapped and not iconified). */ void -x_make_frame_invisible (f) - struct frame *f; +x_make_frame_invisible (struct frame *f) { Window window; @@ -9447,8 +9184,7 @@ /* Change window state from mapped to iconified. */ void -x_iconify_frame (f) - struct frame *f; +x_iconify_frame (struct frame *f) { int result; Lisp_Object type; @@ -9574,8 +9310,7 @@ /* Free X resources of frame F. */ void -x_free_frame_resources (f) - struct frame *f; +x_free_frame_resources (struct frame *f) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Lisp_Object bar; @@ -9698,8 +9433,7 @@ /* Destroy the X window of frame F. */ void -x_destroy_window (f) - struct frame *f; +x_destroy_window (struct frame *f) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -9826,9 +9560,7 @@ /* Used for IconicState or NormalState */ void -x_wm_set_window_state (f, state) - struct frame *f; - int state; +x_wm_set_window_state (struct frame *f, int state) { #ifdef USE_X_TOOLKIT Arg al[1]; @@ -9846,9 +9578,7 @@ } void -x_wm_set_icon_pixmap (f, pixmap_id) - struct frame *f; - int pixmap_id; +x_wm_set_icon_pixmap (struct frame *f, int pixmap_id) { Pixmap icon_pixmap, icon_mask; @@ -9896,9 +9626,7 @@ } void -x_wm_set_icon_position (f, icon_x, icon_y) - struct frame *f; - int icon_x, icon_y; +x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y) { Window window = FRAME_OUTER_WINDOW (f); @@ -9971,8 +9699,7 @@ /* Test whether two display-name strings agree up to the dot that separates the screen number from the server number. */ static int -same_x_server (name1, name2) - const char *name1, *name2; +same_x_server (const char *name1, const char *name2) { int seen_colon = 0; const unsigned char *system_name = SDATA (Vsystem_name); @@ -10019,10 +9746,7 @@ get to the first bit. With MASK 0x7e0, *BITS is set to 6, and *OFFSET to 5. */ static void -get_bits_and_offset (mask, bits, offset) - unsigned long mask; - int *bits; - int *offset; +get_bits_and_offset (long unsigned int mask, int *bits, int *offset) { int nr = 0; int off = 0; @@ -10047,8 +9771,7 @@ But don't permanently open it, just test its availability. */ int -x_display_ok (display) - const char *display; +x_display_ok (const char *display) { int dpy_ok = 1; Display *dpy; @@ -10063,11 +9786,7 @@ #ifdef USE_GTK static void -my_log_handler (log_domain, log_level, message, user_data) - const gchar *log_domain; - GLogLevelFlags log_level; - const gchar *message; - gpointer user_data; +my_log_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { if (!strstr (message, "g_set_prgname")) fprintf (stderr, "%s-WARNING **: %s\n", log_domain, message); @@ -10079,10 +9798,7 @@ If we cannot contact the display, return null. */ struct x_display_info * -x_term_init (display_name, xrm_option, resource_name) - Lisp_Object display_name; - char *xrm_option; - char *resource_name; +x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) { int connection; Display *dpy; @@ -10610,8 +10326,7 @@ and without sending any more commands to the X server. */ void -x_delete_display (dpyinfo) - struct x_display_info *dpyinfo; +x_delete_display (struct x_display_info *dpyinfo) { struct terminal *t; @@ -10880,7 +10595,7 @@ } void -x_initialize () +x_initialize (void) { baud_rate = 19200; @@ -10938,7 +10653,7 @@ void -syms_of_xterm () +syms_of_xterm (void) { x_error_message = NULL;