changeset 708:35ffb03ffd01

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 22:33:26 +0300
parents 987541c66517
children 8c6cf02718be
files dmeval.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dmeval.c	Tue Apr 16 22:08:47 2013 +0300
+++ b/dmeval.c	Tue Apr 16 22:33:26 2013 +0300
@@ -819,7 +819,7 @@
 static int dm_eval_reorder_passN(DMEvalContext *ev, const DMEvalNode *node, DMEvalNode **result,
     const int op1, const int op2, const int op3)
 {
-    DMEvalNode *tmp, *sub;
+    DMEvalNode *tmp, *sub, *foo;
 
     for (; node != NULL; node = node->next)
     {
@@ -831,13 +831,15 @@
 
             // Add subexpression node
             if ((sub = dm_eval_add_node(result, OP_SUBEXPR)) == NULL)
-                return -3;
+                return DMERR_MALLOC;
 
             // Add popped node into subexpression
             dm_eval_push_node(&(sub->subexpr), tmp);
             
             // Add this operator into subexpression
-            DMEvalNode *foo = dm_eval_add_node(&(sub->subexpr), node->op);
+            if ((foo = dm_eval_add_node(&(sub->subexpr), node->op)) == NULL)
+                return DMERR_MALLOC;
+
             foo->ok = TRUE;
 
             // Next node