summaryrefslogtreecommitdiff
path: root/eel/eel-canvas.c
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-04-12 22:17:28 +0200
committerraveit65 <[email protected]>2019-04-18 10:47:40 +0200
commitc93d8453ecc0421fe45e6f88ed3d15163149e39c (patch)
tree595dbe405c56dfc882081b0eb23a4db97a7e3adc /eel/eel-canvas.c
parent2f3f26ee105181dbc2996f5fb492cfa24468cf6c (diff)
downloadcaja-c93d8453ecc0421fe45e6f88ed3d15163149e39c.tar.bz2
caja-c93d8453ecc0421fe45e6f88ed3d15163149e39c.tar.xz
eel: reduce the scope of some variables
Fixes 'cppcheck' warnings: [eel/eel-background.c:163]: (style) The scope of the variable 'intensity' can be reduced. [eel/eel-background.c:163]: (style) The scope of the variable 'saturation' can be reduced. [eel/eel-background.c:196]: (style) The scope of the variable 'end_color' can be reduced. [eel/eel-canvas-rect-ellipse.c:600]: (style) The scope of the variable 'tmp' can be reduced. [eel/eel-canvas-rect-ellipse.c:705]: (style) The scope of the variable 'width_pixels' can be reduced. [eel/eel-canvas-rect-ellipse.c:706]: (style) The scope of the variable 'width_lt' can be reduced. [eel/eel-canvas-rect-ellipse.c:706]: (style) The scope of the variable 'width_rb' can be reduced. [eel/eel-canvas.c:1420]: (style) The scope of the variable 'child' can be reduced. [eel/eel-canvas.c:1493]: (style) The scope of the variable 'i' can be reduced. [eel/eel-canvas.c:1518]: (style) The scope of the variable 'i' can be reduced. [eel/eel-canvas.c:1545]: (style) The scope of the variable 'i' can be reduced. [eel/eel-canvas.c:1599]: (style) The scope of the variable 'child' can be reduced. [eel/eel-canvas.c:2598]: (style) The scope of the variable 'cx' can be reduced. [eel/eel-canvas.c:2598]: (style) The scope of the variable 'cy' can be reduced. [eel/eel-debug.c:80]: (style) The scope of the variable 'f' can be reduced. [eel/eel-editable-label.c:1493]: (style) The scope of the variable 'clip' can be reduced. [eel/eel-editable-label.c:1571]: (style) The scope of the variable 'text' can be reduced. [eel/eel-editable-label.c:2270]: (style) The scope of the variable 'anchor' can be reduced. [eel/eel-editable-label.c:2270]: (style) The scope of the variable 'end' can be reduced. [eel/eel-editable-label.c:3054]: (style) The scope of the variable 'menuitem' can be reduced. [eel/eel-editable-label.c:3400]: (style) The scope of the variable 'index' can be reduced. [eel/eel-gdk-pixbuf-extensions.c:85]: (style) The scope of the variable 'scale' can be reduced. [eel/eel-gdk-pixbuf-extensions.c:283]: (style) The scope of the variable 's_x1' can be reduced. [eel/eel-gdk-pixbuf-extensions.c:283]: (style) The scope of the variable 's_y2' can be reduced. [eel/eel-gdk-pixbuf-extensions.c:284]: (style) The scope of the variable 's_xfrac' can be reduced. [eel/eel-glib-extensions.c:439]: (style) The scope of the variable 'compare_result' can be reduced. [eel/eel-glib-extensions.c:561]: (style) The scope of the variable 'hash_table_to_free' can be reduced. [eel/eel-graphic-effects.c:74]: (style) The scope of the variable 'pixsrc' can be reduced. [eel/eel-graphic-effects.c:74]: (style) The scope of the variable 'pixdest' can be reduced. [eel/eel-graphic-effects.c:137]: (style) The scope of the variable 'pixsrc' can be reduced. [eel/eel-graphic-effects.c:137]: (style) The scope of the variable 'pixdest' can be reduced. [eel/eel-graphic-effects.c:195]: (style) The scope of the variable 'pixsrc' can be reduced. [eel/eel-graphic-effects.c:196]: (style) The scope of the variable 'pixdest' can be reduced. [eel/eel-graphic-effects.c:245]: (style) The scope of the variable 'slab_width' can be reduced. [eel/eel-graphic-effects.c:262]: (style) The scope of the variable 'slab_height' can be reduced. [eel/eel-graphic-effects.c:282]: (style) The scope of the variable 'y' can be reduced. [eel/eel-gtk-extensions.c:165]: (style) The scope of the variable 'screen' can be reduced. [eel/eel-gtk-extensions.c:167]: (style) The scope of the variable 'screen_width' can be reduced. [eel/eel-gtk-extensions.c:167]: (style) The scope of the variable 'screen_height' can be reduced. [eel/eel-gtk-extensions.c:168]: (style) The scope of the variable 'scale' can be reduced. [eel/eel-labeled-image.c:1051]: (style) The scope of the variable 'x_alignment' can be reduced. [eel/eel-labeled-image.c:1052]: (style) The scope of the variable 'y_alignment' can be reduced. [eel/eel-labeled-image.c:1100]: (style) The scope of the variable 'x_alignment' can be reduced. [eel/eel-labeled-image.c:1101]: (style) The scope of the variable 'y_alignment' can be reduced. [eel/eel-mate-extensions.c:73]: (style) The scope of the variable 'quoted' can be reduced. [eel/eel-stock-dialogs.c:409]: (style) The scope of the variable 'button_title' can be reduced. [eel/eel-string.c:415]: (style) The scope of the variable 'i' can be reduced. [eel/eel-string.c:542]: (style) The scope of the variable 'type' can be reduced. [eel/eel-vfs-extensions.c:65]: (style) The scope of the variable 'valid_bytes' can be reduced. [eel/eel-wrap-table.c:766]: (style) The scope of the variable 'hadj' can be reduced. [eel/eel-wrap-table.c:766]: (style) The scope of the variable 'vadj' can be reduced.
Diffstat (limited to 'eel/eel-canvas.c')
-rw-r--r--eel/eel-canvas.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 5cdcc4db..dc98bbc3 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -1417,8 +1417,8 @@ static void
eel_canvas_group_destroy (EelCanvasItem *object)
{
EelCanvasGroup *group;
- EelCanvasItem *child;
GList *list;
+ EelCanvasItem *child = NULL;
g_return_if_fail (EEL_IS_CANVAS_GROUP (object));
@@ -1490,7 +1490,7 @@ eel_canvas_group_unrealize (EelCanvasItem *item)
{
EelCanvasGroup *group;
GList *list;
- EelCanvasItem *i;
+ EelCanvasItem *i = NULL;
group = EEL_CANVAS_GROUP (item);
@@ -1515,7 +1515,7 @@ eel_canvas_group_map (EelCanvasItem *item)
{
EelCanvasGroup *group;
GList *list;
- EelCanvasItem *i;
+ EelCanvasItem *i = NULL;
group = EEL_CANVAS_GROUP (item);
@@ -1542,7 +1542,7 @@ eel_canvas_group_unmap (EelCanvasItem *item)
{
EelCanvasGroup *group;
GList *list;
- EelCanvasItem *i;
+ EelCanvasItem *i = NULL;
group = EEL_CANVAS_GROUP (item);
@@ -1594,13 +1594,14 @@ static double
eel_canvas_group_point (EelCanvasItem *item, double x, double y, int cx, int cy,
EelCanvasItem **actual_item)
{
- EelCanvasGroup *group;
- GList *list;
- EelCanvasItem *child, *point_item;
int x1, y1, x2, y2;
double gx, gy;
double dist, best;
int has_point;
+ EelCanvasGroup *group;
+ GList *list;
+ EelCanvasItem *point_item;
+ EelCanvasItem *child = NULL;
group = EEL_CANVAS_GROUP (item);
@@ -2595,7 +2596,6 @@ pick_current_item (EelCanvas *canvas, GdkEvent *event)
{
int button_down;
double x, y;
- int cx, cy;
int retval;
retval = FALSE;
@@ -2674,6 +2674,7 @@ pick_current_item (EelCanvas *canvas, GdkEvent *event)
}
/* canvas pixel coords */
+ int cx, cy;
cx = (int) (x + 0.5);
cy = (int) (y + 0.5);
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-27 08:13:50 +0000