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

css node declaration: Avoid optional out parameters

Browse Source 
Always pass a pos to find_class, and avoid the if.
This commit is contained in:
Matthias Clasen
2015-09-10 22:04:31 -04:00
parent 29505af07f
commit 20c49b8837
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkcssnodedeclaration.c
View File

@ -231,8 +231,7 @@ find_class (const GtkCssNodeDeclaration *decl,
GQuark *classes; GQuark *classes;
guint pos; guint pos;
if (position) *position = 0;
*position = 0;
if (decl->n_classes == 0) if (decl->n_classes == 0)
return FALSE; return FALSE;
@ -264,8 +263,7 @@ find_class (const GtkCssNodeDeclaration *decl,
} }
while (min <= max); while (min <= max);
if (position) *position = pos;
*position = pos;
return found; return found;
} }
@ -326,6 +324,7 @@ gboolean
gtk_css_node_declaration_has_class (const GtkCssNodeDeclaration *decl, gtk_css_node_declaration_has_class (const GtkCssNodeDeclaration *decl,
GQuark class_quark) GQuark class_quark)
{ {
guint pos;
GQuark *classes = get_classes (decl); GQuark *classes = get_classes (decl);
switch (decl->n_classes) switch (decl->n_classes)
@ -346,7 +345,7 @@ gtk_css_node_declaration_has_class (const GtkCssNodeDeclaration *decl,
return FALSE; return FALSE;
default: default:
return find_class (decl, class_quark, NULL); return find_class (decl, class_quark, &pos);
} }
} }