Revision: 42222
http://brlcad.svn.sourceforge.net/brlcad/?rev=42222&view=rev
Author: brlcad
Date: 2011-01-13 07:44:13 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
a smaller conversion from strcmp()!=0 to rossberg's newly added bu_strcmp() via
the related BU_STR_EQUAL() macro. improved readability and consistency. 70+
calls.
Modified Paths:
--------------
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/conv/asc/g2asc.c
brlcad/trunk/src/conv/off/off-g.c
brlcad/trunk/src/gtools/g_transfer.c
brlcad/trunk/src/lgt/texture.c
brlcad/trunk/src/libbu/avs.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/units.c
brlcad/trunk/src/libbu/whereis.c
brlcad/trunk/src/libbu/which.c
brlcad/trunk/src/libged/make_name.c
brlcad/trunk/src/libged/search.c
brlcad/trunk/src/liboptical/sh_stack.c
brlcad/trunk/src/libpkg/tpkg.c
brlcad/trunk/src/librt/db5_io.c
brlcad/trunk/src/librt/db_scan.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/parse.c
brlcad/trunk/src/mged/animedit.c
brlcad/trunk/src/mged/buttons.c
brlcad/trunk/src/mged/cad_boundp.c
brlcad/trunk/src/mged/cad_parea.c
brlcad/trunk/src/mged/clone.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/remrt/ihost.c
brlcad/trunk/src/remrt/remrt.c
brlcad/trunk/src/shapes/fence.c
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===================================================================
--- brlcad/trunk/src/conv/asc/asc2g.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -990,7 +990,7 @@
}
*np = '\0';
- if (strcmp(version, ID_VERSION) != 0) {
+ if (!BU_STR_EQUAL(version, ID_VERSION)) {
bu_log("WARNING: input file version (%s) is not %s\n",
version, ID_VERSION);
}
Modified: brlcad/trunk/src/conv/asc/g2asc.c
===================================================================
--- brlcad/trunk/src/conv/asc/g2asc.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/conv/asc/g2asc.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -575,7 +575,7 @@
);
/* Print a warning message on stderr if versions differ */
- if ( strcmp( record.i.i_version, ID_VERSION ) != 0 ) {
+ if ( !BU_STR_EQUAL( record.i.i_version, ID_VERSION ) ) {
(void)fprintf(stderr,
"g2asc: File is version (%s), Program is version (%s)\n",
record.i.i_version, ID_VERSION );
Modified: brlcad/trunk/src/conv/off/off-g.c
===================================================================
--- brlcad/trunk/src/conv/off/off-g.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/conv/off/off-g.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -160,7 +160,7 @@
char dtype[40], format[40];
if (sscanf(buf2, "%40s %40s %64s", dtype, format, geom_fname) != 3)
bu_exit(1, "Incomplete geometry field in input file.");
- if (strcmp(dtype, "indexed_poly") != 0)
+ if (!BU_STR_EQUAL(dtype, "indexed_poly"))
bu_exit(1, "Unknown geometry data type. Must be
\"indexed_poly\".");
}
bu_fgets(buf, sizeof(buf), fpin);
Modified: brlcad/trunk/src/gtools/g_transfer.c
===================================================================
--- brlcad/trunk/src/gtools/g_transfer.c 2011-01-13 07:25:05 UTC (rev
42221)
+++ brlcad/trunk/src/gtools/g_transfer.c 2011-01-13 07:44:13 UTC (rev
42222)
@@ -281,7 +281,7 @@
client = PKC_NULL;
} else {
/* validate magic header */
- if (strcmp(title, MAGIC_ID) != 0) {
+ if (!BU_STR_EQUAL(title, MAGIC_ID)) {
bu_log("Bizarre corruption, received a HELO without at matching
MAGIC ID!\n");
pkg_close(client);
client = PKC_NULL;
Modified: brlcad/trunk/src/lgt/texture.c
===================================================================
--- brlcad/trunk/src/lgt/texture.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/lgt/texture.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -216,7 +216,7 @@
char *file = entry->name + TEX_KEYLEN;
bu_semaphore_acquire( RT_SEM_RESULTS );
for ( iconp = icons;
- iconp != NULL && strcmp( iconp->filenm, file ) != 0;
+ iconp != NULL && !BU_STR_EQUAL( iconp->filenm, file );
iconp = iconp->next )
;
if ( iconp == NULL )
@@ -253,7 +253,7 @@
char *file = entry->name + TEX_KEYLEN;
bu_semaphore_acquire( RT_SEM_RESULTS );
for ( fbp = fbs;
- fbp != NULL && strcmp( fbp->filenm, file ) != 0;
+ fbp != NULL && !BU_STR_EQUAL( fbp->filenm, file );
fbp = fbp->next )
;
if ( fbp == NULL )
Modified: brlcad/trunk/src/libbu/avs.c
===================================================================
--- brlcad/trunk/src/libbu/avs.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libbu/avs.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -89,7 +89,7 @@
if (avsp->count) {
for (BU_AVS_FOR(app, avsp)) {
- if (strcmp(app->name, name) != 0) continue;
+ if (!BU_STR_EQUAL(app->name, name)) continue;
/* found a match, replace it fully */
if (app->name && AVS_IS_FREEABLE(avsp, app->name))
@@ -171,7 +171,7 @@
return NULL;
for (BU_AVS_FOR(app, avsp)) {
- if (strcmp(app->name, name) != 0) {
+ if (!BU_STR_EQUAL(app->name, name)) {
continue;
}
return app->value;
@@ -193,7 +193,7 @@
if (avsp->count) {
for (BU_AVS_FOR(app, avsp)) {
- if (strcmp(app->name, name) != 0) continue;
+ if (!BU_STR_EQUAL(app->name, name)) continue;
if (app->name && AVS_IS_FREEABLE(avsp, app->name))
bu_free((genptr_t)app->name, "app->name");
app->name = NULL; /* sanity */
Modified: brlcad/trunk/src/libbu/parse.c
===================================================================
--- brlcad/trunk/src/libbu/parse.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libbu/parse.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -614,7 +614,7 @@
for (; sdp->sp_name != (char *)0; sdp++) {
- if (strcmp(sdp->sp_name, name) != 0 /* no name match */
+ if (!BU_STR_EQUAL(sdp->sp_name, name) /* no name match */
&& sdp->sp_fmt[0] != 'i'
&& sdp->sp_fmt[1] != 'p') /* no include desc */
@@ -2225,7 +2225,7 @@
while (argc > 0) {
/* Find the attribute which matches this argument. */
for (sdp = desc; sdp->sp_name != NULL; sdp++) {
- if (strcmp(sdp->sp_name, *argv) != 0)
+ if (!BU_STR_EQUAL(sdp->sp_name, *argv))
continue;
/* if we get this far, we've got a name match
Modified: brlcad/trunk/src/libbu/units.c
===================================================================
--- brlcad/trunk/src/libbu/units.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libbu/units.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -201,7 +201,7 @@
for (cvtab=unit_lists; cvtab->cvttab; cvtab++) {
for (tp=cvtab->cvttab; tp->name[0]; tp++) {
if (ubuf[0] != tp->name[0]) continue;
- if (strcmp(ubuf, tp->name) != 0) continue;
+ if (!BU_STR_EQUAL(ubuf, tp->name)) continue;
return tp->val;
}
}
Modified: brlcad/trunk/src/libbu/whereis.c
===================================================================
--- brlcad/trunk/src/libbu/whereis.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libbu/whereis.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -69,7 +69,7 @@
/* check for full/relative path match */
bu_strlcpy(bu_whereis_result, cmd, MAXPATHLEN);
- if (strcmp(bu_whereis_result, cmd) != 0) {
+ if (!BU_STR_EQUAL(bu_whereis_result, cmd)) {
if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
bu_log("command [%s] is too long\n", cmd);
}
Modified: brlcad/trunk/src/libbu/which.c
===================================================================
--- brlcad/trunk/src/libbu/which.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libbu/which.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -60,7 +60,7 @@
/* check for full/relative path match */
bu_strlcpy(bu_which_result, cmd, MAXPATHLEN);
- if (strcmp(bu_which_result, cmd) != 0) {
+ if (!BU_STR_EQUAL(bu_which_result, cmd)) {
if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
bu_log("command [%s] is too long\n", cmd);
}
@@ -79,7 +79,7 @@
bu_strlcpy(PATH, gotpath, MAXPATHENV);
/* make sure it fit, we have a problem if it did not */
- if (strcmp(PATH, gotpath) != 0) {
+ if (!BU_STR_EQUAL(PATH, gotpath)) {
position = strrchr(PATH, BU_PATH_SEPARATOR);
if (position) {
position = '\0';
Modified: brlcad/trunk/src/libged/make_name.c
===================================================================
--- brlcad/trunk/src/libged/make_name.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libged/make_name.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -50,7 +50,7 @@
switch (argc) {
case 2:
- if (strcmp(argv[1], "-s") != 0)
+ if (!BU_STR_EQUAL(argv[1], "-s"))
break;
else {
i = 0;
Modified: brlcad/trunk/src/libged/search.c
===================================================================
--- brlcad/trunk/src/libged/search.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libged/search.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -1012,15 +1012,15 @@
avpp = avs.avp;
for (i = 0; i < (size_t)avs.count; i++, avpp++) {
found_attr = 1;
- if (strcmp(avpp->name, "GIFTmater") != 0 &&
- strcmp(avpp->name, "aircode") != 0 &&
- strcmp(avpp->name, "inherit") != 0 &&
- strcmp(avpp->name, "los") != 0 &&
- strcmp(avpp->name, "material_id") != 0 &&
- strcmp(avpp->name, "oshader") != 0 &&
- strcmp(avpp->name, "region") != 0 &&
- strcmp(avpp->name, "region_id") != 0 &&
- strcmp(avpp->name, "rgb") != 0) {
+ if (!BU_STR_EQUAL(avpp->name, "GIFTmater") &&
+ !BU_STR_EQUAL(avpp->name, "aircode") &&
+ !BU_STR_EQUAL(avpp->name, "inherit") &&
+ !BU_STR_EQUAL(avpp->name, "los") &&
+ !BU_STR_EQUAL(avpp->name, "material_id") &&
+ !BU_STR_EQUAL(avpp->name, "oshader") &&
+ !BU_STR_EQUAL(avpp->name, "region") &&
+ !BU_STR_EQUAL(avpp->name, "region_id") &&
+ !BU_STR_EQUAL(avpp->name, "rgb")) {
found_nonstd_attr = 1;
}
@@ -2079,7 +2079,7 @@
/* initialize result */
bu_vls_trunc(&gedp->ged_result_str, 0);
- if (!((argv[1][0] == '-') || (argv[1][0] == '!') || (argv[1][0] ==
'(')) && (strcmp(argv[1], "/") != 0) && (strcmp(argv[1], ".") != 0)) {
+ if (!((argv[1][0] == '-') || (argv[1][0] == '!') || (argv[1][0] ==
'(')) && (!BU_STR_EQUAL(argv[1], "/")) && (!BU_STR_EQUAL(argv[1], "."))) {
/* We seem to have a path - make sure it's valid */
if (db_string_to_path(&dfp, gedp->ged_wdbp->dbip, argv[1]) == -1) {
bu_vls_printf(&gedp->ged_result_str, " Search path not found
in database.\n");
Modified: brlcad/trunk/src/liboptical/sh_stack.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_stack.c 2011-01-13 07:25:05 UTC (rev
42221)
+++ brlcad/trunk/src/liboptical/sh_stack.c 2011-01-13 07:44:13 UTC (rev
42222)
@@ -151,7 +151,7 @@
#endif
for ( mfp = *headp; mfp != MF_NULL; mfp = mfp->mf_forw ) {
if (matname[0] != mfp->mf_name[0] ||
- strcmp( matname, mfp->mf_name ) != 0 )
+ !BU_STR_EQUAL( matname, mfp->mf_name ) )
continue;
goto found;
}
Modified: brlcad/trunk/src/libpkg/tpkg.c
===================================================================
--- brlcad/trunk/src/libpkg/tpkg.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/libpkg/tpkg.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -184,7 +184,7 @@
client = PKC_NULL;
} else {
/* validate magic header that client should have sent */
- if (strcmp(buffer, MAGIC_ID) != 0) {
+ if (!BU_STR_EQUAL(buffer, MAGIC_ID)) {
bu_log("Bizarre corruption, received a HELO without at matching
MAGIC ID!\n");
pkg_close(client);
client = PKC_NULL;
Modified: brlcad/trunk/src/librt/db5_io.c
===================================================================
--- brlcad/trunk/src/librt/db5_io.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/librt/db5_io.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -777,7 +777,7 @@
BU_ASSERT_LONG(raw.h_dli, ==, DB5HDR_HFLAGS_DLI_APPLICATION_DATA_OBJECT);
/* See if name needs to be changed */
- if (raw.name.ext_buf == NULL || strcmp(name, raw.name.ext_buf) != 0) {
+ if (raw.name.ext_buf == NULL || !BU_STR_EQUAL(name, raw.name.ext_buf)) {
/* Name needs to be changed. Create new external form.
* Make temporary copy so input isn't smashed
* as new external object is constructed.
Modified: brlcad/trunk/src/librt/db_scan.c
===================================================================
--- brlcad/trunk/src/librt/db_scan.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/librt/db_scan.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -117,7 +117,7 @@
nrec++;
switch ( record.u_id ) {
case ID_IDENT:
- if ( strcmp( record.i.i_version, ID_VERSION) != 0 ) {
+ if ( !BU_STR_EQUAL( record.i.i_version, ID_VERSION) ) {
bu_log("db_scan WARNING: File is Version %s, Program is
version %s\n",
record.i.i_version, ID_VERSION );
}
Modified: brlcad/trunk/src/librt/db_tree.c
===================================================================
--- brlcad/trunk/src/librt/db_tree.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/librt/db_tree.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -424,7 +424,7 @@
switch (tp->tr_op) {
case OP_DB_LEAF:
- if (strcmp(cp, tp->tr_l.tl_name) != 0)
+ if (!BU_STR_EQUAL(cp, tp->tr_l.tl_name))
return 0; /* NO-OP */
tsp->ts_sofar |= sofar;
if (db_apply_state_from_memb(tsp, pathp, tp) < 0)
Modified: brlcad/trunk/src/librt/parse.c
===================================================================
--- brlcad/trunk/src/librt/parse.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/librt/parse.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -307,7 +307,7 @@
for (; sdp->sp_name != (char *)0; sdp++ ) {
- if ( strcmp( sdp->sp_name, name ) != 0 /* no name match */
+ if ( !BU_STR_EQUAL( sdp->sp_name, name ) /* no name match */
&& sdp->sp_fmt[0] != 'i' ) /* no include desc */
continue;
Modified: brlcad/trunk/src/mged/animedit.c
===================================================================
--- brlcad/trunk/src/mged/animedit.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/animedit.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -3429,7 +3429,7 @@
if (jp->path.arc_last+i >= pathp->fp_len) break;
for (j=0; j<=(size_t)jp->path.arc_last;j++) {
if ((*pathp->fp_names[i+j]->d_namep != *jp->path.arc[j]) ||
- (strcmp(pathp->fp_names[i+j]->d_namep, jp->path.arc[j])
!=0)) {
+ (!BU_STR_EQUAL(pathp->fp_names[i+j]->d_namep,
jp->path.arc[j]))) {
good=0;
break;
}
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/buttons.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -293,7 +293,7 @@
/* Process the button function requested. */
for (bp = button_table; bp->bu_code >= 0; bp++) {
- if (strcmp(str, bp->bu_name) != 0)
+ if (!BU_STR_EQUAL(str, bp->bu_name))
continue;
(void)bp->bu_func(clientData, interp, 2, argv+1);
@@ -305,7 +305,7 @@
for (item=0, mptr = *m;
mptr->menu_string[0] != '\0';
mptr++, item++) {
- if (strcmp(str, mptr->menu_string) != 0)
+ if (!BU_STR_EQUAL(str, mptr->menu_string))
continue;
menu_state->ms_cur_item = item;
Modified: brlcad/trunk/src/mged/cad_boundp.c
===================================================================
--- brlcad/trunk/src/mged/cad_boundp.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/cad_boundp.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -146,7 +146,7 @@
}
iflag = 1;
- if (strcmp(bu_optarg, "-") != 0 && freopen(bu_optarg, "r",
stdin) == NULL) {
+ if (!BU_STR_EQUAL(bu_optarg, "-") && freopen(bu_optarg, "r",
stdin) == NULL) {
fprintf(stderr, "can't open \"%s\"", bu_optarg);
return 1;
}
@@ -159,7 +159,7 @@
}
oflag = 1;
- if (strcmp(bu_optarg, "-") != 0 && freopen(bu_optarg, "w",
stdout) == NULL) {
+ if (!BU_STR_EQUAL(bu_optarg, "-") && freopen(bu_optarg, "w",
stdout) == NULL) {
fprintf(stderr, "can't create \"%s\"", bu_optarg);
return 1;
}
Modified: brlcad/trunk/src/mged/cad_parea.c
===================================================================
--- brlcad/trunk/src/mged/cad_parea.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/cad_parea.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -109,7 +109,7 @@
}
iflag = 1;
- if (strcmp(bu_optarg, "-") != 0
+ if (!BU_STR_EQUAL(bu_optarg, "-")
&& freopen(bu_optarg, "r", stdin) == NULL
) {
(void)printf("cad_parea: can't open \"%s\"\n", bu_optarg);
@@ -124,7 +124,7 @@
}
oflag = 1;
- if (strcmp(bu_optarg, "-") != 0
+ if (!BU_STR_EQUAL(bu_optarg, "-")
&& freopen(bu_optarg, "w", stdout) == NULL
) {
(void)printf("cad_parea: can't create \"%s\"\n", bu_optarg);
Modified: brlcad/trunk/src/mged/clone.c
===================================================================
--- brlcad/trunk/src/mged/clone.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/clone.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -952,7 +952,7 @@
/* Read in knots from specified file *************/
do
bu_fgets(line, 81, points);
- while (strcmp(strtok(line, ","), "112") != 0);
+ while (!BU_STR_EQUAL(strtok(line, ","), "112"));
bu_strlcpy(tok, strtok(NULL, ","), sizeof(tok));
bu_strlcpy(tok, strtok(NULL, ","), sizeof(tok));
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/mged/cmd.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -1207,7 +1207,7 @@
functions = in_functions;
for (ftp = &functions[1]; ftp->ft_name; ftp++) {
- if (strcmp(ftp->ft_name, argv[0]) != 0)
+ if (!BU_STR_EQUAL(ftp->ft_name, argv[0]))
continue;
/* We have a match */
if ((ftp->ft_min <= argc) && (ftp->ft_max < 0 || argc <= ftp->ft_max)) {
@@ -1324,7 +1324,7 @@
/* Help command(s) */
for (i=1; i<argc; i++) {
for (ftp = functions+1; ftp->ft_name; ftp++) {
- if (strcmp(ftp->ft_name, argv[i]) != 0)
+ if (!BU_STR_EQUAL(ftp->ft_name, argv[i]))
continue;
Tcl_AppendResult(INTERP, "Usage: ", functions->ft_name,
ftp->ft_name,
Modified: brlcad/trunk/src/remrt/ihost.c
===================================================================
--- brlcad/trunk/src/remrt/ihost.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/remrt/ihost.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -124,7 +124,7 @@
for ( BU_LIST_FOR( ihp, ihost, &HostHead ) ) {
CK_IHOST(ihp);
- if ( strcmp( ihp->ht_name, addr->h_name ) != 0 )
+ if ( !BU_STR_EQUAL( ihp->ht_name, addr->h_name ) )
continue;
return ihp;
}
Modified: brlcad/trunk/src/remrt/remrt.c
===================================================================
--- brlcad/trunk/src/remrt/remrt.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/remrt/remrt.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -2204,7 +2204,7 @@
struct servers *sp;
sp = &servers[pc->pkc_fd];
- if ( strcmp( PROTOCOL_VERSION, buf ) != 0 ) {
+ if ( !BU_STR_EQUAL( PROTOCOL_VERSION, buf ) ) {
bu_log("ERROR %s: protocol version mis-match\n",
sp->sr_host->ht_name);
bu_log(" local='%s'\n", PROTOCOL_VERSION );
@@ -3826,7 +3826,7 @@
frame_script = (char *)0;
}
- if (strcmp(argv[1], "off") != 0 ) {
+ if (!BU_STR_EQUAL(argv[1], "off") ) {
frame_script = bu_strdup(argv[1]);
}
return 0;
Modified: brlcad/trunk/src/shapes/fence.c
===================================================================
--- brlcad/trunk/src/shapes/fence.c 2011-01-13 07:25:05 UTC (rev 42221)
+++ brlcad/trunk/src/shapes/fence.c 2011-01-13 07:44:13 UTC (rev 42222)
@@ -1864,7 +1864,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for fence
name\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(fenceName, verboseinput, DEFAULT_MAXNAMELENGTH);
}
}
@@ -1880,7 +1880,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for start
position\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf%lf%lf", &fenceStartPosition[0],
&fenceStartPosition[1], &fenceStartPosition[2]);
}
}
@@ -1896,7 +1896,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for end
position\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf%lf%lf", &fenceEndPosition[0],
&fenceEndPosition[1], &fenceEndPosition[2]);
}
}
@@ -1912,7 +1912,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for fence
height\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf%lf%lf", &fenceHeight[0],
&fenceHeight[1], &fenceHeight[2]);
}
}
@@ -1939,7 +1939,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for fence
material\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(fenceMaterial, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -1955,7 +1955,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for fence
material params\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(fenceMaterialParams, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -1971,7 +1971,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for fence
material color\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%d%d%d", &colorinput[0],
&colorinput[1], &colorinput[2]);
if ((colorinput[0]<0)|(colorinput[1]<0)|(colorinput[2]<0)) {
@@ -2006,7 +2006,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
name\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(poleName, verboseinput, DEFAULT_MAXNAMELENGTH);
}
}
@@ -2022,7 +2022,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
height\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &poleHeight);
}
}
@@ -2038,7 +2038,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
radius\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &poleRadius);
}
}
@@ -2054,7 +2054,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
spacing\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &fencePoleSpacing);
}
}
@@ -2070,7 +2070,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
material\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(poleMaterial, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2086,7 +2086,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
material params\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(poleMaterialParams, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2102,7 +2102,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for pole
material color\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%d%d%d", &colorinput[0],
&colorinput[1], &colorinput[2]);
if ((colorinput[0]<0)|(colorinput[1]<0)|(colorinput[2]<0)) {
@@ -2137,7 +2137,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
name\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(meshName, verboseinput, DEFAULT_MAXNAMELENGTH);
}
}
@@ -2153,7 +2153,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
height\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &meshHeight);
}
}
@@ -2169,7 +2169,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
width\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &meshWidth);
}
}
@@ -2185,7 +2185,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
material\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(meshMaterial, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2201,7 +2201,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
material params\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(meshMaterialParams, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2217,7 +2217,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for mesh
material color\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%d%d%d", &colorinput[0],
&colorinput[1], &colorinput[2]);
if ((colorinput[0]<0)|(colorinput[1]<0)|(colorinput[2]<0)) {
@@ -2252,7 +2252,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
name\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(wireName, verboseinput, DEFAULT_MAXNAMELENGTH);
}
}
@@ -2268,7 +2268,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] wire
radius\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &wireRadius);
}
}
@@ -2284,7 +2284,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
angle\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &wireAngle);
}
}
@@ -2300,7 +2300,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
material\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(wireMaterial, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2316,7 +2316,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
material params\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(wireMaterialParams, verboseinput,
DEFAULT_MAXNAMELENGTH*3);
}
}
@@ -2332,7 +2332,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
material color\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%d%d%d", &colorinput[0],
&colorinput[1], &colorinput[2]);
if ((colorinput[0]<0)|(colorinput[1]<0)|(colorinput[2]<0)) {
@@ -2364,7 +2364,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
segment length\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &wireSegmentLength);
}
}
@@ -2380,7 +2380,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for wire
segment separation\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
sscanf(verboseinput, "%lf", &wireSegmentSeparation);
}
}
@@ -2396,7 +2396,7 @@
if (debug) {
fprintf(DEFAULT_DEBUG_OUTPUT, "main:entered [%s] for
segment name\n", verboseinput);
}
- if (strcmp(verboseinput, "") != 0) {
+ if (!BU_STR_EQUAL(verboseinput, "")) {
bu_strlcpy(segmentName, verboseinput,
DEFAULT_MAXNAMELENGTH);
}
}
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
