[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100744: Convert function definitions
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100744: Convert function definitions in MS-DOS sources to ANSI C. |
Date: |
Wed, 07 Jul 2010 18:31:11 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100744 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-07 18:31:11 +0300
message:
Convert function definitions in MS-DOS sources to ANSI C.
msdos.h:
msdos.c:
dosfns.c:
w16select.c: Convert function definitions to ANSI C.
msdos.h (ctrl_break_func, install_ctrl_break_check): Remove
unused prototypes.
modified:
src/ChangeLog
src/dosfns.c
src/msdos.c
src/msdos.h
src/w16select.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-07 09:38:03 +0000
+++ b/src/ChangeLog 2010-07-07 15:28:47 +0000
@@ -1,3 +1,13 @@
+2010-07-07 Eli Zaretskii <address@hidden>
+
+ * msdos.h:
+ * msdos.c:
+ * dosfns.c:
+ * w16select.c: Convert function definitions to ANSI C.
+
+ * msdos.h (ctrl_break_func, install_ctrl_break_check): Remove
+ unused prototypes.
+
2010-07-07 Juanma Barranquero <address@hidden>
* coding.c, sysdep.c: Convert some more functions to standard C.
=== modified file 'src/dosfns.c'
--- a/src/dosfns.c 2010-04-01 14:59:46 +0000
+++ b/src/dosfns.c 2010-07-07 15:28:47 +0000
@@ -283,7 +283,7 @@
#endif /* !HAVE_X_WINDOWS */
void
-init_dosfns ()
+init_dosfns (void)
{
union REGS regs;
_go32_dpmi_registers dpmiregs;
@@ -481,9 +481,7 @@
sets the name in the frame struct, but has no other effects. */
void
-x_set_title (f, name)
- struct frame *f;
- Lisp_Object name;
+x_set_title (struct frame *f, Lisp_Object name)
{
/* Don't change the title if it's already NAME. */
if (EQ (name, f->title))
@@ -536,7 +534,7 @@
(There are no other processes on DOS, right?) */
Lisp_Object
-list_system_processes ()
+list_system_processes (void)
{
Lisp_Object proclist = Qnil;
@@ -689,7 +687,8 @@
/*
* Define everything
*/
-syms_of_dosfns ()
+void
+syms_of_dosfns (void)
{
defsubr (&Sint86);
defsubr (&Sdos_memget);
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2010-07-03 14:36:18 +0000
+++ b/src/msdos.c 2010-07-07 15:28:47 +0000
@@ -102,7 +102,7 @@
#endif /* not SYSTEM_MALLOC */
static unsigned long
-event_timestamp ()
+event_timestamp (void)
{
struct time t;
unsigned long s;
@@ -138,7 +138,7 @@
static int mouse_button_count;
void
-mouse_on ()
+mouse_on (void)
{
union REGS regs;
@@ -155,7 +155,7 @@
}
void
-mouse_off ()
+mouse_off (void)
{
union REGS regs;
@@ -222,8 +222,7 @@
}
void
-mouse_moveto (x, y)
- int x, y;
+mouse_moveto (int x, int y)
{
union REGS regs;
struct tty_display_info *tty = CURTTY ();
@@ -237,8 +236,7 @@
}
static int
-mouse_pressed (b, xp, yp)
- int b, *xp, *yp;
+mouse_pressed (int b, int *xp, int *yp)
{
union REGS regs;
@@ -253,8 +251,7 @@
}
static int
-mouse_released (b, xp, yp)
- int b, *xp, *yp;
+mouse_released (int b, int *xp, int *yp)
{
union REGS regs;
@@ -269,8 +266,7 @@
}
static int
-mouse_button_depressed (b, xp, yp)
- int b, *xp, *yp;
+mouse_button_depressed (int b, int *xp, int *yp)
{
union REGS regs;
@@ -288,12 +284,9 @@
}
void
-mouse_get_pos (f, insist, bar_window, part, x, y, time)
- FRAME_PTR *f;
- int insist;
- Lisp_Object *bar_window, *x, *y;
- enum scroll_bar_part *part;
- unsigned long *time;
+mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
+ enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
+ unsigned long *time)
{
int ix, iy;
Lisp_Object frame, tail;
@@ -311,7 +304,7 @@
}
static void
-mouse_check_moved ()
+mouse_check_moved (void)
{
int x, y;
@@ -338,7 +331,7 @@
}
void
-mouse_init ()
+mouse_init (void)
{
union REGS regs;
struct tty_display_info *tty = CURTTY ();
@@ -440,10 +433,7 @@
}
static void
-dos_direct_output (y, x, buf, len)
- int x, y;
- char *buf;
- int len;
+dos_direct_output (int y, int x, char *buf, int len)
{
int t0 = 2 * (x + y * screen_size_X);
int t = t0 + (int) ScreenPrimary;
@@ -510,8 +500,7 @@
ROWS x COLS frame. */
void
-dos_set_window_size (rows, cols)
- int *rows, *cols;
+dos_set_window_size (int *rows, int *cols)
{
char video_name[30];
union REGS regs;
@@ -620,7 +609,7 @@
the mouse cursor may need to be refreshed. */
static void
-mouse_off_maybe ()
+mouse_off_maybe (void)
{
int x, y;
@@ -1864,10 +1853,7 @@
/* Insert and delete glyphs. */
static void
-IT_insert_glyphs (f, start, len)
- struct frame *f;
- register struct glyph *start;
- register int len;
+IT_insert_glyphs (struct frame *f, struct glyph *start, int len)
{
int shift_by_width = screen_size_X - (new_pos_X + len);
@@ -1880,18 +1866,14 @@
}
static void
-IT_delete_glyphs (f, n)
- struct frame *f;
- register int n;
+IT_delete_glyphs (struct frame *f, int n)
{
abort ();
}
/* set-window-configuration on window.c needs this. */
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)
{
set_menu_bar_lines (f, value, oldval);
}
@@ -2080,9 +2062,7 @@
}
void
-IT_set_frame_parameters (f, alist)
- struct frame *f;
- Lisp_Object alist;
+IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
{
Lisp_Object tail;
int i, j, length = XINT (Flength (alist));
@@ -2289,7 +2269,7 @@
/* Do we need the internal terminal? */
void
-internal_terminal_init ()
+internal_terminal_init (void)
{
static int init_needed = 1;
char *term = getenv ("TERM"), *colors;
@@ -2425,10 +2405,8 @@
term->read_socket_hook = &tty_read_avail_input; /* from keyboard.c */
}
-dos_get_saved_screen (screen, rows, cols)
- char **screen;
- int *rows;
- int *cols;
+int
+dos_get_saved_screen (char **screen, int *rows, int *cols)
{
#ifndef HAVE_X_WINDOWS
*screen = startup_screen_buffer;
@@ -2587,9 +2565,7 @@
static int international_keyboard;
int
-dos_set_keyboard (code, always)
- int code;
- int always;
+dos_set_keyboard (int code, int always)
{
int i;
_go32_dpmi_registers regs;
@@ -2856,8 +2832,7 @@
#define HYPER_P 0x8000 /* pseudo */
static int
-dos_get_modifiers (keymask)
- int *keymask;
+dos_get_modifiers (int *keymask)
{
union REGS regs;
int mask, modifiers = 0;
@@ -2939,7 +2914,7 @@
#define NUM_RECENT_DOSKEYS (100)
int recent_doskeys_index; /* Index for storing next element into
recent_doskeys */
int total_doskeys; /* Total number of elements stored into
recent_doskeys */
-Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */
+Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */
DEFUN ("recent-doskeys", Frecent_doskeys, Srecent_doskeys, 0, 0, 0,
doc: /* Return vector of last 100 keyboard input values seen in
dos_rawgetc.
@@ -2966,7 +2941,7 @@
/* Get a char from keyboard. Function keys are put into the event queue. */
static int
-dos_rawgetc ()
+dos_rawgetc (void)
{
struct input_event event;
union REGS regs;
@@ -3317,8 +3292,8 @@
static int prev_get_char = -1;
/* Return 1 if a key is ready to be read without suspending execution. */
-
-dos_keysns ()
+int
+dos_keysns (void)
{
if (prev_get_char != -1)
return 1;
@@ -3327,8 +3302,8 @@
}
/* Read a key. Return -1 if no key is ready. */
-
-dos_keyread ()
+int
+dos_keyread (void)
{
if (prev_get_char != -1)
{
@@ -3357,7 +3332,7 @@
static int menu_help_paneno, menu_help_itemno;
static XMenu *
-IT_menu_create ()
+IT_menu_create (void)
{
XMenu *menu;
@@ -3526,7 +3501,7 @@
/* Report availability of menus. */
int
-have_menus_p () { return 1; }
+have_menus_p (void) { return 1; }
/* Create a brand new menu structure. */
@@ -3884,8 +3859,7 @@
/* Destructively turn backslashes into slashes. */
void
-dostounix_filename (p)
- register char *p;
+dostounix_filename (char *p)
{
msdos_downcase_filename (p);
@@ -3900,8 +3874,7 @@
/* Destructively turn slashes into backslashes. */
void
-unixtodos_filename (p)
- register char *p;
+unixtodos_filename (char *p)
{
if (p[1] == ':' && *p >= 'A' && *p <= 'Z')
{
@@ -3920,9 +3893,7 @@
/* Get the default directory for a given drive. 0=def, 1=A, 2=B, ... */
int
-getdefdir (drive, dst)
- int drive;
- char *dst;
+getdefdir (int drive, char *dst)
{
char in_path[4], *p = in_path, e = errno;
@@ -3961,9 +3932,7 @@
/* Remove all CR's that are followed by a LF. */
int
-crlf_to_lf (n, buf)
- register int n;
- register unsigned char *buf;
+crlf_to_lf (int n, unsigned char *buf)
{
unsigned char *np = buf, *startp = buf, *endp = buf + n;
@@ -3995,8 +3964,7 @@
/* Convert alphabetic characters in a filename to lower-case. */
void
-msdos_downcase_filename (p)
- register unsigned char *p;
+msdos_downcase_filename (unsigned char *p)
{
/* Always lower-case drive letters a-z, even if the filesystem
preserves case in filenames.
@@ -4040,8 +4008,7 @@
static char emacsroot[MAXPATHLEN];
char *
-rootrelativepath (rel)
- char *rel;
+rootrelativepath (char *rel)
{
static char result[MAXPATHLEN + 10];
@@ -4056,10 +4023,7 @@
break if one or more of these are missing. */
void
-init_environment (argc, argv, skip_args)
- int argc;
- char **argv;
- int skip_args;
+init_environment (int argc, char **argv, int skip_args)
{
char *s, *t, *root;
int len, i;
@@ -4293,7 +4257,7 @@
/* Restore status of standard input and Ctrl-C checking. */
int
-dos_ttcooked ()
+dos_ttcooked (void)
{
union REGS inregs, outregs;
@@ -4319,11 +4283,8 @@
file TEMPOUT and stderr to TEMPERR. */
int
-run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv)
- unsigned char **argv;
- const char *working_dir;
- int tempin, tempout, temperr;
- char **envv;
+run_msdos_command (unsigned char **argv, const char *working_dir,
+ int tempin, int tempout, int temperr, char **envv)
{
char *saveargv1, *saveargv2, *lowcase_argv0, *pa, *pl;
char oldwd[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */
@@ -4464,8 +4425,7 @@
}
void
-croak (badfunc)
- char *badfunc;
+croak (char *badfunc)
{
fprintf (stderr, "%s not yet implemented\r\n", badfunc);
reset_all_sys_modes ();
@@ -4475,8 +4435,8 @@
/*
* A few unimplemented functions that we silently ignore.
*/
-setpgrp () {return 0; }
-setpriority (x,y,z) int x,y,z; { return 0; }
+int setpgrp (void) {return 0; }
+int setpriority (int x, int y, int z) { return 0; }
#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2
@@ -4501,17 +4461,13 @@
/* A signal handler which just records that a signal occurred
(it will be raised later, if and when the signal is unblocked). */
static void
-sig_suspender (signo)
- int signo;
+sig_suspender (int signo)
{
sigaddset (&msdos_pending_signals, signo);
}
int
-sigprocmask (how, new_set, old_set)
- int how;
- const sigset_t *new_set;
- sigset_t *old_set;
+sigprocmask (int how, const sigset_t *new_set, sigset_t *old_set)
{
int signo;
sigset_t new_mask;
@@ -4613,10 +4569,8 @@
/* We don't have to call timer_check here
because wait_reading_process_output takes care of that. */
int
-sys_select (nfds, rfds, wfds, efds, timeout)
- int nfds;
- SELECT_TYPE *rfds, *wfds, *efds;
- EMACS_TIME *timeout;
+sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
+ EMACS_TIME *timeout)
{
int check_input;
struct time t;
@@ -4686,11 +4640,10 @@
#ifdef chdir
#undef chdir
-extern int chdir ();
+extern int chdir (const char *);
int
-sys_chdir (path)
- const char* path;
+sys_chdir (const char *path)
{
int len = strlen (path);
char *tmp = (char *)path;
@@ -4719,7 +4672,7 @@
extern void tzset (void);
void
-init_gettimeofday ()
+init_gettimeofday (void)
{
time_t ltm, gtm;
struct tm *lstm;
@@ -4737,9 +4690,7 @@
#ifdef abort
#undef abort
void
-dos_abort (file, line)
- char *file;
- int line;
+dos_abort (char *file, int line)
{
char buffer1[200], buffer2[400];
int i, j;
@@ -4755,7 +4706,7 @@
}
#else
void
-abort ()
+abort (void)
{
dos_ttcooked ();
ScreenSetCursor (10, 0);
@@ -4780,7 +4731,8 @@
static int delete_exited_processes;
#endif
-syms_of_msdos ()
+void
+syms_of_msdos (void)
{
recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil);
staticpro (&recent_doskeys);
=== modified file 'src/msdos.h'
--- a/src/msdos.h 2010-07-02 13:05:59 +0000
+++ b/src/msdos.h 2010-07-07 15:28:47 +0000
@@ -23,7 +23,7 @@
#include <dpmi.h>
int dos_ttraw (struct tty_display_info *);
-int dos_ttcooked ();
+int dos_ttcooked (void);
int dos_get_saved_screen (char **, int *, int *);
int dos_set_keyboard (int, int);
void dos_set_window_size (int *, int *);
@@ -32,15 +32,13 @@
void unixtodos_filename (char *);
void dostounix_filename (char *);
char *rootrelativepath (char *);
-void init_environment ();
-void internal_terminal_init ();
-void ctrl_break_func (_go32_dpmi_registers *);
-void install_ctrl_break_check ();
+void init_environment (int, char **, int);
+void internal_terminal_init (void);
extern int have_mouse;
-void mouse_init ();
-void mouse_on ();
-void mouse_off ();
+void mouse_init (void);
+void mouse_on (void);
+void mouse_off (void);
void mouse_moveto (int, int);
#ifndef HAVE_X_WINDOWS
=== modified file 'src/w16select.c'
--- a/src/w16select.c 2010-05-07 13:51:16 +0000
+++ b/src/w16select.c 2010-07-07 15:28:47 +0000
@@ -109,7 +109,7 @@
/* Return the WinOldAp support version, or 0x1700 if not supported. */
unsigned
-identify_winoldap_version ()
+identify_winoldap_version (void)
{
__dpmi_regs regs;
@@ -124,7 +124,7 @@
/* Open the clipboard, return non-zero if successfull. */
unsigned
-open_clipboard ()
+open_clipboard (void)
{
__dpmi_regs regs;
@@ -147,7 +147,7 @@
/* Empty clipboard, return non-zero if successfull. */
unsigned
-empty_clipboard ()
+empty_clipboard (void)
{
__dpmi_regs regs;
@@ -162,8 +162,7 @@
/* Ensure we have a buffer in low memory with enough memory for data
of size WANT_SIZE. Return the linear address of the buffer. */
static unsigned long
-alloc_xfer_buf (want_size)
- unsigned want_size;
+alloc_xfer_buf (unsigned want_size)
{
__dpmi_regs regs;
@@ -200,7 +199,7 @@
The clipboard buffer tends to be large in size, because for small
clipboard data sizes we use the DJGPP transfer buffer. */
static void
-free_xfer_buf ()
+free_xfer_buf (void)
{
/* If the size is 0, we used DJGPP transfer buffer, so don't free. */
if (clipboard_xfer_buf_info.size)
@@ -218,11 +217,7 @@
/* Copy data into the clipboard, return zero if successfull. */
unsigned
-set_clipboard_data (Format, Data, Size, Raw)
- unsigned Format;
- void *Data;
- unsigned Size;
- int Raw;
+set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
{
__dpmi_regs regs;
unsigned truelen;
@@ -321,8 +316,7 @@
/* Return the size of the clipboard data of format FORMAT. */
unsigned
-get_clipboard_data_size (Format)
- unsigned Format;
+get_clipboard_data_size (unsigned Format)
{
__dpmi_regs regs;
@@ -342,11 +336,7 @@
Warning: this doesn't check whether DATA has enough space to hold
SIZE bytes. */
unsigned
-get_clipboard_data (Format, Data, Size, Raw)
- unsigned Format;
- void *Data;
- unsigned Size;
- int Raw;
+get_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
{
__dpmi_regs regs;
unsigned long xbuf_addr;
@@ -425,7 +415,7 @@
/* Close clipboard, return non-zero if successfull. */
unsigned
-close_clipboard ()
+close_clipboard (void)
{
__dpmi_regs regs;
@@ -439,8 +429,7 @@
/* Compact clipboard data so that at least SIZE bytes is available. */
unsigned
-clipboard_compact (Size)
- unsigned Size;
+clipboard_compact (unsigned Size)
{
__dpmi_regs regs;
@@ -705,7 +694,7 @@
}
void
-syms_of_win16select ()
+syms_of_win16select (void)
{
defsubr (&Sw16_set_clipboard_data);
defsubr (&Sw16_get_clipboard_data);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100744: Convert function definitions in MS-DOS sources to ANSI C.,
Eli Zaretskii <=