[gtk+/wip/multiple-backgrounds: 12/15] csspositionvalue: make empty error value non fatal
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/multiple-backgrounds: 12/15] csspositionvalue: make empty error value non fatal
- Date: Mon, 14 May 2012 13:24:08 +0000 (UTC)
commit 9de815d1d3fc15a72d9bf5cd3f0fdaf5db77c790
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri May 11 20:46:18 2012 -0400
csspositionvalue: make empty error value non fatal
If there's just no value to parse (e.g. because we're parsing a
shorthand property), don't error out while trying to parse a number.
gtk/gtkcsspositionvalue.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c
index 61c34f3..fd230ed 100644
--- a/gtk/gtkcsspositionvalue.c
+++ b/gtk/gtkcsspositionvalue.c
@@ -187,12 +187,18 @@ _gtk_css_position_value_parse (GtkCssParser *parser)
}
if (names[first].name == NULL)
{
- missing = &y;
- x = _gtk_css_number_value_parse (parser,
- GTK_CSS_PARSE_PERCENT
- | GTK_CSS_PARSE_LENGTH);
- if (x == NULL)
- return NULL;
+ if (_gtk_css_parser_has_number (parser))
+ {
+ missing = &y;
+ x = _gtk_css_number_value_parse (parser,
+ GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_PARSE_LENGTH);
+
+ if (x == NULL)
+ return NULL;
+ }
+ else
+ return NULL;
}
for (second = 0; names[second].name != NULL; second++)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]