Commit dd4c5104 authored by Dan Nicolaescu's avatar Dan Nicolaescu

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.
parent 9c8a2331
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>
......
......@@ -5015,7 +5015,7 @@ returns nil, because real GC can't be done. */)
#ifdef USE_GTK
{
extern void xg_mark_data ();
extern void xg_mark_data (void);
xg_mark_data ();
}
#endif
......
......@@ -1282,17 +1282,13 @@ usage: (define-charset-internal ...) */)
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];
......
......@@ -690,10 +690,9 @@ equivalent and can be merged. It defaults to `equal'. */)
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 @@ range of characters that have the same value. */)
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_sub_char_table_for_charset (c_function, function, table, arg, range,
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;
......
......@@ -2582,7 +2582,7 @@ enum arithop
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)
......
......@@ -90,7 +90,7 @@ extern struct direct *readdir ();
#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 *);
......
......@@ -48,8 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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.
......
......@@ -157,9 +157,9 @@ int initialized;
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 @@ int daemon_pipe[2];
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 @@ pthread_t main_thread;
/* 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 @@ abort ()
/* 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 @@ void __main ()
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 @@ argmatch (argv, argc, sstr, lstr, minlen, valptr, skipptr)
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 @@ malloc_initialize_hook ()
}
}
void (*__malloc_initialize_hook) () = malloc_initialize_hook;
void (*__malloc_initialize_hook) (void) = malloc_initialize_hook;
#endif /* DOUG_LEA_MALLOC */
......@@ -1928,9 +1917,7 @@ const struct standard_args standard_args[] =
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 @@ fixup_locale ()
/* 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))
{
......
......@@ -4437,10 +4437,9 @@ build_annotations_unwind (Lisp_Object arg)
/* 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 @@ This calls `write-region-annotate-functions' at the start, and
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). */)
......
......@@ -941,8 +941,7 @@ With optional DIVISOR, truncate ARG/DIVISOR. */)
Lisp_Object
fmod_float (x, y)
register Lisp_Object x, y;
fmod_float (Lisp_Object x, Lisp_Object y)
{
double f1, f2;
......
......@@ -201,7 +201,7 @@ extern Lisp_Object Vminibuffer_list;
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;
......
......@@ -1154,12 +1154,9 @@ struct xg_dialog_data
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 @@ xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
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 @@ xg_get_file_name_from_selector (GtkWidget *w)
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 @@ xg_destroy_widgets (GList *list)
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 @@ xg_update_radio_item (widget_value *val, GtkWidget *w)
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;
......
......@@ -223,7 +223,7 @@ static int read_emacs_mule_char (int, int (*) (int, Lisp_Object),
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 @@ end_of_file_error (void)
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;
......
......@@ -67,7 +67,7 @@ typedef unsigned long SIZE;
#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
......
......@@ -86,17 +86,12 @@ static void do_scrolling (struct frame *,
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 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m
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 @@ line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn, register int
}
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,
......
......@@ -1331,7 +1331,7 @@ and the function returns nil. Field boundaries are not noticed if
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 @@ in_classes (int c, Lisp_Object iso_classes)
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;
......
......@@ -3009,11 +3009,8 @@ adjust_window_margins (struct window *w)
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;
......
......@@ -68,7 +68,7 @@ extern struct passwd *getpwuid (uid_t);
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. */
......
......@@ -184,18 +184,12 @@ smc_interact_CB (SmcConn smcConn, SmPointer clientData)
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 @@ smc_shutdown_cancelled_CB (SmcConn smcConn, SmPointer clientData)
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 */
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment