Revision: 42436
http://brlcad.svn.sourceforge.net/brlcad/?rev=42436&view=rev
Author: brlcad
Date: 2011-01-19 08:32:39 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
be more specific. match the resource struct member name, allocating more than
one directory.
Modified Paths:
--------------
brlcad/trunk/doc/deprecation.txt
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/librt/db_alloc.c
Modified: brlcad/trunk/doc/deprecation.txt
===================================================================
--- brlcad/trunk/doc/deprecation.txt 2011-01-19 08:29:04 UTC (rev 42435)
+++ brlcad/trunk/doc/deprecation.txt 2011-01-19 08:32:39 UTC (rev 42436)
@@ -324,8 +324,8 @@
have been identified in reverse chronological order. As expressions
are not extensively tested, use with caution.
-s/db_get_directory(/db_alloc_directory(/g
- db_get_directory() renamed to db_alloc_directory() [7.18]
+s/db_get_directory(/db_alloc_directory_block(/g
+ db_get_directory() renamed to db_alloc_directory_block() [7.18]
s/db_get_directory_size(/db_directory_size(/g
db_get_directory_size() renamed to db_directory_size() [7.18]
s/db_get_version(/db_version(/g
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2011-01-19 08:29:04 UTC (rev 42435)
+++ brlcad/trunk/include/raytrace.h 2011-01-19 08:32:39 UTC (rev 42436)
@@ -928,7 +928,7 @@
*/
#define RT_GET_DIRECTORY(_p, _res) { \
while (((_p) = (_res)->re_directory_hd) == NULL) \
- db_alloc_directory(_res); \
+ db_alloc_directory_block(_res); \
(_res)->re_directory_hd = (_p)->d_forw; \
(_p)->d_forw = NULL; }
Modified: brlcad/trunk/src/librt/db_alloc.c
===================================================================
--- brlcad/trunk/src/librt/db_alloc.c 2011-01-19 08:29:04 UTC (rev 42435)
+++ brlcad/trunk/src/librt/db_alloc.c 2011-01-19 08:32:39 UTC (rev 42436)
@@ -217,7 +217,7 @@
void
-db_alloc_directory(struct resource *resp)
+db_alloc_directory_block(struct resource *resp)
{
struct directory *dp;
size_t bytes;
@@ -229,7 +229,7 @@
/* Get a BIG block */
bytes = (size_t)bu_malloc_len_roundup(1024*sizeof(struct directory));
- dp = (struct directory *)bu_malloc(bytes, "re_directory_blocks from
db_alloc_directory() " BU_FLSTR);
+ dp = (struct directory *)bu_malloc(bytes, "re_directory_blocks from
db_alloc_directory_block() " BU_FLSTR);
/* Record storage for later */
bu_ptbl_ins(&resp->re_directory_blocks, (long *)dp);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
