Revision: 42227
http://brlcad.svn.sourceforge.net/brlcad/?rev=42227&view=rev
Author: brlcad
Date: 2011-01-13 08:33:41 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
and yet even more. set !BU_STR_EQUAL() for handling a few remaining strcmp
cases used to test for non-matching.
Modified Paths:
--------------
brlcad/trunk/src/conv/dbupgrade.c
brlcad/trunk/src/conv/ply-g.c
brlcad/trunk/src/conv/viewpoint-g.c
brlcad/trunk/src/external/Unigraphics/ug-g.c
brlcad/trunk/src/gtools/g_diff.c
brlcad/trunk/src/irprep/irdisp.c
brlcad/trunk/src/lgt/do_options.c
brlcad/trunk/src/libanalyze/overlaps.c
brlcad/trunk/src/libbu/fnmatch.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/vls.c
brlcad/trunk/src/libged/bot_smooth.c
brlcad/trunk/src/libged/edcodes.c
brlcad/trunk/src/libged/editit.c
brlcad/trunk/src/libged/find.c
brlcad/trunk/src/libged/ls.c
brlcad/trunk/src/libged/prefix.c
brlcad/trunk/src/libged/put_comb.c
brlcad/trunk/src/libged/red.c
brlcad/trunk/src/libged/showmats.c
brlcad/trunk/src/libged/wdb_obj.c
brlcad/trunk/src/liboptical/sh_light.c
brlcad/trunk/src/librt/comb/comb.c
brlcad/trunk/src/librt/db5_types.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/tcl.c
brlcad/trunk/src/mged/animedit.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/chgview.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/columns.c
brlcad/trunk/src/mged/dir.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/red.c
brlcad/trunk/src/mged/solids_on_ray.c
brlcad/trunk/src/mged/tedit.c
brlcad/trunk/src/rt/reshoot.c
brlcad/trunk/src/vdeck/vdeck.c
Modified: brlcad/trunk/src/conv/dbupgrade.c
===================================================================
--- brlcad/trunk/src/conv/dbupgrade.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/conv/dbupgrade.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -83,7 +83,7 @@
/* undocumented option to revert to an old db version
* currently, can only revert to db version 4
*/
- if ( strcmp( argv[1], "-r" ) ) {
+ if ( !BU_STR_EQUAL( argv[1], "-r" ) ) {
fprintf(stderr, "Usage: %s input.g output.g\n", argv[0]);
return 1;
} else {
Modified: brlcad/trunk/src/conv/ply-g.c
===================================================================
--- brlcad/trunk/src/conv/ply-g.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/conv/ply-g.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -529,7 +529,7 @@
c = strtok( tmp_buf, " \t" );
if ( c ) {
- if ( strcmp( c, "property" ) ) {
+ if ( !BU_STR_EQUAL( c, "property" ) ) {
bu_exit(1, "get_property called for non-property, line = %s\n",
line );
}
} else {
Modified: brlcad/trunk/src/conv/viewpoint-g.c
===================================================================
--- brlcad/trunk/src/conv/viewpoint-g.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/conv/viewpoint-g.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -290,7 +290,7 @@
/* skip elements with the wrong name */
name = NULL;
- while (name == NULL || strcmp(name, curr_name)) {
+ while (name == NULL || !BU_STR_EQUAL(name, curr_name)) {
/* check for enf of file */
if (bu_fgets(line, MAX_LINE_SIZE, elems) == NULL) {
eof = 1;
Modified: brlcad/trunk/src/external/Unigraphics/ug-g.c
===================================================================
--- brlcad/trunk/src/external/Unigraphics/ug-g.c 2011-01-13 08:22:31 UTC
(rev 42226)
+++ brlcad/trunk/src/external/Unigraphics/ug-g.c 2011-01-13 08:33:41 UTC
(rev 42227)
@@ -668,7 +668,7 @@
get_part_name( ®ion_name_vls );
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
bu_vls_strcat( ®ion_name_vls, "_" );
bu_vls_strcat( ®ion_name_vls, refset_name );
}
@@ -1286,7 +1286,7 @@
}
bu_log( "offsets = :%s: :%s:\n", offsets[0], offsets[1] );
- if ( strcmp( offsets[0], "0.0" ) || strcmp( offsets[1], "0.0" ) ) {
+ if ( !BU_STR_EQUAL( offsets[0], "0.0" ) || !BU_STR_EQUAL( offsets[1],
"0.0" ) ) {
bu_log( "Cannot handle offset extrusions yet\n" );
UF_free( ta );
UF_free( limits[0] );
@@ -1741,7 +1741,7 @@
bu_vls_strcat( &inner_name_vls, "_inner" );
}
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
bu_vls_strcat( ®ion_name_vls, "_" );
bu_vls_strcat( ®ion_name_vls, refset_name );
}
@@ -4351,7 +4351,7 @@
UF_func( UF_OBJ_ask_type_and_subtype( parents[i], &type, &subtype));
UF_func( UF_MODL_ask_feat_type( parents[i], &ftype1 ) );
- if ( strcmp( ftype1, "DATUM_PLANE" ) ) {
+ if ( !BU_STR_EQUAL( ftype1, "DATUM_PLANE" ) ) {
uf_list_p_t feat_list;
int feat_count=0;
tag_t body_tag;
@@ -4833,7 +4833,7 @@
get_part_name( &name_vls );
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
bu_vls_strcat( &name_vls, "_" );
bu_vls_strcat( &name_vls, refset_name );
}
@@ -5115,7 +5115,7 @@
get_part_name( &name_vls );
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
bu_vls_strcat( &name_vls, "_" );
bu_vls_strcat( &name_vls, refset_name );
}
@@ -5320,7 +5320,7 @@
get_part_name( &name_vls );
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
bu_vls_strcat( &name_vls, "_" );
bu_vls_strcat( &name_vls, refset_name );
}
@@ -5361,7 +5361,7 @@
curr_xform, units_conv ) );
}
}
- if ( refset_name && strcmp( refset_name, "None" ) ) {
+ if ( refset_name && !BU_STR_EQUAL( refset_name, "None" ) ) {
/* convert reference set */
return( convert_reference_set( node, p_name, refset_name, inst_name,
curr_xform, units_conv ) );
Modified: brlcad/trunk/src/gtools/g_diff.c
===================================================================
--- brlcad/trunk/src/gtools/g_diff.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/gtools/g_diff.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -297,7 +297,7 @@
return 1;
}
} else {
- if (strcmp(str1, str2)) {
+ if (!BU_STR_EQUAL(str1, str2)) {
return strstr(str2, str1)?2:1;
}
}
@@ -866,7 +866,7 @@
}
/* the two objects are different types */
- if (strcmp(str1, str2)) {
+ if (!BU_STR_EQUAL(str1, str2)) {
has_diff += 1;
if (mode == HUMAN)
printf("%s:\n\twas: %s\n\tis now: %s\n\n",
@@ -1060,7 +1060,7 @@
}
/* compare titles */
- if (strcmp(dbip1->dbi_title, dbip2->dbi_title)) {
+ if (!BU_STR_EQUAL(dbip1->dbi_title, dbip2->dbi_title)) {
different = 1;
if (mode == HUMAN) {
printf("Title has changed from: \"%s\" to: \"%s\"\n\n",
dbip1->dbi_title, dbip2->dbi_title);
Modified: brlcad/trunk/src/irprep/irdisp.c
===================================================================
--- brlcad/trunk/src/irprep/irdisp.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/irprep/irdisp.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -134,7 +134,7 @@
/* Call the program ir-X or ir-sgi so that a file that has been
raytraced */
/* may be displayed. */
choice[0] = '\0';
- while ( strcmp( choice, "sgi" ) && strcmp( choice, "X" ) && strcmp(
choice, "x" ) )
+ while ( !BU_STR_EQUAL( choice, "sgi" ) && !BU_STR_EQUAL( choice, "X" )
&& !BU_STR_EQUAL( choice, "x" ) )
{
(void)printf("\nSelect display ('X' or 'sgi') -> " );
(void)fflush(stdout);
Modified: brlcad/trunk/src/lgt/do_options.c
===================================================================
--- brlcad/trunk/src/lgt/do_options.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/lgt/do_options.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -3583,7 +3583,7 @@
type_grid,
force_viewsz ? view_size : 0.0 );
- if ( err_file[0] != '\0' && strcmp( err_file, "/dev/tty" ) )
+ if ( err_file[0] != '\0' && !BU_STR_EQUAL( err_file, "/dev/tty" ) )
(void) fprintf( run_fp, " -O%s", err_file );
if ( aperture_sz > 1 )
(void) fprintf( run_fp, " -A%d", aperture_sz );
Modified: brlcad/trunk/src/libanalyze/overlaps.c
===================================================================
--- brlcad/trunk/src/libanalyze/overlaps.c 2011-01-13 08:22:31 UTC (rev
42226)
+++ brlcad/trunk/src/libanalyze/overlaps.c 2011-01-13 08:33:41 UTC (rev
42227)
@@ -123,7 +123,7 @@
struct bu_hash_entry *prev, *entry;
struct overlap_instance *overlap;
int status;
- int order = strcmp(reg1->reg_name, reg2->reg_name);
+ int order = bu_strcmp(reg1->reg_name, reg2->reg_name);
/* If we somehow got the same region name in both regions, ignore the
segment */
if (!order) return 0;
Modified: brlcad/trunk/src/libbu/fnmatch.c
===================================================================
--- brlcad/trunk/src/libbu/fnmatch.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libbu/fnmatch.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -195,7 +195,7 @@
static int
classcompare(const void *a, const void *b)
{
- return strcmp(((CHARCLASS *)a)->idstring, ((CHARCLASS *)b)->idstring);
+ return !BU_STR_EQUAL(((CHARCLASS *)a)->idstring, ((CHARCLASS
*)b)->idstring);
}
Modified: brlcad/trunk/src/libbu/mappedfile.c
===================================================================
--- brlcad/trunk/src/libbu/mappedfile.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libbu/mappedfile.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -70,8 +70,8 @@
}
for (BU_LIST_FOR(mp, bu_mapped_file, &bu_mapped_file_list)) {
BU_CK_MAPPED_FILE(mp);
- if (strcmp(name, mp->name)) continue;
- if (appl && strcmp(appl, mp->appl))
+ if (!BU_STR_EQUAL(name, mp->name)) continue;
+ if (appl && !BU_STR_EQUAL(appl, mp->appl))
continue;
/* File is already mapped -- verify size and modtime */
#ifdef HAVE_SYS_STAT_H
Modified: brlcad/trunk/src/libbu/vls.c
===================================================================
--- brlcad/trunk/src/libbu/vls.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libbu/vls.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -453,7 +453,7 @@
}
/* neither empty, straight up comparison */
- return strcmp(s1->vls_str+s1->vls_offset, s2->vls_str+s2->vls_offset);
+ return !BU_STR_EQUAL(s1->vls_str+s1->vls_offset,
s2->vls_str+s2->vls_offset);
}
Modified: brlcad/trunk/src/libged/bot_smooth.c
===================================================================
--- brlcad/trunk/src/libged/bot_smooth.c 2011-01-13 08:22:31 UTC (rev
42226)
+++ brlcad/trunk/src/libged/bot_smooth.c 2011-01-13 08:33:41 UTC (rev
42227)
@@ -94,7 +94,7 @@
GED_DB_LOOKUP(gedp, dp_old, old_bot_name, LOOKUP_QUIET, GED_ERROR);
- if ( strcmp( old_bot_name, new_bot_name ) ) {
+ if ( !BU_STR_EQUAL( old_bot_name, new_bot_name ) ) {
GED_CHECK_EXISTS(gedp, new_bot_name, LOOKUP_QUIET, GED_ERROR);
} else {
dp_new = dp_old;
Modified: brlcad/trunk/src/libged/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/edcodes.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -58,7 +58,7 @@
reg1 = strchr(*(char **)p1, '/');
reg2 = strchr(*(char **)p2, '/');
- return strcmp(reg1, reg2);
+ return !BU_STR_EQUAL(reg1, reg2);
}
Modified: brlcad/trunk/src/libged/editit.c
===================================================================
--- brlcad/trunk/src/libged/editit.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/editit.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -69,13 +69,13 @@
avtmp = (char **)bu_malloc(sizeof(char *)*5, "ged_editit: editstring
args");
bu_argv_from_string(avtmp, 4, editstring);
- if (avtmp[0] && strcmp(avtmp[0], "(null)"))
+ if (avtmp[0] && !BU_STR_EQUAL(avtmp[0], "(null)"))
terminal = avtmp[0];
- if (avtmp[1] && strcmp(avtmp[1], "(null)"))
+ if (avtmp[1] && !BU_STR_EQUAL(avtmp[1], "(null)"))
terminal_opt = avtmp[1];
- if (avtmp[2] && strcmp(avtmp[2], "(null)"))
+ if (avtmp[2] && !BU_STR_EQUAL(avtmp[2], "(null)"))
editor = avtmp[2];
- if (avtmp[3] && strcmp(avtmp[3], "(null)"))
+ if (avtmp[3] && !BU_STR_EQUAL(avtmp[3], "(null)"))
editor_opt = avtmp[3];
if (!editor) {
Modified: brlcad/trunk/src/libged/find.c
===================================================================
--- brlcad/trunk/src/libged/find.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/find.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -50,7 +50,7 @@
RT_CK_TREE(comb_leaf);
obj_name = (char *)object;
- if (strcmp(comb_leaf->tr_l.tl_name, obj_name))
+ if (!BU_STR_EQUAL(comb_leaf->tr_l.tl_name, obj_name))
return;
comb_name = (char *)comb_name_ptr;
Modified: brlcad/trunk/src/libged/ls.c
===================================================================
--- brlcad/trunk/src/libged/ls.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/ls.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -83,7 +83,7 @@
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return strcmp((*dp1)->d_namep, (*dp2)->d_namep);
+ return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/libged/prefix.c
===================================================================
--- brlcad/trunk/src/libged/prefix.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/prefix.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -159,7 +159,7 @@
prefix = (char *)prefix_ptr;
obj = (char *)obj_ptr;
- if ( strcmp( comb_leaf->tr_l.tl_name, obj ) )
+ if ( !BU_STR_EQUAL( comb_leaf->tr_l.tl_name, obj ) )
return;
bu_free( comb_leaf->tr_l.tl_name, "comb_leaf->tr_l.tl_name" );
Modified: brlcad/trunk/src/libged/put_comb.c
===================================================================
--- brlcad/trunk/src/libged/put_comb.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/put_comb.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -53,7 +53,7 @@
intern.idb_ptr = (genptr_t)comb;
comb->tree = final_tree;
- if (strcmp(new_name, old_name)) {
+ if (!BU_STR_EQUAL(new_name, old_name)) {
int flags;
if (comb->region_flag)
Modified: brlcad/trunk/src/libged/red.c
===================================================================
--- brlcad/trunk/src/libged/red.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/red.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -331,7 +331,7 @@
bu_vls_trunc(¤t_substring, 0);
bu_vls_strncpy(¤t_substring, currptr + attrstart, attrend -
attrstart);
if (get_attr_val_pair(bu_vls_addr(¤t_substring), &attr_vls,
&val_vls)) {
- if (strcmp(bu_vls_addr(&val_vls), "") &&
strcmp(bu_vls_addr(&attr_vls), "name"))
+ if (!BU_STR_EQUAL(bu_vls_addr(&val_vls), "") &&
!BU_STR_EQUAL(bu_vls_addr(&attr_vls), "name"))
(void)bu_avs_add(&avs, bu_vls_addr(&attr_vls),
bu_vls_addr(&val_vls));
}
currptr = currptr + attrend;
@@ -913,7 +913,7 @@
} else {
/* it worked - kill the original and put the updated copy in
its place if a pre-existing
* comb was being edited - otherwise everything is already
fine.*/
- if (strcmp(bu_vls_addr(&comb_name), bu_vls_addr(&temp_name))) {
+ if (!BU_STR_EQUAL(bu_vls_addr(&comb_name),
bu_vls_addr(&temp_name))) {
av[0] = "kill";
av[1] = bu_vls_addr(&comb_name);
av[2] = NULL;
Modified: brlcad/trunk/src/libged/showmats.c
===================================================================
--- brlcad/trunk/src/libged/showmats.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/showmats.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -53,7 +53,7 @@
smdp = (struct showmats_data *)user_ptr1;
aflag = *((int *)user_ptr2);
- if (strcmp(comb_leaf->tr_l.tl_name, smdp->smd_child))
+ if (!BU_STR_EQUAL(comb_leaf->tr_l.tl_name, smdp->smd_child))
return;
smdp->smd_count++;
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/libged/wdb_obj.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -1624,7 +1624,7 @@
smdp = (struct showmats_data *)user_ptr1;
- if (strcmp(comb_leaf->tr_l.tl_name, smdp->smd_child))
+ if (!BU_STR_EQUAL(comb_leaf->tr_l.tl_name, smdp->smd_child))
return;
smdp->smd_count++;
@@ -4360,7 +4360,7 @@
RT_CK_TREE(comb_leaf);
obj_name = (char *)object;
- if (strcmp(comb_leaf->tr_l.tl_name, obj_name))
+ if (!BU_STR_EQUAL(comb_leaf->tr_l.tl_name, obj_name))
return;
comb_name = (char *)comb_name_ptr;
@@ -8437,7 +8437,7 @@
return TCL_ERROR;
}
- if (strcmp(old_bot_name, new_bot_name)) {
+ if (!BU_STR_EQUAL(old_bot_name, new_bot_name)) {
if ((dp_new=db_lookup(wdbp->dbip, new_bot_name, LOOKUP_QUIET)) !=
DIR_NULL) {
Tcl_AppendResult(interp, new_bot_name, " already exists!!\n", (char
*)NULL);
@@ -8906,7 +8906,7 @@
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return strcmp((*dp1)->d_namep, (*dp2)->d_namep);
+ return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/liboptical/sh_light.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_light.c 2011-01-13 08:22:31 UTC (rev
42226)
+++ brlcad/trunk/src/liboptical/sh_light.c 2011-01-13 08:33:41 UTC (rev
42227)
@@ -224,7 +224,7 @@
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)) {
+ } else if (!BU_STR_EQUAL("pn", name)) {
bu_log("*********** unknown option in light_pt_set %s:%d\n", __FILE__,
__LINE__);
return;
}
Modified: brlcad/trunk/src/librt/comb/comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/comb.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/librt/comb/comb.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -1001,14 +1001,14 @@
}
} else if (BU_STR_EQUAL(buf, "shader")) {
bu_vls_trunc(&comb->shader, 0);
- if (strcmp(argv[1], "none")) {
+ if (!BU_STR_EQUAL(argv[1], "none")) {
bu_vls_strcat(&comb->shader, argv[1]);
/* Leading spaces boggle the combination exporter */
bu_vls_trimspace(&comb->shader);
}
} else if (BU_STR_EQUAL(buf, "material")) {
bu_vls_trunc(&comb->material, 0);
- if (strcmp(argv[1], "none")) {
+ if (!BU_STR_EQUAL(argv[1], "none")) {
bu_vls_strcat(&comb->material, argv[1]);
bu_vls_trimspace(&comb->material);
}
Modified: brlcad/trunk/src/librt/db5_types.c
===================================================================
--- brlcad/trunk/src/librt/db5_types.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/librt/db5_types.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -647,7 +647,7 @@
bu_vls_sprintf(&newval, "%d/%d/%d", comb->rgb[0], comb->rgb[1],
comb->rgb[2]);
(void)bu_avs_add_vls(&avs, "color", &newval);
}
- if (strcmp(bu_vls_addr(&comb->shader), "")) {
+ if (!BU_STR_EQUAL(bu_vls_addr(&comb->shader), "")) {
bu_vls_sprintf(&newval, "%s", bu_vls_addr(&comb->shader));
(void)bu_avs_add_vls(&avs, "oshader", &newval);
} else {
Modified: brlcad/trunk/src/librt/db_tree.c
===================================================================
--- brlcad/trunk/src/librt/db_tree.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/librt/db_tree.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -472,7 +472,7 @@
switch (tp->tr_op) {
case OP_DB_LEAF:
- if (strcmp(cp, tp->tr_l.tl_name))
+ if (!BU_STR_EQUAL(cp, tp->tr_l.tl_name))
return TREE_NULL;
return tp;
Modified: brlcad/trunk/src/librt/tcl.c
===================================================================
--- brlcad/trunk/src/librt/tcl.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/librt/tcl.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -370,7 +370,7 @@
struct rt_i *rtip;
int idx;
- if ((argc != 5 && argc != 6) || (argc == 6 && strcmp(argv[2], "-R"))) {
+ if ((argc != 5 && argc != 6) || (argc == 6 && !BU_STR_EQUAL(argv[2],
"-R"))) {
Tcl_AppendResult(interp,
"wrong # args: should be \"",
argv[0], " ", argv[1], " [-R] {P} dir|at {V}\"",
Modified: brlcad/trunk/src/mged/animedit.c
===================================================================
--- brlcad/trunk/src/mged/animedit.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/animedit.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -2352,12 +2352,12 @@
continue;
}
for (i=0;i<hp->effector.path.fp_len; i++) {
- if (strcmp(jp->path.arc[0],
+ if (!BU_STR_EQUAL(jp->path.arc[0],
hp->effector.path.fp_names[i]->d_namep)==0) break;
}
if (i+jp->path.arc_last >= hp->effector.path.fp_len) continue;
for (j=1; j <= (size_t)jp->path.arc_last;j++) {
- if (strcmp(jp->path.arc[j],
+ if (!BU_STR_EQUAL(jp->path.arc[j],
hp->effector.path.fp_names[i+j]->d_namep)
!= 0) break;
}
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/attach.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -201,7 +201,7 @@
return TCL_OK; /* Ignore */
FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
- if (strcmp(name, bu_vls_addr(&p->dml_dmp->dm_pathName)))
+ if (!BU_STR_EQUAL(name, bu_vls_addr(&p->dml_dmp->dm_pathName)))
continue;
/* found it */
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/chgview.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -1002,7 +1002,7 @@
for (; a_new_match && (i >= 0) && (j >= 0); --i, --j) {
sname = DB_FULL_PATH_GET(&sp->s_fullpath, i)->d_namep;
if ((*sname != *(path_piece[j]))
- || strcmp(sname, path_piece[j]))
+ || !BU_STR_EQUAL(sname, path_piece[j]))
a_new_match = 0;
}
@@ -3435,7 +3435,7 @@
return TCL_OK;
}
- if (strcmp("-a", argv[2])) {
+ if (!BU_STR_EQUAL("-a", argv[2])) {
bu_vls_init(&vls);
bu_vls_printf(&vls, "help view_ring");
Tcl_Eval(interp, bu_vls_addr(&vls));
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/cmd.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -799,7 +799,7 @@
}
for (BU_LIST_FOR (curr_cmd_list, cmd_list, &head_cmd_list.l)) {
- if (strcmp(bu_vls_addr(&curr_cmd_list->cl_name), argv[2]))
+ if (!BU_STR_EQUAL(bu_vls_addr(&curr_cmd_list->cl_name), argv[2]))
continue;
break;
@@ -1468,7 +1468,7 @@
break;
if (clp == &head_cmd_list &&
- (strcmp(bu_vls_addr(&head_cmd_list.cl_name), argv[1]))) {
+ (!BU_STR_EQUAL(bu_vls_addr(&head_cmd_list.cl_name), argv[1]))) {
Tcl_AppendResult(interpreter, "f_tie: unrecognized command_window - ",
argv[1],
"\n", (char *)NULL);
bu_vls_free(&vls);
Modified: brlcad/trunk/src/mged/columns.c
===================================================================
--- brlcad/trunk/src/mged/columns.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/columns.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -98,7 +98,7 @@
dp1 = (struct directory **)a;
dp2 = (struct directory **)b;
- return strcmp((*dp1)->d_namep, (*dp2)->d_namep);
+ return !BU_STR_EQUAL((*dp1)->d_namep, (*dp2)->d_namep);
}
Modified: brlcad/trunk/src/mged/dir.c
===================================================================
--- brlcad/trunk/src/mged/dir.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/dir.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -79,7 +79,7 @@
prefix = (char *)prefix_ptr;
obj = (char *)obj_ptr;
- if (strcmp(comb_leaf->tr_l.tl_name, obj))
+ if (!BU_STR_EQUAL(comb_leaf->tr_l.tl_name, obj))
return;
bu_free(comb_leaf->tr_l.tl_name, "comb_leaf->tr_l.tl_name");
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/mged.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -2619,10 +2619,10 @@
bu_vls_init(&msg);
if (argc == 3
- && strcmp("y", argv[2])
- && strcmp("Y", argv[2])
- && strcmp("n", argv[2])
- && strcmp("N", argv[2]))
+ && !BU_STR_EQUAL("y", argv[2])
+ && !BU_STR_EQUAL("Y", argv[2])
+ && !BU_STR_EQUAL("n", argv[2])
+ && !BU_STR_EQUAL("N", argv[2]))
{
bu_vls_printf(&vls, "help opendb");
Tcl_Eval(interpreter, bu_vls_addr(&vls));
Modified: brlcad/trunk/src/mged/red.c
===================================================================
--- brlcad/trunk/src/mged/red.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/red.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -248,7 +248,7 @@
intern.idb_ptr = (genptr_t)comb;
comb->tree = final_tree;
- if (strcmp(new_name, old_name)) {
+ if (!BU_STR_EQUAL(new_name, old_name)) {
int flags;
if (comb->region_flag)
Modified: brlcad/trunk/src/mged/solids_on_ray.c
===================================================================
--- brlcad/trunk/src/mged/solids_on_ray.c 2011-01-13 08:22:31 UTC (rev
42226)
+++ brlcad/trunk/src/mged/solids_on_ray.c 2011-01-13 08:33:41 UTC (rev
42227)
@@ -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 strcmp(s1->name, s2->name);
+ return !BU_STR_EQUAL(s1->name, s2->name);
}
Modified: brlcad/trunk/src/mged/tedit.c
===================================================================
--- brlcad/trunk/src/mged/tedit.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/mged/tedit.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -1037,7 +1037,7 @@
/* For now, assume there aren't any situations where Windows will use a
terminal */
/* If it's not mac, and it's not Windows, we need a controlling
terminal */
- if (strcmp(os, "Darwin") && strcmp(os, "Windows 95") && strcmp(os,
"Windows NT")) {
+ if (!BU_STR_EQUAL(os, "Darwin") && !BU_STR_EQUAL(os, "Windows 95") &&
!BU_STR_EQUAL(os, "Windows NT")) {
if (BU_STR_EQUAL(editor, EMACS_EDITOR)) {
terminal = bu_which(XTERM_COMMAND);
if (terminal)
Modified: brlcad/trunk/src/rt/reshoot.c
===================================================================
--- brlcad/trunk/src/rt/reshoot.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/rt/reshoot.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -203,17 +203,17 @@
}
/* check the region name */
- if (strcmp( pp->pt_regionp->reg_name, bu_vls_addr(&rh->regname) )) {
+ if (!BU_STR_EQUAL( pp->pt_regionp->reg_name, bu_vls_addr(&rh->regname)
)) {
/* region names don't match */
bu_vls_printf(&result, "\tregion name mismatch %s %s\n",
pp->pt_regionp->reg_name, bu_vls_addr(&rh->regname) );
status = 1;
}
- if ( strcmp(pp->pt_inseg->seg_stp->st_dp->d_namep,
bu_vls_addr(&rh->in_primitive))) {
+ if ( !BU_STR_EQUAL(pp->pt_inseg->seg_stp->st_dp->d_namep,
bu_vls_addr(&rh->in_primitive))) {
bu_vls_printf(&result, "\tin primitive name mismatch %s %s\n",
pp->pt_inseg->seg_stp->st_dp->d_namep, bu_vls_addr(&rh->in_primitive));
status = 1;
}
- if ( strcmp(pp->pt_outseg->seg_stp->st_dp->d_namep,
bu_vls_addr(&rh->out_primitive))) {
+ if ( !BU_STR_EQUAL(pp->pt_outseg->seg_stp->st_dp->d_namep,
bu_vls_addr(&rh->out_primitive))) {
bu_vls_printf(&result, "\tout primitive name mismatch %s %s\n",
pp->pt_outseg->seg_stp->st_dp->d_namep, bu_vls_addr(&rh->out_primitive));
status = 1;
}
Modified: brlcad/trunk/src/vdeck/vdeck.c
===================================================================
--- brlcad/trunk/src/vdeck/vdeck.c 2011-01-13 08:22:31 UTC (rev 42226)
+++ brlcad/trunk/src/vdeck/vdeck.c 2011-01-13 08:33:41 UTC (rev 42227)
@@ -211,7 +211,7 @@
const char **lhs = (const char **)a;
const char **rhs = (const char **)b;
- return strcmp( *lhs, *rhs );
+ return !BU_STR_EQUAL( *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
