mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert function declarations from K&R to ANSI style.

Browse Source 
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
2014-02-23 15:34:45 -05:00
parent 1bcbc42330
commit b76c358f3d
54 changed files with 6840 additions and 10886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

359
src/ops.c
View File

@@ -130,9 +130,7 @@ static char opchars[][3] =
* Translate a command name into an operator type.
* Must only be called with a valid operator name!
*/
int get_op_type(char1, char2)
int char1;
int char2;
int get_op_type(int char1, int char2)
{
int i;
@@ -149,8 +147,7 @@ int char2;
/*
* Return TRUE if operator "op" always works on whole lines.
*/
int op_on_lines(op)
int op;
int op_on_lines(int op)
{
return opchars[op][2];
}
@@ -159,8 +156,7 @@ int op;
* Get first operator command character.
* Returns 'g' or 'z' if there is another command character.
*/
int get_op_char(optype)
int optype;
int get_op_char(int optype)
{
return opchars[optype][0];
}
@@ -168,8 +164,7 @@ int optype;
/*
* Get second operator command character.
*/
int get_extra_op_char(optype)
int optype;
int get_extra_op_char(int optype)
{
return opchars[optype][1];
}
@@ -177,10 +172,7 @@ int optype;
/*
* op_shift - handle a shift operation
*/
void op_shift(oap, curs_top, amount)
oparg_T *oap;
int curs_top;
int amount;
void op_shift(oparg_T *oap, int curs_top, int amount)
{
long i;
int first_char;
@@ -257,11 +249,13 @@ int amount;
* shift the current line one shiftwidth left (if left != 0) or right
* leaves cursor on first blank in the line
*/
void shift_line(left, round, amount, call_changed_bytes)
int left;
int round;
int amount;
int call_changed_bytes; /* call changed_bytes() */
void
shift_line (
int left,
int round,
int amount,
int call_changed_bytes /* call changed_bytes() */
)
{
int count;
int i, j;
@@ -301,9 +295,7 @@ int call_changed_bytes; /* call changed_bytes() */
* Shift one line of the current block one shiftwidth right or left.
* Leaves cursor on first character in block.
*/
static void shift_block(oap, amount)
oparg_T *oap;
int amount;
static void shift_block(oparg_T *oap, int amount)
{
int left = (oap->op_type == OP_LSHIFT);
int oldstate = State;
@@ -466,11 +458,7 @@ int amount;
* Insert string "s" (b_insert ? before : after) block :AKelly
* Caller must prepare for undo.
*/
static void block_insert(oap, s, b_insert, bdp)
oparg_T *oap;
char_u *s;
int b_insert;
struct block_def *bdp;
static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def *bdp)
{
int p_ts;
int count = 0; /* extra spaces to replace a cut TAB */
@@ -643,7 +631,7 @@ static char_u *expr_line = NULL;
* Get an expression for the "\"=expr1" or "CTRL-R =expr1"
* Returns '=' when OK, NUL otherwise.
*/
int get_expr_register() {
int get_expr_register(void) {
char_u *new_line;
new_line = getcmdline('=', 0L, 0);
@@ -660,8 +648,7 @@ int get_expr_register() {
* Set the expression for the '=' register.
* Argument must be an allocated string.
*/
void set_expr_line(new_line)
char_u *new_line;
void set_expr_line(char_u *new_line)
{
vim_free(expr_line);
expr_line = new_line;
@@ -671,7 +658,7 @@ char_u *new_line;
* Get the result of the '=' register expression.
* Returns a pointer to allocated memory, or NULL for failure.
*/
char_u * get_expr_line() {
char_u *get_expr_line(void) {
char_u *expr_copy;
char_u *rv;
static int nested = 0;
@@ -700,7 +687,7 @@ char_u * get_expr_line() {
/*
* Get the '=' register expression itself, without evaluating it.
*/
char_u * get_expr_line_src() {
char_u *get_expr_line_src(void) {
if (expr_line == NULL)
return NULL;
return vim_strsave(expr_line);
@@ -710,9 +697,11 @@ char_u * get_expr_line_src() {
* Check if 'regname' is a valid name of a yank register.
* Note: There is no check for 0 (default register), caller should do this
*/
int valid_yank_reg(regname, writing)
int regname;
int writing; /* if TRUE check for writable registers */
int
valid_yank_reg (
int regname,
int writing /* if TRUE check for writable registers */
)
{
if ( (regname > 0 && ASCII_ISALNUM(regname))
|| (!writing && vim_strchr((char_u *)
@@ -734,9 +723,7 @@ int writing; /* if TRUE check for writable registers */
* If regname is 0 and writing, use register 0
* If regname is 0 and reading, use previous register
*/
void get_yank_register(regname, writing)
int regname;
int writing;
void get_yank_register(int regname, int writing)
{
int i;
@@ -767,9 +754,11 @@ int writing;
* Obtain the contents of a "normal" register. The register is made empty.
* The returned pointer has allocated memory, use put_register() later.
*/
void * get_register(name, copy)
int name;
int copy; /* make a copy, if FALSE make register empty. */
void *
get_register (
int name,
int copy /* make a copy, if FALSE make register empty. */
)
{
struct yankreg *reg;
int i;
@@ -799,9 +788,7 @@ int copy; /* make a copy, if FALSE make register empty. */
/*
* Put "reg" into register "name". Free any previous contents and "reg".
*/
void put_register(name, reg)
int name;
void *reg;
void put_register(int name, void *reg)
{
get_yank_register(name, 0);
free_yank_all();
@@ -810,8 +797,7 @@ void *reg;
}
void free_register(reg)
void *reg;
void free_register(void *reg)
{
struct yankreg tmp;
@@ -825,8 +811,7 @@ void *reg;
/*
* return TRUE if the current yank register has type MLINE
*/
int yank_register_mline(regname)
int regname;
int yank_register_mline(int regname)
{
if (regname != 0 && !valid_yank_reg(regname, FALSE))
return FALSE;
@@ -841,8 +826,7 @@ int regname;
*
* Return FAIL for failure, OK otherwise.
*/
int do_record(c)
int c;
int do_record(int c)
{
char_u *p;
static int regname;
@@ -896,9 +880,7 @@ int c;
*
* return FAIL for failure, OK otherwise
*/
static int stuff_yank(regname, p)
int regname;
char_u *p;
static int stuff_yank(int regname, char_u *p)
{
char_u *lp;
char_u **pp;
@@ -946,11 +928,13 @@ static int execreg_lastc = NUL;
*
* return FAIL for failure, OK otherwise
*/
int do_execreg(regname, colon, addcr, silent)
int regname;
int colon; /* insert ':' before each line */
int addcr; /* always add '\n' to end of line */
int silent; /* set "silent" flag in typeahead buffer */
int
do_execreg (
int regname,
int colon, /* insert ':' before each line */
int addcr, /* always add '\n' to end of line */
int silent /* set "silent" flag in typeahead buffer */
)
{
long i;
char_u *p;
@@ -1052,8 +1036,7 @@ int silent; /* set "silent" flag in typeahead buffer */
* If "restart_edit" is not zero, put it in the typeahead buffer, so that it's
* used only after other typeahead has been processed.
*/
static void put_reedit_in_typebuf(silent)
int silent;
static void put_reedit_in_typebuf(int silent)
{
char_u buf[3];
@@ -1077,11 +1060,13 @@ int silent;
* When "esc" is TRUE it is to be taken literally: Escape CSI characters and
* no remapping.
*/
static int put_in_typebuf(s, esc, colon, silent)
char_u *s;
int esc;
int colon; /* add ':' before the line */
int silent;
static int
put_in_typebuf (
char_u *s,
int esc,
int colon, /* add ':' before the line */
int silent
)
{
int retval = OK;
@@ -1114,9 +1099,11 @@ int silent;
*
* return FAIL for failure, OK otherwise
*/
int insert_reg(regname, literally)
int regname;
int literally; /* insert literally, not as if typed */
int
insert_reg (
int regname,
int literally /* insert literally, not as if typed */
)
{
long i;
int retval = OK;
@@ -1169,9 +1156,7 @@ int literally; /* insert literally, not as if typed */
* Stuff a string into the typeahead buffer, such that edit() will insert it
* literally ("literally" TRUE) or interpret is as typed characters.
*/
static void stuffescaped(arg, literally)
char_u *arg;
int literally;
static void stuffescaped(char_u *arg, int literally)
{
int c;
char_u *start;
@@ -1206,11 +1191,13 @@ int literally;
* If "regname" is a special register, return TRUE and store a pointer to its
* value in "argp".
*/
int get_spec_reg(regname, argp, allocated, errmsg)
int regname;
char_u **argp;
int *allocated; /* return: TRUE when value was allocated */
int errmsg; /* give error message when failing */
int
get_spec_reg (
int regname,
char_u **argp,
int *allocated, /* return: TRUE when value was allocated */
int errmsg /* give error message when failing */
)
{
int cnt;
@@ -1287,10 +1274,12 @@ int errmsg; /* give error message when failing */
*
* return FAIL for failure, OK otherwise
*/
int cmdline_paste_reg(regname, literally, remcr)
int regname;
int literally; /* Insert text literally instead of "as typed" */
int remcr; /* don't add trailing CR */
int
cmdline_paste_reg (
int regname,
int literally, /* Insert text literally instead of "as typed" */
int remcr /* don't add trailing CR */
)
{
long i;
@@ -1325,8 +1314,7 @@ int remcr; /* don't add trailing CR */
*
* Return FAIL if undo failed, OK otherwise.
*/
int op_delete(oap)
oparg_T *oap;
int op_delete(oparg_T *oap)
{
int n;
linenr_T lnum;
@@ -1667,8 +1655,7 @@ setmarks:
* Adjust end of operating area for ending on a multi-byte character.
* Used for deletion.
*/
static void mb_adjust_opend(oap)
oparg_T *oap;
static void mb_adjust_opend(oparg_T *oap)
{
char_u *p;
@@ -1681,9 +1668,7 @@ oparg_T *oap;
/*
* Replace a whole area with one character.
*/
int op_replace(oap, c)
oparg_T *oap;
int c;
int op_replace(oparg_T *oap, int c)
{
int n, numc;
int num_chars;
@@ -1885,8 +1870,7 @@ static int swapchars __ARGS((int op_type, pos_T *pos, int length));
/*
* Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
*/
void op_tilde(oap)
oparg_T *oap;
void op_tilde(oparg_T *oap)
{
pos_T pos;
struct block_def bd;
@@ -1961,10 +1945,7 @@ oparg_T *oap;
* Also works correctly when the number of bytes changes.
* Returns TRUE if some character was changed.
*/
static int swapchars(op_type, pos, length)
int op_type;
pos_T *pos;
int length;
static int swapchars(int op_type, pos_T *pos, int length)
{
int todo;
int did_change = 0;
@@ -1991,9 +1972,7 @@ int length;
* else swap case of character at 'pos'
* returns TRUE when something actually changed.
*/
int swapchar(op_type, pos)
int op_type;
pos_T *pos;
int swapchar(int op_type, pos_T *pos)
{
int c;
int nc;
@@ -2050,9 +2029,7 @@ pos_T *pos;
/*
* op_insert - Insert and append operators for Visual mode.
*/
void op_insert(oap, count1)
oparg_T *oap;
long count1;
void op_insert(oparg_T *oap, long count1)
{
long ins_len, pre_textlen = 0;
char_u *firstline, *ins_text;
@@ -2198,8 +2175,7 @@ long count1;
*
* return TRUE if edit() returns because of a CTRL-O command
*/
int op_change(oap)
oparg_T *oap;
int op_change(oparg_T *oap)
{
colnr_T l;
int retval;
@@ -2318,7 +2294,7 @@ oparg_T *oap;
/*
* set all the yank registers to empty (called from main())
*/
void init_yank() {
void init_yank(void) {
int i;
for (i = 0; i < NUM_REGISTERS; ++i)
@@ -2326,7 +2302,7 @@ void init_yank() {
}
#if defined(EXITFREE) || defined(PROTO)
void clear_registers() {
void clear_registers(void) {
int i;
for (i = 0; i < NUM_REGISTERS; ++i) {
@@ -2342,8 +2318,7 @@ void clear_registers() {
* Free "n" lines from the current yank register.
* Called for normal freeing and in case of error.
*/
static void free_yank(n)
long n;
static void free_yank(long n)
{
if (y_current->y_array != NULL) {
long i;
@@ -2356,7 +2331,7 @@ long n;
}
}
static void free_yank_all() {
static void free_yank_all(void) {
free_yank(y_current->y_size);
}
@@ -2368,10 +2343,7 @@ static void free_yank_all() {
*
* Return FAIL for failure, OK otherwise.
*/
int op_yank(oap, deleting, mess)
oparg_T *oap;
int deleting;
int mess;
int op_yank(oparg_T *oap, int deleting, int mess)
{
long y_idx; /* index in y_array[] */
struct yankreg *curr; /* copy of y_current */
@@ -2604,9 +2576,7 @@ fail: /* free the allocated lines */
return FAIL;
}
static int yank_copy_line(bd, y_idx)
struct block_def *bd;
long y_idx;
static int yank_copy_line(struct block_def *bd, long y_idx)
{
char_u *pnew;
@@ -2632,11 +2602,13 @@ long y_idx;
* PUT_CURSEND leave cursor after end of new text
* PUT_LINE force linewise put (":put")
*/
void do_put(regname, dir, count, flags)
int regname;
int dir; /* BACKWARD for 'P', FORWARD for 'p' */
long count;
int flags;
void
do_put (
int regname,
int dir, /* BACKWARD for 'P', FORWARD for 'p' */
long count,
int flags
)
{
char_u *ptr;
char_u *newp, *oldp;
@@ -3197,7 +3169,7 @@ end:
* When the cursor is on the NUL past the end of the line and it should not be
* there move it left.
*/
void adjust_cursor_eol() {
void adjust_cursor_eol(void) {
if (curwin->w_cursor.col > 0
&& gchar_cursor() == NUL
&& (ve_flags & VE_ONEMORE) == 0
@@ -3218,7 +3190,7 @@ void adjust_cursor_eol() {
/*
* Return TRUE if lines starting with '#' should be left aligned.
*/
int preprocs_left() {
int preprocs_left(void) {
return
(curbuf->b_p_si && !curbuf->b_p_cin) ||
(curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE)
@@ -3227,8 +3199,7 @@ int preprocs_left() {
}
/* Return the character name of the register with the given number */
int get_register_name(num)
int num;
int get_register_name(int num)
{
if (num == -1)
return '"';
@@ -3244,8 +3215,7 @@ int num;
/*
* ":dis" and ":registers": Display the contents of the yank registers.
*/
void ex_display(eap)
exarg_T *eap;
void ex_display(exarg_T *eap)
{
int i, n;
long j;
@@ -3374,9 +3344,11 @@ exarg_T *eap;
* display a string for do_dis()
* truncate at end of screen line
*/
static void dis_msg(p, skip_esc)
char_u *p;
int skip_esc; /* if TRUE, ignore trailing ESC */
static void
dis_msg (
char_u *p,
int skip_esc /* if TRUE, ignore trailing ESC */
)
{
int n;
int l;
@@ -3406,11 +3378,7 @@ int skip_esc; /* if TRUE, ignore trailing ESC */
* is_comment - will indicate whether the current line ends with an unclosed
* comment.
*/
static char_u * skip_comment(line, process, include_space, is_comment)
char_u *line;
int process;
int include_space;
int *is_comment;
static char_u *skip_comment(char_u *line, int process, int include_space, int *is_comment)
{
char_u *comment_flags = NULL;
int lead_len;
@@ -3470,11 +3438,7 @@ int *is_comment;
*
* return FAIL for failure, OK otherwise
*/
int do_join(count, insert_space, save_undo, use_formatoptions)
long count;
int insert_space;
int save_undo;
int use_formatoptions UNUSED;
int do_join(long count, int insert_space, int save_undo, int use_formatoptions)
{
char_u *curr = NULL;
char_u *curr_start = NULL;
@@ -3652,13 +3616,7 @@ theend:
* the first line. White-space is ignored. Note that the whole of
* 'leader1' must match 'leader2_len' characters from 'leader2' -- webb
*/
static int same_leader(lnum, leader1_len, leader1_flags, leader2_len,
leader2_flags)
linenr_T lnum;
int leader1_len;
char_u *leader1_flags;
int leader2_len;
char_u *leader2_flags;
static int same_leader(linenr_T lnum, int leader1_len, char_u *leader1_flags, int leader2_len, char_u *leader2_flags)
{
int idx1 = 0, idx2 = 0;
char_u *p;
@@ -3719,9 +3677,11 @@ char_u *leader2_flags;
/*
* Implementation of the format operator 'gq'.
*/
void op_format(oap, keep_cursor)
oparg_T *oap;
int keep_cursor; /* keep cursor on same text char */
void
op_format (
oparg_T *oap,
int keep_cursor /* keep cursor on same text char */
)
{
long old_line_count = curbuf->b_ml.ml_line_count;
@@ -3787,8 +3747,7 @@ int keep_cursor; /* keep cursor on same text char */
/*
* Implementation of the format operator 'gq' for when using 'formatexpr'.
*/
void op_formatexpr(oap)
oparg_T *oap;
void op_formatexpr(oparg_T *oap)
{
if (oap->is_VIsual)
/* When there is no change: need to remove the Visual selection */
@@ -3800,10 +3759,12 @@ oparg_T *oap;
op_format(oap, FALSE);
}
int fex_format(lnum, count, c)
linenr_T lnum;
long count;
int c; /* character to be inserted */
int
fex_format (
linenr_T lnum,
long count,
int c /* character to be inserted */
)
{
int use_sandbox = was_set_insecurely((char_u *)"formatexpr",
OPT_LOCAL);
@@ -3837,9 +3798,11 @@ int c; /* character to be inserted */
* Lines after the cursor line are saved for undo, caller must have saved the
* first line.
*/
void format_lines(line_count, avoid_fex)
linenr_T line_count;
int avoid_fex; /* don't use 'formatexpr' */
void
format_lines (
linenr_T line_count,
int avoid_fex /* don't use 'formatexpr' */
)
{
int max_len;
int is_not_par; /* current line not part of parag. */
@@ -4056,8 +4019,7 @@ int avoid_fex; /* don't use 'formatexpr' */
/*
* Return TRUE if line "lnum" ends in a white character.
*/
static int ends_in_white(lnum)
linenr_T lnum;
static int ends_in_white(linenr_T lnum)
{
char_u *s = ml_get(lnum);
size_t l;
@@ -4078,11 +4040,7 @@ linenr_T lnum;
* previous line. A new paragraph starts after a blank line, or when the
* comment leader changes -- webb.
*/
static int fmt_check_par(lnum, leader_len, leader_flags, do_comments)
linenr_T lnum;
int *leader_len;
char_u **leader_flags;
int do_comments;
static int fmt_check_par(linenr_T lnum, int *leader_len, char_u **leader_flags, int do_comments)
{
char_u *flags = NULL; /* init for GCC */
char_u *ptr;
@@ -4111,8 +4069,7 @@ int do_comments;
* Return TRUE when a paragraph starts in line "lnum". Return FALSE when the
* previous line is in the same paragraph. Used for auto-formatting.
*/
int paragraph_start(lnum)
linenr_T lnum;
int paragraph_start(linenr_T lnum)
{
char_u *p;
int leader_len = 0; /* leader len of current line */
@@ -4165,11 +4122,7 @@ linenr_T lnum;
* - start/endspaces is the number of columns of the first/last yanked char
* that are to be yanked.
*/
static void block_prep(oap, bdp, lnum, is_del)
oparg_T *oap;
struct block_def *bdp;
linenr_T lnum;
int is_del;
static void block_prep(oparg_T *oap, struct block_def *bdp, linenr_T lnum, int is_del)
{
int incr = 0;
char_u *pend;
@@ -4281,8 +4234,7 @@ int is_del;
static void reverse_line __ARGS((char_u *s));
static void reverse_line(s)
char_u *s;
static void reverse_line(char_u *s)
{
int i, j;
char_u c;
@@ -4304,9 +4256,7 @@ char_u *s;
*
* return FAIL for failure, OK otherwise
*/
int do_addsub(command, Prenum1)
int command;
linenr_T Prenum1;
int do_addsub(int command, linenr_T Prenum1)
{
int col;
char_u *buf1;
@@ -4530,9 +4480,7 @@ linenr_T Prenum1;
return OK;
}
int read_viminfo_register(virp, force)
vir_T *virp;
int force;
int read_viminfo_register(vir_T *virp, int force)
{
int eof;
int do_it = TRUE;
@@ -4622,8 +4570,7 @@ int force;
return eof;
}
void write_viminfo_registers(fp)
FILE *fp;
void write_viminfo_registers(FILE *fp)
{
int i, j;
char_u *type;
@@ -4710,9 +4657,7 @@ FILE *fp;
* Used for getregtype()
* Returns MAUTO for error.
*/
char_u get_reg_type(regname, reglen)
int regname;
long *reglen;
char_u get_reg_type(int regname, long *reglen)
{
switch (regname) {
case '%': /* file name */
@@ -4748,10 +4693,12 @@ long *reglen;
* Used for "@r" in expressions and for getreg().
* Returns NULL for error.
*/
char_u * get_reg_contents(regname, allowexpr, expr_src)
int regname;
int allowexpr; /* allow "=" register */
int expr_src; /* get expression for "=" register */
char_u *
get_reg_contents (
int regname,
int allowexpr, /* allow "=" register */
int expr_src /* get expression for "=" register */
)
{
long i;
char_u *retval;
@@ -4835,22 +4782,12 @@ int expr_src; /* get expression for "=" register */
* Careful: 'str' is modified, you may have to use a copy!
* If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise.
*/
void write_reg_contents(name, str, maxlen, must_append)
int name;
char_u *str;
int maxlen;
int must_append;
void write_reg_contents(int name, char_u *str, int maxlen, int must_append)
{
write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L);
}
void write_reg_contents_ex(name, str, maxlen, must_append, yank_type, block_len)
int name;
char_u *str;
int maxlen;
int must_append;
int yank_type;
long block_len;
void write_reg_contents_ex(int name, char_u *str, int maxlen, int must_append, int yank_type, long block_len)
{
struct yankreg *old_y_previous, *old_y_current;
long len;
@@ -4910,12 +4847,14 @@ long block_len;
* Put a string into a register. When the register is not empty, the string
* is appended.
*/
static void str_to_reg(y_ptr, yank_type, str, len, blocklen)
struct yankreg *y_ptr; /* pointer to yank register */
int yank_type; /* MCHAR, MLINE, MBLOCK, MAUTO */
char_u *str; /* string to put in register */
long len; /* length of string */
long blocklen; /* width of Visual block */
static void
str_to_reg (
struct yankreg *y_ptr, /* pointer to yank register */
int yank_type, /* MCHAR, MLINE, MBLOCK, MAUTO */
char_u *str, /* string to put in register */
long len, /* length of string */
long blocklen /* width of Visual block */
)
{
int type; /* MCHAR, MLINE or MBLOCK */
int lnum;
@@ -5010,8 +4949,7 @@ long blocklen; /* width of Visual block */
y_ptr->y_width = 0;
}
void clear_oparg(oap)
oparg_T *oap;
void clear_oparg(oparg_T *oap)
{
vim_memset(oap, 0, sizeof(oparg_T));
}
@@ -5034,12 +4972,7 @@ static long line_count_info __ARGS((char_u *line, long *wc, long *cc,
* case, eol_size will be added to the character count to account for
* the size of the EOL character.
*/
static long line_count_info(line, wc, cc, limit, eol_size)
char_u *line;
long *wc;
long *cc;
long limit;
int eol_size;
static long line_count_info(char_u *line, long *wc, long *cc, long limit, int eol_size)
{
long i;
long words = 0;
@@ -5076,7 +5009,7 @@ int eol_size;
* In Visual mode, give some info about the selected region. (In this case,
* the *_count_cursor variables store running totals for the selection.)
*/
void cursor_pos_info() {
void cursor_pos_info(void) {
char_u *p;
char_u buf1[50];
char_u buf2[40];