Revision: 42225
http://brlcad.svn.sourceforge.net/brlcad/?rev=42225&view=rev
Author: brlcad
Date: 2011-01-13 08:09:39 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
more conversion from !strcmp() to rossbergs new bu_strcmp() func via the
related BU_STR_EQUAL() macro. improved readability and consistency. 30+calls.
Modified Paths:
--------------
brlcad/trunk/src/conv/g-vrml.c
brlcad/trunk/src/conv/g-x3d.c
brlcad/trunk/src/conv/proe-g.c
brlcad/trunk/src/conv/viewpoint-g.c
brlcad/trunk/src/gtools/g_diff.c
brlcad/trunk/src/libged/clone.c
brlcad/trunk/src/libged/draw.c
brlcad/trunk/src/libged/erase.c
brlcad/trunk/src/libged/sphgroup.c
brlcad/trunk/src/librt/db5_types.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/clone.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/muves.c
brlcad/trunk/src/mged/share.c
brlcad/trunk/src/mged/tedit.c
brlcad/trunk/src/util/pl-dm.c
Modified: brlcad/trunk/src/conv/g-vrml.c
===================================================================
--- brlcad/trunk/src/conv/g-vrml.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/conv/g-vrml.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -216,7 +216,7 @@
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB( comb );
- if ( !strcmp( bu_vls_addr( &comb->shader ), "light" ) )
+ if ( BU_STR_EQUAL( bu_vls_addr( &comb->shader ), "light" ) )
{
rt_db_free_internal(&intern);
return 0;
Modified: brlcad/trunk/src/conv/g-x3d.c
===================================================================
--- brlcad/trunk/src/conv/g-x3d.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/conv/g-x3d.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -236,7 +236,7 @@
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB( comb );
- if ( !strcmp( bu_vls_addr( &comb->shader ), "light" ) )
+ if ( BU_STR_EQUAL( bu_vls_addr( &comb->shader ), "light" ) )
{
rt_db_free_internal(&intern);
return 0;
Modified: brlcad/trunk/src/conv/proe-g.c
===================================================================
--- brlcad/trunk/src/conv/proe-g.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/conv/proe-g.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -142,8 +142,8 @@
bu_vls_strcpy(&ret_name, name);
ptr = name_root;
while (ptr) {
- if (!strcmp(bu_vls_addr(&ret_name), ptr->brlcad_name) ||
- (ptr->solid_name && !strcmp(bu_vls_addr(&ret_name),
ptr->solid_name))) {
+ if (BU_STR_EQUAL(bu_vls_addr(&ret_name), ptr->brlcad_name) ||
+ (ptr->solid_name && BU_STR_EQUAL(bu_vls_addr(&ret_name),
ptr->solid_name))) {
/* this name already exists, build a new one */
++tries;
bu_vls_trunc(&ret_name, name_len);
Modified: brlcad/trunk/src/conv/viewpoint-g.c
===================================================================
--- brlcad/trunk/src/conv/viewpoint-g.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/conv/viewpoint-g.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -228,7 +228,7 @@
/* check the list to see if this name is already there */
for (i=0; i<BU_PTBL_END(&names); i++) {
- if (!strcmp((char *)BU_PTBL_GET(&names, i), name)) {
+ if (BU_STR_EQUAL((char *)BU_PTBL_GET(&names, i), name)) {
/* found it, so go back and read the next line */
found = 1;
break;
Modified: brlcad/trunk/src/gtools/g_diff.c
===================================================================
--- brlcad/trunk/src/gtools/g_diff.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/gtools/g_diff.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -357,7 +357,7 @@
fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
bu_exit (1, NULL);
}
- if (!strcmp(Tcl_GetStringFromObj(key1, &junk),
Tcl_GetStringFromObj(key2, &junk))) {
+ if (BU_STR_EQUAL(Tcl_GetStringFromObj(key1, &junk),
Tcl_GetStringFromObj(key2, &junk))) {
found = 1;
if (Tcl_ListObjIndex(interp, obj2, j+1, &val2) == TCL_ERROR) {
@@ -466,7 +466,7 @@
fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
bu_exit (1, NULL);
}
- if (!strcmp(Tcl_GetStringFromObj(key1, &junk),
Tcl_GetStringFromObj(key2, &junk))) {
+ if (BU_STR_EQUAL(Tcl_GetStringFromObj(key1, &junk),
Tcl_GetStringFromObj(key2, &junk))) {
found = 1;
break;
}
@@ -576,7 +576,7 @@
bu_vls_init(&adjust);
/* first check if there is any difference */
- if (!strcmp(Tcl_GetStringFromObj(obj1, &junk), Tcl_GetStringFromObj(obj2,
&junk)))
+ if (BU_STR_EQUAL(Tcl_GetStringFromObj(obj1, &junk),
Tcl_GetStringFromObj(obj2, &junk)))
return 0;
if (mode != HUMAN) {
Modified: brlcad/trunk/src/libged/clone.c
===================================================================
--- brlcad/trunk/src/libged/clone.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/libged/clone.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -185,7 +185,7 @@
int i;
for (i = 0; i < l.names_used; i++)
- if (!strcmp(bu_vls_addr(&l.names[i].src), name))
+ if (BU_STR_EQUAL(bu_vls_addr(&l.names[i].src), name))
return i;
return -1;
}
Modified: brlcad/trunk/src/libged/draw.c
===================================================================
--- brlcad/trunk/src/libged/draw.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/libged/draw.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -1318,7 +1318,7 @@
/* Make sure name is not already in the list */
gdlp = BU_LIST_NEXT(ged_display_list, &gedp->ged_gdp->gd_headDisplay);
while (BU_LIST_NOT_HEAD(gdlp, &gedp->ged_gdp->gd_headDisplay)) {
- if (!strcmp(name, bu_vls_addr(&gdlp->gdl_path)))
+ if (BU_STR_EQUAL(name, bu_vls_addr(&gdlp->gdl_path)))
goto end;
/*
Modified: brlcad/trunk/src/libged/erase.c
===================================================================
--- brlcad/trunk/src/libged/erase.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/libged/erase.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -255,7 +255,7 @@
while (BU_LIST_NOT_HEAD(gdlp, &gedp->ged_gdp->gd_headDisplay)) {
next_gdlp = BU_LIST_PNEXT(ged_display_list, gdlp);
- if (!strcmp(path, bu_vls_addr(&gdlp->gdl_path))) {
+ if (BU_STR_EQUAL(path, bu_vls_addr(&gdlp->gdl_path))) {
/* Free up the solids list associated with this display list */
while (BU_LIST_WHILE(sp, solid, &gdlp->gdl_headSolid)) {
dp = FIRST_SOLID(sp);
Modified: brlcad/trunk/src/libged/sphgroup.c
===================================================================
--- brlcad/trunk/src/libged/sphgroup.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/libged/sphgroup.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -76,7 +76,7 @@
for (i = 0; i < RT_DBNHASH; i++)
for (dp = gedp->ged_wdbp->dbip->dbi_Head[i]; dp != DIR_NULL; dp =
dp->d_forw) {
if (dp->d_nref == 0 && !(dp->d_flags & DIR_HIDDEN) && (dp->d_addr !=
RT_DIR_PHONY_ADDR)) continue;
- if (!(strcmp(dp->d_namep, sphdp->d_namep))) continue;
+ if (BU_STR_EQUAL(dp->d_namep, sphdp->d_namep)) continue;
if (!(dp->d_flags & DIR_REGION)) continue;
inside_flag = 0;
if (_ged_get_obj_bounds(gedp, 1, (const char **)&(dp->d_namep), 0,
obj_min, obj_max) != GED_ERROR) {
Modified: brlcad/trunk/src/librt/db5_types.c
===================================================================
--- brlcad/trunk/src/librt/db5_types.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/librt/db5_types.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -527,8 +527,8 @@
/* region flag */
bu_vls_sprintf(&newval, "%s", bu_avs_get(&avs, "region"));
- if (!strcmp(bu_vls_addr(&newval), "Yes") ||
!strcmp(bu_vls_addr(&newval), "R") || !strcmp(bu_vls_addr(&newval), "1") ||
- !strcmp(bu_vls_addr(&newval), "Y") || !strcmp(bu_vls_addr(&newval),
"y")) {
+ if (BU_STR_EQUAL(bu_vls_addr(&newval), "Yes") ||
BU_STR_EQUAL(bu_vls_addr(&newval), "R") || BU_STR_EQUAL(bu_vls_addr(&newval),
"1") ||
+ BU_STR_EQUAL(bu_vls_addr(&newval), "Y") ||
BU_STR_EQUAL(bu_vls_addr(&newval), "y")) {
comb->region_flag = 1;
dp->d_flags |= DIR_REGION;
} else {
@@ -589,8 +589,8 @@
/* inherit */
bu_vls_sprintf(&newval, "%s", bu_avs_get(&avs, "inherit"));
- if (!strcmp(bu_vls_addr(&newval), "Yes") ||
!strcmp(bu_vls_addr(&newval), "1") ||
- !strcmp(bu_vls_addr(&newval), "Y") || !strcmp(bu_vls_addr(&newval),
"y")) {
+ if (BU_STR_EQUAL(bu_vls_addr(&newval), "Yes") ||
BU_STR_EQUAL(bu_vls_addr(&newval), "1") ||
+ BU_STR_EQUAL(bu_vls_addr(&newval), "Y") ||
BU_STR_EQUAL(bu_vls_addr(&newval), "y")) {
comb->inherit = 1;
} else {
comb->inherit = 0;
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/attach.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -217,7 +217,7 @@
" not found\n", (char *)NULL);
return TCL_ERROR;
}
- } else if (dmp && !strcmp("nu", bu_vls_addr(&pathName)))
+ } else if (dmp && BU_STR_EQUAL("nu", bu_vls_addr(&pathName)))
return TCL_OK; /* Ignore */
if (fbp) {
Modified: brlcad/trunk/src/mged/clone.c
===================================================================
--- brlcad/trunk/src/mged/clone.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/clone.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -201,7 +201,7 @@
size_t i;
for (i = 0; i < l.names_used; i++)
- if (!strcmp(bu_vls_addr(&l.names[i].src), name))
+ if (BU_STR_EQUAL(bu_vls_addr(&l.names[i].src), name))
return i;
return -1;
}
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/cmd.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -715,7 +715,7 @@
/* Search to see if there exists a command window with this name */
for (BU_LIST_FOR (clp, cmd_list, &head_cmd_list.l))
- if (!strcmp(argv[2], bu_vls_addr(&clp->cl_name))) {
+ if (BU_STR_EQUAL(argv[2], bu_vls_addr(&clp->cl_name))) {
name_not_used = 0;
break;
}
@@ -748,7 +748,7 @@
* the name in argv[2].
*/
for (BU_LIST_FOR (clp, cmd_list, &head_cmd_list.l))
- if (!strcmp(argv[2], bu_vls_addr(&clp->cl_name)))
+ if (BU_STR_EQUAL(argv[2], bu_vls_addr(&clp->cl_name)))
break;
if (clp == &head_cmd_list) {
@@ -1464,7 +1464,7 @@
}
for (BU_LIST_FOR (clp, cmd_list, &head_cmd_list.l))
- if (!strcmp(bu_vls_addr(&clp->cl_name), argv[1]))
+ if (BU_STR_EQUAL(bu_vls_addr(&clp->cl_name), argv[1]))
break;
if (clp == &head_cmd_list &&
@@ -1660,7 +1660,7 @@
/* change primary focus to window argv[1] */
FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
- if (!strcmp(argv[1], bu_vls_addr(&p->dml_dmp->dm_pathName))) {
+ if (BU_STR_EQUAL(argv[1], bu_vls_addr(&p->dml_dmp->dm_pathName))) {
curr_dm_list = p;
if (curr_dm_list->dml_tie)
Modified: brlcad/trunk/src/mged/muves.c
===================================================================
--- brlcad/trunk/src/mged/muves.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/muves.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -400,7 +400,7 @@
/* look for system name in existing list */
new_sys = (struct muves_sys *)NULL;
for (BU_LIST_FOR(sys, muves_sys, &muves_sys_head.l)) {
- if (!strcmp(&line[i], sys->muves_name)) {
+ if (BU_STR_EQUAL(&line[i], sys->muves_name)) {
/* found system already existing */
new_sys = sys;
break;
Modified: brlcad/trunk/src/mged/share.c
===================================================================
--- brlcad/trunk/src/mged/share.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/share.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -119,7 +119,7 @@
}
FOR_ALL_DISPLAYS(dlp1, &head_dm_list.l)
- if (!strcmp(argv[2], bu_vls_addr(&dlp1->dml_dmp->dm_pathName)))
+ if (BU_STR_EQUAL(argv[2], bu_vls_addr(&dlp1->dml_dmp->dm_pathName)))
break;
if (dlp1 == &head_dm_list) {
@@ -132,7 +132,7 @@
if (!uflag) {
FOR_ALL_DISPLAYS(dlp2, &head_dm_list.l)
- if (!strcmp(argv[3], bu_vls_addr(&dlp2->dml_dmp->dm_pathName)))
+ if (BU_STR_EQUAL(argv[3], bu_vls_addr(&dlp2->dml_dmp->dm_pathName)))
break;
if (dlp2 == &head_dm_list) {
Modified: brlcad/trunk/src/mged/tedit.c
===================================================================
--- brlcad/trunk/src/mged/tedit.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/mged/tedit.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -978,15 +978,15 @@
count += (BU_STR_EQUAL(editor, which) && (!editor_opt ||
editor_opt[0] == '\0'));
which = bu_which(VIM_EDITOR);
if (which)
- count += !strcmp(editor, which);
+ count += BU_STR_EQUAL(editor, which);
which = bu_which(VI_EDITOR);
if (which)
- count += !strcmp(editor, which);
+ count += BU_STR_EQUAL(editor, which);
which = bu_which(ED_EDITOR);
if (which)
- count += !strcmp(editor, which);
- count += !strcmp(editor, JOVE_EDITOR);
- count += !strcmp(editor, MAC_EDITOR);
+ count += BU_STR_EQUAL(editor, which);
+ count += BU_STR_EQUAL(editor, JOVE_EDITOR);
+ count += BU_STR_EQUAL(editor, MAC_EDITOR);
if (count > 0) {
/* start with emacs... */
editor = bu_which(EMACS_EDITOR);
Modified: brlcad/trunk/src/util/pl-dm.c
===================================================================
--- brlcad/trunk/src/util/pl-dm.c 2011-01-13 07:58:26 UTC (rev 42224)
+++ brlcad/trunk/src/util/pl-dm.c 2011-01-13 08:09:39 UTC (rev 42225)
@@ -614,7 +614,7 @@
/* check for existing objects with same name as argv[i] */
for (BU_LIST_FOR(plp, plot_list, &HeadPlot.l)) {
/* found object with same name */
- if (!strcmp(bu_vls_addr(&plp->pl_name), bnp)) {
+ if (BU_STR_EQUAL(bu_vls_addr(&plp->pl_name), bnp)) {
rt_vlblock_free(plp->pl_vbp);
goto up_to_vl;
}
@@ -743,7 +743,7 @@
for (i=1; i < argc; ++i) {
for (BU_LIST_FOR(plp, plot_list, &HeadPlot.l)) {
- if (!strcmp(argv[i], bu_vls_addr(&plp->pl_name))) {
+ if (BU_STR_EQUAL(argv[i], bu_vls_addr(&plp->pl_name))) {
BU_LIST_DEQUEUE(&plp->l);
bu_vls_free(&plp->pl_name);
rt_vlblock_free(plp->pl_vbp);
@@ -779,7 +779,7 @@
for (i=1; i < argc; ++i) {
for (BU_LIST_FOR(plp, plot_list, &HeadPlot.l)) {
- if (!strcmp(argv[i], bu_vls_addr(&plp->pl_name))) {
+ if (BU_STR_EQUAL(argv[i], bu_vls_addr(&plp->pl_name))) {
plp->pl_draw = 1;
break;
}
@@ -812,7 +812,7 @@
for (i=1; i < argc; ++i) {
for (BU_LIST_FOR(plp, plot_list, &HeadPlot.l)) {
- if (!strcmp(argv[i], bu_vls_addr(&plp->pl_name))) {
+ if (BU_STR_EQUAL(argv[i], bu_vls_addr(&plp->pl_name))) {
plp->pl_draw = 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
