commit 81e7a9c3fb37cad46c8f04a5ce871fb06819a371
author Bram Moolenaar <Bram@vim.org> Sat Feb 06 19:57:20 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Feb 06 19:57:20 2016 +0100
tree 137d60842f9637b69037c043e9e5f6e6215d3402
parent 4f8b8faec31a934920a723053e8dcf47b6fac08c

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

src/if_py_both.h

diff --git a/src/if_py_both.h b/src/if_py_both.h
index e8a5f5d..6ae3fe7 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -5831,11 +5831,10 @@
 	}
 	/* 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
     {

src/if_python.c

diff --git a/src/if_python.c b/src/if_python.c
index 43c8992..4c2760e 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1556,6 +1556,12 @@
 	    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;
     }
 }
 

src/if_python3.c

diff --git a/src/if_python3.c b/src/if_python3.c
index 569aca8..7194b6e 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1649,6 +1649,12 @@
 	    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;
     }
 }
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 626639a..74518d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1270,
+/**/
     1269,
 /**/
     1268,