Revision: 41216
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41216&view=rev
Author:   brlcad
Date:     2010-11-02 10:48:56 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
db_free_tree() already tests the pointer and does nothing if null.  simplify.

Modified Paths:
--------------
    brlcad/trunk/src/libged/facetize.c

Modified: brlcad/trunk/src/libged/facetize.c
===================================================================
--- brlcad/trunk/src/libged/facetize.c  2010-11-02 10:47:12 UTC (rev 41215)
+++ brlcad/trunk/src/libged/facetize.c  2010-11-02 10:48:56 UTC (rev 41216)
@@ -201,8 +201,7 @@
            /* catch */
            BU_UNSETJUMP;
            bu_vls_printf(&gedp->ged_result_str, "WARNING: facetization 
failed!!!\n");
-           if (facetize_tree)
-               db_free_tree(facetize_tree, &rt_uniresource);
+           db_free_tree(facetize_tree, &rt_uniresource);
            facetize_tree = (union tree *)NULL;
            nmg_km(nmg_model);
            nmg_model = (struct model *)NULL;
@@ -214,8 +213,7 @@
 
     if (failed) {
        bu_vls_printf(&gedp->ged_result_str, "facetize:  no resulting region, 
aborting\n");
-       if (facetize_tree)
-           db_free_tree(facetize_tree, &rt_uniresource);
+       db_free_tree(facetize_tree, &rt_uniresource);
        facetize_tree = (union tree *)NULL;
        nmg_km(nmg_model);
        nmg_model = (struct model *)NULL;
@@ -238,8 +236,7 @@
            /* catch */
            BU_UNSETJUMP;
            bu_vls_printf(&gedp->ged_result_str, "WARNING: triangulation 
failed!!!\n");
-           if (facetize_tree)
-               db_free_tree(facetize_tree, &rt_uniresource);
+           db_free_tree(facetize_tree, &rt_uniresource);
            facetize_tree = (union tree *)NULL;
            nmg_km(nmg_model);
            nmg_model = (struct model *)NULL;
@@ -271,8 +268,7 @@
            /* catch */
            BU_UNSETJUMP;
            bu_vls_printf(&gedp->ged_result_str, "WARNING: conversion to BOT 
failed!\n");
-           if (facetize_tree)
-               db_free_tree(facetize_tree, &rt_uniresource);
+           db_free_tree(facetize_tree, &rt_uniresource);
            facetize_tree = (union tree *)NULL;
            nmg_km(nmg_model);
            nmg_model = (struct model *)NULL;


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to