[brlcad-commits] SF.net SVN: brlcad:[46813] brlcad/trunk/src/librt/db5_io.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2011-09-21 01:22:14
|
Revision: 46813 http://brlcad.svn.sourceforge.net/brlcad/?rev=46813&view=rev Author: brlcad Date: 2011-09-21 01:22:07 +0000 (Wed, 21 Sep 2011) Log Message: ----------- be consistent about checking the resource pointer, but only set rt_uniresource if it's a routine that calls into the functab. Modified Paths: -------------- brlcad/trunk/src/librt/db5_io.c Modified: brlcad/trunk/src/librt/db5_io.c =================================================================== --- brlcad/trunk/src/librt/db5_io.c 2011-09-21 01:16:45 UTC (rev 46812) +++ brlcad/trunk/src/librt/db5_io.c 2011-09-21 01:22:07 UTC (rev 46813) @@ -724,7 +724,13 @@ } RT_CK_DB_INTERNAL(ip); if (dbip) RT_CK_DBI(dbip); /* may be null */ - RT_CK_RESOURCE(resp); + + if (resp) { + RT_CK_RESOURCE(resp); + } else { + /* needed for call into functab */ + resp = &rt_uniresource; + } /* prepare output */ BU_EXTERNAL_INIT(ext); @@ -914,9 +920,11 @@ RT_CK_DIR(dp); RT_CK_DBI(dbip); RT_CK_DB_INTERNAL(ip); - RT_CK_RESOURCE(resp); BU_ASSERT_LONG(dbip->dbi_version, ==, 5); + if (resp) + RT_CK_RESOURCE(resp); + BU_EXTERNAL_INIT(&ext); if (rt_db_cvt_to_external5(&ext, dp->d_namep, ip, 1.0, dbip, resp, major) < 0) { bu_log("rt_db_put_internal5(%s): export failure\n", @@ -983,9 +991,12 @@ RT_CK_DB_INTERNAL(ip); RT_CK_DBI(dbip); - /* needed for call into functab */ - if (resp == RESOURCE_NULL) + if (resp) { + RT_CK_RESOURCE(resp); + } else { + /* needed for call into functab */ resp = &rt_uniresource; + } BU_ASSERT_LONG(dbip->dbi_version, ==, 5); @@ -1097,6 +1108,8 @@ BU_EXTERNAL_INIT(&ext); RT_DB_INTERNAL_INIT(ip); + if (resp) { + RT_CK_RESOURCE(resp); BU_ASSERT_LONG(dbip->dbi_version, ==, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |