callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not initialize the priv pointer before check type

Browse Source
This commit is contained in:
Javier Jardon
2011-07-06 14:25:06 +01:00
parent f90f2858c8
commit ad0c0b8eb3
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkhsv.c
View File

@ -1360,18 +1360,18 @@ gtk_hsv_get_color (GtkHSV *hsv,
double *s, double *s,
double *v) double *v)
{ {
GtkHSVPrivate *priv = hsv->priv; GtkHSVPrivate *priv;
g_return_if_fail (GTK_IS_HSV (hsv)); g_return_if_fail (GTK_IS_HSV (hsv));
priv = hsv->priv; priv = hsv->priv;
if (h) if (h)
*h = priv->h; *h = priv->h;
if (s) if (s)
*s = priv->s; *s = priv->s;
if (v) if (v)
*v = priv->v; *v = priv->v;
} }
@ -1391,7 +1391,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
gint size, gint size,
gint ring_width) gint ring_width)
{ {
GtkHSVPrivate *priv = hsv->priv; GtkHSVPrivate *priv;
int same_size; int same_size;
g_return_if_fail (GTK_IS_HSV (hsv)); g_return_if_fail (GTK_IS_HSV (hsv));
@ -1402,7 +1402,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
priv = hsv->priv; priv = hsv->priv;
same_size = (priv->size == size); same_size = (priv->size == size);
priv->size = size; priv->size = size;
priv->ring_width = ring_width; priv->ring_width = ring_width;
@ -1427,7 +1427,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
gint *size, gint *size,
gint *ring_width) gint *ring_width)
{ {
GtkHSVPrivate *priv = hsv->priv; GtkHSVPrivate *priv;
g_return_if_fail (GTK_IS_HSV (hsv)); g_return_if_fail (GTK_IS_HSV (hsv));
@ -1458,7 +1458,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
gboolean gboolean
gtk_hsv_is_adjusting (GtkHSV *hsv) gtk_hsv_is_adjusting (GtkHSV *hsv)
{ {
GtkHSVPrivate *priv = hsv->priv; GtkHSVPrivate *priv;
g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE); g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE);

2
gtk/gtklabel.c
View File

@ -2820,7 +2820,7 @@ void
gtk_label_set_pattern (GtkLabel *label, gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern) const gchar *pattern)
{ {
GtkLabelPrivate *priv = label->priv; GtkLabelPrivate *priv;
g_return_if_fail (GTK_IS_LABEL (label)); g_return_if_fail (GTK_IS_LABEL (label));

2
gtk/gtkliststore.c
View File

@ -939,7 +939,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
gint column, gint column,
GValue *value) GValue *value)
{ {
GtkListStorePrivate *priv = list_store->priv; GtkListStorePrivate *priv;
g_return_if_fail (GTK_IS_LIST_STORE (list_store)); g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter_is_valid (iter, list_store)); g_return_if_fail (iter_is_valid (iter, list_store));

4
gtk/gtktable.c
View File

@ -750,9 +750,9 @@ gtk_table_attach (GtkTable *table,
guint xpadding, guint xpadding,
guint ypadding) guint ypadding)
{ {
GtkTablePrivate *priv = table->priv; GtkTablePrivate *priv;
GtkTableChild *table_child; GtkTableChild *table_child;
g_return_if_fail (GTK_IS_TABLE (table)); g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (gtk_widget_get_parent (child) == NULL); g_return_if_fail (gtk_widget_get_parent (child) == NULL);