updated for version 7.2-177
diff --git a/src/eval.c b/src/eval.c
index 00e199f..3f231b6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3772,7 +3772,6 @@
* 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 @@
* 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 @@
/*
* "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 @@
/*
* "byteidx()" function
*/
-/*ARGSUSED*/
static void
f_byteidx(argvars, rettv)
typval_T *argvars;
@@ -8852,7 +8848,7 @@
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 @@
/*
* "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 @@
/*
* "complete_add()" function
*/
-/*ARGSUSED*/
static void
f_complete_add(argvars, rettv)
typval_T *argvars;
@@ -8963,10 +8957,9 @@
/*
* "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 @@
/*
* "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 @@
*
* 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 @@
* 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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "eval()" function
*/
-/*ARGSUSED*/
static void
f_eval(argvars, rettv)
typval_T *argvars;
@@ -9444,10 +9430,9 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "function()" function
*/
-/*ARGSUSED*/
static void
f_function(argvars, rettv)
typval_T *argvars;
@@ -10357,11 +10337,10 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* 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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "mode()" function
*/
-/*ARGSUSED*/
static void
f_mode(argvars, rettv)
typval_T *argvars;
@@ -13726,11 +13681,10 @@
/*
* "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_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 @@
/*
* "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 @@
#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 @@
#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 @@
/*
* "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 @@
/*
* "repeat()" function
*/
-/*ARGSUSED*/
static void
f_repeat(argvars, rettv)
typval_T *argvars;
@@ -15207,10 +15155,9 @@
}
-/*ARGSUSED*/
static void
f_server2client(argvars, rettv)
- typval_T *argvars;
+ typval_T *argvars UNUSED;
typval_T *rettv;
{
#ifdef FEAT_CLIENTSERVER
@@ -15239,10 +15186,9 @@
#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 @@
/*
* "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 @@
/*
* 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 @@
/*
* "setloclist()" function
*/
-/*ARGSUSED*/
static void
f_setloclist(argvars, rettv)
typval_T *argvars;
@@ -15520,7 +15463,6 @@
/*
* "setpos()" function
*/
-/*ARGSUSED*/
static void
f_setpos(argvars, rettv)
typval_T *argvars;
@@ -15564,7 +15506,6 @@
/*
* "setqflist()" function
*/
-/*ARGSUSED*/
static void
f_setqflist(argvars, rettv)
typval_T *argvars;
@@ -15667,11 +15608,10 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
/*
* "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 @@
* 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 @@
/*
* 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;