GNOME.org
 

[mutter] Use G_GNUC_FALLTHROUGH instead of comments

commit 6e5ac0b5852e702e5e3efeb12a441807da7c5cbc
Author: Jonas Ådahl <jadahl gmail com>
Date:   Thu Jan 9 17:54:28 2020 +0100

    Use G_GNUC_FALLTHROUGH instead of comments
    
    Get the same task done in a bit more C:y way.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/998

 clutter/clutter/clutter-main.c                     |  6 +++---
 cogl/cogl/cogl-blend-string.c                      | 14 +++++++-------
 src/backends/meta-screen-cast-monitor-stream-src.c |  2 +-
 src/backends/native/meta-barrier-native.c          |  2 +-
 src/backends/x11/meta-backend-x11.c                |  2 +-
 src/compositor/meta-sync-ring.c                    |  2 +-
 src/core/display.c                                 |  2 +-
 src/x11/window-x11.c                               |  8 ++++----
 8 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 81847b26f..7723a2010 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -1523,7 +1523,7 @@ event_click_count_generate (ClutterEvent *event)
         previous_y = event->button.y;
         previous_time = event->button.time;
 
-        /* fallthrough */
+        G_GNUC_FALLTHROUGH;
       case CLUTTER_BUTTON_RELEASE:
         event->button.click_count = click_count;
         break;
@@ -1871,7 +1871,7 @@ _clutter_process_event_details (ClutterActor        *stage,
             break;
           }
 
-      /* fallthrough from motion */
+        G_GNUC_FALLTHROUGH;
       case CLUTTER_BUTTON_PRESS:
       case CLUTTER_BUTTON_RELEASE:
 #ifdef CLUTTER_WINDOWING_X11
@@ -2016,7 +2016,7 @@ _clutter_process_event_details (ClutterActor        *stage,
             break;
           }
 
-      /* fallthrough from motion */
+        G_GNUC_FALLTHROUGH;
       case CLUTTER_TOUCH_BEGIN:
       case CLUTTER_TOUCH_CANCEL:
       case CLUTTER_TOUCH_END:
diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
index 7acaddd07..ba8eb8e96 100644
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@@ -509,7 +509,7 @@ parse_argument (const char *string, /* original user string */
           if (parsing_factor)
             arg->factor.is_color = TRUE;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_ARG_STATE_SCRAPING_COLOR_SRC_NAME:
           if (!is_symbol_char (*p))
             {
@@ -540,7 +540,7 @@ parse_argument (const char *string, /* original user string */
           else
             continue;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_ARG_STATE_MAYBE_COLOR_MASK:
           if (*p != '[')
             {
@@ -554,7 +554,7 @@ parse_argument (const char *string, /* original user string */
           state = PARSER_ARG_STATE_SCRAPING_MASK;
           mark = p;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_ARG_STATE_SCRAPING_MASK:
           if (*p == ']')
             {
@@ -687,7 +687,7 @@ parse_argument (const char *string, /* original user string */
           arg->factor.is_one = TRUE;
           state = PARSER_ARG_STATE_EXPECT_END;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_ARG_STATE_EXPECT_END:
           if (*p != ',' && *p != ')')
             {
@@ -787,7 +787,7 @@ _cogl_blend_string_compile (const char *string,
           mark = p;
           state = PARSER_STATE_SCRAPING_DEST_CHANNELS;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_STATE_SCRAPING_DEST_CHANNELS:
           if (*p != '=')
             continue;
@@ -810,7 +810,7 @@ _cogl_blend_string_compile (const char *string,
           mark = p;
           state = PARSER_STATE_SCRAPING_FUNCTION_NAME;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_STATE_SCRAPING_FUNCTION_NAME:
           if (*p != '(')
             {
@@ -832,7 +832,7 @@ _cogl_blend_string_compile (const char *string,
           current_arg = 0;
           state = PARSER_STATE_EXPECT_ARG_START;
 
-          /* fall through */
+          G_GNUC_FALLTHROUGH;
         case PARSER_STATE_EXPECT_ARG_START:
           if (*p != '(' && *p != ',')
             continue;
diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c 
b/src/backends/meta-screen-cast-monitor-stream-src.c
index 4cede47e9..5d9dadc8c 100644
--- a/src/backends/meta-screen-cast-monitor-stream-src.c
+++ b/src/backends/meta-screen-cast-monitor-stream-src.c
@@ -282,7 +282,7 @@ meta_screen_cast_monitor_stream_src_enable (MetaScreenCastStreamSrc *src)
         g_signal_connect_after (cursor_tracker, "cursor-changed",
                                 G_CALLBACK (cursor_changed),
                                 monitor_src);
-      /* Intentional fall-through */
+      G_GNUC_FALLTHROUGH;
     case META_SCREEN_CAST_CURSOR_MODE_HIDDEN:
       monitor_src->paint_watch =
         meta_stage_watch_view (meta_stage,
diff --git a/src/backends/native/meta-barrier-native.c b/src/backends/native/meta-barrier-native.c
index 34a2c90c4..260febe8d 100644
--- a/src/backends/native/meta-barrier-native.c
+++ b/src/backends/native/meta-barrier-native.c
@@ -367,7 +367,7 @@ emit_barrier_event (MetaBarrierImplNative *self,
     case META_BARRIER_STATE_LEFT:
       self->state = META_BARRIER_STATE_ACTIVE;
 
-      /* Intentional fall-through. */
+      G_GNUC_FALLTHROUGH;
     case META_BARRIER_STATE_HELD:
       event->dt = time - self->last_event_time;
 
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index 225d14d33..379d22a06 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -275,7 +275,7 @@ maybe_spoof_event_as_stage_event (MetaBackendX11 *x11,
     case XI_ButtonRelease:
       maybe_translate_touch_replay_pointer_event (x11,
                                                   (XIDeviceEvent *) input_event);
-      /* Intentional fall-through */
+      G_GNUC_FALLTHROUGH;
     case XI_KeyPress:
     case XI_KeyRelease:
     case XI_TouchBegin:
diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c
index c354992cf..944b4a886 100644
--- a/src/compositor/meta-sync-ring.c
+++ b/src/compositor/meta-sync-ring.c
@@ -394,7 +394,7 @@ meta_sync_free (MetaSync *self)
         XIfEvent (self->xdisplay, &event, alarm_event_predicate, (XPointer) self);
         meta_sync_handle_event (self, (XSyncAlarmNotifyEvent *) &event);
       }
-      /* fall through */
+      G_GNUC_FALLTHROUGH;
     case META_SYNC_STATE_READY:
       XSyncTriggerFence (self->xdisplay, self->xfence);
       XFlush (self->xdisplay);
diff --git a/src/core/display.c b/src/core/display.c
index 64da04d5d..8a6d69440 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -637,7 +637,7 @@ gesture_tracker_state_changed (MetaGestureTracker   *tracker,
     case META_SEQUENCE_ACCEPTED:
       meta_display_cancel_touch (display);
 
-      /* Intentional fall-through */
+      G_GNUC_FALLTHROUGH;
     case META_SEQUENCE_REJECTED:
       {
         MetaBackend *backend;
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 4c7956dd1..3e63bb4ed 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1597,7 +1597,7 @@ meta_window_x11_update_struts (MetaWindow *window)
                 {
                 case META_SIDE_RIGHT:
                   temp->rect.x = BOX_RIGHT(temp->rect) - thickness;
-                  /* Intentionally fall through without breaking */
+                  G_GNUC_FALLTHROUGH;
                 case META_SIDE_LEFT:
                   temp->rect.width  = thickness;
                   temp->rect.y      = strut_begin;
@@ -1605,7 +1605,7 @@ meta_window_x11_update_struts (MetaWindow *window)
                   break;
                 case META_SIDE_BOTTOM:
                   temp->rect.y = BOX_BOTTOM(temp->rect) - thickness;
-                  /* Intentionally fall through without breaking */
+                  G_GNUC_FALLTHROUGH;
                 case META_SIDE_TOP:
                   temp->rect.height = thickness;
                   temp->rect.x      = strut_begin;
@@ -1661,13 +1661,13 @@ meta_window_x11_update_struts (MetaWindow *window)
                 {
                 case META_SIDE_RIGHT:
                   temp->rect.x = BOX_RIGHT(temp->rect) - thickness;
-                  /* Intentionally fall through without breaking */
+                  G_GNUC_FALLTHROUGH;
                 case META_SIDE_LEFT:
                   temp->rect.width  = thickness;
                   break;
                 case META_SIDE_BOTTOM:
                   temp->rect.y = BOX_BOTTOM(temp->rect) - thickness;
-                  /* Intentionally fall through without breaking */
+                  G_GNUC_FALLTHROUGH;
                 case META_SIDE_TOP:
                   temp->rect.height = thickness;
                   break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]