if (!node || !newtree)
abort();
+ else {
- copy = copy_widget_value_tree(newtree, STRUCTURAL_CHANGE);
+ copy = copy_widget_value_tree(newtree, STRUCTURAL_CHANGE);
- free_widget_value_contents(node);
- *node = *copy;
- free_widget_value(copy); /* free the node, but not its contents. */
+ free_widget_value_contents(node);
+ *node = *copy;
+ /* free the node, but not its contents. */
+ free_widget_value(copy);
+ }
return node;
}
if (!info)
abort();
-
- if (info->val)
+ else if (info->val)
return map_widget_values(info->val, mapfunc, closure);
return 0;
}
return (s1 && s2) ? strcmp(s1, s2) : s1 ? False : !!s2;
}
+
+/* We only expect to use the following max function */
+#ifdef max
+#undef max
+#endif
+
static change_type max(change_type i1, change_type i2)
{
return (int)i1 > (int)i2 ? i1 : i2;
fprintf(stderr, "No creation function for widget type %s\n",
instance->info->type);
abort();
+ } else {
+ instance->widget = (*function) (instance);
}
- instance->widget = (*function) (instance);
-
if (!instance->widget)
abort();