[brlcad-commits] SF.net SVN: brlcad:[68479] brlcad/trunk/src/librt
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2016-07-25 03:58:51
|
Revision: 68479 http://sourceforge.net/p/brlcad/code/68479 Author: brlcad Date: 2016-07-25 03:58:48 +0000 (Mon, 25 Jul 2016) Log Message: ----------- warning message consistency, using WARNING: Modified Paths: -------------- brlcad/trunk/src/librt/db_diff.c brlcad/trunk/src/librt/db_fullpath.c brlcad/trunk/src/librt/db_tree.c brlcad/trunk/src/librt/primitives/nmg/nmg.c brlcad/trunk/src/librt/tests/nurbs_tests.cpp Modified: brlcad/trunk/src/librt/db_diff.c =================================================================== --- brlcad/trunk/src/librt/db_diff.c 2016-07-25 03:49:18 UTC (rev 68478) +++ brlcad/trunk/src/librt/db_diff.c 2016-07-25 03:58:48 UTC (rev 68479) @@ -524,7 +524,7 @@ /* If we're checking everything, we want a sanity check to make sure we spot it when the objects differ */ if (flags == DB_COMPARE_ALL && dp1 != RT_DIR_NULL && dp1->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY && dp2 != RT_DIR_NULL && dp2->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY) { if (db_get_external(&ext1, dp1, dbip1) || db_get_external(&ext2, dp2, dbip2)) { - bu_log("Warning - Error getting bu_external form when comparing %s and %s\n", dp1->d_namep, dp2->d_namep); + bu_log("WARNING: Unexpected failure reading serialized data for %s and %s\n", dp1->d_namep, dp2->d_namep); } else { if (db_diff_external(&ext1, &ext2)) {extern_state = DIFF_CHANGED;} } @@ -540,7 +540,7 @@ state |= db_diff_dp(dbip1, dbip2, dp1, dp2, diff_tol, DB_COMPARE_ATTRS, result); } if (flags == DB_COMPARE_ALL && state == DIFF_UNCHANGED && extern_state == DIFF_CHANGED) { - bu_log("Warning - internal comparison and bu_external comparison disagree when comparing %s and %s\n", dp1->d_namep, dp2->d_namep); + bu_log("WARNING: internal and bu_external comparison disagree for %s and %s\n", dp1->d_namep, dp2->d_namep); } @@ -898,7 +898,7 @@ dp_ancestor != RT_DIR_NULL && dp_ancestor->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY && dp_right != RT_DIR_NULL && dp_right->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY) { if (db_get_external(&ext_left, dp_left, dbip_left) || db_get_external(&ext_ancestor, dp_ancestor, dbip_ancestor) || db_get_external(&ext_right, dp_right, dbip_right)) { - bu_log("Warning - Error getting bu_external form when comparing %s and %s\n", dp_left->d_namep, dp_ancestor->d_namep); + bu_log("WARNING: unexpected failure reading serialized data for %s and %s\n", dp_left->d_namep, dp_ancestor->d_namep); } else { if (db_diff_external(&ext_left, &ext_right) || db_diff_external(&ext_left, &ext_ancestor)) {extern_state = DIFF_CHANGED;} } @@ -915,7 +915,7 @@ ancestor_state |= db_diff3_dp(dbip_left, dbip_ancestor, dbip_right, dp_left, dp_ancestor, dp_right, diff3_tol, DB_COMPARE_ATTRS, result); } if (flags == DB_COMPARE_ALL && (ancestor_state == DIFF_UNCHANGED || ancestor_state == DIFF_EMPTY) && extern_state == DIFF_CHANGED) { - bu_log("Warning - internal comparison and bu_external comparison disagree\n"); + bu_log("WARNING: internal and bu_external comparison disagree\n"); } if (results) { @@ -945,7 +945,7 @@ dp_left != RT_DIR_NULL && dp_left->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY && dp_right != RT_DIR_NULL && dp_right->d_major_type != DB5_MAJORTYPE_ATTRIBUTE_ONLY) { if (db_get_external(&ext_left, dp_left, dbip_left) || db_get_external(&ext_right, dp_right, dbip_right)) { - bu_log("Warning - Error getting bu_external form\n"); + bu_log("WARNING: Unexpected failure reading serialized data\n"); } else { if (db_diff_external(&ext_left, &ext_right)) {extern_state = DIFF_CHANGED;} } @@ -961,7 +961,7 @@ left_state |= db_diff3_dp(dbip_left, dbip_ancestor, dbip_right, dp_left, NULL, dp_right, diff3_tol, DB_COMPARE_ATTRS, result); } if (flags == DB_COMPARE_ALL && (left_state == DIFF_UNCHANGED || left_state == DIFF_EMPTY) && extern_state == DIFF_CHANGED) { - bu_log("Warning - internal comparison and bu_external comparison disagree"); + bu_log("WARNING: internal and bu_external comparison disagree"); } if (results) { Modified: brlcad/trunk/src/librt/db_fullpath.c =================================================================== --- brlcad/trunk/src/librt/db_fullpath.c 2016-07-25 03:49:18 UTC (rev 68478) +++ brlcad/trunk/src/librt/db_fullpath.c 2016-07-25 03:58:48 UTC (rev 68479) @@ -269,7 +269,7 @@ } if ((fp_flags & DB_FP_PRINT_TYPE) && !dbip) { - bu_log("Warning - requested object type printing, but dbip is NULL - object types will not be printed!"); + bu_log("WARNING: requested object type printing, but database is unavailable\n\tObject types will not be printed!"); } for (i = 0; i < full_path->fp_len; i++) { Modified: brlcad/trunk/src/librt/db_tree.c =================================================================== --- brlcad/trunk/src/librt/db_tree.c 2016-07-25 03:49:18 UTC (rev 68478) +++ brlcad/trunk/src/librt/db_tree.c 2016-07-25 03:58:48 UTC (rev 68479) @@ -281,7 +281,7 @@ if (tsp->ts_sofar & TS_SOFAR_REGION) { if ((tsp->ts_sofar&(TS_SOFAR_MINUS|TS_SOFAR_INTER)) == 0) { char *sofar = db_path_to_string(pathp); - bu_log("Warning: region unioned into region at '%s', lower region info ignored\n", + bu_log("WARNING: region unioned into region at '%s', lower region info ignored\n", sofar); bu_free(sofar, "path string"); } Modified: brlcad/trunk/src/librt/primitives/nmg/nmg.c =================================================================== --- brlcad/trunk/src/librt/primitives/nmg/nmg.c 2016-07-25 03:49:18 UTC (rev 68478) +++ brlcad/trunk/src/librt/primitives/nmg/nmg.c 2016-07-25 03:58:48 UTC (rev 68479) @@ -987,7 +987,8 @@ #define INDEX(o, i, elem) *(uint32_t *)(o)->elem = htonl(reindex((void *)((i)->elem), ecnt)) #define INDEXL(oo, ii, elem) { \ uint32_t _f = reindex((void *)((ii)->elem.forw), ecnt); \ - if (_f == DISK_INDEX_NULL) bu_log("Warning rt_nmg_edisk: reindex forw to null?\n"); \ + if (_f == DISK_INDEX_NULL) \ + bu_log("INTERNAL WARNING: rt_nmg_edisk() reindex forw to null?\n"); \ *(uint32_t *)((oo)->elem.forw) = htonl(_f); \ *(uint32_t *)((oo)->elem.back) = htonl(reindex((void *)((ii)->elem.back), ecnt)); } #define PUTMAGIC(_magic) *(uint32_t *)d->magic = htonl(_magic) Modified: brlcad/trunk/src/librt/tests/nurbs_tests.cpp =================================================================== --- brlcad/trunk/src/librt/tests/nurbs_tests.cpp 2016-07-25 03:49:18 UTC (rev 68478) +++ brlcad/trunk/src/librt/tests/nurbs_tests.cpp 2016-07-25 03:58:48 UTC (rev 68479) @@ -78,8 +78,10 @@ std::cout << std::setprecision(std::numeric_limits<double>::digits10) << " 2d Point 2: " << pt_2d_2.x << "," << pt_2d_2.y << "\n"; return -1; } - if (p1_result == false) std::cout << "Warning - p1 pullback failed\n"; - if (p2_result == false) std::cout << "Warning - p2 pullback failed\n"; + if (p1_result == false) + std::cout << "WARNING: p1 pullback failed\n"; + if (p2_result == false) + std::cout << "WARNING: p2 pullback failed\n"; return 0; } default: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |