Mercurial > vim
diff src/normal.c @ 7803:37c929c4a073 v7.4.1198
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 29 22:36:45 2016 +0100
patch 7.4.1198
Problem: Still using __ARGS.
Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
Also remove use of HAVE_STDARG_H.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 29 Jan 2016 22:45:06 +0100 |
| parents | 39251e981d1f |
| children | 2a8d6b2dd925 |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -25,31 +25,31 @@ static int VIsual_mode_orig = NUL; /* s static int restart_VIsual_select = 0; #ifdef FEAT_EVAL -static void set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount)); +static void set_vcount_ca(cmdarg_T *cap, int *set_prevcount); #endif static int #ifdef __BORLANDC__ _RTLENTRYF #endif - nv_compare __ARGS((const void *s1, const void *s2)); -static int find_command __ARGS((int cmdchar)); -static void op_colon __ARGS((oparg_T *oap)); -static void op_function __ARGS((oparg_T *oap)); + nv_compare(const void *s1, const void *s2); +static int find_command(int cmdchar); +static void op_colon(oparg_T *oap); +static void op_function(oparg_T *oap); #if defined(FEAT_MOUSE) -static void find_start_of_word __ARGS((pos_T *)); -static void find_end_of_word __ARGS((pos_T *)); -static int get_mouse_class __ARGS((char_u *p)); -#endif -static void prep_redo_cmd __ARGS((cmdarg_T *cap)); -static void prep_redo __ARGS((int regname, long, int, int, int, int, int)); -static int checkclearop __ARGS((oparg_T *oap)); -static int checkclearopq __ARGS((oparg_T *oap)); -static void clearop __ARGS((oparg_T *oap)); -static void clearopbeep __ARGS((oparg_T *oap)); -static void unshift_special __ARGS((cmdarg_T *cap)); -static void may_clear_cmdline __ARGS((void)); +static void find_start_of_word(pos_T *); +static void find_end_of_word(pos_T *); +static int get_mouse_class(char_u *p); +#endif +static void prep_redo_cmd(cmdarg_T *cap); +static void prep_redo(int regname, long, int, int, int, int, int); +static int checkclearop(oparg_T *oap); +static int checkclearopq(oparg_T *oap); +static void clearop(oparg_T *oap); +static void clearopbeep(oparg_T *oap); +static void unshift_special(cmdarg_T *cap); +static void may_clear_cmdline(void); #ifdef FEAT_CMDL_INFO -static void del_from_showcmd __ARGS((int)); +static void del_from_showcmd(int); #endif /* @@ -57,125 +57,125 @@ static void del_from_showcmd __ARGS((int * n_*(): functions called to handle Normal mode commands. * v_*(): functions called to handle Visual mode commands. */ -static void nv_ignore __ARGS((cmdarg_T *cap)); -static void nv_nop __ARGS((cmdarg_T *cap)); -static void nv_error __ARGS((cmdarg_T *cap)); -static void nv_help __ARGS((cmdarg_T *cap)); -static void nv_addsub __ARGS((cmdarg_T *cap)); -static void nv_page __ARGS((cmdarg_T *cap)); -static void nv_gd __ARGS((oparg_T *oap, int nchar, int thisblock)); -static int nv_screengo __ARGS((oparg_T *oap, int dir, long dist)); +static void nv_ignore(cmdarg_T *cap); +static void nv_nop(cmdarg_T *cap); +static void nv_error(cmdarg_T *cap); +static void nv_help(cmdarg_T *cap); +static void nv_addsub(cmdarg_T *cap); +static void nv_page(cmdarg_T *cap); +static void nv_gd(oparg_T *oap, int nchar, int thisblock); +static int nv_screengo(oparg_T *oap, int dir, long dist); #ifdef FEAT_MOUSE -static void nv_mousescroll __ARGS((cmdarg_T *cap)); -static void nv_mouse __ARGS((cmdarg_T *cap)); -#endif -static void nv_scroll_line __ARGS((cmdarg_T *cap)); -static void nv_zet __ARGS((cmdarg_T *cap)); +static void nv_mousescroll(cmdarg_T *cap); +static void nv_mouse(cmdarg_T *cap); +#endif +static void nv_scroll_line(cmdarg_T *cap); +static void nv_zet(cmdarg_T *cap); #ifdef FEAT_GUI -static void nv_ver_scrollbar __ARGS((cmdarg_T *cap)); -static void nv_hor_scrollbar __ARGS((cmdarg_T *cap)); +static void nv_ver_scrollbar(cmdarg_T *cap); +static void nv_hor_scrollbar(cmdarg_T *cap); #endif #ifdef FEAT_GUI_TABLINE -static void nv_tabline __ARGS((cmdarg_T *cap)); -static void nv_tabmenu __ARGS((cmdarg_T *cap)); -#endif -static void nv_exmode __ARGS((cmdarg_T *cap)); -static void nv_colon __ARGS((cmdarg_T *cap)); -static void nv_ctrlg __ARGS((cmdarg_T *cap)); -static void nv_ctrlh __ARGS((cmdarg_T *cap)); -static void nv_clear __ARGS((cmdarg_T *cap)); -static void nv_ctrlo __ARGS((cmdarg_T *cap)); -static void nv_hat __ARGS((cmdarg_T *cap)); -static void nv_Zet __ARGS((cmdarg_T *cap)); -static void nv_ident __ARGS((cmdarg_T *cap)); -static void nv_tagpop __ARGS((cmdarg_T *cap)); -static void nv_scroll __ARGS((cmdarg_T *cap)); -static void nv_right __ARGS((cmdarg_T *cap)); -static void nv_left __ARGS((cmdarg_T *cap)); -static void nv_up __ARGS((cmdarg_T *cap)); -static void nv_down __ARGS((cmdarg_T *cap)); +static void nv_tabline(cmdarg_T *cap); +static void nv_tabmenu(cmdarg_T *cap); +#endif +static void nv_exmode(cmdarg_T *cap); +static void nv_colon(cmdarg_T *cap); +static void nv_ctrlg(cmdarg_T *cap); +static void nv_ctrlh(cmdarg_T *cap); +static void nv_clear(cmdarg_T *cap); +static void nv_ctrlo(cmdarg_T *cap); +static void nv_hat(cmdarg_T *cap); +static void nv_Zet(cmdarg_T *cap); +static void nv_ident(cmdarg_T *cap); +static void nv_tagpop(cmdarg_T *cap); +static void nv_scroll(cmdarg_T *cap); +static void nv_right(cmdarg_T *cap); +static void nv_left(cmdarg_T *cap); +static void nv_up(cmdarg_T *cap); +static void nv_down(cmdarg_T *cap); #ifdef FEAT_SEARCHPATH -static void nv_gotofile __ARGS((cmdarg_T *cap)); -#endif -static void nv_end __ARGS((cmdarg_T *cap)); -static void nv_dollar __ARGS((cmdarg_T *cap)); -static void nv_search __ARGS((cmdarg_T *cap)); -static void nv_next __ARGS((cmdarg_T *cap)); -static int normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt)); -static void nv_csearch __ARGS((cmdarg_T *cap)); -static void nv_brackets __ARGS((cmdarg_T *cap)); -static void nv_percent __ARGS((cmdarg_T *cap)); -static void nv_brace __ARGS((cmdarg_T *cap)); -static void nv_mark __ARGS((cmdarg_T *cap)); -static void nv_findpar __ARGS((cmdarg_T *cap)); -static void nv_undo __ARGS((cmdarg_T *cap)); -static void nv_kundo __ARGS((cmdarg_T *cap)); -static void nv_Replace __ARGS((cmdarg_T *cap)); +static void nv_gotofile(cmdarg_T *cap); +#endif +static void nv_end(cmdarg_T *cap); +static void nv_dollar(cmdarg_T *cap); +static void nv_search(cmdarg_T *cap); +static void nv_next(cmdarg_T *cap); +static int normal_search(cmdarg_T *cap, int dir, char_u *pat, int opt); +static void nv_csearch(cmdarg_T *cap); +static void nv_brackets(cmdarg_T *cap); +static void nv_percent(cmdarg_T *cap); +static void nv_brace(cmdarg_T *cap); +static void nv_mark(cmdarg_T *cap); +static void nv_findpar(cmdarg_T *cap); +static void nv_undo(cmdarg_T *cap); +static void nv_kundo(cmdarg_T *cap); +static void nv_Replace(cmdarg_T *cap); #ifdef FEAT_VREPLACE -static void nv_vreplace __ARGS((cmdarg_T *cap)); -#endif -static void v_swap_corners __ARGS((int cmdchar)); -static void nv_replace __ARGS((cmdarg_T *cap)); -static void n_swapchar __ARGS((cmdarg_T *cap)); -static void nv_cursormark __ARGS((cmdarg_T *cap, int flag, pos_T *pos)); -static void v_visop __ARGS((cmdarg_T *cap)); -static void nv_subst __ARGS((cmdarg_T *cap)); -static void nv_abbrev __ARGS((cmdarg_T *cap)); -static void nv_optrans __ARGS((cmdarg_T *cap)); -static void nv_gomark __ARGS((cmdarg_T *cap)); -static void nv_pcmark __ARGS((cmdarg_T *cap)); -static void nv_regname __ARGS((cmdarg_T *cap)); -static void nv_visual __ARGS((cmdarg_T *cap)); -static void n_start_visual_mode __ARGS((int c)); -static void nv_window __ARGS((cmdarg_T *cap)); -static void nv_suspend __ARGS((cmdarg_T *cap)); -static void nv_g_cmd __ARGS((cmdarg_T *cap)); -static void n_opencmd __ARGS((cmdarg_T *cap)); -static void nv_dot __ARGS((cmdarg_T *cap)); -static void nv_redo __ARGS((cmdarg_T *cap)); -static void nv_Undo __ARGS((cmdarg_T *cap)); -static void nv_tilde __ARGS((cmdarg_T *cap)); -static void nv_operator __ARGS((cmdarg_T *cap)); +static void nv_vreplace(cmdarg_T *cap); +#endif +static void v_swap_corners(int cmdchar); +static void nv_replace(cmdarg_T *cap); +static void n_swapchar(cmdarg_T *cap); +static void nv_cursormark(cmdarg_T *cap, int flag, pos_T *pos); +static void v_visop(cmdarg_T *cap); +static void nv_subst(cmdarg_T *cap); +static void nv_abbrev(cmdarg_T *cap); +static void nv_optrans(cmdarg_T *cap); +static void nv_gomark(cmdarg_T *cap); +static void nv_pcmark(cmdarg_T *cap); +static void nv_regname(cmdarg_T *cap); +static void nv_visual(cmdarg_T *cap); +static void n_start_visual_mode(int c); +static void nv_window(cmdarg_T *cap); +static void nv_suspend(cmdarg_T *cap); +static void nv_g_cmd(cmdarg_T *cap); +static void n_opencmd(cmdarg_T *cap); +static void nv_dot(cmdarg_T *cap); +static void nv_redo(cmdarg_T *cap); +static void nv_Undo(cmdarg_T *cap); +static void nv_tilde(cmdarg_T *cap); +static void nv_operator(cmdarg_T *cap); #ifdef FEAT_EVAL -static void set_op_var __ARGS((int optype)); -#endif -static void nv_lineop __ARGS((cmdarg_T *cap)); -static void nv_home __ARGS((cmdarg_T *cap)); -static void nv_pipe __ARGS((cmdarg_T *cap)); -static void nv_bck_word __ARGS((cmdarg_T *cap)); -static void nv_wordcmd __ARGS((cmdarg_T *cap)); -static void nv_beginline __ARGS((cmdarg_T *cap)); -static void adjust_cursor __ARGS((oparg_T *oap)); -static void adjust_for_sel __ARGS((cmdarg_T *cap)); -static int unadjust_for_sel __ARGS((void)); -static void nv_select __ARGS((cmdarg_T *cap)); -static void nv_goto __ARGS((cmdarg_T *cap)); -static void nv_normal __ARGS((cmdarg_T *cap)); -static void nv_esc __ARGS((cmdarg_T *oap)); -static void nv_edit __ARGS((cmdarg_T *cap)); -static void invoke_edit __ARGS((cmdarg_T *cap, int repl, int cmd, int startln)); +static void set_op_var(int optype); +#endif +static void nv_lineop(cmdarg_T *cap); +static void nv_home(cmdarg_T *cap); +static void nv_pipe(cmdarg_T *cap); +static void nv_bck_word(cmdarg_T *cap); +static void nv_wordcmd(cmdarg_T *cap); +static void nv_beginline(cmdarg_T *cap); +static void adjust_cursor(oparg_T *oap); +static void adjust_for_sel(cmdarg_T *cap); +static int unadjust_for_sel(void); +static void nv_select(cmdarg_T *cap); +static void nv_goto(cmdarg_T *cap); +static void nv_normal(cmdarg_T *cap); +static void nv_esc(cmdarg_T *oap); +static void nv_edit(cmdarg_T *cap); +static void invoke_edit(cmdarg_T *cap, int repl, int cmd, int startln); #ifdef FEAT_TEXTOBJ -static void nv_object __ARGS((cmdarg_T *cap)); -#endif -static void nv_record __ARGS((cmdarg_T *cap)); -static void nv_at __ARGS((cmdarg_T *cap)); -static void nv_halfpage __ARGS((cmdarg_T *cap)); -static void nv_join __ARGS((cmdarg_T *cap)); -static void nv_put __ARGS((cmdarg_T *cap)); -static void nv_open __ARGS((cmdarg_T *cap)); +static void nv_object(cmdarg_T *cap); +#endif +static void nv_record(cmdarg_T *cap); +static void nv_at(cmdarg_T *cap); +static void nv_halfpage(cmdarg_T *cap); +static void nv_join(cmdarg_T *cap); +static void nv_put(cmdarg_T *cap); +static void nv_open(cmdarg_T *cap); #ifdef FEAT_SNIFF -static void nv_sniff __ARGS((cmdarg_T *cap)); +static void nv_sniff(cmdarg_T *cap); #endif #ifdef FEAT_NETBEANS_INTG -static void nv_nbcmd __ARGS((cmdarg_T *cap)); +static void nv_nbcmd(cmdarg_T *cap); #endif #ifdef FEAT_DND -static void nv_drop __ARGS((cmdarg_T *cap)); +static void nv_drop(cmdarg_T *cap); #endif #ifdef FEAT_AUTOCMD -static void nv_cursorhold __ARGS((cmdarg_T *cap)); -#endif -static void get_op_vcol __ARGS((oparg_T *oap, colnr_T col, int initial)); +static void nv_cursorhold(cmdarg_T *cap); +#endif +static void get_op_vcol(oparg_T *oap, colnr_T col, int initial); static char *e_noident = N_("E349: No identifier under cursor"); @@ -183,7 +183,7 @@ static char *e_noident = N_("E349: No id * Function to be called for a Normal or Visual mode command. * The argument is a cmdarg_T. */ -typedef void (*nv_func_T) __ARGS((cmdarg_T *cap)); +typedef void (*nv_func_T)(cmdarg_T *cap); /* Values for cmd_flags. */ #define NV_NCH 0x01 /* may need to get a second char */ @@ -3360,7 +3360,7 @@ reset_VIsual() } #if defined(FEAT_BEVAL) -static int find_is_eval_item __ARGS((char_u *ptr, int *colp, int *nbp, int dir)); +static int find_is_eval_item(char_u *ptr, int *colp, int *nbp, int dir); /* * Check for a balloon-eval special item to include when searching for an @@ -3760,7 +3760,7 @@ static char_u old_showcmd_buf[SHOWCMD_BU static int showcmd_is_clear = TRUE; static int showcmd_visual = FALSE; -static void display_showcmd __ARGS((void)); +static void display_showcmd(void); void clear_showcmd()