[maemo-commits] [maemo-commits] r18753 - in projects/haf/trunk/clutter0.8: clutter clutter/eglx debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-18 11:38:46 +0300 (Thu, 18 Jun 2009)
New Revision: 18753

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
   projects/haf/trunk/clutter0.8/clutter/clutter-behaviour-path.c
   projects/haf/trunk/clutter0.8/clutter/clutter-behaviour.c
   projects/haf/trunk/clutter0.8/clutter/clutter-list-model.c
   projects/haf/trunk/clutter0.8/clutter/clutter-main.c
   projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
minor coverity issues fixed



Modified: projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -5662,15 +5662,23 @@
 clutter_actor_set_parent (ClutterActor *self,
 		          ClutterActor *parent)
 {
+#ifndef G_DEBUG_DISABLE
   ClutterMainContext *clutter_context;
+#endif
   ClutterActorPrivate *priv;
 
+#ifndef G_DEBUG_DISABLE
   clutter_context = clutter_context_get_default ();
+#else
+  clutter_context_get_default ();
+#endif
 
   g_return_if_fail (CLUTTER_IS_ACTOR (self));
   g_return_if_fail (CLUTTER_IS_ACTOR (parent));
   g_return_if_fail (self != parent);
+#ifndef G_DEBUG_DISABLE
   g_return_if_fail (clutter_context != NULL);
+#endif
 
   priv = self->priv;
 

Modified: projects/haf/trunk/clutter0.8/clutter/clutter-behaviour-path.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-behaviour-path.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-behaviour-path.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -347,9 +347,7 @@
 static void
 clutter_behaviour_path_init (ClutterBehaviourPath *self)
 {
-  ClutterBehaviourPathPrivate *priv;
-
-  self->priv = priv = CLUTTER_BEHAVIOUR_PATH_GET_PRIVATE (self);
+  self->priv = CLUTTER_BEHAVIOUR_PATH_GET_PRIVATE (self);
 }
 
 static void

Modified: projects/haf/trunk/clutter0.8/clutter/clutter-behaviour.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-behaviour.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-behaviour.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -319,10 +319,7 @@
 static void
 clutter_behaviour_init (ClutterBehaviour *self)
 {
-  ClutterBehaviourPrivate *priv;
-
-  self->priv = priv = CLUTTER_BEHAVIOUR_GET_PRIVATE (self);
-
+  self->priv = CLUTTER_BEHAVIOUR_GET_PRIVATE (self);
 }
 
 static void

Modified: projects/haf/trunk/clutter0.8/clutter/clutter-list-model.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-list-model.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-list-model.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -740,6 +740,7 @@
         {
           g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type));
           g_object_unref (model);
+          va_end (args);
           return NULL;
         }
 

Modified: projects/haf/trunk/clutter0.8/clutter/clutter-main.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-main.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-main.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -302,13 +302,11 @@
 
 static inline void init_bits (void)
 {
-  ClutterMainContext *ctx;
-
   static gboolean done = FALSE;
   if (G_LIKELY (done))
     return;
 
-  ctx = clutter_context_get_default ();
+  clutter_context_get_default ();
 
   done = TRUE;
 }

Modified: projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c	2009-06-18 08:38:46 UTC (rev 18753)
@@ -184,7 +184,6 @@
   ClutterStageEGL   *stage_egl = CLUTTER_STAGE_EGL (actor);
   ClutterStageX11   *stage_x11 = CLUTTER_STAGE_X11 (actor);
   ClutterBackendEGL *backend_egl;
-  ClutterBackendX11 *backend_x11;
   EGLConfig          configs[20], chosen_config = 0;
   EGLint             config_count;
   gboolean           is_offscreen = FALSE;
@@ -194,7 +193,6 @@
   g_object_get (stage_x11->wrapper, "offscreen", &is_offscreen, NULL);
 
   backend_egl = CLUTTER_BACKEND_EGL (clutter_get_default_backend ());
-  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
 
   if (G_LIKELY (!is_offscreen))
     {

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-06-18 06:09:26 UTC (rev 18752)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-06-18 08:38:46 UTC (rev 18753)
@@ -1,6 +1,7 @@
 clutter (0.8.2-0maemo37~unreleased) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * Fix some minor Coverity issues, such as unused variables.
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 15 Jun 2009 09:26:15 +0300