diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-04 16:13:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-04 16:13:49 +0100 |
| commit | 3d8a513b46b586cb5d2893e7f28c5f51c4dfdc17 (patch) | |
| tree | 2931875c1c84bacc2254e4d66fea1f53d2b3f040 | |
| parent | 0892832bb6c7e322fcae8560eaad5a8140ee4a06 (diff) | |
patch 8.2.0085: dead code in builtin functionsv8.2.0085
Problem: Dead code in builtin functions.
Solution: Clean up the code.
| -rw-r--r-- | src/evalvars.c | 14 | ||||
| -rw-r--r-- | src/sound.c | 6 | ||||
| -rw-r--r-- | src/textprop.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 3aaae13b45..6ec5c25dce 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -2980,7 +2980,7 @@ getwinvar( * "setwinvar()" and "settabwinvar()" functions */ static void -setwinvar(typval_T *argvars, typval_T *rettv UNUSED, int off) +setwinvar(typval_T *argvars, int off) { win_T *win; win_T *save_curwin; @@ -3381,15 +3381,13 @@ f_getbufvar(typval_T *argvars, typval_T *rettv) * "settabvar()" function */ void -f_settabvar(typval_T *argvars, typval_T *rettv) +f_settabvar(typval_T *argvars, typval_T *rettv UNUSED) { tabpage_T *save_curtab; tabpage_T *tp; char_u *varname, *tabvarname; typval_T *varp; - rettv->vval.v_number = 0; - if (check_secure()) return; @@ -3421,18 +3419,18 @@ f_settabvar(typval_T *argvars, typval_T *rettv) * "settabwinvar()" function */ void -f_settabwinvar(typval_T *argvars, typval_T *rettv) +f_settabwinvar(typval_T *argvars, typval_T *rettv UNUSED) { - setwinvar(argvars, rettv, 1); + setwinvar(argvars, 1); } /* * "setwinvar()" function */ void -f_setwinvar(typval_T *argvars, typval_T *rettv) +f_setwinvar(typval_T *argvars, typval_T *rettv UNUSED) { - setwinvar(argvars, rettv, 0); + setwinvar(argvars, 0); } /* diff --git a/src/sound.c b/src/sound.c index c3052fd243..9d91f6c086 100644 --- a/src/sound.c +++ b/src/sound.c @@ -351,9 +351,6 @@ f_sound_playevent(typval_T *argvars, typval_T *rettv) { WCHAR *wp; - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = 0; - wp = enc_to_utf16(tv_get_string(&argvars[0]), NULL); if (wp == NULL) return; @@ -375,9 +372,6 @@ f_sound_playfile(typval_T *argvars, typval_T *rettv) char buf[32]; MCIERROR err; - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = 0; - esc = vim_strsave_shellescape(tv_get_string(&argvars[0]), FALSE, FALSE); len = STRLEN(esc) + 5 + 18 + 1; diff --git a/src/textprop.c b/src/textprop.c index fa3830cb20..dfd30dd4f5 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -885,7 +885,7 @@ f_prop_type_delete(typval_T *argvars, typval_T *rettv UNUSED) * prop_type_get({name} [, {bufnr}]) */ void -f_prop_type_get(typval_T *argvars, typval_T *rettv UNUSED) +f_prop_type_get(typval_T *argvars, typval_T *rettv) { char_u *name = tv_get_string(&argvars[0]); diff --git a/src/version.c b/src/version.c index 6b2c9c82c6..d159ceb306 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 85, +/**/ 84, /**/ 83, |