Release 1.0.2

[gob-dx.git] / src / generate_treefuncs.pl

diff --git a/src/generate_treefuncs.pl b/src/generate_treefuncs.pl
index 12890fc13f826e52e126b1fc15620e7193f92185..de6c4b6832819fa2dc9c69642f769eeb2cb548f6 100755 (executable)
--- a/src/generate_treefuncs.pl
+++ b/src/generate_treefuncs.pl
@@ -97,8 +97,8 @@ while(<FILE>) {
                                        "\tself->type = $uct"."_NODE;\n";
                $copyfunc{$typename} = "{\n" .
                                        "\t$typename * new;\n" .
-                                       "\tg_return_if_fail(self != NULL);\n" .
-                                       "\tg_return_if_fail(self->type == $uct"."_NODE);\n" .
+                                       "\tg_return_val_if_fail(self != NULL, NULL);\n" .
+                                       "\tg_return_val_if_fail(self->type == $uct"."_NODE, NULL);\n" .
                                        "\tnew = g_new0($typename, 1);\n" .
                                        "\tnew->type = $uct"."_NODE;\n";
                $freefunc{$typename} = "{\n\tg_return_if_fail(self != NULL);\n" .
@@ -258,8 +258,8 @@ foreach $t (sort keys %freefunc_prot) {
 
 print OUTC "Node * copy_node(Node *node)\n" .
           "{\n" .
-          "\tg_return_if_fail(node != NULL);\n" .
-          "\tg_return_if_fail(node->type >= 0 && node->type < LAST_NODE_TYPE);\n" .
+          "\tg_return_val_if_fail(node != NULL, NULL);\n" .
+          "\tg_return_val_if_fail(node->type >= 0 && node->type < LAST_NODE_TYPE, NULL);\n" .
           "\tswitch(node->type) {\n";
 foreach $t (sort keys %typestruct) {
        print OUTC "\tcase " . uc($t) . "_NODE: return (Node *)copy_" . lc($t) . " (($t *)node);\n";