Mercurial > vim
changeset 1880:e5602d92da8c v7.2.177
updated for version 7.2-177
| author | vimboss |
|---|---|
| date | Sat, 16 May 2009 15:31:32 +0000 |
| parents | e8eeeff19eae |
| children | 6605dca2960f |
| files | src/eval.c src/ex_docmd.c src/ex_eval.c src/ex_getln.c src/farsi.c src/fileio.c src/hardcopy.c src/if_cscope.c src/if_xcmdsrv.c src/mark.c src/menu.c src/version.c |
| diffstat | 12 files changed, 145 insertions(+), 240 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -3772,7 +3772,6 @@ cat_prefix_varname(prefix, name) * Function given to ExpandGeneric() to obtain the list of user defined * (global/buffer/window/built-in) variable names. */ -/*ARGSUSED*/ char_u * get_user_var_name(xp, idx) expand_T *xp; @@ -7787,7 +7786,6 @@ get_function_name(xp, idx) * Function given to ExpandGeneric() to obtain the list of internal or * user defined variable or function names. */ -/*ARGSUSED*/ char_u * get_expr_name(xp, idx) expand_T *xp; @@ -8655,10 +8653,9 @@ f_bufwinnr(argvars, rettv) /* * "byte2line(byte)" function */ -/*ARGSUSED*/ static void f_byte2line(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifndef FEAT_BYTEOFF @@ -8678,7 +8675,6 @@ f_byte2line(argvars, rettv) /* * "byteidx()" function */ -/*ARGSUSED*/ static void f_byteidx(argvars, rettv) typval_T *argvars; @@ -8852,7 +8848,7 @@ f_cindent(argvars, rettv) static void f_clearmatches(argvars, rettv) typval_T *argvars UNUSED; - typval_T *rettv; + typval_T *rettv UNUSED; { #ifdef FEAT_SEARCH_EXTRA clear_matches(curwin); @@ -8916,11 +8912,10 @@ f_col(argvars, rettv) /* * "complete()" function */ -/*ARGSUSED*/ static void f_complete(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { int startcol; @@ -8951,7 +8946,6 @@ f_complete(argvars, rettv) /* * "complete_add()" function */ -/*ARGSUSED*/ static void f_complete_add(argvars, rettv) typval_T *argvars; @@ -8963,10 +8957,9 @@ f_complete_add(argvars, rettv) /* * "complete_check()" function */ -/*ARGSUSED*/ static void f_complete_check(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int saved = RedrawingDisabled; @@ -8981,11 +8974,10 @@ f_complete_check(argvars, rettv) /* * "confirm(message, buttons[, default [, type]])" function */ -/*ARGSUSED*/ static void f_confirm(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) char_u *message; @@ -9150,11 +9142,10 @@ f_count(argvars, rettv) * * Checks the existence of a cscope connection. */ -/*ARGSUSED*/ static void f_cscope_connection(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CSCOPE int num = 0; @@ -9181,7 +9172,6 @@ f_cscope_connection(argvars, rettv) * Moves the cursor to the specified line and column. * Returns 0 when the position could be set, -1 otherwise. */ -/*ARGSUSED*/ static void f_cursor(argvars, rettv) typval_T *argvars; @@ -9275,11 +9265,10 @@ f_delete(argvars, rettv) /* * "did_filetype()" function */ -/*ARGSUSED*/ static void f_did_filetype(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_AUTOCMD rettv->vval.v_number = did_filetype; @@ -9289,11 +9278,10 @@ f_did_filetype(argvars, rettv) /* * "diff_filler()" function */ -/*ARGSUSED*/ static void f_diff_filler(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_DIFF rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); @@ -9303,11 +9291,10 @@ f_diff_filler(argvars, rettv) /* * "diff_hlID()" function */ -/*ARGSUSED*/ static void f_diff_hlID(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_DIFF linenr_T lnum = get_tv_lnum(argvars); @@ -9420,7 +9407,6 @@ f_escape(argvars, rettv) /* * "eval()" function */ -/*ARGSUSED*/ static void f_eval(argvars, rettv) typval_T *argvars; @@ -9444,10 +9430,9 @@ f_eval(argvars, rettv) /* * "eventhandler()" function */ -/*ARGSUSED*/ static void f_eventhandler(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = vgetc_busy; @@ -9704,11 +9689,10 @@ f_extend(argvars, rettv) /* * "feedkeys()" function */ -/*ARGSUSED*/ static void f_feedkeys(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { int remap = TRUE; char_u *keys, *flags; @@ -10210,10 +10194,9 @@ f_foldlevel(argvars, rettv) /* * "foldtext()" function */ -/*ARGSUSED*/ static void f_foldtext(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_FOLDING @@ -10278,10 +10261,9 @@ f_foldtext(argvars, rettv) /* * "foldtextresult(lnum)" function */ -/*ARGSUSED*/ static void f_foldtextresult(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_FOLDING @@ -10314,11 +10296,10 @@ f_foldtextresult(argvars, rettv) /* * "foreground()" function */ -/*ARGSUSED*/ static void f_foreground(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_GUI if (gui.in_use) @@ -10333,7 +10314,6 @@ f_foreground(argvars, rettv) /* * "function()" function */ -/*ARGSUSED*/ static void f_function(argvars, rettv) typval_T *argvars; @@ -10357,11 +10337,10 @@ f_function(argvars, rettv) /* * "garbagecollect()" function */ -/*ARGSUSED*/ static void f_garbagecollect(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { /* This is postponed until we are back at the toplevel, because we may be * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ @@ -10664,10 +10643,9 @@ f_getchar(argvars, rettv) /* * "getcharmod()" function */ -/*ARGSUSED*/ static void f_getcharmod(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = mod_mask; @@ -10676,10 +10654,9 @@ f_getcharmod(argvars, rettv) /* * "getcmdline()" function */ -/*ARGSUSED*/ static void f_getcmdline(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10689,10 +10666,9 @@ f_getcmdline(argvars, rettv) /* * "getcmdpos()" function */ -/*ARGSUSED*/ static void f_getcmdpos(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = get_cmdline_pos() + 1; @@ -10701,10 +10677,9 @@ f_getcmdpos(argvars, rettv) /* * "getcmdtype()" function */ -/*ARGSUSED*/ static void f_getcmdtype(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10719,10 +10694,9 @@ f_getcmdtype(argvars, rettv) /* * "getcwd()" function */ -/*ARGSUSED*/ static void f_getcwd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u cwd[MAXPATHL]; @@ -10743,10 +10717,9 @@ f_getcwd(argvars, rettv) /* * "getfontname()" function */ -/*ARGSUSED*/ static void f_getfontname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -10973,10 +10946,9 @@ f_getline(argvars, rettv) /* * "getmatches()" function */ -/*ARGSUSED*/ static void f_getmatches(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SEARCH_EXTRA @@ -11004,10 +10976,9 @@ f_getmatches(argvars, rettv) /* * "getpid()" function */ -/*ARGSUSED*/ static void f_getpid(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = mch_get_pid(); @@ -11051,11 +11022,10 @@ f_getpos(argvars, rettv) /* * "getqflist()" and "getloclist()" functions */ -/*ARGSUSED*/ static void f_getqflist(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_QUICKFIX win_T *wp; @@ -11170,10 +11140,9 @@ f_gettabwinvar(argvars, rettv) /* * "getwinposx()" function */ -/*ARGSUSED*/ static void f_getwinposx(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = -1; @@ -11191,10 +11160,9 @@ f_getwinposx(argvars, rettv) /* * "getwinposy()" function */ -/*ARGSUSED*/ static void f_getwinposy(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = -1; @@ -11921,10 +11889,9 @@ f_has_key(argvars, rettv) /* * "haslocaldir()" function */ -/*ARGSUSED*/ static void f_haslocaldir(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = (curwin->w_localdir != NULL); @@ -11962,10 +11929,9 @@ f_hasmapto(argvars, rettv) /* * "histadd()" function */ -/*ARGSUSED*/ static void f_histadd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CMDHIST @@ -11996,11 +11962,10 @@ f_histadd(argvars, rettv) /* * "histdel()" function */ -/*ARGSUSED*/ static void f_histdel(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CMDHIST int n; @@ -12028,10 +11993,9 @@ f_histdel(argvars, rettv) /* * "histget()" function */ -/*ARGSUSED*/ static void f_histget(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CMDHIST @@ -12061,10 +12025,9 @@ f_histget(argvars, rettv) /* * "histnr()" function */ -/*ARGSUSED*/ static void f_histnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int i; @@ -12106,10 +12069,9 @@ f_hlexists(argvars, rettv) /* * "hostname()" function */ -/*ARGSUSED*/ static void f_hostname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u hostname[256]; @@ -12122,10 +12084,9 @@ f_hostname(argvars, rettv) /* * iconv() function */ -/*ARGSUSED*/ static void f_iconv(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_MBYTE @@ -12420,10 +12381,9 @@ static garray_T ga_userinput = {0, 0 /* * "inputrestore()" function */ -/*ARGSUSED*/ static void f_inputrestore(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { if (ga_userinput.ga_len > 0) @@ -12443,10 +12403,9 @@ f_inputrestore(argvars, rettv) /* * "inputsave()" function */ -/*ARGSUSED*/ static void f_inputsave(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { /* Add an entry to the stack of typeahead storage. */ @@ -12733,10 +12692,9 @@ f_keys(argvars, rettv) /* * "last_buffer_nr()" function. */ -/*ARGSUSED*/ static void f_last_buffer_nr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int n = 0; @@ -12863,10 +12821,9 @@ f_line(argvars, rettv) /* * "line2byte(lnum)" function */ -/*ARGSUSED*/ static void f_line2byte(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifndef FEAT_BYTEOFF @@ -12912,10 +12869,9 @@ f_lispindent(argvars, rettv) /* * "localtime()" function */ -/*ARGSUSED*/ static void f_localtime(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->vval.v_number = (varnumber_T)time(NULL); @@ -13497,7 +13453,6 @@ f_mkdir(argvars, rettv) /* * "mode()" function */ -/*ARGSUSED*/ static void f_mode(argvars, rettv) typval_T *argvars; @@ -13726,11 +13681,10 @@ f_printf(argvars, rettv) /* * "pumvisible()" function */ -/*ARGSUSED*/ static void f_pumvisible(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_INS_EXPAND if (pum_visible()) @@ -14131,10 +14085,9 @@ remote_common(argvars, rettv, expr) /* * "remote_expr()" function */ -/*ARGSUSED*/ static void f_remote_expr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -14147,11 +14100,10 @@ f_remote_expr(argvars, rettv) /* * "remote_foreground()" function */ -/*ARGSUSED*/ static void f_remote_foreground(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_CLIENTSERVER # ifdef WIN32 @@ -14173,10 +14125,9 @@ f_remote_foreground(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_remote_peek(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CLIENTSERVER @@ -14231,10 +14182,9 @@ f_remote_peek(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_remote_read(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *r = NULL; @@ -14266,10 +14216,9 @@ f_remote_read(argvars, rettv) /* * "remote_send()" function */ -/*ARGSUSED*/ static void f_remote_send(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { rettv->v_type = VAR_STRING; @@ -14398,7 +14347,6 @@ f_rename(argvars, rettv) /* * "repeat()" function */ -/*ARGSUSED*/ static void f_repeat(argvars, rettv) typval_T *argvars; @@ -15207,10 +15155,9 @@ f_searchpos(argvars, rettv) } -/*ARGSUSED*/ static void f_server2client(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_CLIENTSERVER @@ -15239,10 +15186,9 @@ f_server2client(argvars, rettv) #endif } -/*ARGSUSED*/ static void f_serverlist(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *r = NULL; @@ -15263,11 +15209,10 @@ f_serverlist(argvars, rettv) /* * "setbufvar()" function */ -/*ARGSUSED*/ static void f_setbufvar(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { buf_T *buf; aco_save_T aco; @@ -15402,12 +15347,11 @@ static void set_qf_ll_list __ARGS((win_T /* * Used by "setqflist()" and "setloclist()" functions */ -/*ARGSUSED*/ static void set_qf_ll_list(wp, list_arg, action_arg, rettv) - win_T *wp; - typval_T *list_arg; - typval_T *action_arg; + win_T *wp UNUSED; + typval_T *list_arg UNUSED; + typval_T *action_arg UNUSED; typval_T *rettv; { #ifdef FEAT_QUICKFIX @@ -15442,7 +15386,6 @@ set_qf_ll_list(wp, list_arg, action_arg, /* * "setloclist()" function */ -/*ARGSUSED*/ static void f_setloclist(argvars, rettv) typval_T *argvars; @@ -15520,7 +15463,6 @@ f_setmatches(argvars, rettv) /* * "setpos()" function */ -/*ARGSUSED*/ static void f_setpos(argvars, rettv) typval_T *argvars; @@ -15564,7 +15506,6 @@ f_setpos(argvars, rettv) /* * "setqflist()" function */ -/*ARGSUSED*/ static void f_setqflist(argvars, rettv) typval_T *argvars; @@ -15667,11 +15608,10 @@ f_setwinvar(argvars, rettv) /* * "setwinvar()" and "settabwinvar()" functions */ -/*ARGSUSED*/ static void setwinvar(argvars, rettv, off) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; int off; { win_T *win; @@ -15987,10 +15927,9 @@ f_soundfold(argvars, rettv) /* * "spellbadword()" function */ -/* ARGSUSED */ static void f_spellbadword(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *word = (char_u *)""; @@ -16042,10 +15981,9 @@ f_spellbadword(argvars, rettv) /* * "spellsuggest()" function */ -/*ARGSUSED*/ static void f_spellsuggest(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SPELL @@ -16528,10 +16466,9 @@ f_substitute(argvars, rettv) /* * "synID(lnum, col, trans)" function */ -/*ARGSUSED*/ static void f_synID(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int id = 0; @@ -16556,10 +16493,9 @@ f_synID(argvars, rettv) /* * "synIDattr(id, what [, mode])" function */ -/*ARGSUSED*/ static void f_synIDattr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u *p = NULL; @@ -16652,10 +16588,9 @@ f_synIDattr(argvars, rettv) /* * "synIDtrans(id)" function */ -/*ARGSUSED*/ static void f_synIDtrans(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int id; @@ -16675,10 +16610,9 @@ f_synIDtrans(argvars, rettv) /* * "synstack(lnum, col)" function */ -/*ARGSUSED*/ static void f_synstack(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_SYN_HL @@ -16812,11 +16746,10 @@ done: /* * "tabpagebuflist()" function */ -/* ARGSUSED */ static void f_tabpagebuflist(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_WINDOWS tabpage_T *tp; @@ -16844,10 +16777,9 @@ f_tabpagebuflist(argvars, rettv) /* * "tabpagenr()" function */ -/* ARGSUSED */ static void f_tabpagenr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -16929,10 +16861,9 @@ get_winnr(tp, argvar) /* * "tabpagewinnr()" function */ -/* ARGSUSED */ static void f_tabpagewinnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -16952,10 +16883,9 @@ f_tabpagewinnr(argvars, rettv) /* * "tagfiles()" function */ -/*ARGSUSED*/ static void f_tagfiles(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { char_u fname[MAXPATHL + 1]; @@ -16995,10 +16925,9 @@ f_taglist(argvars, rettv) /* * "tempname()" function */ -/*ARGSUSED*/ static void f_tempname(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { static int x = 'A'; @@ -17031,11 +16960,10 @@ f_tempname(argvars, rettv) /* * "test(list)" function: Just checking the walls... */ -/*ARGSUSED*/ static void f_test(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { /* Used for unit testing. Change the code below to your liking. */ #if 0 @@ -17320,11 +17248,10 @@ f_virtcol(argvars, rettv) /* * "visualmode()" function */ -/*ARGSUSED*/ static void f_visualmode(argvars, rettv) - typval_T *argvars; - typval_T *rettv; + typval_T *argvars UNUSED; + typval_T *rettv UNUSED; { #ifdef FEAT_VISUAL char_u str[2]; @@ -17360,10 +17287,9 @@ f_winbufnr(argvars, rettv) /* * "wincol()" function */ -/*ARGSUSED*/ static void f_wincol(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { validate_cursor(); @@ -17390,10 +17316,9 @@ f_winheight(argvars, rettv) /* * "winline()" function */ -/*ARGSUSED*/ static void f_winline(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { validate_cursor(); @@ -17403,10 +17328,9 @@ f_winline(argvars, rettv) /* * "winnr()" function */ -/* ARGSUSED */ static void f_winnr(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { int nr = 1; @@ -17420,10 +17344,9 @@ f_winnr(argvars, rettv) /* * "winrestcmd()" function */ -/* ARGSUSED */ static void f_winrestcmd(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { #ifdef FEAT_WINDOWS @@ -17455,11 +17378,10 @@ f_winrestcmd(argvars, rettv) /* * "winrestview()" function */ -/* ARGSUSED */ static void f_winrestview(argvars, rettv) typval_T *argvars; - typval_T *rettv; + typval_T *rettv UNUSED; { dict_T *dict; @@ -17501,10 +17423,9 @@ f_winrestview(argvars, rettv) /* * "winsaveview()" function */ -/* ARGSUSED */ static void f_winsaveview(argvars, rettv) - typval_T *argvars; + typval_T *argvars UNUSED; typval_T *rettv; { dict_T *dict; @@ -21646,12 +21567,11 @@ get_return_cmd(rettv) * Called by do_cmdline() to get the next line. * Returns allocated string, or NULL for end of function. */ -/* ARGSUSED */ char_u * get_func_line(c, cookie, indent) - int c; /* not used */ + int c UNUSED; void *cookie; - int indent; /* not used */ + int indent UNUSED; { funccall_T *fcp = (funccall_T *)cookie; ufunc_T *fp = fcp->func; @@ -22023,10 +21943,9 @@ last_set_msg(scriptID) /* * List v:oldfiles in a nice way. */ -/*ARGSUSED*/ void ex_oldfiles(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { list_T *l = vimvars[VV_OLDFILES].vv_list; listitem_T *li;
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3004,7 +3004,7 @@ modifier_len(cmd) if (VIM_ISDIGIT(*cmd)) p = skipwhite(skipdigits(cmd)); - for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) + for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) { for (j = 0; p[j] != NUL; ++j) if (p[j] != cmdmods[i].name[j]) @@ -3032,7 +3032,7 @@ cmd_exists(name) char_u *p; /* Check command modifiers. */ - for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) + for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) { for (j = 0; name[j] != NUL; ++j) if (name[j] != cmdmods[i].name[j]) @@ -6093,7 +6093,7 @@ get_user_cmd_flags(xp, idx) {"bang", "bar", "buffer", "complete", "count", "nargs", "range", "register"}; - if (idx >= sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0])) + if (idx >= (int)(sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0]))) return NULL; return (char_u *)user_cmd_flags[idx]; } @@ -6108,7 +6108,7 @@ get_user_cmd_nargs(xp, idx) { static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; - if (idx >= sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0])) + if (idx >= (int)(sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0]))) return NULL; return (char_u *)user_cmd_nargs[idx]; } @@ -9144,10 +9144,9 @@ ex_startinsert(eap) /* * ":stopinsert" */ -/*ARGSUSED*/ static void ex_stopinsert(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { restart_edit = 0; stop_insert_mode = TRUE;
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -60,7 +60,9 @@ static char_u *get_end_emsg __ARGS((stru #else /* Values used for the Vim release. */ # define THROW_ON_ERROR TRUE +# define THROW_ON_ERROR_TRUE # define THROW_ON_INTERRUPT TRUE +# define THROW_ON_INTERRUPT_TRUE #endif static void catch_exception __ARGS((except_T *excp)); @@ -1320,16 +1322,20 @@ do_throw(cstack) * and reset the did_emsg or got_int flag, so this won't happen again at * the next surrounding try conditional. */ +#ifndef THROW_ON_ERROR_TRUE if (did_emsg && !THROW_ON_ERROR) { inactivate_try = TRUE; did_emsg = FALSE; } +#endif +#ifndef THROW_ON_INTERRUPT_TRUE if (got_int && !THROW_ON_INTERRUPT) { inactivate_try = TRUE; got_int = FALSE; } +#endif idx = cleanup_conditionals(cstack, 0, inactivate_try); if (idx >= 0) { @@ -2254,10 +2260,9 @@ rewind_conditionals(cstack, idx, cond_ty /* * ":endfunction" when not after a ":function" */ -/*ARGSUSED*/ void ex_endfunction(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { EMSG(_("E193: :endfunction not inside a function")); }
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4533,7 +4533,7 @@ ExpandFromContext(xp, pat, num_file, fil * right function to do the expansion. */ ret = FAIL; - for (i = 0; i < sizeof(tab) / sizeof(struct expgen); ++i) + for (i = 0; i < (int)(sizeof(tab) / sizeof(struct expgen)); ++i) if (xp->xp_context == tab[i].context) { if (tab[i].ic)
--- a/src/farsi.c +++ b/src/farsi.c @@ -103,7 +103,8 @@ toF_Xor_X_(c) case F_HE: tempc = _HE; - if (p_ri && (curwin->w_cursor.col+1 < STRLEN(ml_get_curline()))) + if (p_ri && (curwin->w_cursor.col + 1 + < (colnr_T)STRLEN(ml_get_curline()))) { inc_cursor(); @@ -344,7 +345,7 @@ put_curr_and_l_to_X(c) if (curwin->w_p_rl && p_ri) return; - if ( (curwin->w_cursor.col < STRLEN(ml_get_curline()))) + if ((curwin->w_cursor.col < (colnr_T)STRLEN(ml_get_curline()))) { if ((p_ri && curwin->w_cursor.col) || !p_ri) { @@ -565,7 +566,7 @@ chg_c_to_X_or_X () tempc = gchar_cursor(); - if (curwin->w_cursor.col+1 < STRLEN(ml_get_curline())) + if (curwin->w_cursor.col + 1 < (colnr_T)STRLEN(ml_get_curline())) { inc_cursor(); @@ -594,8 +595,8 @@ chg_l_to_X_orX_ () { int tempc; - if (!curwin->w_cursor.col && - (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) + if (curwin->w_cursor.col != 0 && + (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) return; if (!curwin->w_cursor.col && p_ri) @@ -663,8 +664,8 @@ chg_l_toXor_X () { int tempc; - if (!curwin->w_cursor.col && - (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) + if (curwin->w_cursor.col != 0 && + (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) return; if (!curwin->w_cursor.col && p_ri)
--- a/src/fileio.c +++ b/src/fileio.c @@ -9085,12 +9085,11 @@ auto_next_pat(apc, stop_at_last) * Called by do_cmdline() to get the next line for ":if". * Returns allocated string, or NULL for end of autocommands. */ -/* ARGSUSED */ static char_u * getnextac(c, cookie, indent) - int c; /* not used */ + int c UNUSED; void *cookie; - int indent; /* not used */ + int indent UNUSED; { AutoPatCmd *acp = (AutoPatCmd *)cookie; char_u *retval; @@ -9201,10 +9200,9 @@ has_autocmd(event, sfname, buf) * Function given to ExpandGeneric() to obtain the list of autocommand group * names. */ -/*ARGSUSED*/ char_u * get_augroup_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { if (idx == augroups.ga_len) /* add "END" add the end */ @@ -9270,10 +9268,9 @@ set_context_in_autocmd(xp, arg, doautocm /* * Function given to ExpandGeneric() to obtain the list of event names. */ -/*ARGSUSED*/ char_u * get_event_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { if (idx < augroups.ga_len) /* First list group names, if wanted */
--- a/src/hardcopy.c +++ b/src/hardcopy.c @@ -442,12 +442,11 @@ prt_get_unit(idx) /* * Print the page header. */ -/*ARGSUSED*/ static void prt_header(psettings, pagenum, lnum) prt_settings_T *psettings; int pagenum; - linenr_T lnum; + linenr_T lnum UNUSED; { int width = psettings->chars_per_line; int page_line; @@ -1881,7 +1880,7 @@ prt_next_dsc(p_dsc_line) return FALSE; /* Find type of DSC comment */ - for (comment = 0; comment < NUM_ELEMENTS(prt_dsc_table); comment++) + for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++) if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, prt_dsc_table[comment].len) == 0) break; @@ -2454,12 +2453,11 @@ prt_match_charset(p_charset, p_cmap, pp_ } #endif -/*ARGSUSED*/ int mch_print_init(psettings, jobname, forceit) prt_settings_T *psettings; char_u *jobname; - int forceit; + int forceit UNUSED; { int i; char *paper_name; @@ -2514,7 +2512,7 @@ mch_print_init(psettings, jobname, force if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) { p_mbenc_first = NULL; - for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++) + for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], &p_mbenc)) { @@ -2642,7 +2640,7 @@ mch_print_init(psettings, jobname, force paper_name = "A4"; paper_strlen = 2; } - for (i = 0; i < PRT_MEDIASIZE_LEN; ++i) + for (i = 0; i < (int)PRT_MEDIASIZE_LEN; ++i) if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen && STRNICMP(prt_mediasize[i].name, paper_name, paper_strlen) == 0) @@ -3308,10 +3306,9 @@ mch_print_end_page() return !prt_file_error; } -/*ARGSUSED*/ int mch_print_begin_page(str) - char_u *str; + char_u *str UNUSED; { int page_num[2]; @@ -3379,11 +3376,10 @@ mch_print_start_line(margin, page_line) #endif } -/*ARGSUSED*/ int mch_print_text_out(p, len) char_u *p; - int len; + int len UNUSED; { int need_break; char_u ch;
--- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -83,7 +83,7 @@ static cscmd_T cs_cmds[] = N_("Reinit all connections"), "reset", 0 }, { "show", cs_show, N_("Show connections"), "show", 0 }, - { NULL } + { NULL, NULL, NULL, NULL, 0 } }; static void @@ -107,10 +107,9 @@ static enum * Function given to ExpandGeneric() to obtain the cscope command * expansion. */ -/*ARGSUSED*/ char_u * get_cscope_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { int current_idx; @@ -496,10 +495,9 @@ cs_connection(num, dbpath, ppath) * * MAXPATHL 256 */ -/* ARGSUSED */ static int cs_add(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char *fname, *ppath, *flags = NULL; @@ -1292,10 +1290,9 @@ cs_find_common(opt, pat, forceit, verbos * * print help */ -/* ARGSUSED */ static int cs_help(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { cscmd_T *cmdp = cs_cmds; @@ -1399,13 +1396,12 @@ GetWin32Error() * * insert a new cscope database filename into the filelist */ -/*ARGSUSED*/ static int cs_insert_filelist(fname, ppath, flags, sb) char *fname; char *ppath; char *flags; - struct stat *sb; + struct stat *sb UNUSED; { short i, j; #ifndef UNIX @@ -1561,10 +1557,9 @@ cs_lookup_cmd(eap) * * nuke em */ -/* ARGSUSED */ static int cs_kill(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char *stok; short i; @@ -2241,7 +2236,6 @@ cs_read_prompt(i) /* * Used to catch and ignore SIGALRM below. */ -/* ARGSUSED */ static RETSIGTYPE sig_handler SIGDEFARG(sigarg) { @@ -2381,10 +2375,9 @@ cs_release_csp(i, freefnpp) * * calls cs_kill on all cscope connections then reinits */ -/* ARGSUSED */ static int cs_reset(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { char **dblist = NULL, **pplist = NULL, **fllist = NULL; int i; @@ -2497,10 +2490,9 @@ cs_resolve_file(i, name) * * show all cscope connections */ -/* ARGSUSED */ static int cs_show(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { short i; if (cs_cnt_connections() == 0)
--- a/src/if_xcmdsrv.c +++ b/src/if_xcmdsrv.c @@ -682,7 +682,7 @@ serverGetVimNames(dpy) * Scan all of the names out of the property. */ ga_init2(&ga, 1, 100); - for (p = regProp; (p - regProp) < numItems; p++) + for (p = regProp; (long_u)(p - regProp) < numItems; p++) { entry = p; while (*p != 0 && !isspace(*p)) @@ -969,7 +969,7 @@ LookupName(dpy, name, delete, loose) */ returnValue = (int_u)None; entry = NULL; /* Not needed, but eliminates compiler warning. */ - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { entry = p; while (*p != 0 && !isspace(*p)) @@ -986,7 +986,7 @@ LookupName(dpy, name, delete, loose) if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name)) { - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { entry = p; while (*p != 0 && !isspace(*p)) @@ -1056,7 +1056,7 @@ DeleteAnyLingerer(dpy, win) return; /* Scan the property for the window id. */ - for (p = regProp; (p - regProp) < numItems; ) + for (p = regProp; (long_u)(p - regProp) < numItems; ) { if (*p != 0) { @@ -1196,7 +1196,7 @@ serverEventProc(dpy, eventPtr) * one time; each iteration through the outer loop handles a * single command or result. */ - for (p = propInfo; (p - propInfo) < numItems; ) + for (p = propInfo; (long_u)(p - propInfo) < numItems; ) { /* * Ignore leading NULs; each command or result starts with a @@ -1230,7 +1230,7 @@ serverEventProc(dpy, eventPtr) serial = (char_u *)""; script = NULL; enc = NULL; - while (p - propInfo < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1333,7 +1333,7 @@ serverEventProc(dpy, eventPtr) res = (char_u *)""; code = 0; enc = NULL; - while ((p-propInfo) < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1401,7 +1401,7 @@ serverEventProc(dpy, eventPtr) gotWindow = 0; str = (char_u *)""; enc = NULL; - while ((p-propInfo) < numItems && *p == '-') + while ((long_u)(p - propInfo) < numItems && *p == '-') { switch (p[1]) { @@ -1489,11 +1489,10 @@ AppendPropCarefully(dpy, window, propert /* * Another X Error handler, just used to check for errors. */ -/* ARGSUSED */ static int x_error_check(dpy, error_event) - Display *dpy; - XErrorEvent *error_event; + Display *dpy UNUSED; + XErrorEvent *error_event UNUSED; { got_x_error = TRUE; return 0;
--- a/src/mark.c +++ b/src/mark.c @@ -884,10 +884,9 @@ ex_delmarks(eap) /* * print the jumplist */ -/*ARGSUSED*/ void ex_jumps(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { int i; char_u *name; @@ -933,10 +932,9 @@ ex_jumps(eap) /* * print the changelist */ -/*ARGSUSED*/ void ex_changes(eap) - exarg_T *eap; + exarg_T *eap UNUSED; { int i; char_u *name;
--- a/src/menu.c +++ b/src/menu.c @@ -231,7 +231,7 @@ ex_menu(eap) if (skipdigits(menu_path + 7) == p) { menuarg.iconidx = atoi((char *)menu_path + 7); - if (menuarg.iconidx >= TOOLBAR_NAME_COUNT) + if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT) menuarg.iconidx = -1; else menuarg.icon_builtin = TRUE; @@ -239,7 +239,7 @@ ex_menu(eap) } else { - for (i = 0; i < TOOLBAR_NAME_COUNT; ++i) + for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i) if (STRNCMP(toolbar_names[i], menu_path, p - menu_path) == 0) { @@ -1341,10 +1341,9 @@ set_context_in_menu_cmd(xp, cmd, arg, fo * Function given to ExpandGeneric() to obtain the list of (sub)menus (not * entries). */ -/*ARGSUSED*/ char_u * get_menu_name(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { static vimmenu_T *menu = NULL; @@ -1378,10 +1377,9 @@ get_menu_name(xp, idx) * Function given to ExpandGeneric() to obtain the list of menus and menu * entries. */ -/*ARGSUSED*/ char_u * get_menu_names(xp, idx) - expand_T *xp; + expand_T *xp UNUSED; int idx; { static vimmenu_T *menu = NULL; @@ -1739,10 +1737,9 @@ menu_is_hidden(name) /* * Return TRUE if the menu is the tearoff menu. */ -/*ARGSUSED*/ static int menu_is_tearoff(name) - char_u *name; + char_u *name UNUSED; { #ifdef FEAT_GUI return (STRCMP(name, TEAR_STRING) == 0);