Apparently forgot to push the last set of changed. Fixes a null
return value in EFbuild.c and adds a couple of sanity checks.
This commit is contained in:
parent
44b269e037
commit
c514f5ce0b
|
|
@ -1374,7 +1374,8 @@ calmaFindCell(name, was_called, predefined)
|
|||
* if the cell is used in a parent before being defined
|
||||
* then it will cause a core dump.
|
||||
*/
|
||||
DBReComputeBbox(def);
|
||||
DBReComputeBbox(def);
|
||||
if (was_called) *was_called = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1385,9 +1386,9 @@ calmaFindCell(name, was_called, predefined)
|
|||
if (predefined) *predefined = TRUE;
|
||||
TxPrintf("Using pre-existing cell definition\n");
|
||||
}
|
||||
if (was_called) *was_called = TRUE;
|
||||
}
|
||||
HashSetValue(h, def);
|
||||
if (was_called) *was_called = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1789,7 +1789,7 @@ efNodeMerge(node1ptr, node2ptr)
|
|||
|
||||
/* Sanity check: ignore if same node */
|
||||
if (*node1ptr == *node2ptr)
|
||||
return;
|
||||
return NULL;
|
||||
|
||||
/* Keep the node with the greater number of entries, and merge */
|
||||
/* the node with fewer entries into it. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue