luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Replace fallthrough comments with G_GNUC_FALLTHROUGH

See merge request GNOME/glib!1406
This commit is contained in:
Philip Withnall 2020-03-04 11:10:01 +00:00
commit 855e1de044
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gdate.c
View File

@ -1142,7 +1142,8 @@ g_date_prepare_to_parse (const gchar *str,
dmy_order[i] = G_DATE_DAY; dmy_order[i] = G_DATE_DAY;
break; break;
case 76: case 76:
using_twodigit_years = TRUE; /* FALL THRU */ using_twodigit_years = TRUE;
G_GNUC_FALLTHROUGH;
case 1976: case 1976:
dmy_order[i] = G_DATE_YEAR; dmy_order[i] = G_DATE_YEAR;
break; break;

2
glib/gscanner.c
View File

@ -1955,7 +1955,7 @@ g_scanner_get_token_ll (GScanner *scanner,
} }
else else
ch = '0'; ch = '0';
/* fall through */ G_GNUC_FALLTHROUGH;
case '1': case '1':
case '2': case '2':
case '3': case '3':

2
glib/gshell.c
View File

@ -523,7 +523,7 @@ tokenize_command_line (const gchar *command_line,
ensure_token (&current_token); ensure_token (&current_token);
g_string_append_c (current_token, *p); g_string_append_c (current_token, *p);
/* FALL THRU */ G_GNUC_FALLTHROUGH;
case '\\': case '\\':
current_quote = *p; current_quote = *p;
break; break;

1
glib/gslice.c
View File

@ -310,6 +310,7 @@ g_slice_set_config (GSliceConfig ckey,
break; break;
case G_SLICE_CONFIG_COLOR_INCREMENT: case G_SLICE_CONFIG_COLOR_INCREMENT:
slice_config.color_increment = value; slice_config.color_increment = value;
break;
default: ; default: ;
} }
} }

3
glib/gspawn.c
View File

@ -2255,8 +2255,7 @@ g_execute (const gchar *file,
*/ */
got_eacces = TRUE; got_eacces = TRUE;
/* FALL THRU */ G_GNUC_FALLTHROUGH;
case ENOENT: case ENOENT:
#ifdef ESTALE #ifdef ESTALE
case ESTALE: case ESTALE:

4
glib/gvariant.c
View File

@ -4466,7 +4466,7 @@ g_variant_check_format_string (GVariant *value,
return FALSE; return FALSE;
} }
/* fall through */ G_GNUC_FALLTHROUGH;
case '^': case '^':
case '@': case '@':
/* ignore these 2 (or 3) */ /* ignore these 2 (or 3) */
@ -4487,7 +4487,7 @@ g_variant_check_format_string (GVariant *value,
if (*type_string != '(') if (*type_string != '(')
return FALSE; return FALSE;
/* fall through */ G_GNUC_FALLTHROUGH;
case '*': case '*':
/* consume a full type string for the '*' or 'r' */ /* consume a full type string for the '*' or 'r' */
if (!g_variant_type_string_scan (type_string, NULL, &type_string)) if (!g_variant_type_string_scan (type_string, NULL, &type_string))