From c93d8453ecc0421fe45e6f88ed3d15163149e39c Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Fri, 12 Apr 2019 22:17:28 +0200 Subject: 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. --- eel/eel-canvas-rect-ellipse.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'eel/eel-canvas-rect-ellipse.c') diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index 7538244f..55196da3 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -597,7 +597,6 @@ eel_canvas_rect_point (EelCanvasItem *item, double x, double y, int cx, int cy, double x1, y1, x2, y2; double hwidth; double dx, dy; - double tmp; #ifdef VERBOSE g_print ("eel_canvas_rect_point\n"); @@ -632,6 +631,8 @@ eel_canvas_rect_point (EelCanvasItem *item, double x, double y, int cx, int cy, if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) { + double tmp; + if (re->fill_set || !re->outline_set) return 0.0; @@ -702,8 +703,6 @@ eel_canvas_rect_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, gint double x1, y1, x2, y2; int cx1, cy1, cx2, cy2; int repaint_rects_count, i; - int width_pixels; - int width_lt, width_rb; Rect update_rect, repaint_rects[4]; EelCanvasRectPrivate *priv; @@ -734,6 +733,9 @@ eel_canvas_rect_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, gint if (re->outline_set) { + int width_pixels; + int width_lt, width_rb; + /* Outline and bounding box */ if (re->width_pixels) width_pixels = (int) re->width; -- cgit v1.2.1