X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/072bb12e618b26cce359784aa56f9a2b70e1ce52..486240dc4c5d57b0afaddba60d87fe375112bed5:/src/generate_treefuncs.pl

diff --git a/src/generate_treefuncs.pl b/src/generate_treefuncs.pl
index 12890fc..de6c4b6 100755
--- 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";