patch 7.4.1270

Problem:    Warnings for missing values in switch.
Solution:   Change switch to if-else or add values.

diff --git a/src/if_py_both.h b/src/if_py_both.h
index e8a5f5de9cc8eced86a2c1e1e27f16d8d686bac3..6ae3fe7f6b8941e7e0116aaddde1b5268ca26351 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -5831,11 +5831,10 @@ convert_dl(PyObject *obj, typval_T *tv,
        }
        /* As we are not using copy_tv which increments reference count we must
         * do it ourself. */
-       switch(tv->v_type)
-       {
-           case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break;
-           case VAR_LIST: ++tv->vval.v_list->lv_refcount; break;
-       }
+       if (tv->v_type == VAR_DICT)
+           ++tv->vval.v_dict->dv_refcount;
+       else if (tv->v_type == VAR_LIST)
+           ++tv->vval.v_list->lv_refcount;
     }
     else
     {

diff --git a/src/if_python.c b/src/if_python.c
index 43c89928e336cbbca2fc6d7ee5798ac753453ca3..4c2760e06b86e152016a707d11527025bb8eb422 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1556,6 +1556,12 @@ do_pyeval (char_u *str, typval_T *rettv)
            rettv->v_type = VAR_NUMBER;
            rettv->vval.v_number = 0;
            break;
+       case VAR_NUMBER:
+       case VAR_STRING:
+       case VAR_FLOAT:
+       case VAR_JOB:
+       case VAR_SPECIAL:
+           break;
     }
 }
 

diff --git a/src/if_python3.c b/src/if_python3.c
index 569aca85700af9aa856a27d27f0aece823d0ec97..7194b6edb52f1144d31de75a9d7d895c5e106c29 100644 (file)
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1649,6 +1649,12 @@ do_py3eval (char_u *str, typval_T *rettv)
            rettv->v_type = VAR_NUMBER;
            rettv->vval.v_number = 0;
            break;
+       case VAR_NUMBER:
+       case VAR_STRING:
+       case VAR_FLOAT:
+       case VAR_JOB:
+       case VAR_SPECIAL:
+           break;
     }
 }
 

diff --git a/src/version.c b/src/version.c
index 626639a1c5411eaae1f0953491f576c1339165e6..74518d936a9d959e046934bf702e94ce43f52092 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1270,
 /**/
     1269,
 /**/