Revision: 55227
http://sourceforge.net/p/brlcad/code/55227
Author: starseeker
Date: 2013-04-24 18:58:09 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
path variable is only used by code within the ifdef - put the variable
definition in there as well.
Modified Paths:
--------------
brlcad/trunk/src/libbu/brlcad_path.c
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===================================================================
--- brlcad/trunk/src/libbu/brlcad_path.c 2013-04-24 18:56:37 UTC (rev
55226)
+++ brlcad/trunk/src/libbu/brlcad_path.c 2013-04-24 18:58:09 UTC (rev
55227)
@@ -407,7 +407,6 @@
const char *lhs;
struct bu_vls searched = BU_VLS_INIT_ZERO;
char where[MAX_WHERE_SIZE] = {0};
- char path[MAXPATHLEN] = {0};
if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
bu_log("bu_brlcad_data: looking for [%s]\n", rhs?rhs:"");
@@ -442,16 +441,19 @@
/* bu_brlcad_root/BRLCAD_DATA_DIR path */
#ifdef BRLCAD_DATA_DIR
- snprintf(path, MAXPATHLEN, "%s", BRLCAD_DATA_DIR);
- lhs = bu_brlcad_root(path, 1);
- if (lhs) {
- snprintf(where, MAX_WHERE_SIZE, "\tBRLCAD_ROOT common data path
[%s]\n", path);
- if (find_path(result, lhs, rhs, &searched, where)) {
- if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
- bu_log("Found: BRLCAD_ROOT common data path [%s]\n", result);
+ {
+ char path[MAXPATHLEN] = {0};
+ snprintf(path, MAXPATHLEN, "%s", BRLCAD_DATA_DIR);
+ lhs = bu_brlcad_root(path, 1);
+ if (lhs) {
+ snprintf(where, MAX_WHERE_SIZE, "\tBRLCAD_ROOT common data path
[%s]\n", path);
+ if (find_path(result, lhs, rhs, &searched, where)) {
+ if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
+ bu_log("Found: BRLCAD_ROOT common data path [%s]\n",
result);
+ }
+ bu_vls_free(&searched);
+ return result;
}
- bu_vls_free(&searched);
- return result;
}
}
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
