0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1270

Problem:    Warnings for missing values in switch.
Solution:   Change switch to if-else or add values.
This commit is contained in:
Bram Moolenaar
2016-02-06 19:57:20 +01:00
parent 4f8b8faec3
commit 81e7a9c3fb
4 changed files with 18 additions and 5 deletions

View File

@@ -5831,11 +5831,10 @@ convert_dl(PyObject *obj, typval_T *tv,
} }
/* As we are not using copy_tv which increments reference count we must /* As we are not using copy_tv which increments reference count we must
* do it ourself. */ * do it ourself. */
switch(tv->v_type) if (tv->v_type == VAR_DICT)
{ ++tv->vval.v_dict->dv_refcount;
case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break; else if (tv->v_type == VAR_LIST)
case VAR_LIST: ++tv->vval.v_list->lv_refcount; break; ++tv->vval.v_list->lv_refcount;
}
} }
else else
{ {

View File

@@ -1556,6 +1556,12 @@ do_pyeval (char_u *str, typval_T *rettv)
rettv->v_type = VAR_NUMBER; rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = 0; rettv->vval.v_number = 0;
break; break;
case VAR_NUMBER:
case VAR_STRING:
case VAR_FLOAT:
case VAR_JOB:
case VAR_SPECIAL:
break;
} }
} }

View File

@@ -1649,6 +1649,12 @@ do_py3eval (char_u *str, typval_T *rettv)
rettv->v_type = VAR_NUMBER; rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = 0; rettv->vval.v_number = 0;
break; break;
case VAR_NUMBER:
case VAR_STRING:
case VAR_FLOAT:
case VAR_JOB:
case VAR_SPECIAL:
break;
} }
} }

View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1270,
/**/ /**/
1269, 1269,
/**/ /**/