Revision: 65106
http://sourceforge.net/p/brlcad/code/65106
Author: ejno
Date: 2015-05-29 23:45:35 +0000 (Fri, 29 May 2015)
Log Message:
-----------
fix warning: address of an array is always true
Modified Paths:
--------------
brlcad/trunk/src/librt/db_fullpath.c
brlcad/trunk/src/librt/search.c
Modified: brlcad/trunk/src/librt/db_fullpath.c
===================================================================
--- brlcad/trunk/src/librt/db_fullpath.c 2015-05-29 21:46:21 UTC (rev
65105)
+++ brlcad/trunk/src/librt/db_fullpath.c 2015-05-29 23:45:35 UTC (rev
65106)
@@ -291,7 +291,6 @@
if ((fp_flags & DB_FP_PRINT_TYPE) && dbip) {
struct rt_db_internal intern;
if (!(rt_db_get_internal(&intern, full_path->fp_names[i], dbip,
NULL, &rt_uniresource) < 0)) {
- if (intern.idb_meth->ft_label) {
bu_vls_putc(vls, '(');
switch (intern.idb_minor_type) {
case DB5_MINORTYPE_BRLCAD_ARB8:
@@ -328,7 +327,6 @@
break;
}
- }
bu_vls_putc(vls, ')');
rt_db_free_internal(&intern);
}
Modified: brlcad/trunk/src/librt/search.c
===================================================================
--- brlcad/trunk/src/librt/search.c 2015-05-29 21:46:21 UTC (rev 65105)
+++ brlcad/trunk/src/librt/search.c 2015-05-29 23:45:35 UTC (rev 65106)
@@ -1021,7 +1021,7 @@
}
if (rt_db_get_internal(&intern, dp, dbip, (fastf_t *)NULL,
&rt_uniresource) < 0) return 0;
- if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD ||
!intern.idb_meth->ft_label) {
+ if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
rt_db_free_internal(&intern);
db_node->matched_filters = 0;
return 0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
