mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 06:48:17 +00:00
Convert function declarations from K&R to ANSI style.
cproto (http://invisible-island.net/cproto/) was used to do the bulk of the work in batch; even the most recent version had some issues with typedef'd parameters; a quick "patch" was to modify `lex.l` to explicitly include all vim typedefs as known types. One example from `vim.h` is typedef unsigned char char_u; which was added in `lex.l` as <INITIAL>char_u { save_text_offset(); return T_CHAR; } Even with these changes there were some problems: * Two files (`mbyte.c` and `os_unix.c`) were not cleanly converted. * Any function with the `UNUSED` macro in its parameter list was not converted. Rather than spend more time fixing the automated approach, the two files `mbyte.c` and `os_unix.c` were converted by hand. The `UNUSED` macros were compiler specific, and the alternative, generic version would require a different syntax, so in order to simplify the conversion all uses of `UNUSED` were stripped, and then the sources were run back through cproto. It is planned to reconsider each use of `UNUSED` manually using a new macro definition.
This commit is contained in:
scott-linder
273
src/os_unix.c
273
src/os_unix.c
@@ -221,8 +221,7 @@ static struct signalinfo {
|
||||
{-1, "Unknown!", FALSE}
|
||||
};
|
||||
|
||||
int mch_chdir(path)
|
||||
char *path;
|
||||
int mch_chdir(char *path)
|
||||
{
|
||||
if (p_verbose >= 5) {
|
||||
verbose_enter();
|
||||
@@ -235,9 +234,7 @@ char *path;
|
||||
/*
|
||||
* Write s[len] to the screen.
|
||||
*/
|
||||
void mch_write(s, len)
|
||||
char_u *s;
|
||||
int len;
|
||||
void mch_write(char_u *s, int len)
|
||||
{
|
||||
ignored = (int)write(1, (char *)s, len);
|
||||
if (p_wd) /* Unix is too fast, slow down a bit more */
|
||||
@@ -252,74 +249,75 @@ int len;
|
||||
* If wtime == n wait a short time for characters.
|
||||
* If wtime == -1 wait forever for characters.
|
||||
*/
|
||||
int mch_inchar(buf, maxlen, wtime, tb_change_cnt)
|
||||
char_u *buf;
|
||||
int maxlen;
|
||||
long wtime; /* don't use "time", MIPS cannot handle it */
|
||||
int tb_change_cnt;
|
||||
int mch_inchar(
|
||||
char_u *buf,
|
||||
int maxlen,
|
||||
long wtime, /* don't use "time", MIPS cannot handle it */
|
||||
int tb_change_cnt
|
||||
)
|
||||
{
|
||||
int len;
|
||||
int len;
|
||||
|
||||
|
||||
/* Check if window changed size while we were busy, perhaps the ":set
|
||||
* columns=99" command was used. */
|
||||
while (do_resize)
|
||||
handle_resize();
|
||||
|
||||
if (wtime >= 0) {
|
||||
while (WaitForChar(wtime) == 0) { /* no character available */
|
||||
if (!do_resize) /* return if not interrupted by resize */
|
||||
return 0;
|
||||
handle_resize();
|
||||
}
|
||||
} else { /* wtime == -1 */
|
||||
/*
|
||||
* If there is no character available within 'updatetime' seconds
|
||||
* flush all the swap files to disk.
|
||||
* Also done when interrupted by SIGWINCH.
|
||||
*/
|
||||
if (WaitForChar(p_ut) == 0) {
|
||||
if (trigger_cursorhold() && maxlen >= 3
|
||||
&& !typebuf_changed(tb_change_cnt)) {
|
||||
buf[0] = K_SPECIAL;
|
||||
buf[1] = KS_EXTRA;
|
||||
buf[2] = (int)KE_CURSORHOLD;
|
||||
return 3;
|
||||
}
|
||||
before_blocking();
|
||||
}
|
||||
}
|
||||
|
||||
for (;; ) { /* repeat until we got a character */
|
||||
while (do_resize) /* window changed size */
|
||||
handle_resize();
|
||||
|
||||
/*
|
||||
* We want to be interrupted by the winch signal
|
||||
* or by an event on the monitored file descriptors.
|
||||
*/
|
||||
if (WaitForChar(-1L) == 0) {
|
||||
if (do_resize) /* interrupted by SIGWINCH signal */
|
||||
/* Check if window changed size while we were busy, perhaps the ":set
|
||||
* columns=99" command was used. */
|
||||
while (do_resize)
|
||||
handle_resize();
|
||||
return 0;
|
||||
|
||||
if (wtime >= 0) {
|
||||
while (WaitForChar(wtime) == 0) { /* no character available */
|
||||
if (!do_resize) /* return if not interrupted by resize */
|
||||
return 0;
|
||||
handle_resize();
|
||||
}
|
||||
} else { /* wtime == -1 */
|
||||
/*
|
||||
* If there is no character available within 'updatetime' seconds
|
||||
* flush all the swap files to disk.
|
||||
* Also done when interrupted by SIGWINCH.
|
||||
*/
|
||||
if (WaitForChar(p_ut) == 0) {
|
||||
if (trigger_cursorhold() && maxlen >= 3
|
||||
&& !typebuf_changed(tb_change_cnt)) {
|
||||
buf[0] = K_SPECIAL;
|
||||
buf[1] = KS_EXTRA;
|
||||
buf[2] = (int)KE_CURSORHOLD;
|
||||
return 3;
|
||||
}
|
||||
before_blocking();
|
||||
}
|
||||
}
|
||||
|
||||
/* If input was put directly in typeahead buffer bail out here. */
|
||||
if (typebuf_changed(tb_change_cnt))
|
||||
return 0;
|
||||
for (;; ) { /* repeat until we got a character */
|
||||
while (do_resize) /* window changed size */
|
||||
handle_resize();
|
||||
|
||||
/*
|
||||
* For some terminals we only get one character at a time.
|
||||
* We want the get all available characters, so we could keep on
|
||||
* trying until none is available
|
||||
* For some other terminals this is quite slow, that's why we don't do
|
||||
* it.
|
||||
*/
|
||||
len = read_from_input_buf(buf, (long)maxlen);
|
||||
if (len > 0) {
|
||||
return len;
|
||||
/*
|
||||
* We want to be interrupted by the winch signal
|
||||
* or by an event on the monitored file descriptors.
|
||||
*/
|
||||
if (WaitForChar(-1L) == 0) {
|
||||
if (do_resize) /* interrupted by SIGWINCH signal */
|
||||
handle_resize();
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* If input was put directly in typeahead buffer bail out here. */
|
||||
if (typebuf_changed(tb_change_cnt))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* For some terminals we only get one character at a time.
|
||||
* We want the get all available characters, so we could keep on
|
||||
* trying until none is available
|
||||
* For some other terminals this is quite slow, that's why we don't do
|
||||
* it.
|
||||
*/
|
||||
len = read_from_input_buf(buf, (long)maxlen);
|
||||
if (len > 0) {
|
||||
return len;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void handle_resize() {
|
||||
@@ -349,8 +347,7 @@ int mch_char_avail() {
|
||||
* Return total amount of memory available in Kbyte.
|
||||
* Doesn't change when memory has been allocated.
|
||||
*/
|
||||
long_u mch_total_mem(special)
|
||||
int special UNUSED;
|
||||
long_u mch_total_mem(int special)
|
||||
{
|
||||
long_u mem = 0;
|
||||
long_u shiftright = 10; /* how much to shift "mem" right for Kbyte */
|
||||
@@ -430,9 +427,7 @@ int special UNUSED;
|
||||
}
|
||||
#endif
|
||||
|
||||
void mch_delay(msec, ignoreinput)
|
||||
long msec;
|
||||
int ignoreinput;
|
||||
void mch_delay(long msec, int ignoreinput)
|
||||
{
|
||||
int old_tmode;
|
||||
|
||||
@@ -508,8 +503,7 @@ static int stack_grows_downwards;
|
||||
* Find out if the stack grows upwards or downwards.
|
||||
* "p" points to a variable on the stack of the caller.
|
||||
*/
|
||||
static void check_stack_growth(p)
|
||||
char *p;
|
||||
static void check_stack_growth(char *p)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -577,8 +571,7 @@ static void get_stack_limit() {
|
||||
* Return FAIL when running out of stack space.
|
||||
* "p" must point to any variable local to the caller that's on the stack.
|
||||
*/
|
||||
int mch_stackcheck(p)
|
||||
char *p;
|
||||
int mch_stackcheck(char *p)
|
||||
{
|
||||
if (stack_limit != NULL) {
|
||||
if (stack_grows_downwards) {
|
||||
@@ -1005,9 +998,10 @@ void reset_signals() {
|
||||
#endif
|
||||
}
|
||||
|
||||
static void catch_signals(func_deadly, func_other)
|
||||
RETSIGTYPE (*func_deadly)();
|
||||
RETSIGTYPE (*func_other)();
|
||||
static void catch_signals(
|
||||
RETSIGTYPE (*func_deadly)(),
|
||||
RETSIGTYPE (*func_other)()
|
||||
)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -1056,8 +1050,7 @@ RETSIGTYPE (*func_other)();
|
||||
* signal
|
||||
* Returns TRUE when Vim should exit.
|
||||
*/
|
||||
int vim_handle_signal(sig)
|
||||
int sig;
|
||||
int vim_handle_signal(int sig)
|
||||
{
|
||||
static int got_signal = 0;
|
||||
static int blocked = TRUE;
|
||||
@@ -1088,9 +1081,7 @@ int sig;
|
||||
/*
|
||||
* Check_win checks whether we have an interactive stdout.
|
||||
*/
|
||||
int mch_check_win(argc, argv)
|
||||
int argc UNUSED;
|
||||
char **argv UNUSED;
|
||||
int mch_check_win(int argc, char **argv)
|
||||
{
|
||||
if (isatty(1))
|
||||
return OK;
|
||||
@@ -1106,14 +1097,12 @@ int mch_input_isatty() {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int get_x11_title(test_only)
|
||||
int test_only UNUSED;
|
||||
static int get_x11_title(int test_only)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int get_x11_icon(test_only)
|
||||
int test_only;
|
||||
static int get_x11_icon(int test_only)
|
||||
{
|
||||
if (!test_only) {
|
||||
if (STRNCMP(T_NAME, "builtin_", 8) == 0)
|
||||
@@ -1136,9 +1125,7 @@ int mch_can_restore_icon() {
|
||||
/*
|
||||
* Set the window title and icon.
|
||||
*/
|
||||
void mch_settitle(title, icon)
|
||||
char_u *title;
|
||||
char_u *icon;
|
||||
void mch_settitle(char_u *title, char_u *icon)
|
||||
{
|
||||
int type = 0;
|
||||
static int recursive = 0;
|
||||
@@ -1195,8 +1182,7 @@ char_u *icon;
|
||||
* 2 only restore icon
|
||||
* 3 restore title and icon
|
||||
*/
|
||||
void mch_restore_title(which)
|
||||
int which;
|
||||
void mch_restore_title(int which)
|
||||
{
|
||||
/* only restore the title or icon when it has been set */
|
||||
mch_settitle(((which & 1) && did_set_title) ?
|
||||
@@ -1209,8 +1195,7 @@ int which;
|
||||
* Return TRUE if "name" looks like some xterm name.
|
||||
* Seiichi Sato mentioned that "mlterm" works like xterm.
|
||||
*/
|
||||
int vim_is_xterm(name)
|
||||
char_u *name;
|
||||
int vim_is_xterm(char_u *name)
|
||||
{
|
||||
if (name == NULL)
|
||||
return FALSE;
|
||||
@@ -1227,8 +1212,7 @@ char_u *name;
|
||||
* known to support the xterm-style mouse protocol.
|
||||
* Relies on term_is_xterm having been set to its correct value.
|
||||
*/
|
||||
int use_xterm_like_mouse(name)
|
||||
char_u *name;
|
||||
int use_xterm_like_mouse(char_u *name)
|
||||
{
|
||||
return name != NULL
|
||||
&& (term_is_xterm || STRNICMP(name, "screen", 6) == 0);
|
||||
@@ -1253,8 +1237,7 @@ int use_xterm_mouse() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int vim_is_iris(name)
|
||||
char_u *name;
|
||||
int vim_is_iris(char_u *name)
|
||||
{
|
||||
if (name == NULL)
|
||||
return FALSE;
|
||||
@@ -1262,8 +1245,7 @@ char_u *name;
|
||||
|| STRCMP(name, "builtin_iris-ansi") == 0;
|
||||
}
|
||||
|
||||
int vim_is_vt300(name)
|
||||
char_u *name;
|
||||
int vim_is_vt300(char_u *name)
|
||||
{
|
||||
if (name == NULL)
|
||||
return FALSE; /* actually all ANSI comp. terminals should be here */
|
||||
@@ -1277,8 +1259,7 @@ char_u *name;
|
||||
* Return TRUE if "name" is a terminal for which 'ttyfast' should be set.
|
||||
* This should include all windowed terminal emulators.
|
||||
*/
|
||||
int vim_is_fastterm(name)
|
||||
char_u *name;
|
||||
int vim_is_fastterm(char_u *name)
|
||||
{
|
||||
if (name == NULL)
|
||||
return FALSE;
|
||||
@@ -1294,9 +1275,7 @@ char_u *name;
|
||||
* Insert user name in s[len].
|
||||
* Return OK if a name found.
|
||||
*/
|
||||
int mch_get_user_name(s, len)
|
||||
char_u *s;
|
||||
int len;
|
||||
int mch_get_user_name(char_u *s, int len)
|
||||
{
|
||||
return mch_get_uname(getuid(), s, len);
|
||||
}
|
||||
@@ -1305,10 +1284,7 @@ int len;
|
||||
* Insert user name for "uid" in s[len].
|
||||
* Return OK if a name found.
|
||||
*/
|
||||
int mch_get_uname(uid, s, len)
|
||||
uid_t uid;
|
||||
char_u *s;
|
||||
int len;
|
||||
int mch_get_uname(uid_t uid, char_u *s, int len)
|
||||
{
|
||||
#if defined(HAVE_PWD_H) && defined(HAVE_GETPWUID)
|
||||
struct passwd *pw;
|
||||
@@ -1328,9 +1304,7 @@ int len;
|
||||
*/
|
||||
|
||||
#ifdef HAVE_SYS_UTSNAME_H
|
||||
void mch_get_host_name(s, len)
|
||||
char_u *s;
|
||||
int len;
|
||||
void mch_get_host_name(char_u *s, int len)
|
||||
{
|
||||
struct utsname vutsname;
|
||||
|
||||
@@ -1345,9 +1319,7 @@ int len;
|
||||
# define gethostname(nam, len) sysinfo(SI_HOSTNAME, nam, len)
|
||||
# endif
|
||||
|
||||
void mch_get_host_name(s, len)
|
||||
char_u *s;
|
||||
int len;
|
||||
void mch_get_host_name(char_u *s, int len)
|
||||
{
|
||||
gethostname((char *)s, len);
|
||||
s[len - 1] = NUL; /* make sure it's terminated */
|
||||
@@ -1364,8 +1336,7 @@ long mch_get_pid() {
|
||||
#if !defined(HAVE_STRERROR) && defined(USE_GETCWD)
|
||||
static char *strerror __ARGS((int));
|
||||
|
||||
static char * strerror(err)
|
||||
int err;
|
||||
static char * strerror(int err)
|
||||
{
|
||||
extern int sys_nerr;
|
||||
extern char *sys_errlist[];
|
||||
@@ -1382,9 +1353,7 @@ int err;
|
||||
* Get name of current directory into buffer 'buf' of length 'len' bytes.
|
||||
* Return OK for success, FAIL for failure.
|
||||
*/
|
||||
int mch_dirname(buf, len)
|
||||
char_u *buf;
|
||||
int len;
|
||||
int mch_dirname(char_u *buf, int len)
|
||||
{
|
||||
#if defined(USE_GETCWD)
|
||||
if (getcwd((char *)buf, len) == NULL) {
|
||||
@@ -1403,10 +1372,12 @@ int len;
|
||||
*
|
||||
* return FAIL for failure, OK for success
|
||||
*/
|
||||
int mch_FullName(fname, buf, len, force)
|
||||
char_u *fname, *buf;
|
||||
int len;
|
||||
int force; /* also expand when already absolute path */
|
||||
int mch_FullName(
|
||||
char_u *fname,
|
||||
char_u *buf,
|
||||
int len,
|
||||
int force /* also expand when already absolute path */
|
||||
)
|
||||
{
|
||||
int l;
|
||||
#ifdef HAVE_FCHDIR
|
||||
@@ -1512,8 +1483,7 @@ int force; /* also expand when already absolute path */
|
||||
/*
|
||||
* Return TRUE if "fname" does not depend on the current directory.
|
||||
*/
|
||||
int mch_isFullName(fname)
|
||||
char_u *fname;
|
||||
int mch_isFullName(char_u *fname)
|
||||
{
|
||||
return *fname == '/' || *fname == '~';
|
||||
}
|
||||
@@ -1524,9 +1494,10 @@ char_u *fname;
|
||||
* file name to remain exactly the same.
|
||||
* Only required for file systems where case is ignored and preserved.
|
||||
*/
|
||||
void fname_case(name, len)
|
||||
char_u *name;
|
||||
int len UNUSED; /* buffer size, only used when name gets longer */
|
||||
void fname_case(
|
||||
char_u *name,
|
||||
int len; /* buffer size, only used when name gets longer */
|
||||
)
|
||||
{
|
||||
struct stat st;
|
||||
char_u *slash, *tail;
|
||||
@@ -1578,8 +1549,7 @@ int len UNUSED; /* buffer size, only used when name gets longer */
|
||||
* Get file permissions for 'name'.
|
||||
* Returns -1 when it doesn't exist.
|
||||
*/
|
||||
long mch_getperm(name)
|
||||
char_u *name;
|
||||
long mch_getperm(char_u *name)
|
||||
{
|
||||
struct stat statb;
|
||||
|
||||
@@ -1600,9 +1570,7 @@ char_u *name;
|
||||
*
|
||||
* return FAIL for failure, OK otherwise
|
||||
*/
|
||||
int mch_setperm(name, perm)
|
||||
char_u *name;
|
||||
long perm;
|
||||
int mch_setperm(char_u *name, long perm)
|
||||
{
|
||||
return chmod((char *)
|
||||
name,
|
||||
@@ -1622,9 +1590,7 @@ long perm;
|
||||
/*
|
||||
* Copy security info from "from_file" to "to_file".
|
||||
*/
|
||||
void mch_copy_sec(from_file, to_file)
|
||||
char_u *from_file;
|
||||
char_u *to_file;
|
||||
void mch_copy_sec(char_u *from_file, char_u *to_file)
|
||||
{
|
||||
if (from_file == NULL)
|
||||
return;
|
||||
@@ -1672,8 +1638,7 @@ char_u *to_file;
|
||||
* Return a pointer to the ACL of file "fname" in allocated memory.
|
||||
* Return NULL if the ACL is not available for whatever reason.
|
||||
*/
|
||||
vim_acl_T mch_get_acl(fname)
|
||||
char_u *fname UNUSED;
|
||||
vim_acl_T mch_get_acl(char_u *fname)
|
||||
{
|
||||
vim_acl_T ret = NULL;
|
||||
return ret;
|
||||
@@ -1682,16 +1647,13 @@ char_u *fname UNUSED;
|
||||
/*
|
||||
* Set the ACL of file "fname" to "acl" (unless it's NULL).
|
||||
*/
|
||||
void mch_set_acl(fname, aclent)
|
||||
char_u *fname UNUSED;
|
||||
vim_acl_T aclent;
|
||||
void mch_set_acl(char_u *fname, vim_acl_T aclent)
|
||||
{
|
||||
if (aclent == NULL)
|
||||
return;
|
||||
}
|
||||
|
||||
void mch_free_acl(aclent)
|
||||
vim_acl_T aclent;
|
||||
void mch_free_acl(vim_acl_T aclent)
|
||||
{
|
||||
if (aclent == NULL)
|
||||
return;
|
||||
@@ -1701,8 +1663,7 @@ vim_acl_T aclent;
|
||||
/*
|
||||
* Set hidden flag for "name".
|
||||
*/
|
||||
void mch_hide(name)
|
||||
char_u *name UNUSED;
|
||||
void mch_hide(char_u *name)
|
||||
{
|
||||
/* can't hide a file */
|
||||
}
|
||||
@@ -1712,8 +1673,7 @@ char_u *name UNUSED;
|
||||
* return FALSE if "name" is not a directory
|
||||
* return FALSE for error
|
||||
*/
|
||||
int mch_isdir(name)
|
||||
char_u *name;
|
||||
int mch_isdir(char_u *name)
|
||||
{
|
||||
struct stat statb;
|
||||
|
||||
@@ -1733,8 +1693,7 @@ static int executable_file __ARGS((char_u *name));
|
||||
/*
|
||||
* Return 1 if "name" is an executable file, 0 if not or it doesn't exist.
|
||||
*/
|
||||
static int executable_file(name)
|
||||
char_u *name;
|
||||
static int executable_file(char_u *name)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
@@ -1747,8 +1706,7 @@ char_u *name;
|
||||
* Return 1 if "name" can be found in $PATH and executed, 0 if not.
|
||||
* Return -1 if unknown.
|
||||
*/
|
||||
int mch_can_exe(name)
|
||||
char_u *name;
|
||||
int mch_can_exe(char_u *name)
|
||||
{
|
||||
char_u *buf;
|
||||
char_u *p, *e;
|
||||
@@ -1801,8 +1759,7 @@ char_u *name;
|
||||
* NODE_WRITABLE: writable device, socket, fifo, etc.
|
||||
* NODE_OTHER: non-writable things
|
||||
*/
|
||||
int mch_nodetype(name)
|
||||
char_u *name;
|
||||
int mch_nodetype(char_u *name)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
@@ -1876,8 +1833,7 @@ static void exit_scroll() {
|
||||
}
|
||||
}
|
||||
|
||||
void mch_exit(r)
|
||||
int r;
|
||||
void mch_exit(int r)
|
||||
{
|
||||
exiting = TRUE;
|
||||
|
||||
@@ -1934,8 +1890,7 @@ static void may_core_dump() {
|
||||
}
|
||||
}
|
||||
|
||||
void mch_settmode(tmode)
|
||||
int tmode;
|
||||
void mch_settmode(int tmode)
|
||||
{
|
||||
static int first = TRUE;
|
||||
|
||||
@@ -2196,7 +2151,7 @@ void check_mouse_termcode() {
|
||||
* set screen mode, always fails.
|
||||
*/
|
||||
int mch_screenmode(arg)
|
||||
char_u *arg UNUSED;
|
||||
char_u *arg;
|
||||
{
|
||||
EMSG(_(e_screenmode));
|
||||
return FAIL;
|
||||
@@ -3153,7 +3108,7 @@ long msec;
|
||||
static int RealWaitForChar(fd, msec, check_for_gpm)
|
||||
int fd;
|
||||
long msec;
|
||||
int *check_for_gpm UNUSED;
|
||||
int *check_for_gpm;
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user