diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-09-10 22:02:03 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-09-12 11:28:39 -0400 |
| commit | 60ccda05975c63b178a76e53cd4ab5bf681cc22f (patch) | |
| tree | 3c7dfee44788daf64864135fa6d5dd86e8890a11 /gtk | |
| parent | 83d68ea107bbeec96309608b6b18818d95ec35f9 (diff) | |
| download | gtk+-60ccda05975c63b178a76e53cd4ab5bf681cc22f.tar.gz | |
css lookup: Replace g_return by gtk_internal return
These functions are called in an inner loop in
gtk_css_style_provider_lookup.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkcsslookup.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c index 66fe47213b..7725241407 100644 --- a/gtk/gtkcsslookup.c +++ b/gtk/gtkcsslookup.c @@ -22,6 +22,7 @@ #include "gtkcssstylepropertyprivate.h" #include "gtkcsstypesprivate.h" #include "gtkprivatetypebuiltins.h" +#include "gtkprivate.h" GtkCssLookup * _gtk_css_lookup_new (const GtkBitmask *relevant) @@ -47,7 +48,7 @@ _gtk_css_lookup_new (const GtkBitmask *relevant) void _gtk_css_lookup_free (GtkCssLookup *lookup) { - g_return_if_fail (lookup != NULL); + gtk_internal_return_if_fail (lookup != NULL); _gtk_bitmask_free (lookup->missing); g_free (lookup); @@ -57,7 +58,7 @@ gboolean _gtk_css_lookup_is_missing (const GtkCssLookup *lookup, guint id) { - g_return_val_if_fail (lookup != NULL, FALSE); + gtk_internal_return_val_if_fail (lookup != NULL, FALSE); return _gtk_bitmask_get (lookup->missing, id); } @@ -81,9 +82,9 @@ _gtk_css_lookup_set (GtkCssLookup *lookup, GtkCssSection *section, GtkCssValue *value) { - g_return_if_fail (lookup != NULL); - g_return_if_fail (_gtk_bitmask_get (lookup->missing, id)); - g_return_if_fail (value != NULL); + gtk_internal_return_if_fail (lookup != NULL); + gtk_internal_return_if_fail (_gtk_bitmask_get (lookup->missing, id)); + gtk_internal_return_if_fail (value != NULL); lookup->missing = _gtk_bitmask_set (lookup->missing, id, FALSE); lookup->values[id].value = value; @@ -110,10 +111,10 @@ _gtk_css_lookup_resolve (GtkCssLookup *lookup, { guint i, n; - g_return_if_fail (lookup != NULL); - g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - g_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style)); - g_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style)); + gtk_internal_return_if_fail (lookup != NULL); + gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); + gtk_internal_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style)); + gtk_internal_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style)); n = _gtk_css_style_property_get_n_properties (); |