brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some missing va_ends

Browse Source 
Found by Coverity.

https://bugzilla.gnome.org/show_bug.cgi?id=689496
This commit is contained in:
Jasper St. Pierre 2012-11-30 21:35:58 -05:00
parent 039ba910f0
commit fbcab5f097
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter-list-model.c
View File

@ -776,15 +776,16 @@ clutter_list_model_new (guint n_columns,
{ {
g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type)); g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type));
g_object_unref (model); g_object_unref (model);
return NULL; model = NULL;
goto out;
} }
_clutter_model_set_column_type (model, i, type); _clutter_model_set_column_type (model, i, type);
_clutter_model_set_column_name (model, i, name); _clutter_model_set_column_name (model, i, name);
} }
out:
va_end (args); va_end (args);
return model; return model;
} }

7
clutter/deprecated/clutter-animator.c
View File

@ -1206,6 +1206,10 @@ clutter_animator_set (ClutterAnimator *animator,
object = first_object; object = first_object;
property_name = first_property_name; property_name = first_property_name;
g_return_if_fail (object);
g_return_if_fail (property_name);
mode = first_mode; mode = first_mode;
progress = first_progress; progress = first_progress;
@ -1218,9 +1222,6 @@ clutter_animator_set (ClutterAnimator *animator,
GValue value = G_VALUE_INIT; GValue value = G_VALUE_INIT;
gchar *error = NULL; gchar *error = NULL;
g_return_if_fail (object);
g_return_if_fail (property_name);
klass = G_OBJECT_GET_CLASS (object); klass = G_OBJECT_GET_CLASS (object);
pspec = g_object_class_find_property (klass, property_name); pspec = g_object_class_find_property (klass, property_name);

5
clutter/deprecated/clutter-state.c
View File

@ -1,4 +1,4 @@
/* g/*
* Clutter. * Clutter.
* *
* An OpenGL based 'interactive canvas' library. * An OpenGL based 'interactive canvas' library.
@ -991,11 +991,12 @@ clutter_state_set (ClutterState *state,
property_name = first_property_name; property_name = first_property_name;
mode = first_mode; mode = first_mode;
va_start (args, first_mode);
g_return_if_fail (G_IS_OBJECT (first_object)); g_return_if_fail (G_IS_OBJECT (first_object));
g_return_if_fail (first_property_name); g_return_if_fail (first_property_name);
va_start (args, first_mode);
while (object != NULL) while (object != NULL)
{ {
GParamSpec *pspec; GParamSpec *pspec;