Revision: 41372
http://brlcad.svn.sourceforge.net/brlcad/?rev=41372&view=rev
Author: brlcad
Date: 2010-11-16 02:40:54 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
even more NULLings. also seems unnecessary that solids_on_ray is using static
vars here.
Modified Paths:
--------------
brlcad/trunk/src/libged/killtree.c
brlcad/trunk/src/libged/solids_on_ray.c
brlcad/trunk/src/libged/wcodes.c
Modified: brlcad/trunk/src/libged/killtree.c
===================================================================
--- brlcad/trunk/src/libged/killtree.c 2010-11-16 02:28:39 UTC (rev 41371)
+++ brlcad/trunk/src/libged/killtree.c 2010-11-16 02:40:54 UTC (rev 41372)
@@ -149,6 +149,7 @@
default:
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0],
usage);
bu_free(gktd.av, "free av (error)");
+ gktd.av = NULL;
return GED_ERROR;
}
}
@@ -188,6 +189,7 @@
if (!gktd.nflag)
bu_vls_printf(&gedp->ged_result_str, "Freeing %s\n",
gktd.av[i]);
bu_free((genptr_t)gktd.av[i], "ged_killtree_data");
+ gktd.av[i] = NULL;
}
}
@@ -195,6 +197,7 @@
bu_vls_printf(&gedp->ged_result_str, "}");
bu_free(gktd.av, "free av");
+ gktd.av = NULL;
return GED_OK;
}
Modified: brlcad/trunk/src/libged/solids_on_ray.c
===================================================================
--- brlcad/trunk/src/libged/solids_on_ray.c 2010-11-16 02:28:39 UTC (rev
41371)
+++ brlcad/trunk/src/libged/solids_on_ray.c 2010-11-16 02:40:54 UTC (rev
41372)
@@ -189,8 +189,8 @@
int
ged_solids_on_ray(struct ged *gedp, int argc, const char *argv[])
{
- static char **solids_on_ray_cmd_vec = NULL;
- static int solids_on_ray_cmd_vec_len = 0;
+ char **solids_on_ray_cmd_vec = NULL;
+ int solids_on_ray_cmd_vec_len = 0;
size_t args;
char **snames;
@@ -289,6 +289,7 @@
snames = ged_skewer_solids(gedp, solids_on_ray_cmd_vec_len, (const char
**)solids_on_ray_cmd_vec, ray_orig, ray_dir, 1);
bu_free(solids_on_ray_cmd_vec, "free solids_on_ray_cmd_vec");
+ solids_on_ray_cmd_vec = NULL;
if (snames == 0) {
bu_vls_printf(&gedp->ged_result_str, "Error executing
ged_skewer_solids: ");
Modified: brlcad/trunk/src/libged/wcodes.c
===================================================================
--- brlcad/trunk/src/libged/wcodes.c 2010-11-16 02:28:39 UTC (rev 41371)
+++ brlcad/trunk/src/libged/wcodes.c 2010-11-16 02:40:54 UTC (rev 41372)
@@ -173,6 +173,8 @@
(void)fclose(fp);
bu_free(path, "dealloc path");
+ path = NULL;
+ path_capacity = 0;
return GED_OK;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
