gimp r25292 - in trunk: . app/base app/core app/plug-in app/tools app/vectors

[muks svn gnome org]

Author: muks
Date: Fri Mar 28 23:18:19 2008
New Revision: 25292
URL: http://svn.gnome.org/viewvc/gimp?rev=25292&view=rev

Log:
2008-03-28  Mukund Sivaraman  <muks mukund org>

        Fixes for some Sparse reported issues in app/

        * app/core/gimpdrawable-operation.c: Added prototype for            
        gegl_node_add_child().

        * app/core/gimpcurve.c: Remove C99 code       
                                
        * app/tools/gimpcurvestool.c 
        * app/tools/gimpperspectiveclonetool.c 
        * app/vectors/gimpstroke.c: Mark functions as static.

        * app/base/siox.c: state is a pointer.

        * app/plug-in/gimppluginprocframe.c: values is a pointer.

        * app/plug-in/plug-in-rc.c: plug_in_rc_parse() returns a pointer.

        * app/plug-in/gimpinterpreterdb.c: Check program[0] for '\0'
        instead of the pointer program itself.



Modified:
   trunk/ChangeLog
   trunk/app/base/siox.c
   trunk/app/core/gimpcurve.c
   trunk/app/core/gimpdrawable-operation.c
   trunk/app/plug-in/gimpinterpreterdb.c
   trunk/app/plug-in/gimppluginprocframe.c
   trunk/app/plug-in/plug-in-rc.c
   trunk/app/tools/gimpcurvestool.c
   trunk/app/tools/gimpperspectiveclonetool.c
   trunk/app/vectors/gimpstroke.c

Modified: trunk/app/base/siox.c
==============================================================================
--- trunk/app/base/siox.c	(original)
+++ trunk/app/base/siox.c	Fri Mar 28 23:18:19 2008
@@ -1294,7 +1294,7 @@
   gpointer     pr;
   gint         row, col;
 
-  g_return_if_fail (state != 0);
+  g_return_if_fail (state != NULL);
   g_return_if_fail (mask != NULL && tile_manager_bpp (mask) == 1);
 
   pixel_region_init (&srcPR, state->pixels,

Modified: trunk/app/core/gimpcurve.c
==============================================================================
--- trunk/app/core/gimpcurve.c	(original)
+++ trunk/app/core/gimpcurve.c	Fri Mar 28 23:18:19 2008
@@ -713,13 +713,15 @@
 gimp_curve_calculate (GimpCurve *curve)
 {
   gint i;
-  gint points[curve->n_points];
+  gint *points;
   gint num_pts;
   gint p1, p2, p3, p4;
 
   if (GIMP_DATA (curve)->freeze_count > 0)
     return;
 
+  points = g_newa (gint, curve->n_points);
+
   switch (curve->curve_type)
     {
     case GIMP_CURVE_SMOOTH:

Modified: trunk/app/core/gimpdrawable-operation.c
==============================================================================
--- trunk/app/core/gimpdrawable-operation.c	(original)
+++ trunk/app/core/gimpdrawable-operation.c	Fri Mar 28 23:18:19 2008
@@ -32,6 +32,11 @@
 #include "gimpprogress.h"
 
 
+#warning FIXME: gegl_node_add_child() is not public API
+
+extern GeglNode *    gegl_node_add_child    (GeglNode      *self,
+                                             GeglNode      *child);
+
 void
 gimp_drawable_apply_operation (GimpDrawable *drawable,
                                GeglNode     *operation,
@@ -69,6 +74,8 @@
                                 "linear",       linear,
                                 NULL);
 
+#warning FIXME: gegl_node_add_child() is not public API
+
   gegl_node_add_child (gegl, operation);
 
   gegl_node_link_many (input, operation, output, NULL);

Modified: trunk/app/plug-in/gimpinterpreterdb.c
==============================================================================
--- trunk/app/plug-in/gimpinterpreterdb.c	(original)
+++ trunk/app/plug-in/gimpinterpreterdb.c	Fri Mar 28 23:18:19 2008
@@ -297,7 +297,8 @@
   type    = tokens[1];
   program = tokens[5];
 
-  if (name[0] == '\0' || program == '\0' || type[0] == '\0' || type[1] != '\0')
+  if ((name[0] == '\0') || (program[0] == '\0') ||
+      (type[0] == '\0') || (type[1] != '\0'))
     goto bail;
 
   switch (type[0])

Modified: trunk/app/plug-in/gimppluginprocframe.c
==============================================================================
--- trunk/app/plug-in/gimppluginprocframe.c	(original)
+++ trunk/app/plug-in/gimppluginprocframe.c	Fri Mar 28 23:18:19 2008
@@ -181,7 +181,7 @@
 
           /* Free the old arguments. */
           g_free (proc_frame->return_vals->values);
-          proc_frame->return_vals->values = 0;
+          proc_frame->return_vals->values = NULL;
           proc_frame->return_vals->n_values = 0;
           g_value_array_free (proc_frame->return_vals);
         }

Modified: trunk/app/plug-in/plug-in-rc.c
==============================================================================
--- trunk/app/plug-in/plug-in-rc.c	(original)
+++ trunk/app/plug-in/plug-in-rc.c	Fri Mar 28 23:18:19 2008
@@ -102,9 +102,9 @@
   gint        version      = GIMP_PROTOCOL_VERSION;
   GTokenType  token;
 
-  g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
-  g_return_val_if_fail (filename != NULL, FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   scanner = gimp_scanner_new_file (filename, error);
 

Modified: trunk/app/tools/gimpcurvestool.c
==============================================================================
--- trunk/app/tools/gimpcurvestool.c	(original)
+++ trunk/app/tools/gimpcurvestool.c	Fri Mar 28 23:18:19 2008
@@ -284,7 +284,7 @@
                                                   release_type, display);
 }
 
-gboolean
+static gboolean
 gimp_curves_tool_key_press (GimpTool    *tool,
                             GdkEventKey *kevent,
                             GimpDisplay *display)

Modified: trunk/app/tools/gimpperspectiveclonetool.c
==============================================================================
--- trunk/app/tools/gimpperspectiveclonetool.c	(original)
+++ trunk/app/tools/gimpperspectiveclonetool.c	Fri Mar 28 23:18:19 2008
@@ -429,7 +429,7 @@
   clone_tool->trans_info[Y3] = clone_tool->y2;
 }
 
-void
+static void
 gimp_perspective_clone_tool_recalc (GimpPerspectiveCloneTool *clone_tool,
                                     GimpDisplay              *display)
 {

Modified: trunk/app/vectors/gimpstroke.c
==============================================================================
--- trunk/app/vectors/gimpstroke.c	(original)
+++ trunk/app/vectors/gimpstroke.c	Fri Mar 28 23:18:19 2008
@@ -636,7 +636,7 @@
 }
 
 
-gboolean
+static gboolean
 gimp_stroke_real_point_is_movable (GimpStroke *stroke,
                                    GimpAnchor *predec,
                                    gdouble     position)
@@ -660,7 +660,7 @@
 }
 
 
-void
+static void
 gimp_stroke_real_point_move_relative (GimpStroke           *stroke,
                                       GimpAnchor           *predec,
                                       gdouble               position,
@@ -685,7 +685,7 @@
                                                        feature);
 }
 
-void
+static void
 gimp_stroke_real_point_move_absolute (GimpStroke           *stroke,
                                       GimpAnchor           *predec,
                                       gdouble               position,
@@ -780,7 +780,7 @@
                                                                position);
 }
 
-gboolean
+static gboolean
 gimp_stroke_real_anchor_is_insertable (GimpStroke *stroke,
                                        GimpAnchor *predec,
                                        gdouble     position)
@@ -802,7 +802,7 @@
                                                         predec, position);
 }
 
-GimpAnchor *
+static GimpAnchor *
 gimp_stroke_real_anchor_insert (GimpStroke *stroke,
                                 GimpAnchor *predec,
                                 gdouble     position)
@@ -982,7 +982,7 @@
   return GIMP_STROKE_GET_CLASS (stroke)->duplicate (stroke);
 }
 
-GimpStroke *
+static GimpStroke *
 gimp_stroke_real_duplicate (const GimpStroke *stroke)
 {
   GimpStroke *new_stroke;