[gtk+] css node declaration: Avoid optional out parameters
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] css node declaration: Avoid optional out parameters
- Date: Sat, 12 Sep 2015 17:06:33 +0000 (UTC)
commit 20c49b883763c1a8d0097425cdfb1eaf1e4df190
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Sep 10 22:04:31 2015 -0400
css node declaration: Avoid optional out parameters
Always pass a pos to find_class, and avoid the if.
gtk/gtkcssnodedeclaration.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcssnodedeclaration.c b/gtk/gtkcssnodedeclaration.c
index 87030d0..da1c944 100644
--- a/gtk/gtkcssnodedeclaration.c
+++ b/gtk/gtkcssnodedeclaration.c
@@ -231,8 +231,7 @@ find_class (const GtkCssNodeDeclaration *decl,
GQuark *classes;
guint pos;
- if (position)
- *position = 0;
+ *position = 0;
if (decl->n_classes == 0)
return FALSE;
@@ -264,8 +263,7 @@ find_class (const GtkCssNodeDeclaration *decl,
}
while (min <= max);
- if (position)
- *position = pos;
+ *position = pos;
return found;
}
@@ -326,6 +324,7 @@ gboolean
gtk_css_node_declaration_has_class (const GtkCssNodeDeclaration *decl,
GQuark class_quark)
{
+ guint pos;
GQuark *classes = get_classes (decl);
switch (decl->n_classes)
@@ -346,7 +345,7 @@ gtk_css_node_declaration_has_class (const GtkCssNodeDeclaration *decl,
return FALSE;
default:
- return find_class (decl, class_quark, NULL);
+ return find_class (decl, class_quark, &pos);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]