Revision: 42223
http://brlcad.svn.sourceforge.net/brlcad/?rev=42223&view=rev
Author: brlcad
Date: 2011-01-13 07:56:34 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
even smaller conversion from strcmp()==0 to rossberg's newly added bu_strcmp()
via the related BU_STR_EQUAL() macro. improved readability and consistency.
20+ calls.
Modified Paths:
--------------
brlcad/trunk/src/libbu/cmdhist_obj.c
brlcad/trunk/src/libbu/observer.c
brlcad/trunk/src/libdm/dm_obj.c
brlcad/trunk/src/libged/dg_obj.c
brlcad/trunk/src/libged/illum.c
brlcad/trunk/src/libpkg/pkg.c
brlcad/trunk/src/librt/primitives/submodel/submodel.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/rt/viewarea.c
Modified: brlcad/trunk/src/libbu/cmdhist_obj.c
===================================================================
--- brlcad/trunk/src/libbu/cmdhist_obj.c 2011-01-13 07:44:13 UTC (rev
42222)
+++ brlcad/trunk/src/libbu/cmdhist_obj.c 2011-01-13 07:56:34 UTC (rev
42223)
@@ -97,7 +97,7 @@
/* check to see if command history object exists */
for (BU_LIST_FOR(chop, bu_cmdhist_obj, &HeadCmdHistObj.l)) {
- if (strcmp(name, bu_vls_addr(&chop->cho_name)) == 0) {
+ if (BU_STR_EQUAL(name, bu_vls_addr(&chop->cho_name))) {
Tcl_AppendResult(interp, "ch_open: ", name,
" exists.\n", (char *)NULL);
return CMDHIST_OBJ_NULL;
Modified: brlcad/trunk/src/libbu/observer.c
===================================================================
--- brlcad/trunk/src/libbu/observer.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/libbu/observer.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -54,7 +54,7 @@
/* see if it already exists, if so, modify it */
for (BU_LIST_FOR(op, bu_observer, &headp->l))
- if (strcmp(bu_vls_addr(&op->observer), argv[1]) == 0) {
+ if (BU_STR_EQUAL(bu_vls_addr(&op->observer), argv[1])) {
if (argc == 2)
/* clobber cmd */
bu_vls_init(&op->cmd);
@@ -108,7 +108,7 @@
/* search for observer and remove from list */
for (BU_LIST_FOR(op, bu_observer, &headp->l))
- if (strcmp(bu_vls_addr(&op->observer), argv[1]) == 0) {
+ if (BU_STR_EQUAL(bu_vls_addr(&op->observer), argv[1])) {
BU_LIST_DEQUEUE(&op->l);
bu_vls_free(&op->observer);
bu_vls_free(&op->cmd);
Modified: brlcad/trunk/src/libdm/dm_obj.c
===================================================================
--- brlcad/trunk/src/libdm/dm_obj.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/libdm/dm_obj.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -267,7 +267,7 @@
/* check to see if display manager object exists */
for (BU_LIST_FOR(dmop, dm_obj, &HeadDMObj.l)) {
- if (strcmp(argv[name_index], bu_vls_addr(&dmop->dmo_name)) == 0) {
+ if (BU_STR_EQUAL(argv[name_index], bu_vls_addr(&dmop->dmo_name))) {
Tcl_AppendStringsToObj(obj, "dmo_open: ", argv[name_index],
" exists.", (char *)NULL);
Tcl_SetObjResult(interp, obj);
@@ -1540,7 +1540,7 @@
argv += 2;
for (i = 0; i < argc; ++i) {
for (BU_LIST_FOR(dgop, dg_obj, &HeadDGObj.l)) {
- if (strcmp(bu_vls_addr(&dgop->dgo_name), argv[i]) == 0) {
+ if (BU_STR_EQUAL(bu_vls_addr(&dgop->dgo_name), argv[i])) {
dmo_drawSList(dmop, &dgop->dgo_headSolid);
break;
}
@@ -1602,7 +1602,7 @@
}
for (BU_LIST_FOR(dgop, dg_obj, &HeadDGObj.l)) {
- if (strcmp(bu_vls_addr(&dgop->dgo_name), argv[2]) == 0) {
+ if (BU_STR_EQUAL(bu_vls_addr(&dgop->dgo_name), argv[2])) {
/* for each primitive */
for (i = 4; i < argc; ++i) {
dm_draw_labels(dmop->dmo_dmp, dgop->dgo_wdbp, argv[i],
dmop->viewMat,
Modified: brlcad/trunk/src/libged/dg_obj.c
===================================================================
--- brlcad/trunk/src/libged/dg_obj.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/libged/dg_obj.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -401,7 +401,7 @@
/* search for database object */
for (BU_LIST_FOR (wdbp, rt_wdb, &rt_g.rtg_headwdb.l)) {
- if (strcmp(bu_vls_addr(&wdbp->wdb_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&wdbp->wdb_name), argv[2]))
break;
}
@@ -487,7 +487,7 @@
for (i = 0; i < sp->s_fullpath.fp_len; ++i) {
if (*argv[1] == *DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_namep &&
- strcmp(argv[1], DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_namep)
== 0) {
+ BU_STR_EQUAL(argv[1], DB_FULL_PATH_GET(&sp->s_fullpath,
i)->d_namep)) {
found = 1;
if (illum)
sp->s_iflag = UP;
@@ -1191,7 +1191,7 @@
/* search for view object */
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[2]))
break;
}
@@ -1333,7 +1333,7 @@
* Retrieve the view object
*/
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[1]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[1]))
break;
}
@@ -1484,7 +1484,7 @@
/* search for view object */
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[2]))
break;
}
@@ -2144,7 +2144,7 @@
/* search for view object */
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[2]))
break;
}
@@ -2183,7 +2183,7 @@
if (argc == 3) {
/* search for database object */
for (BU_LIST_FOR (wdbp, rt_wdb, &rt_g.rtg_headwdb.l)) {
- if (strcmp(bu_vls_addr(&wdbp->wdb_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&wdbp->wdb_name), argv[2]))
break;
}
@@ -2359,7 +2359,7 @@
/* search for view object */
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[2]))
break;
}
@@ -2395,7 +2395,7 @@
/* search for view object */
for (BU_LIST_FOR (vop, view_obj, &HeadViewObj.l)) {
- if (strcmp(bu_vls_addr(&vop->vo_name), argv[2]) == 0)
+ if (BU_STR_EQUAL(bu_vls_addr(&vop->vo_name), argv[2]))
break;
}
Modified: brlcad/trunk/src/libged/illum.c
===================================================================
--- brlcad/trunk/src/libged/illum.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/libged/illum.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -81,7 +81,7 @@
for (i = 0; i < sp->s_fullpath.fp_len; ++i) {
if (*argv[1] == *DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_namep
&&
- strcmp(argv[1], DB_FULL_PATH_GET(&sp->s_fullpath,
i)->d_namep) == 0) {
+ BU_STR_EQUAL(argv[1], DB_FULL_PATH_GET(&sp->s_fullpath,
i)->d_namep)) {
found = 1;
if (illum)
sp->s_iflag = UP;
Modified: brlcad/trunk/src/libpkg/pkg.c
===================================================================
--- brlcad/trunk/src/libpkg/pkg.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/libpkg/pkg.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -415,7 +415,7 @@
memset((char *)&sinme, 0, sizeof(sinme));
#ifdef HAVE_SYS_UN_H
- if (host == NULL || strlen(host) == 0 || strcmp(host, "unix") == 0) {
+ if (host == NULL || strlen(host) == 0 || BU_STR_EQUAL(host, "unix")) {
/* UNIX Domain socket, port = pathname */
sunhim.sun_family = AF_UNIX;
strncpy(sunhim.sun_path, service, sizeof(sunhim.sun_path));
Modified: brlcad/trunk/src/librt/primitives/submodel/submodel.c
===================================================================
--- brlcad/trunk/src/librt/primitives/submodel/submodel.c 2011-01-13
07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/librt/primitives/submodel/submodel.c 2011-01-13
07:56:34 UTC (rev 42223)
@@ -134,7 +134,7 @@
char *ttp;
RT_CK_RTI(*rtipp);
ttp = (*rtipp)->rti_treetop;
- if (ttp && strcmp(ttp, bu_vls_addr(&sip->treetop)) == 0) {
+ if (ttp && BU_STR_EQUAL(ttp, bu_vls_addr(&sip->treetop))) {
/* Re-cycle an already prepped rti */
sub_rtip = *rtipp;
sub_rtip->rti_uses++;
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/mged/attach.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -573,7 +573,7 @@
return;
}
- if (bu_vls_strlen(&type) == 0 || strcmp(bu_vls_addr(&type), "nu") == 0)
{
+ if (bu_vls_strlen(&type) == 0 || BU_STR_EQUAL(bu_vls_addr(&type),
"nu")) {
/* Nothing more to do. */
bu_vls_free(&type);
return;
@@ -583,7 +583,7 @@
bu_vls_trimspace(&type);
for (wp = &which_dm[2]; wp->type != -1; wp++) {
- if (strcmp(bu_vls_addr(&type), wp->name) == 0) {
+ if (BU_STR_EQUAL(bu_vls_addr(&type), wp->name)) {
break;
}
}
Modified: brlcad/trunk/src/rt/viewarea.c
===================================================================
--- brlcad/trunk/src/rt/viewarea.c 2011-01-13 07:44:13 UTC (rev 42222)
+++ brlcad/trunk/src/rt/viewarea.c 2011-01-13 07:56:34 UTC (rev 42223)
@@ -318,7 +318,7 @@
* structure, increment number of exposures & hits and
* increment seen, then exit for-loop.
*/
- if ( (strcmp(area_record_ptr->name, &buffer[l])==0) ) {
+ if ( (BU_STR_EQUAL(area_record_ptr->name, &buffer[l])) ) {
if (type == EXPOSED_AREA) {
if (!area_record_ptr->seen) {
area_record_ptr->exposures++;
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
