Revision: 42470
http://brlcad.svn.sourceforge.net/brlcad/?rev=42470&view=rev
Author: brlcad
Date: 2011-01-19 23:25:38 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
more cases similiar to the search failure (affecting a bunch of commands
including the likes of ls, the tedit commands, tops, and others) where we
cannot use BU_STR_EQUAL since we actually need to use the real return value
from bu_strcmp() instead of !BU_STR_EQUAL(). nice early catch.
Modified Paths:
--------------
brlcad/trunk/src/libbu/fnmatch.c
brlcad/trunk/src/libbu/vls.c
brlcad/trunk/src/libged/edcodes.c
brlcad/trunk/src/libged/ls.c
brlcad/trunk/src/libged/wdb_obj.c
brlcad/trunk/src/mged/columns.c
brlcad/trunk/src/mged/solids_on_ray.c
brlcad/trunk/src/vdeck/vdeck.c
Modified: brlcad/trunk/src/libbu/fnmatch.c
===================================================================
--- brlcad/trunk/src/libbu/fnmatch.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/libbu/fnmatch.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -195,7 +195,7 @@
static int
classcompare(const void *a, const void *b)
{
- return !BU_STR_EQUAL(((CHARCLASS *)a)->idstring, ((CHARCLASS
*)b)->idstring);
+ return bu_strcmp(((CHARCLASS *)a)->idstring, ((CHARCLASS *)b)->idstring);
}
Modified: brlcad/trunk/src/libbu/vls.c
===================================================================
--- brlcad/trunk/src/libbu/vls.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/libbu/vls.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -453,7 +453,7 @@
}
/* neither empty, straight up comparison */
- return !BU_STR_EQUAL(s1->vls_str+s1->vls_offset,
s2->vls_str+s2->vls_offset);
+ return bu_strcmp(s1->vls_str+s1->vls_offset, s2->vls_str+s2->vls_offset);
}
Modified: brlcad/trunk/src/libged/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/libged/edcodes.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -58,7 +58,7 @@
reg1 = strchr(*(char **)p1, '/');
reg2 = strchr(*(char **)p2, '/');
- return !BU_STR_EQUAL(reg1, reg2);
+ return bu_strcmp(reg1, reg2);
}
Modified: brlcad/trunk/src/libged/ls.c
===================================================================
--- brlcad/trunk/src/libged/ls.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/libged/ls.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -68,14 +68,13 @@
* compare on the respective names and return that value.
*/
static int
-cmpdirname(const genptr_t a,
- const genptr_t b)
+cmpdirname(const genptr_t a, const genptr_t b)
{
struct directory **dp1, **dp2;
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
+ return bu_strcmp((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/libged/wdb_obj.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -8920,14 +8920,13 @@
* on the respective names and return that value.
*/
int
-wdb_cmpdirname(const genptr_t a,
- const genptr_t b)
+wdb_cmpdirname(const genptr_t a, const genptr_t b)
{
struct directory **dp1, **dp2;
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
+ return bu_strcmp((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/mged/columns.c
===================================================================
--- brlcad/trunk/src/mged/columns.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/mged/columns.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -98,7 +98,7 @@
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
+ return bu_strcmp((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/mged/solids_on_ray.c
===================================================================
--- brlcad/trunk/src/mged/solids_on_ray.c 2011-01-19 23:24:55 UTC (rev
42469)
+++ brlcad/trunk/src/mged/solids_on_ray.c 2011-01-19 23:25:38 UTC (rev
42470)
@@ -75,7 +75,7 @@
BU_CKMAG(s1, SOL_NAME_DIST_MAGIC, "sol_name_dist structure");
BU_CKMAG(s2, SOL_NAME_DIST_MAGIC, "sol_name_dist structure");
- return !BU_STR_EQUAL(s1->name, s2->name);
+ return bu_strcmp(s1->name, s2->name);
}
Modified: brlcad/trunk/src/vdeck/vdeck.c
===================================================================
--- brlcad/trunk/src/vdeck/vdeck.c 2011-01-19 23:24:55 UTC (rev 42469)
+++ brlcad/trunk/src/vdeck/vdeck.c 2011-01-19 23:25:38 UTC (rev 42470)
@@ -211,7 +211,7 @@
const char **lhs = (const char **)a;
const char **rhs = (const char **)b;
- return !BU_STR_EQUAL( *lhs, *rhs );
+ return bu_strcmp( *lhs, *rhs );
}
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
