Revision: 42226
http://brlcad.svn.sourceforge.net/brlcad/?rev=42226&view=rev
Author: brlcad
Date: 2011-01-13 08:22:31 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
handle a few more strcmp cases where the value returned is indeed important, so
convert to bu_strcmp() intead of macro.
Modified Paths:
--------------
brlcad/trunk/src/conv/fast4-g.c
brlcad/trunk/src/external/ProEngineer/proe-brl.c
brlcad/trunk/src/gtools/g_diff.c
brlcad/trunk/src/lgt/error.c
brlcad/trunk/src/libanalyze/overlaps.c
brlcad/trunk/src/libged/make_bb.c
brlcad/trunk/src/libged/search.c
brlcad/trunk/src/libged/wdb_obj.c
brlcad/trunk/src/liboptical/material.c
brlcad/trunk/src/liboptical/sh_light.c
brlcad/trunk/src/liboptical/sh_prj.c
brlcad/trunk/src/rt/viewarea.c
Modified: brlcad/trunk/src/conv/fast4-g.c
===================================================================
--- brlcad/trunk/src/conv/fast4-g.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/conv/fast4-g.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -383,7 +383,7 @@
while (1) {
int diff;
- diff = strcmp(name, ptr->name);
+ diff = bu_strcmp(name, ptr->name);
if (diff == 0) {
*found = 1;
return ptr;
@@ -518,7 +518,7 @@
if (!name_root) {
name_root = new_ptr;
} else {
- diff = strcmp(name, nptr_model->name);
+ diff = bu_strcmp(name, nptr_model->name);
if (diff > 0) {
if (nptr_model->nright) {
@@ -676,7 +676,7 @@
return;
}
- diff = strcmp(name, ptr->name);
+ diff = bu_strcmp(name, ptr->name);
if (diff > 0) {
if (ptr->nright) {
bu_log("Insert_name: ptr->nright not null\n");
@@ -875,7 +875,7 @@
found = 0;
while (1) {
- diff = strcmp(name, ptr->name);
+ diff = bu_strcmp(name, ptr->name);
if (diff == 0) {
found = 1;
break;
@@ -2080,11 +2080,11 @@
}
/* eliminate trailing blanks */
- s_len = strlen(line);
+ s_len = bu_strlen(line);
while (isspace(line[--s_len]))
line[s_len] = '\0';
- s_len = strlen(line);
+ s_len = bu_strlen(line);
if (s_len > 80)
s_len = 80;
Modified: brlcad/trunk/src/external/ProEngineer/proe-brl.c
===================================================================
--- brlcad/trunk/src/external/ProEngineer/proe-brl.c 2011-01-13 08:09:39 UTC
(rev 42225)
+++ brlcad/trunk/src/external/ProEngineer/proe-brl.c 2011-01-13 08:22:31 UTC
(rev 42226)
@@ -574,7 +574,7 @@
if ( logger_type == LOGGER_TYPE_ALL ) {
fprintf( logger, "\tCreating rb tree for brlcad names\n" );
}
- brlcad_names = bu_rb_create1( "BRL-CAD names", strcmp );
+ brlcad_names = bu_rb_create1( "BRL-CAD names", bu_strcmp );
bu_rb_uniq_all_on( brlcad_names );
}
Modified: brlcad/trunk/src/gtools/g_diff.c
===================================================================
--- brlcad/trunk/src/gtools/g_diff.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/gtools/g_diff.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -246,13 +246,13 @@
{
int len1, len2;
int i;
- int str_ret;
+ int str_eq;
float a, b;
Tcl_Obj *obj1, *obj2;
- str_ret = strcmp(Tcl_GetStringFromObj(val1, NULL),
Tcl_GetStringFromObj(val2, NULL));
+ str_ret = BU_STR_EQUAL(Tcl_GetStringFromObj(val1, NULL),
Tcl_GetStringFromObj(val2, NULL));
- if (str_ret == 0 || type == ATTRS) {
+ if (str_eq || type == ATTRS) {
return 0;
}
Modified: brlcad/trunk/src/lgt/error.c
===================================================================
--- brlcad/trunk/src/lgt/error.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/lgt/error.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -72,7 +72,7 @@
/* We use the same lock as malloc. Sys-call or mem lock, really */
bu_semaphore_acquire( BU_SEM_SYSCALL ); /* lock */
va_start( ap, fmt );
- if ( tty && (err_file[0] == '\0' || ! strcmp( err_file, "/dev/tty" )) ) {
+ if ( tty && (err_file[0] == '\0' || BU_STR_EQUAL( err_file, "/dev/tty" ))
) {
/* Only move cursor and scroll if newline is output. */
static int newline = 1;
if ( CS != NULL ) {
Modified: brlcad/trunk/src/libanalyze/overlaps.c
===================================================================
--- brlcad/trunk/src/libanalyze/overlaps.c 2011-01-13 08:09:39 UTC (rev
42225)
+++ brlcad/trunk/src/libanalyze/overlaps.c 2011-01-13 08:22:31 UTC (rev
42226)
@@ -68,7 +68,7 @@
/* insert in the list at the "nice" place */
for (BU_LIST_FOR (rp, region_pair, &list->l)) {
- if (strcmp(rp->r.r1->reg_name, r1->reg_name) <= 0)
+ if (bu_strcmp(rp->r.r1->reg_name, r1->reg_name) <= 0)
break;
}
BU_LIST_INSERT(&rp->l, &rpair->l);
Modified: brlcad/trunk/src/libged/make_bb.c
===================================================================
--- brlcad/trunk/src/libged/make_bb.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/libged/make_bb.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -68,7 +68,7 @@
i = 1;
/* look for a USEAIR option */
- if (! strcmp(argv[i], "-u")) {
+ if (BU_STR_EQUAL(argv[i], "-u")) {
use_air = 1;
i++;
}
Modified: brlcad/trunk/src/libged/search.c
===================================================================
--- brlcad/trunk/src/libged/search.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/libged/search.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -834,7 +834,7 @@
}
}
if ((checkval == 2) && (strcomparison == 1)) {
- if (strcmp(bu_vls_addr(&value), avpp->value) < 0) {
+ if (bu_strcmp(bu_vls_addr(&value), avpp->value) < 0) {
bu_avs_free(&avs);
bu_vls_free(&attribname);
bu_vls_free(&value);
@@ -847,7 +847,7 @@
}
}
if ((checkval == 3) && (strcomparison == 1)) {
- if (strcmp(bu_vls_addr(&value), avpp->value) > 0) {
+ if (bu_strcmp(bu_vls_addr(&value), avpp->value) > 0) {
bu_avs_free(&avs);
bu_vls_free(&attribname);
bu_vls_free(&value);
@@ -860,7 +860,7 @@
}
}
if ((checkval == 4) && (strcomparison == 1)) {
- if ((!bu_fnmatch(bu_vls_addr(&value), avpp->value, 0)) ||
(strcmp(bu_vls_addr(&value), avpp->value) < 0)) {
+ if ((!bu_fnmatch(bu_vls_addr(&value), avpp->value, 0)) ||
(bu_strcmp(bu_vls_addr(&value), avpp->value) < 0)) {
bu_avs_free(&avs);
bu_vls_free(&attribname);
bu_vls_free(&value);
@@ -873,7 +873,7 @@
}
}
if ((checkval == 5) && (strcomparison == 1)) {
- if ((!bu_fnmatch(bu_vls_addr(&value), avpp->value, 0)) ||
(strcmp(bu_vls_addr(&value), avpp->value) > 0)) {
+ if ((!bu_fnmatch(bu_vls_addr(&value), avpp->value, 0)) ||
(bu_strcmp(bu_vls_addr(&value), avpp->value) > 0)) {
bu_avs_free(&avs);
bu_vls_free(&attribname);
bu_vls_free(&value);
@@ -1544,7 +1544,7 @@
int
typecompare(const void *a, const void *b)
{
- return strcmp(((OPTION *)a)->name, ((OPTION *)b)->name);
+ return !BU_STR_EQUAL(((OPTION *)a)->name, ((OPTION *)b)->name);
}
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/libged/wdb_obj.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -3067,7 +3067,7 @@
extrude = (struct rt_extrude_internal *)intern.idb_ptr;
RT_EXTRUDE_CK_MAGIC(extrude);
- if (! strcmp(extrude->sketch_name, argv[1])) {
+ if (BU_STR_EQUAL(extrude->sketch_name, argv[1])) {
bu_free(extrude->sketch_name, "sketch name");
extrude->sketch_name = bu_strdup(argv[2]);
@@ -7106,7 +7106,7 @@
i = 1;
/* look for a USEAIR option */
- if (! strcmp(argv[i], "-u")) {
+ if (BU_STR_EQUAL(argv[i], "-u")) {
use_air = 1;
i++;
}
Modified: brlcad/trunk/src/liboptical/material.c
===================================================================
--- brlcad/trunk/src/liboptical/material.c 2011-01-13 08:09:39 UTC (rev
42225)
+++ brlcad/trunk/src/liboptical/material.c 2011-01-13 08:22:31 UTC (rev
42226)
@@ -113,7 +113,7 @@
for (mfp = shader_mfuncs; mfp->mf_name != (char *)NULL; mfp++) {
RT_CK_MF(mfp);
- if (! strcmp(mfp->mf_name, shader_name))
+ if (BU_STR_EQUAL(mfp->mf_name, shader_name))
return shader_mfuncs; /* found ! */
}
Modified: brlcad/trunk/src/liboptical/sh_light.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_light.c 2011-01-13 08:09:39 UTC (rev
42225)
+++ brlcad/trunk/src/liboptical/sh_light.c 2011-01-13 08:22:31 UTC (rev
42226)
@@ -221,7 +221,7 @@
struct light_specific *lsp = (struct light_specific *)base;
fastf_t *p = (fastf_t *)(base+sdp->sp_offset);
- if (! strcmp("pt", name)) {
+ if (BU_STR_EQUAL("pt", name)) {
/* user just specified point, set normal to zeros */
p[3] = p[4] = p[5] = 0.0;
} else if (strcmp("pn", name)) {
Modified: brlcad/trunk/src/liboptical/sh_prj.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_prj.c 2011-01-13 08:09:39 UTC (rev
42225)
+++ brlcad/trunk/src/liboptical/sh_prj.c 2011-01-13 08:22:31 UTC (rev
42226)
@@ -230,7 +230,7 @@
/* begining of structure */
/* string containing value */
{
- if (! strcmp("%f", sdp->sp_fmt)) {
+ if (BU_STR_EQUAL("%f", sdp->sp_fmt)) {
fastf_t *f;
f = (fastf_t *)(base + sdp->sp_offset);
if (*f < 0.0) {
@@ -238,7 +238,7 @@
sdp->sp_name, *f, value);
bu_bomb("");
}
- } else if (! strcmp("%d", sdp->sp_fmt)) {
+ } else if (BU_STR_EQUAL("%d", sdp->sp_fmt)) {
int *i;
i = (int *)(base + sdp->sp_offset);
if (*i < 0) {
Modified: brlcad/trunk/src/rt/viewarea.c
===================================================================
--- brlcad/trunk/src/rt/viewarea.c 2011-01-13 08:09:39 UTC (rev 42225)
+++ brlcad/trunk/src/rt/viewarea.c 2011-01-13 08:22:31 UTC (rev 42226)
@@ -741,7 +741,7 @@
struct area_list *newNode;
while (listp->next) {
- if (!listp->cell || (strcmp(cell->name, listp->cell->name)
< 0)) {
+ if (!listp->cell || (bu_strcmp(cell->name,
listp->cell->name) < 0)) {
break;
}
prev = listp;
@@ -893,7 +893,7 @@
if ((!listp->cell) || (cellp->depth > listp->cell->depth)) {
break;
}
- if ((cellp->depth == listp->cell->depth) &&
(strcmp(cellp->name, listp->cell->name) < 0)) {
+ if ((cellp->depth == listp->cell->depth) &&
(bu_strcmp(cellp->name, listp->cell->name) < 0)) {
break;
}
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
