From d0ee02fae7ac3c5fb676d275c8ef20c1f4cab458 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 28 Jul 2020 10:11:07 +0200 Subject: [PATCH] cleanup: Remove duplicate semicolons in C code No functional change, it just hurts my eyes when reading the code. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1385 --- clutter/clutter/clutter-text.c | 2 +- cogl/cogl/cogl-meta-texture.c | 6 +++--- src/backends/meta-monitor-config-store.c | 2 +- src/backends/meta-monitor-manager.c | 2 +- src/backends/meta-screen-cast-stream-src.c | 2 +- src/backends/native/meta-backend-native.c | 2 +- src/backends/native/meta-kms.c | 2 +- src/compositor/meta-background.c | 2 +- src/core/constraints.c | 2 +- src/core/window.c | 2 +- src/ui/frames.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c index 2fef356cd..082bcb399 100644 --- a/clutter/clutter/clutter-text.c +++ b/clutter/clutter/clutter-text.c @@ -5326,7 +5326,7 @@ clutter_text_set_selection_bound (ClutterText *self, if (priv->selection_bound != selection_bound) { - gint len = clutter_text_buffer_get_length (get_buffer (self));; + gint len = clutter_text_buffer_get_length (get_buffer (self)); if (selection_bound < 0 || selection_bound >= len) priv->selection_bound = -1; diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c index adee5ce04..32d341300 100644 --- a/cogl/cogl/cogl-meta-texture.c +++ b/cogl/cogl/cogl-meta-texture.c @@ -325,7 +325,7 @@ foreach_clamped_region (CoglMetaTexture *meta_texture, if (*tx_1 < 0) { clamp_data.start = *tx_1; - clamp_data.end = MIN (0, *tx_2);; + clamp_data.end = MIN (0, *tx_2); cogl_meta_texture_foreach_in_region (meta_texture, half_texel_width, *ty_1, half_texel_width, *ty_2, @@ -377,7 +377,7 @@ foreach_clamped_region (CoglMetaTexture *meta_texture, if (*ty_1 < 0) { clamp_data.start = *ty_1; - clamp_data.end = MIN (0, *ty_2);; + clamp_data.end = MIN (0, *ty_2); cogl_meta_texture_foreach_in_region (meta_texture, *tx_1, half_texel_height, *tx_2, half_texel_height, @@ -396,7 +396,7 @@ foreach_clamped_region (CoglMetaTexture *meta_texture, /* Handle any bottom clamped region */ if (*ty_2 > max_t_coord) { - clamp_data.start = MAX (max_t_coord, *ty_1);; + clamp_data.start = MAX (max_t_coord, *ty_1); clamp_data.end = *ty_2; cogl_meta_texture_foreach_in_region (meta_texture, *tx_1, diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c index 770bef734..0f03f409a 100644 --- a/src/backends/meta-monitor-config-store.c +++ b/src/backends/meta-monitor-config-store.c @@ -317,7 +317,7 @@ handle_start_element (GMarkupParseContext *context, } else if (g_str_equal (element_name, "monitor")) { - parser->current_monitor_config = g_new0 (MetaMonitorConfig, 1);; + parser->current_monitor_config = g_new0 (MetaMonitorConfig, 1); parser->state = STATE_MONITOR; } diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index e2d16b7d0..a519442f3 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -1186,7 +1186,7 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton, { MetaCrtcMode *mode = l->data; const MetaCrtcModeInfo *crtc_mode_info = - meta_crtc_mode_get_info (mode);; + meta_crtc_mode_get_info (mode); g_variant_builder_add (&mode_builder, "(uxuudu)", i, /* ID */ diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c index a0ba05ea5..45eb3852f 100644 --- a/src/backends/meta-screen-cast-stream-src.c +++ b/src/backends/meta-screen-cast-stream-src.c @@ -1101,7 +1101,7 @@ meta_screen_cast_stream_src_set_property (GObject *object, { case PROP_STREAM: priv->stream = g_value_get_object (value); - break;; + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 17f47b80d..1808c6df2 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -554,7 +554,7 @@ on_udev_device_added (MetaUdev *udev, device_path = g_udev_device_get_device_file (device); - gpus = meta_backend_get_gpus (backend);; + gpus = meta_backend_get_gpus (backend); for (l = gpus; l; l = l->next) { MetaGpuKms *gpu_kms = l->data; diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index 80ce4e3c2..96bfe3eb2 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -483,7 +483,7 @@ update_states_in_impl (MetaKmsImpl *impl, gpointer user_data, GError **error) { - MetaKms *kms = meta_kms_impl_get_kms (impl);; + MetaKms *kms = meta_kms_impl_get_kms (impl); meta_kms_update_states_in_impl (kms); diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 4927ae638..04b66a068 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -912,7 +912,7 @@ meta_background_get_texture (MetaBackground *self, (1 - self->blend_factor), (1 - self->blend_factor), (1 - self->blend_factor), - (1 - self->blend_factor));; + (1 - self->blend_factor)); cogl_pipeline_set_layer_texture (pipeline, 0, texture1); cogl_pipeline_set_layer_wrap_mode (pipeline, 0, get_wrap_mode (self->style)); cogl_pipeline_set_layer_max_mipmap_level (pipeline, 0, mipmap_level); diff --git a/src/core/constraints.c b/src/core/constraints.c index 51006614f..61ed2c049 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -758,7 +758,7 @@ try_flip_window_position (MetaWindow *window, int *rel_y, MetaRectangle *intersection) { - MetaPlacementRule flipped_rule = *placement_rule;; + MetaPlacementRule flipped_rule = *placement_rule; MetaRectangle flipped_rect; MetaRectangle flipped_intersection; int flipped_rel_x; diff --git a/src/core/window.c b/src/core/window.c index c660a3b0c..960916cf0 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -2833,7 +2833,7 @@ meta_window_maximize_internal (MetaWindow *window, window->maximized_vertically || maximize_vertically; /* Update the edge constraints */ - update_edge_constraints (window);; + update_edge_constraints (window); meta_window_recalc_features (window); set_net_wm_state (window); diff --git a/src/ui/frames.c b/src/ui/frames.c index 58d653543..5cbfb09e9 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -495,7 +495,7 @@ meta_ui_frame_attach_style (MetaUIFrame *frame) variant = frame->meta_window->gtk_theme_variant; if (variant == NULL) - variant = get_global_theme_variant (frame->frames);; + variant = get_global_theme_variant (frame->frames); if (variant == NULL || *variant == '\0') frame->style_info = meta_style_info_ref (frames->normal_style);