diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2011-05-31 12:30:26 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2011-06-06 15:32:10 -0400 |
commit | d8fc320079b46cf462897148f48d4a63f37f56ce (patch) | |
tree | 739c77444b846363467bf81633973c1eec0d0bad /scripts | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) |
kconfig: annotate non-trivial fall-trough
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/conf.c | 4 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 5 | ||||
-rw-r--r-- | scripts/kconfig/gconf.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 006ad817cd5f..6d2e936f3b67 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -106,6 +106,7 @@ static int conf_askvalue(struct symbol *sym, const char *def) | |||
106 | return 0; | 106 | return 0; |
107 | } | 107 | } |
108 | check_stdin(); | 108 | check_stdin(); |
109 | /* fall through */ | ||
109 | case oldaskconfig: | 110 | case oldaskconfig: |
110 | fflush(stdout); | 111 | fflush(stdout); |
111 | xfgets(line, 128, stdin); | 112 | xfgets(line, 128, stdin); |
@@ -150,6 +151,7 @@ static int conf_string(struct menu *menu) | |||
150 | def = NULL; | 151 | def = NULL; |
151 | break; | 152 | break; |
152 | } | 153 | } |
154 | /* fall through */ | ||
153 | default: | 155 | default: |
154 | line[strlen(line)-1] = 0; | 156 | line[strlen(line)-1] = 0; |
155 | def = line; | 157 | def = line; |
@@ -304,6 +306,7 @@ static int conf_choice(struct menu *menu) | |||
304 | break; | 306 | break; |
305 | } | 307 | } |
306 | check_stdin(); | 308 | check_stdin(); |
309 | /* fall through */ | ||
307 | case oldaskconfig: | 310 | case oldaskconfig: |
308 | fflush(stdout); | 311 | fflush(stdout); |
309 | xfgets(line, 128, stdin); | 312 | xfgets(line, 128, stdin); |
@@ -369,6 +372,7 @@ static void conf(struct menu *menu) | |||
369 | check_conf(menu); | 372 | check_conf(menu); |
370 | return; | 373 | return; |
371 | } | 374 | } |
375 | /* fall through */ | ||
372 | case P_COMMENT: | 376 | case P_COMMENT: |
373 | prompt = menu_get_prompt(menu); | 377 | prompt = menu_get_prompt(menu); |
374 | if (prompt) | 378 | if (prompt) |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 2bafd9a7c8da..0a1ccc397b86 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -128,6 +128,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
128 | sym->flags |= def_flags; | 128 | sym->flags |= def_flags; |
129 | break; | 129 | break; |
130 | } | 130 | } |
131 | /* fall through */ | ||
131 | case S_BOOLEAN: | 132 | case S_BOOLEAN: |
132 | if (p[0] == 'y') { | 133 | if (p[0] == 'y') { |
133 | sym->def[def].tri = yes; | 134 | 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) | |||
148 | sym->type = S_STRING; | 149 | sym->type = S_STRING; |
149 | goto done; | 150 | goto done; |
150 | } | 151 | } |
152 | /* fall through */ | ||
151 | case S_STRING: | 153 | case S_STRING: |
152 | if (*p++ != '"') | 154 | if (*p++ != '"') |
153 | break; | 155 | break; |
@@ -162,6 +164,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
162 | conf_warning("invalid string found"); | 164 | conf_warning("invalid string found"); |
163 | return 1; | 165 | return 1; |
164 | } | 166 | } |
167 | /* fall through */ | ||
165 | case S_INT: | 168 | case S_INT: |
166 | case S_HEX: | 169 | case S_HEX: |
167 | done: | 170 | done: |
@@ -237,6 +240,7 @@ load: | |||
237 | case S_STRING: | 240 | case S_STRING: |
238 | if (sym->def[def].val) | 241 | if (sym->def[def].val) |
239 | free(sym->def[def].val); | 242 | free(sym->def[def].val); |
243 | /* fall through */ | ||
240 | default: | 244 | default: |
241 | sym->def[def].val = NULL; | 245 | sym->def[def].val = NULL; |
242 | sym->def[def].tri = no; | 246 | sym->def[def].tri = no; |
@@ -363,6 +367,7 @@ int conf_read(const char *name) | |||
363 | break; | 367 | break; |
364 | if (!sym_is_choice(sym)) | 368 | if (!sym_is_choice(sym)) |
365 | goto sym_ok; | 369 | goto sym_ok; |
370 | /* fall through */ | ||
366 | default: | 371 | default: |
367 | if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) | 372 | if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) |
368 | goto sym_ok; | 373 | goto sym_ok; |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a11d5f7b9eeb..c406bde28dbe 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -1172,6 +1172,7 @@ static gchar **fill_row(struct menu *menu) | |||
1172 | row[COL_BTNVIS] = GINT_TO_POINTER(TRUE); | 1172 | row[COL_BTNVIS] = GINT_TO_POINTER(TRUE); |
1173 | if (sym_is_choice(sym)) | 1173 | if (sym_is_choice(sym)) |
1174 | break; | 1174 | break; |
1175 | /* fall through */ | ||
1175 | case S_TRISTATE: | 1176 | case S_TRISTATE: |
1176 | val = sym_get_tristate_value(sym); | 1177 | val = sym_get_tristate_value(sym); |
1177 | switch (val) { | 1178 | switch (val) { |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index d433c7a24745..87001e62cefd 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -845,6 +845,7 @@ int main(int ac, char **av) | |||
845 | "\n\n")); | 845 | "\n\n")); |
846 | return 1; | 846 | return 1; |
847 | } | 847 | } |
848 | /* fall through */ | ||
848 | case -1: | 849 | case -1: |
849 | printf(_("\n\n" | 850 | printf(_("\n\n" |
850 | "*** End of the configuration.\n" | 851 | "*** End of the configuration.\n" |