Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some static analysis warnings

Browse Source
This commit is contained in:
Matthias Clasen
2023-11-24 09:27:44 -05:00
parent 57e382b59c
commit b7a1b1d7ee
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkframeclockidle.c
View File

@@ -589,7 +589,10 @@ gdk_frame_clock_paint_idle (void *data)
{ {
if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT && if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT &&
(priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)) (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT))
timings->layout_start_time = g_get_monotonic_time (); {
if (timings)
timings->layout_start_time = g_get_monotonic_time ();
}
} }
priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT; priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT;
@@ -618,7 +621,10 @@ gdk_frame_clock_paint_idle (void *data)
{ {
if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT && if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT &&
(priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT)) (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT))
timings->paint_start_time = g_get_monotonic_time (); {
if (timings)
timings->paint_start_time = g_get_monotonic_time ();
}
} }
priv->phase = GDK_FRAME_CLOCK_PHASE_PAINT; priv->phase = GDK_FRAME_CLOCK_PHASE_PAINT;

1
gsk/gskpathbuilder.c
View File

@@ -1414,7 +1414,6 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
n_segs = ceil (fabs (delta_theta / (M_PI_2 + 0.001))); n_segs = ceil (fabs (delta_theta / (M_PI_2 + 0.001)));
d_theta = delta_theta / n_segs; d_theta = delta_theta / n_segs;
theta = theta1;
_sincos (theta1, &sin_th1, &cos_th1); _sincos (theta1, &sin_th1, &cos_th1);
th_half = d_theta / 2; th_half = d_theta / 2;

1
tests/testlistview.c
View File

@@ -553,7 +553,6 @@ update_statusbar (GtkStatusbar *statusbar)
g_string_append_printf (string, " (%u directories remaining)", active + g_slist_length (pending)); g_string_append_printf (string, " (%u directories remaining)", active + g_slist_length (pending));
result = G_SOURCE_CONTINUE; result = G_SOURCE_CONTINUE;
} }
result = G_SOURCE_CONTINUE;
gtk_statusbar_push (statusbar, 0, string->str); gtk_statusbar_push (statusbar, 0, string->str);
g_free (string->str); g_free (string->str);

6
testsuite/gsk/replay-node.c
View File

@@ -38,7 +38,7 @@ replay_linear_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot)
graphene_rect_t bounds; graphene_rect_t bounds;
const graphene_point_t *start_point, *end_point; const graphene_point_t *start_point, *end_point;
const GskColorStop *stops; const GskColorStop *stops;
gsize n_stops; gsize n_stops = 0;
gsk_render_node_get_bounds (node, &bounds); gsk_render_node_get_bounds (node, &bounds);
start_point = gsk_linear_gradient_node_get_start (node); start_point = gsk_linear_gradient_node_get_start (node);
@@ -65,7 +65,7 @@ replay_radial_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot)
float vradius = gsk_radial_gradient_node_get_vradius (node); float vradius = gsk_radial_gradient_node_get_vradius (node);
float start = gsk_radial_gradient_node_get_start (node); float start = gsk_radial_gradient_node_get_start (node);
float end = gsk_radial_gradient_node_get_end (node); float end = gsk_radial_gradient_node_get_end (node);
gsize n_stops; gsize n_stops = 0;
const GskColorStop *stops = gsk_radial_gradient_node_get_color_stops (node, const GskColorStop *stops = gsk_radial_gradient_node_get_color_stops (node,
&n_stops); &n_stops);
@@ -86,7 +86,7 @@ replay_conic_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot)
gsk_render_node_get_bounds (node, &bounds); gsk_render_node_get_bounds (node, &bounds);
const graphene_point_t *center = gsk_conic_gradient_node_get_center (node); const graphene_point_t *center = gsk_conic_gradient_node_get_center (node);
float rotation = gsk_conic_gradient_node_get_rotation (node); float rotation = gsk_conic_gradient_node_get_rotation (node);
gsize n_stops; gsize n_stops = 0;
const GskColorStop *stops = gsk_conic_gradient_node_get_color_stops (node, const GskColorStop *stops = gsk_conic_gradient_node_get_color_stops (node,
&n_stops); &n_stops);

3
testsuite/gtk/builder.c
View File

@@ -2000,7 +2000,6 @@ test_pango_attributes (void)
/* Test errors are set */ /* Test errors are set */
builder = gtk_builder_new (); builder = gtk_builder_new ();
gtk_builder_add_from_string (builder, err_buffer1, -1, &error); gtk_builder_add_from_string (builder, err_buffer1, -1, &error);
label = gtk_builder_get_object (builder, "label1");
g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_MISSING_ATTRIBUTE); g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_MISSING_ATTRIBUTE);
g_object_unref (builder); g_object_unref (builder);
g_error_free (error); g_error_free (error);
@@ -2008,8 +2007,6 @@ test_pango_attributes (void)
builder = gtk_builder_new (); builder = gtk_builder_new ();
gtk_builder_add_from_string (builder, err_buffer2, -1, &error); gtk_builder_add_from_string (builder, err_buffer2, -1, &error);
label = gtk_builder_get_object (builder, "label1");
g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE); g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE);
g_object_unref (builder); g_object_unref (builder);
g_error_free (error); g_error_free (error);

5
testsuite/gtk/label.c
View File

@@ -46,7 +46,10 @@ print_attribute (PangoAttribute *attr, GString *string)
g_free (text); g_free (text);
} }
else if ((shape = pango_attribute_as_shape (attr)) != NULL) else if ((shape = pango_attribute_as_shape (attr)) != NULL)
g_string_append_printf (string, "shape"); {
g_assert_true (shape != NULL);
g_string_append_printf (string, "shape");
}
else else
g_assert_not_reached (); g_assert_not_reached ();
} }