Mercurial > emacs
changeset 109139:c25c24812fb1
Convert declarations or definitions to standard C.
* src/xsmfns.c (smc_save_yourself_CB, smc_error_handler):
* src/xrdb.c (get_system_name):
* src/window.c (shrink_windows):
* src/syntax.c (forw_comment):
* src/scroll.c (calculate_scrolling, calculate_direct_scrolling)
(ins_del_costs):
* src/mem-limits.h (start_of_data):
* src/lread.c (readevalloop):
* src/gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser)
(xg_get_file_with_selection, xg_update_menubar, xg_update_submenu):
* src/frame.c (x_get_focus_frame):
* src/floatfns.c (fmod_float):
* src/fileio.c (choose_write_coding_system):
* src/emacs.c (fatal_error_signal, init_cmdargs, argmatch)
(malloc_initialize_hook, sort_args, synchronize_locale):
* src/doprnt.c (doprnt):
* src/dired.c (compile_pattern):
* src/data.c (fmod_float):
* src/chartab.c (map_sub_char_table, map_sub_char_table_for_charset)
(map_char_table_for_charset):
* src/charset.c (define_charset_internal):
* src/alloc.c (Fgarbage_collect): Convert declarations or definitions
to standard C.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 04 Jul 2010 21:52:39 -0700 |
| parents | b2c0bf061382 |
| children | 3e48102ba93a |
| files | src/ChangeLog src/alloc.c src/charset.c src/chartab.c src/data.c src/dired.c src/doprnt.c src/emacs.c src/fileio.c src/floatfns.c src/frame.c src/gtkutil.c src/lread.c src/mem-limits.h src/scroll.c src/syntax.c src/window.c src/xrdb.c src/xsmfns.c |
| diffstat | 19 files changed, 150 insertions(+), 204 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jul 05 00:26:11 2010 +0200 +++ b/src/ChangeLog Sun Jul 04 21:52:39 2010 -0700 @@ -1,3 +1,29 @@ +2010-07-05 Dan Nicolaescu <dann@ics.uci.edu> + + * xsmfns.c (smc_save_yourself_CB, smc_error_handler): + * xrdb.c (get_system_name): + * window.c (shrink_windows): + * syntax.c (forw_comment): + * scroll.c (calculate_scrolling, calculate_direct_scrolling) + (ins_del_costs): + * mem-limits.h (start_of_data): + * lread.c (readevalloop): + * gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser) + (xg_get_file_with_selection, xg_update_menubar, xg_update_submenu): + * frame.c (x_get_focus_frame): + * floatfns.c (fmod_float): + * fileio.c (choose_write_coding_system): + * emacs.c (fatal_error_signal, init_cmdargs, argmatch) + (malloc_initialize_hook, sort_args, synchronize_locale): + * doprnt.c (doprnt): + * dired.c (compile_pattern): + * data.c (fmod_float): + * chartab.c (map_sub_char_table, map_sub_char_table_for_charset) + (map_char_table_for_charset): + * charset.c (define_charset_internal): + * alloc.c (Fgarbage_collect): Convert declarations or definitions + to standard C. + 2010-07-04 Tetsurou Okazaki <okazaki@be.to> (tiny change) Stefan Monnier <monnier@iro.umontreal.ca>
--- a/src/alloc.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/alloc.c Sun Jul 04 21:52:39 2010 -0700 @@ -5015,7 +5015,7 @@ #ifdef USE_GTK { - extern void xg_mark_data (); + extern void xg_mark_data (void); xg_mark_data (); } #endif
--- a/src/charset.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/charset.c Sun Jul 04 21:52:39 2010 -0700 @@ -1282,17 +1282,13 @@ charset. */ static int -define_charset_internal (name, dimension, code_space, min_code, max_code, - iso_final, iso_revision, emacs_mule_id, - ascii_compatible, supplementary, - code_offset) - Lisp_Object name; - int dimension; - unsigned char *code_space; - unsigned min_code, max_code; - int iso_final, iso_revision, emacs_mule_id; - int ascii_compatible, supplementary; - int code_offset; +define_charset_internal (Lisp_Object name, + int dimension, + unsigned char *code_space, + unsigned min_code, unsigned max_code, + int iso_final, int iso_revision, int emacs_mule_id, + int ascii_compatible, int supplementary, + int code_offset) { Lisp_Object args[charset_arg_max]; Lisp_Object plist[14];
--- a/src/chartab.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/chartab.c Sun Jul 04 21:52:39 2010 -0700 @@ -690,10 +690,9 @@ following characters in TABLE have the same value. */ static Lisp_Object -map_sub_char_table (c_function, function, table, arg, val, range, - default_val, parent) - void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object function, table, arg, val, range, default_val, parent; +map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), + Lisp_Object function, Lisp_Object table, Lisp_Object arg, Lisp_Object val, + Lisp_Object range, Lisp_Object default_val, Lisp_Object parent) { /* Pointer to the elements of TABLE. */ Lisp_Object *contents; @@ -878,12 +877,10 @@ static void -map_sub_char_table_for_charset (c_function, function, table, arg, range, - charset, from, to) - void (*c_function) (Lisp_Object, Lisp_Object); - Lisp_Object function, table, arg, range; - struct charset *charset; - unsigned from, to; +map_sub_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), + Lisp_Object function, Lisp_Object table, Lisp_Object arg, + Lisp_Object range, struct charset *charset, + unsigned from, unsigned to) { struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); int depth = XINT (tbl->depth); @@ -965,12 +962,10 @@ map_charset_chars. */ void -map_char_table_for_charset (c_function, function, table, arg, - charset, from, to) - void (*c_function) (Lisp_Object, Lisp_Object); - Lisp_Object function, table, arg; - struct charset *charset; - unsigned from, to; +map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), + Lisp_Object function, Lisp_Object table, Lisp_Object arg, + struct charset *charset, + unsigned from, unsigned to) { Lisp_Object range; int c, i;
--- a/src/data.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/data.c Sun Jul 04 21:52:39 2010 -0700 @@ -2582,7 +2582,7 @@ static Lisp_Object float_arith_driver (double, int, enum arithop, int, Lisp_Object *); -extern Lisp_Object fmod_float (); +extern Lisp_Object fmod_float (Lisp_Object, Lisp_Object); Lisp_Object arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
--- a/src/dired.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/dired.c Sun Jul 04 21:52:39 2010 -0700 @@ -90,7 +90,7 @@ #include "blockinput.h" /* Returns a search buffer, with a fastmap allocated and ready to go. */ -extern struct re_pattern_buffer *compile_pattern (); +extern struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *, Lisp_Object, int, int); /* From filemode.c. Can't go in Lisp.h because of `stat'. */ extern void filemodestring (struct stat *, char *);
--- a/src/doprnt.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/doprnt.c Sun Jul 04 21:52:39 2010 -0700 @@ -48,8 +48,6 @@ another macro. */ #include "character.h" -static int doprnt1 (); - /* Generate output from a format-spec FORMAT, terminated at position FORMAT_END. Output goes in BUFFER, which has room for BUFSIZE chars.
--- a/src/emacs.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/emacs.c Sun Jul 04 21:52:39 2010 -0700 @@ -157,9 +157,9 @@ static data inside glibc's malloc. */ void *malloc_state_ptr; /* From glibc, a routine that returns a copy of the malloc internal state. */ -extern void *malloc_get_state (); +extern void *malloc_get_state (void); /* From glibc, a routine that overwrites the malloc internal state. */ -extern int malloc_set_state (); +extern int malloc_set_state (void*); /* Non-zero if the MALLOC_CHECK_ environment variable was set while dumping. Used to work around a bug in glibc's malloc. */ int malloc_using_checking; @@ -252,8 +252,8 @@ char **initial_argv; int initial_argc; -static void sort_args (); -void syms_of_emacs (); +static void sort_args (int argc, char **argv); +void syms_of_emacs (void); /* MSVC needs each string be shorter than 2048 bytes, so the usage strings below are split to not overflow this limit. */ @@ -374,8 +374,7 @@ /* Handle bus errors, invalid instruction, etc. */ SIGTYPE -fatal_error_signal (sig) - int sig; +fatal_error_signal (int sig) { SIGNAL_THREAD_CHECK (sig); fatal_error_code = sig; @@ -444,10 +443,7 @@ /* Code for dealing with Lisp access to the Unix command line. */ static void -init_cmdargs (argc, argv, skip_args) - int argc; - char **argv; - int skip_args; +init_cmdargs (int argc, char **argv, int skip_args) { register int i; Lisp_Object name, dir, tem; @@ -644,14 +640,7 @@ enough information to do it right. */ static int -argmatch (argv, argc, sstr, lstr, minlen, valptr, skipptr) - char **argv; - int argc; - char *sstr; - char *lstr; - int minlen; - char **valptr; - int *skipptr; +argmatch (char **argv, int argc, char *sstr, char *lstr, int minlen, char **valptr, int *skipptr) { char *p = NULL; int arglen; @@ -709,7 +698,7 @@ possible using this special hook. */ static void -malloc_initialize_hook () +malloc_initialize_hook (void) { #ifndef USE_CRT_DLL extern char **environ; @@ -747,7 +736,7 @@ } } -void (*__malloc_initialize_hook) () = malloc_initialize_hook; +void (*__malloc_initialize_hook) (void) = malloc_initialize_hook; #endif /* DOUG_LEA_MALLOC */ @@ -1928,9 +1917,7 @@ than once, eliminate all but one copy of it. */ static void -sort_args (argc, argv) - int argc; - char **argv; +sort_args (int argc, char **argv) { char **new = (char **) xmalloc (sizeof (char *) * argc); /* For each element of argv, @@ -2322,10 +2309,7 @@ /* Set system locale CATEGORY, with previous locale *PLOCALE, to DESIRED_LOCALE. */ static void -synchronize_locale (category, plocale, desired_locale) - int category; - Lisp_Object *plocale; - Lisp_Object desired_locale; +synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_locale) { if (! EQ (*plocale, desired_locale)) {
--- a/src/fileio.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/fileio.c Sun Jul 04 21:52:39 2010 -0700 @@ -4437,10 +4437,9 @@ /* Decide the coding-system to encode the data with. */ static Lisp_Object -choose_write_coding_system (start, end, filename, - append, visit, lockname, coding) - Lisp_Object start, end, filename, append, visit, lockname; - struct coding_system *coding; +choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object filename, + Lisp_Object append, Lisp_Object visit, Lisp_Object lockname, + struct coding_system *coding) { Lisp_Object val; Lisp_Object eol_parent = Qnil; @@ -4883,7 +4882,7 @@ return Qnil; } -Lisp_Object merge (); +Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object); DEFUN ("car-less-than-car", Fcar_less_than_car, Scar_less_than_car, 2, 2, 0, doc: /* Return t if (car A) is numerically less than (car B). */)
--- a/src/floatfns.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/floatfns.c Sun Jul 04 21:52:39 2010 -0700 @@ -941,8 +941,7 @@ Lisp_Object -fmod_float (x, y) - register Lisp_Object x, y; +fmod_float (Lisp_Object x, Lisp_Object y) { double f1, f2;
--- a/src/frame.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/frame.c Sun Jul 04 21:52:39 2010 -0700 @@ -201,7 +201,7 @@ 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 x_get_focus_frame (struct frame *frame); extern Lisp_Object QCname, Qfont_param;
--- a/src/gtkutil.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/gtkutil.c Sun Jul 04 21:52:39 2010 -0700 @@ -1154,12 +1154,9 @@ USER_DATA is what we passed in to g_signal_connect. */ static void -xg_dialog_response_cb (w, - response, - user_data) - GtkDialog *w; - gint response; - gpointer user_data; +xg_dialog_response_cb (GtkDialog *w, + gint response, + gpointer user_data) { struct xg_dialog_data *dd = (struct xg_dialog_data *)user_data; dd->response = response; @@ -1338,13 +1335,11 @@ Returns the created widget. */ static GtkWidget * -xg_get_file_with_chooser (f, prompt, default_filename, - mustmatch_p, only_dir_p, func) - FRAME_PTR f; - char *prompt; - char *default_filename; - int mustmatch_p, only_dir_p; - xg_get_file_func *func; +xg_get_file_with_chooser (FRAME_PTR f, + char *prompt, + char *default_filename, + int mustmatch_p, int only_dir_p, + xg_get_file_func *func) { char message[1024]; @@ -1464,13 +1459,12 @@ Returns the created widget. */ static GtkWidget * -xg_get_file_with_selection (f, prompt, default_filename, - mustmatch_p, only_dir_p, func) - FRAME_PTR f; - char *prompt; - char *default_filename; - int mustmatch_p, only_dir_p; - xg_get_file_func *func; +xg_get_file_with_selection ( + FRAME_PTR f, + char *prompt, + char *default_filename, + int mustmatch_p, int only_dir_p, + xg_get_file_func *func) { GtkWidget *filewin; GtkFileSelection *filesel; @@ -2278,18 +2272,16 @@ This function calls itself to walk through the menu bar names. */ static void -xg_update_menubar (menubar, f, list, iter, pos, val, - select_cb, deactivate_cb, highlight_cb, cl_data) - GtkWidget *menubar; - FRAME_PTR f; - GList **list; - GList *iter; - int pos; - widget_value *val; - GCallback select_cb; - GCallback deactivate_cb; - GCallback highlight_cb; - xg_menu_cb_data *cl_data; +xg_update_menubar (GtkWidget *menubar, + FRAME_PTR f, + GList **list, + GList *iter, + int pos, + widget_value *val, + GCallback select_cb, + GCallback deactivate_cb, + GCallback highlight_cb, + xg_menu_cb_data *cl_data) { if (! iter && ! val) return; @@ -2590,15 +2582,13 @@ was NULL. */ static GtkWidget * -xg_update_submenu (submenu, f, val, - select_cb, deactivate_cb, highlight_cb, cl_data) - GtkWidget *submenu; - FRAME_PTR f; - widget_value *val; - GCallback select_cb; - GCallback deactivate_cb; - GCallback highlight_cb; - xg_menu_cb_data *cl_data; +xg_update_submenu (GtkWidget *submenu, + FRAME_PTR f, + widget_value *val, + GCallback select_cb, + GCallback deactivate_cb, + GCallback highlight_cb, + xg_menu_cb_data *cl_data) { GtkWidget *newsub = submenu; GList *list = 0;
--- a/src/lread.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/lread.c Sun Jul 04 21:52:39 2010 -0700 @@ -223,7 +223,7 @@ Lisp_Object); static void readevalloop (Lisp_Object, FILE*, Lisp_Object, - Lisp_Object (*) (), int, + Lisp_Object (*) (Lisp_Object), int, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); static Lisp_Object load_unwind (Lisp_Object); @@ -1610,15 +1610,13 @@ If the input is not from a buffer, they must be nil. */ static void -readevalloop (readcharfun, stream, sourcename, evalfun, - printflag, unibyte, readfun, start, end) - Lisp_Object readcharfun; - FILE *stream; - Lisp_Object sourcename; - Lisp_Object (*evalfun) (); - int printflag; - Lisp_Object unibyte, readfun; - Lisp_Object start, end; +readevalloop (Lisp_Object readcharfun, + FILE *stream, + Lisp_Object sourcename, + Lisp_Object (*evalfun) (Lisp_Object), + int printflag, + Lisp_Object unibyte, Lisp_Object readfun, + Lisp_Object start, Lisp_Object end) { register int c; register Lisp_Object val;
--- a/src/mem-limits.h Mon Jul 05 00:26:11 2010 +0200 +++ b/src/mem-limits.h Sun Jul 04 21:52:39 2010 -0700 @@ -67,7 +67,7 @@ #endif #define NULL ((POINTER) 0) -extern POINTER start_of_data (); +extern POINTER start_of_data (void); #if defined USE_LSB_TAG #define EXCEEDS_LISP_PTR(ptr) 0 #elif defined DATA_SEG_BITS
--- a/src/scroll.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/scroll.c Sun Jul 04 21:52:39 2010 -0700 @@ -86,17 +86,12 @@ new contents appears. */ static void -calculate_scrolling (frame, matrix, window_size, lines_below, - draw_cost, old_hash, new_hash, - free_at_end) - FRAME_PTR frame; - /* matrix is of size window_size + 1 on each side. */ - struct matrix_elt *matrix; - int window_size, lines_below; - int *draw_cost; - int *old_hash; - int *new_hash; - int free_at_end; +calculate_scrolling (FRAME_PTR frame, + /* matrix is of size window_size + 1 on each side. */ + struct matrix_elt *matrix, + int window_size, int lines_below, + int *draw_cost, int *old_hash, int *new_hash, + int free_at_end) { register int i, j; int frame_lines = FRAME_LINES (frame); @@ -424,18 +419,13 @@ is the equivalent of draw_cost for the old line contents */ static void -calculate_direct_scrolling (frame, matrix, window_size, lines_below, - draw_cost, old_draw_cost, old_hash, new_hash, - free_at_end) - FRAME_PTR frame; - /* matrix is of size window_size + 1 on each side. */ - struct matrix_elt *matrix; - int window_size, lines_below; - int *draw_cost; - int *old_draw_cost; - int *old_hash; - int *new_hash; - int free_at_end; +calculate_direct_scrolling (FRAME_PTR frame, + /* matrix is of size window_size + 1 on each side. */ + struct matrix_elt *matrix, + int window_size, int lines_below, + int *draw_cost, int *old_draw_cost, + int *old_hash, int *new_hash, + int free_at_end) { register int i, j; int frame_lines = FRAME_LINES (frame); @@ -956,15 +946,11 @@ } static void -ins_del_costs (frame, - one_line_string, multi_string, - setup_string, cleanup_string, - costvec, ncostvec, coefficient) - FRAME_PTR frame; - char *one_line_string, *multi_string; - char *setup_string, *cleanup_string; - int *costvec, *ncostvec; - int coefficient; +ins_del_costs (FRAME_PTR frame, + char *one_line_string, char *multi_string, + char *setup_string, char *cleanup_string, + int *costvec, int *ncostvec, + int coefficient) { if (multi_string) line_ins_del (frame,
--- a/src/syntax.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/syntax.c Sun Jul 04 21:52:39 2010 -0700 @@ -1331,7 +1331,7 @@ return val == orig_val ? Qt : Qnil; } -Lisp_Object skip_chars (); +Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int); DEFUN ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0, doc: /* Move point forward, stopping before a char not in STRING, or at pos LIM. @@ -2093,12 +2093,10 @@ remains valid for forward search starting at the returned position. */ static int -forw_comment (from, from_byte, stop, nesting, style, prev_syntax, - charpos_ptr, bytepos_ptr, incomment_ptr) - EMACS_INT from, from_byte, stop; - int nesting, style, prev_syntax; - EMACS_INT *charpos_ptr, *bytepos_ptr; - int *incomment_ptr; +forw_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, + int nesting, int style, int prev_syntax, + EMACS_INT *charpos_ptr, EMACS_INT *bytepos_ptr, + int *incomment_ptr) { register int c, c1; register enum syntaxcode code;
--- a/src/window.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/window.c Sun Jul 04 21:52:39 2010 -0700 @@ -3009,11 +3009,8 @@ a specific window, it will attempt to strictly resize that window proportionally, even at the expense of deleting smaller windows. */ static int * -shrink_windows (total, size, nchildren, shrinkable, resize_fixed_p, - forward, width_p, safe_p) - int total, size, nchildren, shrinkable; - int resize_fixed_p, width_p, safe_p; - Lisp_Object forward; +shrink_windows (int total, int size, int nchildren, int shrinkable, + int resize_fixed_p, Lisp_Object forward, int width_p, int safe_p) { int available_resize = 0; int *new_sizes, *min_sizes;
--- a/src/xrdb.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/xrdb.c Sun Jul 04 21:52:39 2010 -0700 @@ -68,7 +68,7 @@ extern struct passwd *getpwnam (const char *); #endif -extern char *get_system_name (); +extern char *get_system_name (void); /* Make sure not to #include anything after these definitions. Let's not step on anyone's prototypes. */
--- a/src/xsmfns.c Mon Jul 05 00:26:11 2010 +0200 +++ b/src/xsmfns.c Sun Jul 04 21:52:39 2010 -0700 @@ -184,18 +184,12 @@ we do so, because we don't know what the lisp code might do. */ static void -smc_save_yourself_CB (smcConn, - clientData, - saveType, - shutdown, - interactStyle, - fast) - SmcConn smcConn; - SmPointer clientData; - int saveType; - Bool shutdown; - int interactStyle; - Bool fast; +smc_save_yourself_CB (SmcConn smcConn, + SmPointer clientData, + int saveType, + Bool shutdown, + int interactStyle, + Bool fast) { #define NR_PROPS 5 @@ -336,39 +330,25 @@ because there is some error in the session management. */ static void -smc_error_handler (smcConn, - swap, - offendingMinorOpcode, - offendingSequence, - errorClass, - severity, - values) - SmcConn smcConn; - Bool swap; - int offendingMinorOpcode; - unsigned long offendingSequence; - int errorClass; - int severity; - SmPointer values; +smc_error_handler (SmcConn smcConn, + Bool swap, + int offendingMinorOpcode, + unsigned long offendingSequence, + int errorClass, + int severity, + SmPointer values) { /* Empty */ } static void -ice_error_handler (iceConn, - swap, - offendingMinorOpcode, - offendingSequence, - errorClass, - severity, - values) - IceConn iceConn; - Bool swap; - int offendingMinorOpcode; - unsigned long offendingSequence; - int errorClass; - int severity; - IcePointer values; +ice_error_handler (IceConn iceConn, + Bool swap, + int offendingMinorOpcode, + unsigned long offendingSequence, + int errorClass, + int severity, + IcePointer values) { /* Empty */ }