Merge branch 'wip/baedert/fallthrough' into 'master'

Replace a bunch of fallthrough comments with an attribute

See merge request GNOME/glib!1628
This commit is contained in:
Philip Withnall 2020-08-21 08:49:11 +00:00
commit 153ec62e7e
3 changed files with 4 additions and 4 deletions

View File

@ -491,7 +491,7 @@ g_io_channel_new_file (const gchar *filename,
mode_num |= MODE_PLUS;
break;
}
/* Fall through */
G_GNUC_FALLTHROUGH;
default:
g_warning ("Invalid GIOFileMode %s.", mode);
return NULL;

View File

@ -1378,7 +1378,7 @@ g_scanner_unexp_token (GScanner *scanner,
_g_snprintf (token_string, token_string_len, "(unknown) token <%d>", scanner->token);
break;
}
/* fall through */
G_GNUC_FALLTHROUGH;
case G_TOKEN_SYMBOL:
if (expected_token == G_TOKEN_SYMBOL ||
(scanner->config->symbol_2_token &&
@ -1523,7 +1523,7 @@ g_scanner_unexp_token (GScanner *scanner,
_g_snprintf (expected_string, expected_string_len, "(unknown) token <%d>", expected_token);
break;
}
/* fall through */
G_GNUC_FALLTHROUGH;
case G_TOKEN_SYMBOL:
need_valid = (scanner->token == G_TOKEN_SYMBOL ||
(scanner->config->symbol_2_token &&

View File

@ -4930,7 +4930,7 @@ g_variant_valist_get_nnp (const gchar **str,
case '@':
g_variant_type_string_scan (*str, NULL, str);
/* fall through */
G_GNUC_FALLTHROUGH;
case '*':
case '?':