[gimp] app: Always return values in non-void functions.
- From: Michael Henning <mhenning src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: Always return values in non-void functions.
- Date: Mon, 30 Jun 2014 02:36:32 +0000 (UTC)
commit db4f67048df0bde8f57371141bb90340d1c8200a
Author: Michael Henning <drawoc darkrefraction com>
Date: Sun Jun 29 22:35:34 2014 -0400
app: Always return values in non-void functions.
app/core/gimpdrawable-filter.c | 6 +++---
app/core/gimpimagemap.c | 4 ++--
app/gegl/gimp-gegl-apply-operation.c | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/app/core/gimpdrawable-filter.c b/app/core/gimpdrawable-filter.c
index 5e72638..3d2a017 100644
--- a/app/core/gimpdrawable-filter.c
+++ b/app/core/gimpdrawable-filter.c
@@ -92,9 +92,9 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
GeglRectangle rect;
gboolean success = TRUE;
- g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
- g_return_if_fail (GIMP_IS_FILTER (filter));
- g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+ g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
+ g_return_val_if_fail (GIMP_IS_FILTER (filter), FALSE);
+ g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
if (gimp_item_mask_intersect (GIMP_ITEM (drawable),
&rect.x, &rect.y,
diff --git a/app/core/gimpimagemap.c b/app/core/gimpimagemap.c
index 18fbd9a..b23691b 100644
--- a/app/core/gimpimagemap.c
+++ b/app/core/gimpimagemap.c
@@ -404,8 +404,8 @@ gimp_image_map_commit (GimpImageMap *image_map,
{
gboolean success = TRUE;
- g_return_if_fail (GIMP_IS_IMAGE_MAP (image_map));
- g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
+ g_return_val_if_fail (GIMP_IS_IMAGE_MAP (image_map), FALSE);
+ g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
if (gimp_image_map_is_filtering (image_map))
{
diff --git a/app/gegl/gimp-gegl-apply-operation.c b/app/gegl/gimp-gegl-apply-operation.c
index 310f464..30919ee 100644
--- a/app/gegl/gimp-gegl-apply-operation.c
+++ b/app/gegl/gimp-gegl-apply-operation.c
@@ -79,13 +79,13 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
gdouble value;
gboolean cancel = FALSE;
- g_return_if_fail (src_buffer == NULL || GEGL_IS_BUFFER (src_buffer));
- g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
- g_return_if_fail (GEGL_IS_NODE (operation));
- g_return_if_fail (GEGL_IS_BUFFER (dest_buffer));
- g_return_if_fail (cache == NULL || GEGL_IS_BUFFER (cache));
- g_return_if_fail (valid_rects == NULL || cache != NULL);
- g_return_if_fail (valid_rects == NULL || n_valid_rects != 0);
+ g_return_val_if_fail (src_buffer == NULL || GEGL_IS_BUFFER (src_buffer), FALSE);
+ g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
+ g_return_val_if_fail (GEGL_IS_NODE (operation), FALSE);
+ g_return_val_if_fail (GEGL_IS_BUFFER (dest_buffer), FALSE);
+ g_return_val_if_fail (cache == NULL || GEGL_IS_BUFFER (cache), FALSE);
+ g_return_val_if_fail (valid_rects == NULL || cache != NULL, FALSE);
+ g_return_val_if_fail (valid_rects == NULL || n_valid_rects != 0, FALSE);
if (dest_rect)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]