Browse Source

kconfig: annotate non-trivial fall-trough

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Arnaud Lacombe 14 years ago
parent
commit
d8fc320079
4 changed files with 11 additions and 0 deletions
  1. 4 0
      scripts/kconfig/conf.c
  2. 5 0
      scripts/kconfig/confdata.c
  3. 1 0
      scripts/kconfig/gconf.c
  4. 1 0
      scripts/kconfig/mconf.c

+ 4 - 0
scripts/kconfig/conf.c

@@ -106,6 +106,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 			return 0;
 			return 0;
 		}
 		}
 		check_stdin();
 		check_stdin();
+		/* fall through */
 	case oldaskconfig:
 	case oldaskconfig:
 		fflush(stdout);
 		fflush(stdout);
 		xfgets(line, 128, stdin);
 		xfgets(line, 128, stdin);
@@ -150,6 +151,7 @@ static int conf_string(struct menu *menu)
 				def = NULL;
 				def = NULL;
 				break;
 				break;
 			}
 			}
+			/* fall through */
 		default:
 		default:
 			line[strlen(line)-1] = 0;
 			line[strlen(line)-1] = 0;
 			def = line;
 			def = line;
@@ -304,6 +306,7 @@ static int conf_choice(struct menu *menu)
 				break;
 				break;
 			}
 			}
 			check_stdin();
 			check_stdin();
+			/* fall through */
 		case oldaskconfig:
 		case oldaskconfig:
 			fflush(stdout);
 			fflush(stdout);
 			xfgets(line, 128, stdin);
 			xfgets(line, 128, stdin);
@@ -369,6 +372,7 @@ static void conf(struct menu *menu)
 				check_conf(menu);
 				check_conf(menu);
 				return;
 				return;
 			}
 			}
+			/* fall through */
 		case P_COMMENT:
 		case P_COMMENT:
 			prompt = menu_get_prompt(menu);
 			prompt = menu_get_prompt(menu);
 			if (prompt)
 			if (prompt)

+ 5 - 0
scripts/kconfig/confdata.c

@@ -128,6 +128,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			sym->flags |= def_flags;
 			sym->flags |= def_flags;
 			break;
 			break;
 		}
 		}
+		/* fall through */
 	case S_BOOLEAN:
 	case S_BOOLEAN:
 		if (p[0] == 'y') {
 		if (p[0] == 'y') {
 			sym->def[def].tri = yes;
 			sym->def[def].tri = yes;
@@ -148,6 +149,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			sym->type = S_STRING;
 			sym->type = S_STRING;
 			goto done;
 			goto done;
 		}
 		}
+		/* fall through */
 	case S_STRING:
 	case S_STRING:
 		if (*p++ != '"')
 		if (*p++ != '"')
 			break;
 			break;
@@ -162,6 +164,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			conf_warning("invalid string found");
 			conf_warning("invalid string found");
 			return 1;
 			return 1;
 		}
 		}
+		/* fall through */
 	case S_INT:
 	case S_INT:
 	case S_HEX:
 	case S_HEX:
 	done:
 	done:
@@ -237,6 +240,7 @@ load:
 		case S_STRING:
 		case S_STRING:
 			if (sym->def[def].val)
 			if (sym->def[def].val)
 				free(sym->def[def].val);
 				free(sym->def[def].val);
+			/* fall through */
 		default:
 		default:
 			sym->def[def].val = NULL;
 			sym->def[def].val = NULL;
 			sym->def[def].tri = no;
 			sym->def[def].tri = no;
@@ -363,6 +367,7 @@ int conf_read(const char *name)
 					break;
 					break;
 				if (!sym_is_choice(sym))
 				if (!sym_is_choice(sym))
 					goto sym_ok;
 					goto sym_ok;
+				/* fall through */
 			default:
 			default:
 				if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
 				if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
 					goto sym_ok;
 					goto sym_ok;

+ 1 - 0
scripts/kconfig/gconf.c

@@ -1172,6 +1172,7 @@ static gchar **fill_row(struct menu *menu)
 			row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
 			row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
 		if (sym_is_choice(sym))
 		if (sym_is_choice(sym))
 			break;
 			break;
+		/* fall through */
 	case S_TRISTATE:
 	case S_TRISTATE:
 		val = sym_get_tristate_value(sym);
 		val = sym_get_tristate_value(sym);
 		switch (val) {
 		switch (val) {

+ 1 - 0
scripts/kconfig/mconf.c

@@ -845,6 +845,7 @@ int main(int ac, char **av)
 				"\n\n"));
 				"\n\n"));
 			return 1;
 			return 1;
 		}
 		}
+		/* fall through */
 	case -1:
 	case -1:
 		printf(_("\n\n"
 		printf(_("\n\n"
 			"*** End of the configuration.\n"
 			"*** End of the configuration.\n"