Revision: 71965
http://sourceforge.net/p/brlcad/code/71965
Author: starseeker
Date: 2018-10-12 14:44:59 +0000 (Fri, 12 Oct 2018)
Log Message:
-----------
Clear printf warnings
Modified Paths:
--------------
brlcad/trunk/src/anim/anim_hardtrack.c
brlcad/trunk/src/anim/anim_track.c
brlcad/trunk/src/bwish/input.c
brlcad/trunk/src/conv/euclid/euclid-g.c
brlcad/trunk/src/conv/g-shell-rect.c
brlcad/trunk/src/conv/iges/convassem.c
brlcad/trunk/src/conv/iges/convtree.c
brlcad/trunk/src/conv/iges/do_subfigs.c
brlcad/trunk/src/conv/iges/docolor.c
brlcad/trunk/src/conv/iges/get_att.c
brlcad/trunk/src/conv/iges/get_cnurb_curve.c
brlcad/trunk/src/conv/iges/iges.c
brlcad/trunk/src/conv/k-g.cpp
brlcad/trunk/src/conv/patch/patch-g.c
brlcad/trunk/src/conv/ply/g-ply.c
brlcad/trunk/src/conv/ply/ply-g.c
brlcad/trunk/src/conv/viewpoint-g.c
brlcad/trunk/src/external/Creo/shim.h
brlcad/trunk/src/external/Unigraphics/ug-g.c
brlcad/trunk/src/libanalyze/nirt.cxx
brlcad/trunk/src/libbn/tests/bntester.c
brlcad/trunk/src/libbn/tests/plane_pt.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libgcv/plugins/stl/stl_write.c
brlcad/trunk/src/libgcv/plugins/vrml/vrml_write.c
brlcad/trunk/src/libged/comb.c
brlcad/trunk/src/libged/facetize.c
brlcad/trunk/src/libged/pnts.cpp
brlcad/trunk/src/libged/tables.c
brlcad/trunk/src/libicv/tests/size_down.c
brlcad/trunk/src/libnmg/tests/nmg_copy.c
brlcad/trunk/src/librt/db_open.c
brlcad/trunk/src/librt/tests/rt_datum.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/nirt/main.cxx
brlcad/trunk/src/remrt/rtsrv.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/usage.cpp
brlcad/trunk/src/rt/viewcell.c
brlcad/trunk/src/rt/viewedge.c
brlcad/trunk/src/rt/viewhide.c
brlcad/trunk/src/rt/viewrange.c
brlcad/trunk/src/rt/worker.c
brlcad/trunk/src/rtwizard/main.c
brlcad/trunk/src/util/pixdiff.c
brlcad/trunk/src/util/plot3-dm.c
Modified: brlcad/trunk/src/anim/anim_hardtrack.c
===================================================================
--- brlcad/trunk/src/anim/anim_hardtrack.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/anim/anim_hardtrack.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -208,7 +208,7 @@
print_wheel = 1;
break;
case 'l':
- bu_sscanf(bu_optarg, "%zd", &num_links);
+ bu_sscanf(bu_optarg, "%zu", &num_links);
link_nindex = bu_optind;
bu_optind += 1;
print_link = 1;
Modified: brlcad/trunk/src/anim/anim_track.c
===================================================================
--- brlcad/trunk/src/anim/anim_track.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/anim/anim_track.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -231,7 +231,7 @@
one_radius = 1;
break;
case 'p':
- bu_sscanf(bu_optarg, "%zd", &num_links);
+ bu_sscanf(bu_optarg, "%zu", &num_links);
link_nindex = bu_optind;
bu_optind += 1;
print_link = 1;
Modified: brlcad/trunk/src/bwish/input.c
===================================================================
--- brlcad/trunk/src/bwish/input.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/bwish/input.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -288,7 +288,7 @@
if (input_str_index == bu_vls_strlen(&input_str))
break;
insert_prompt();
- bu_log("%*V", input_str_index, &input_str);
+ bu_log("%*s", (int)input_str_index, bu_vls_addr(&input_str));
escaped = bracketed = 0;
break;
case CTRL_B: /* Back one character */
@@ -324,7 +324,7 @@
bu_vls_addr(&input_str)[input_str_index - 1];
bu_vls_addr(&input_str)[input_str_index - 1] = ch;
bu_log("\b");
- bu_log("%c%c", bu_vls_addr(&input_str)+input_str_index-1,
bu_vls_addr(&input_str)+input_str_index);
+ bu_log("%c%c", (bu_vls_addr(&input_str)+input_str_index-1)[0],
(bu_vls_addr(&input_str)+input_str_index)[0]);
++input_str_index;
escaped = bracketed = 0;
break;
Modified: brlcad/trunk/src/conv/euclid/euclid-g.c
===================================================================
--- brlcad/trunk/src/conv/euclid/euclid-g.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/euclid/euclid-g.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -627,7 +627,7 @@
}
if (debug)
- bu_log("%d vertices out of tolerance after fixing out of tolerance
faces\n", nmg_ck_geometry(m, &RTG.rtg_vlfree, &tol));
+ bu_log("%zu vertices out of tolerance after fixing out of tolerance
faces\n", nmg_ck_geometry(m, &RTG.rtg_vlfree, &tol));
nmg_s_join_touchingloops(s, &tol);
nmg_s_split_touchingloops(s, &tol);
Modified: brlcad/trunk/src/conv/g-shell-rect.c
===================================================================
--- brlcad/trunk/src/conv/g-shell-rect.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/g-shell-rect.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -1441,7 +1441,7 @@
}
if (debug > 3) {
- bu_log("Making faces for y_index=%d, z_index=%d\n",
y_index, z_index);
+ bu_log("Making faces for y_index=%zu, z_index=%zu\n",
y_index, z_index);
for (i = 0; i < 4; i++) {
bu_log("part #%d:\n", i);
bu_log("\tray start is (%g %g %g)\n",
V3ARGS(yz_rays[cell_no[i]].r_pt));
@@ -1475,7 +1475,7 @@
}
if (debug > 3) {
- bu_log("Making faces for x_index=%d, z_index=%d\n",
x_index, z_index);
+ bu_log("Making faces for x_index=%zu, z_index=%zu\n",
x_index, z_index);
for (i = 0; i < 4; i++) {
bu_log("part #%d:\n", i);
bu_log("\tray start is (%g %g %g)\n",
V3ARGS(xz_rays[cell_no[i]].r_pt));
@@ -1509,7 +1509,7 @@
}
if (debug > 3) {
- bu_log("Making faces for x_index=%d, y_index=%d\n",
x_index, y_index);
+ bu_log("Making faces for x_index=%zu, y_index=%zu\n",
x_index, y_index);
for (i = 0; i < 4; i++) {
bu_log("part #%d:\n", i);
bu_log("\tray start is (%g %g %g)\n",
V3ARGS(xy_rays[cell_no[i]].r_pt));
@@ -1822,7 +1822,7 @@
cell_count[X] = (int)((rtip->mdl_max[X] - rtip->mdl_min[X])/cell_size) + 3;
cell_count[Y] = (int)((rtip->mdl_max[Y] - rtip->mdl_min[Y])/cell_size) + 3;
cell_count[Z] = (int)((rtip->mdl_max[Z] - rtip->mdl_min[Z])/cell_size) + 3;
- bu_log("cell size is %gmm\n\t%d cells in X-direction\n\t%d cells in
Y-direction\n\t%d cells in Z-direction\n",
+ bu_log("cell size is %gmm\n\t%zu cells in X-direction\n\t%zu cells in
Y-direction\n\t%zu cells in Z-direction\n",
cell_size, cell_count[X], cell_count[Y], cell_count[Z]);
x_start = rtip->mdl_min[X] - ((double)cell_count[X] * cell_size -
(rtip->mdl_max[X] - rtip->mdl_min[X]))/2.0;
Modified: brlcad/trunk/src/conv/iges/convassem.c
===================================================================
--- brlcad/trunk/src/conv/iges/convassem.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/iges/convassem.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -79,7 +79,7 @@
Readint(&j, ""); /* read entity type */
if (j != 184) {
- bu_log("Incorrect entity type in Parameter section for entity
%d\n", i);
+ bu_log("Incorrect entity type in Parameter section for entity
%zu\n", i);
return;
}
Modified: brlcad/trunk/src/conv/iges/convtree.c
===================================================================
--- brlcad/trunk/src/conv/iges/convtree.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/iges/convtree.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -62,7 +62,7 @@
if (dir[i]->param <= pstart) {
/* Illegal parameter address */
- bu_log("Entity number %d (Boolean Tree) does not have a legal
parameter pointer\n", i);
+ bu_log("Entity number %zu (Boolean Tree) does not have a legal
parameter pointer\n", i);
continue;
}
Modified: brlcad/trunk/src/conv/iges/do_subfigs.c
===================================================================
--- brlcad/trunk/src/conv/iges/do_subfigs.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/iges/do_subfigs.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -64,7 +64,7 @@
subfigdef_index = (subfigdef_de - 1)/2;
if (subfigdef_index >= totentities) {
bu_log("Singular Subfigure Instance Entity gives Subfigure
Definition");
- bu_log("\tEntity DE of %d, largest DE in file is %d\n",
+ bu_log("\tEntity DE of %d, largest DE in file is %zu\n",
subfigdef_de, (totentities * 2) - 1);
continue;
}
@@ -134,7 +134,7 @@
if (idx >= totentities) {
bu_log("Subfigure Definition Entity gives Member Entity");
- bu_log("\tDE of %d, largest DE in file is %d\n",
+ bu_log("\tDE of %d, largest DE in file is %zu\n",
members[j], (totentities * 2) - 1);
continue;
}
Modified: brlcad/trunk/src/conv/iges/docolor.c
===================================================================
--- brlcad/trunk/src/conv/iges/docolor.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/iges/docolor.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -59,7 +59,7 @@
Readrec(dir[-dir[i]->colorp]->param);
Readint(&j, "");
if (j != 314) {
- bu_log("Incorrect color parameters for entity %d\n", i);
+ bu_log("Incorrect color parameters for entity %zu\n", i);
bu_log("\tcolor entity is #%d\n", -dir[i]->colorp);
continue;
}
Modified: brlcad/trunk/src/conv/iges/get_att.c
===================================================================
--- brlcad/trunk/src/conv/iges/get_att.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/iges/get_att.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -43,7 +43,7 @@
Readrec(dir[i]->param);
Readint(&j, "");
if (j != 322) {
- bu_log("Parameters at sequence %d are not for entity at
DE%d\n", dir[i]->param, (2*i+1));
+ bu_log("Parameters at sequence %d are not for entity at
DE%zu\n", dir[i]->param, (2*i+1));
continue;
}
Modified: brlcad/trunk/src/conv/iges/get_cnurb_curve.c
===================================================================
--- brlcad/trunk/src/conv/iges/get_cnurb_curve.c 2018-10-12 13:54:58 UTC
(rev 71964)
+++ brlcad/trunk/src/conv/iges/get_cnurb_curve.c 2018-10-12 14:44:59 UTC
(rev 71965)
@@ -32,7 +32,7 @@
curve = (curve_de - 1)/2;
if (curve >= dirarraylen) {
- bu_log("Get_cnurb_curve: DE=%zu is too large, dirarraylen = %zu\n",
curve_de, dirarraylen);
+ bu_log("Get_cnurb_curve: DE=%d is too large, dirarraylen = %zu\n",
curve_de, dirarraylen);
return (struct edge_g_cnurb *)NULL;
}
Modified: brlcad/trunk/src/conv/iges/iges.c
===================================================================
--- brlcad/trunk/src/conv/iges/iges.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/conv/iges/iges.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -848,7 +848,7 @@
for (i = 0; i < 21; i++)
dir_entry[i] = DEFAULT;
- bu_vls_printf(&str, "106,%d,%d", pt_size-1, vert_count+1);
+ bu_vls_printf(&str, "106,%zu,%zu", pt_size-1, vert_count+1);
if (pt_size == 2) {
bu_vls_printf(&str, ",0.0");
for (i = 0; i < vert_count; i++)
@@ -1027,7 +1027,7 @@
curve_de[++i] = nmg_loop_to_tcurve(lu, surf_de, u_dir, v_dir, u_max,
v_max, base_pt, fp_dir, fp_param);
}
- bu_vls_printf(&str, "144,%d,0,%d", surf_de, loop_count-1);
+ bu_vls_printf(&str, "144,%d,0,%zu", surf_de, loop_count-1);
for (i = 0; i < loop_count; i++)
bu_vls_printf(&str, ",%d", curve_de[i]);
bu_vls_strcat(&str, ";");
@@ -1107,7 +1107,7 @@
NMG_CK_VERTEX(v);
vg = v->vg_p;
if (!vg) {
- bu_log("No geometry for vertex %p #%d in table\n", (void *)v, i);
+ bu_log("No geometry for vertex %p #%zu in table\n", (void *)v, i);
} else {
NMG_CK_VERTEX_G(vg);
bu_vls_printf(&str, ",%g,%g,%g",
@@ -1686,12 +1686,12 @@
point_t base_pt;
fastf_t u_max, v_max;
- bu_vls_printf(&str, "510,%d,%d,%d" ,
+ bu_vls_printf(&str, "510,%d,%zu,%d" ,
write_planar_nurb(fu, u_dir, v_dir, &u_max,
&v_max, base_pt, fp_dir, fp_param),
loop_count,
outer_loop_flag);
} else
- bu_vls_printf(&str, "510,%d,%d,%d" ,
+ bu_vls_printf(&str, "510,%d,%zu,%d" ,
write_plane_entity(fu->f_p->g.plane_p->N, fp_dir,
fp_param),
loop_count,
outer_loop_flag);
@@ -1719,7 +1719,7 @@
}
/* write shell entity */
- bu_vls_printf(&str, "514,%d", face_count);
+ bu_vls_printf(&str, "514,%zu", face_count);
for (i = 0; i < face_count; i++)
bu_vls_printf(&str, ",%d,1", face_list[i]);
bu_vls_strcat(&str, ";");
@@ -1761,7 +1761,7 @@
}
/* Put outer shell in BREP object first */
- bu_vls_printf(&str, "186,%d,1,%d", shell_list[0], shell_count-1);
+ bu_vls_printf(&str, "186,%d,1,%zu", shell_list[0], shell_count-1);
/* Add all other shells */
for (i = 1; i < shell_count; i++) {
@@ -2336,7 +2336,7 @@
}
/* write parameter data into a string */
- bu_vls_printf(&str, "180,%d,%d", 2*length-1, -de_list[0]);
+ bu_vls_printf(&str, "180,%zu,%d", 2*length-1, -de_list[0]);
for (i = 1; i < length; i++)
bu_vls_printf(&str, ",%d,1", -de_list[i]);
@@ -2409,7 +2409,7 @@
}
/* write parameter data into a string */
- bu_vls_printf(&str, "184,%d", length);
+ bu_vls_printf(&str, "184,%zu", length);
for (i = 0; i < length; i++)
bu_vls_printf(&str, ",%d", de_list[i]);
for (i = 0; i < length; i++)
@@ -2885,7 +2885,7 @@
/* write the combination as a solid assembly */
entity_type = 184;
- bu_vls_printf(&str, "%d,%d", entity_type, length);
+ bu_vls_printf(&str, "%d,%zu", entity_type, length);
for (i = 0; i < length; i++)
bu_vls_printf(&str, ",%d", de_pointers[i]);
for (i = 0; i < length; i++)
Modified: brlcad/trunk/src/conv/k-g.cpp
===================================================================
--- brlcad/trunk/src/conv/k-g.cpp 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/conv/k-g.cpp 2018-10-12 14:44:59 UTC (rev 71965)
@@ -434,9 +434,9 @@
if (print_map) {
bu_vls_printf(&face_map, "%ld,%ld\n", (long)eind, *eit);
if (es->nodal_pnts[3] != -1) {
- bu_vls_printf(&elem_node_map, "%ld:%d,%d,%d,%d\n", es->EID,
es->nodal_pnts[0], es->nodal_pnts[1], es->nodal_pnts[2], es->nodal_pnts[3]);
+ bu_vls_printf(&elem_node_map, "%ld:%ld,%ld,%ld,%ld\n", es->EID,
es->nodal_pnts[0], es->nodal_pnts[1], es->nodal_pnts[2], es->nodal_pnts[3]);
} else {
- bu_vls_printf(&elem_node_map, "%ld:%d,%d,%d\n", es->EID,
es->nodal_pnts[0], es->nodal_pnts[1], es->nodal_pnts[2]);
+ bu_vls_printf(&elem_node_map, "%ld:%ld,%ld,%ld\n", es->EID,
es->nodal_pnts[0], es->nodal_pnts[1], es->nodal_pnts[2]);
}
}
eind++;
@@ -797,7 +797,7 @@
/* Collect any leftover shells that didn't have parent parts */
if (EIDSHELLS.size() > 0 && !all_elements_one_bot) {
- bu_log("Warning - %d unorganized ELEMENT_SHELL objects. This may be an
indication that this file uses features of the dyna keyword format we don't
support yet.\n", EIDSHELLS.size());
+ bu_log("Warning - %zu unorganized ELEMENT_SHELL objects. This may be
an indication that this file uses features of the dyna keyword format we don't
support yet.\n", EIDSHELLS.size());
}
if (EIDSHELLS.size() > 0) {
add_element_shell_set(EIDSHELLS_to_world, EIDSHELLS, NID_to_world,
&all_head, world, fd_out, all_elements_one_bot);
Modified: brlcad/trunk/src/conv/patch/patch-g.c
===================================================================
--- brlcad/trunk/src/conv/patch/patch-g.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/patch/patch-g.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -605,7 +605,7 @@
/* Make sure we don't overrun our p_faces array */
face_count++;
if (face_count >= 2*l) {
- bu_exit(1, "Face count = %d, only allowed for %d\n",
face_count, 2*l);
+ bu_exit(1, "Face count = %zu, only allowed for %zu\n",
face_count, 2*l);
}
/* Assign geometry */
@@ -646,7 +646,7 @@
*/
i = nmg_break_edges(&m->magic, &RTG.rtg_vlfree, tol);
if (debug > 2)
- bu_log("nmg_break_edges broke %d edges\n", i);
+ bu_log("nmg_break_edges broke %zu edges\n", i);
/* glue all the faces together */
nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
@@ -832,7 +832,7 @@
fu = NMG_INDEX_GETP(faceuse, copy_tbl, p_faces[i].fu);
if (!fu) {
- bu_exit(1, "No fu in duplicate shell corresponding to fu #%d (%p)
in original\n", i, (void *)p_faces[i].fu);
+ bu_exit(1, "No fu in duplicate shell corresponding to fu #%zu (%p)
in original\n", i, (void *)p_faces[i].fu);
}
NMG_CK_FACEUSE(fu);
@@ -1155,12 +1155,12 @@
}
if (debug > 3)
- bu_log("k=%d l=%d %f %f %f flag=%d\n", k, l, list[k].x, list[k].y,
list[k].z, list[k].flag);
+ bu_log("k=%zu l=%zu %f %f %f flag=%d\n", k, l, list[k].x,
list[k].y, list[k].z, list[k].flag);
}
if (debug > 2) {
for (k=1;(k<=l);k++)
- bu_log("%d %f %f %f\n", k, XVAL[k], YVAL[k], ZVAL[k]);
+ bu_log("%zu %f %f %f\n", k, XVAL[k], YVAL[k], ZVAL[k]);
}
VSET(last, MAX_FASTF, MAX_FASTF, MAX_FASTF);
@@ -1453,7 +1453,7 @@
if (debug > 2) {
for (k=1;k<l; k++)
bu_log("Compressed: %f %f %f\n", XVAL[k], YVAL[k], ZVAL[k]);
- bu_log("%d unique plate thicknesses:\n", nthicks);
+ bu_log("%zu unique plate thicknesses:\n", nthicks);
for (thick_no=0; thick_no < nthicks; thick_no++)
bu_log("\t%g inches\n", thicks[thick_no]*conv_mm2in);
}
@@ -3081,7 +3081,7 @@
l= l+1;
if (debug > 3)
- bu_log("k=%d l=%d %f %f %f flag=%d %f mirror=%d\n",
+ bu_log("k=%zu l=%zu %f %f %f flag=%d %f mirror=%d\n",
k, l, list[k].x, list[k].y, list[k].z,
list[k].flag, list[k].radius, list[k].mirror);
}
@@ -3089,7 +3089,7 @@
if (debug > 2) {
for (k=1;(k<=l);k++)
- bu_log("compressed: %d %f %f %f %f %d\n",
+ bu_log("compressed: %zu %f %f %f %f %d\n",
k, XVAL[k], YVAL[k], ZVAL[k], RADIUS[k], mirror[k]);
}
@@ -3647,7 +3647,7 @@
if (bu_sscanf(buf, "%6zu%*66c%3d%5d",
&i, &eqlos, &matcode) != 3) {
- bu_exit(1, "Incomplete line in materials file for component
'%.4d'\n", i);
+ bu_exit(1, "Incomplete line in materials file for component
'%.4zu'\n", i);
}
nm[i].matcode = matcode;
nm[i].eqlos = eqlos;
Modified: brlcad/trunk/src/conv/ply/g-ply.c
===================================================================
--- brlcad/trunk/src/conv/ply/g-ply.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/conv/ply/g-ply.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -320,7 +320,7 @@
for (vi = 0; vi < 3; vi++) {
coords = (double *)bu_hash_get(v_tbl_regs[cur_region], (const
unsigned char *)(f_regs[cur_region][fi] + vi), sizeof(long));
if (!coords) {
- bu_log("ERROR: No vertex found for face with index %d!\n",
f_regs[cur_region][fi][vi]);
+ bu_log("ERROR: No vertex found for face with index %ld!\n",
f_regs[cur_region][fi][vi]);
goto free_nmg;
}
ply_write(ply_fp, coords[3]);
@@ -364,7 +364,7 @@
nmg_km(the_model);
rt_vlist_cleanup();
db_close(dbip);
- bu_exit(1, "");
+ bu_exit(1, NULL);
}
static void
@@ -803,7 +803,7 @@
for (vi = 0; vi < 3; vi++) {
coords = (double *)bu_hash_get(v_tbl_regs[ri], (const
unsigned char *)(f_regs[ri][fi] + vi), sizeof(long));
if (!coords) {
- bu_log("ERROR: No vertex found for face with index
%d!\n", f_regs[ri][fi][vi]);
+ bu_log("ERROR: No vertex found for face with index
%ld!\n", f_regs[ri][fi][vi]);
ply_close(ply_fp);
goto free_all;
}
Modified: brlcad/trunk/src/conv/ply/ply-g.c
===================================================================
--- brlcad/trunk/src/conv/ply/ply-g.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/conv/ply/ply-g.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -72,7 +72,7 @@
bu_log("Could not get info of this element\n");
continue;
}
- bu_log("There are %d instances of the %s element:\n", ninstances,
elem_name);
+ bu_log("There are %ld instances of the %s element:\n", ninstances,
elem_name);
/* iterate over all properties of current element */
while ((prop = ply_get_next_property(elem, prop))) {
@@ -142,7 +142,7 @@
bu_bomb("Unable to import face lists");
}
if (list_len < 3 || list_len > 4) {
- bu_log("ignoring face with %d vertices\n", list_len);
+ bu_log("ignoring face with %ld vertices\n", list_len);
return 1;
}
ply_get_argument_user_data(argument, (void **)&pbot, NULL);
@@ -324,13 +324,13 @@
rgb[i] = (unsigned char) irgb[i];
}
if (mk_comb(out_fp, bu_vls_addr(®ion_name), &head, 1, NULL, NULL,
rgb, 1000, 0, 1, 100, 0, 0, 0)) {
- bu_log("ERROR: Failed to write region(%s) to database\n",
region_name);
+ bu_log("ERROR: Failed to write region(%s) to database\n",
bu_vls_addr(®ion_name));
goto free_bot;
}
}
if (verbose) {
- bu_log("Wrote region %s\n", region_name);
+ bu_log("Wrote region %s\n", bu_vls_addr(®ion_name));
}
free_bot:
Modified: brlcad/trunk/src/conv/viewpoint-g.c
===================================================================
--- brlcad/trunk/src/conv/viewpoint-g.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/conv/viewpoint-g.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -195,7 +195,7 @@
if (number_scanned < 4)
break;
if (i >= no_of_verts)
- bu_log("vertex number too high (%zu) only allowed for %d\n", i,
no_of_verts);
+ bu_log("vertex number too high (%zu) only allowed for %zu\n", i,
no_of_verts);
VSET(verts[i].coord, x, y, z);
if (number_scanned == 7) {
Modified: brlcad/trunk/src/external/Creo/shim.h
===================================================================
--- brlcad/trunk/src/external/Creo/shim.h 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/external/Creo/shim.h 2018-10-12 14:44:59 UTC (rev
71965)
@@ -147,7 +147,7 @@
typedef int __internal_facetset[3];
typedef struct pf {int id;} ProFeature;
typedef struct pmatp {double mass_density;} ProMaterialProps;
-typedef struct pmp {int density; int mass; int volume;} ProMassProperty;
+typedef struct pmp {double density; double mass; double volume;}
ProMassProperty;
typedef struct proparam {wchar_t *id;} ProParameter;
typedef struct prouc {double scale;} ProUnitConversion;
typedef struct psap {double color_rgb[3];double transparency;double
shininess;double diffuse;double highlite;} ProSurfaceAppearanceProps;
Modified: brlcad/trunk/src/external/Unigraphics/ug-g.c
===================================================================
--- brlcad/trunk/src/external/Unigraphics/ug-g.c 2018-10-12 13:54:58 UTC
(rev 71964)
+++ brlcad/trunk/src/external/Unigraphics/ug-g.c 2018-10-12 14:44:59 UTC
(rev 71965)
@@ -1066,7 +1066,7 @@
skt->verts = (point2d_t *)bu_realloc( skt->verts,
*verts_alloced*sizeof(point2d_t ), "skt->verts" );
}
V2MOVE( skt->verts[skt->vert_count], pt );
- bu_log( "new vertex #%d is (%g %g)\n", skt->vert_count, V2ARGS(
skt->verts[skt->vert_count] ) );
+ bu_log( "new vertex #%zu is (%g %g)\n", skt->vert_count, V2ARGS(
skt->verts[skt->vert_count] ) );
skt->vert_count++;
return skt->vert_count - 1;
@@ -5497,7 +5497,7 @@
bu_log( "\t\t%d of the facetized parts were BREP models\n", parts_brep );
elapsed_time = time( &end_time ) - start_time;
- bu_log( "Elapsed time: %02d:%02d:%02d\n", elapsed_time/3600,
(elapsed_time%3600)/60, (elapsed_time%60) );
+ bu_log( "Elapsed time: %02ld:%02ld:%02ld\n", elapsed_time/3600,
(elapsed_time%3600)/60, (elapsed_time%60) );
return 0;
Modified: brlcad/trunk/src/libanalyze/nirt.cxx
===================================================================
--- brlcad/trunk/src/libanalyze/nirt.cxx 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libanalyze/nirt.cxx 2018-10-12 14:44:59 UTC (rev
71965)
@@ -669,7 +669,7 @@
{
// TODO - once we enable C++ 11 switch the precision below to
std::numeric_limits<double>::max_digits10
size_t prec = (p) ? p : std::numeric_limits<double>::digits10 + 2;
- bu_log("prec: %d\n",prec);
+ bu_log("prec: %zu\n",prec);
std::ostringstream ss;
ss << std::fixed << std::setprecision(prec) << d;
std::string sd = ss.str();
@@ -1001,7 +1001,7 @@
struct nirt_seg *left = sd->left;
struct nirt_seg *right = sd->right;
if (left->type != right->type) {
- bu_vls_printf(&dreport, " Segment %d type mismatch : Original
%s, Current %s\n", j, _nirt_seg_string(sd->left->type),
_nirt_seg_string(sd->right->type));
+ bu_vls_printf(&dreport, " Segment %zu type mismatch : Original
%s, Current %s\n", j, _nirt_seg_string(sd->left->type),
_nirt_seg_string(sd->right->type));
nout(nss, "%s", bu_vls_addr(&dreport));
bu_vls_free(&dreport);
return 1;
@@ -1013,7 +1013,7 @@
break;
case NIRT_PARTITION_SEG:
if (!nss->i->diff_settings->report_partitions) continue;
- bu_vls_printf(&dreport, " Segment difference(%s):\n",
_nirt_seg_string(sd->left->type), j);
+ bu_vls_printf(&dreport, " Segment difference(%s)[%zu]:\n",
_nirt_seg_string(sd->left->type), j);
if (bu_vls_strcmp(left->reg_name, right->reg_name) &&
nss->i->diff_settings->report_partition_reg_names) {
bu_vls_printf(&dreport, " Region Name: '%s' ->
'%s'\n", bu_vls_addr(left->reg_name), bu_vls_addr(right->reg_name));
reporting_diff = 1;
@@ -1059,7 +1059,7 @@
break;
case NIRT_GAP_SEG:
if (!nss->i->diff_settings->report_gaps) continue;
- bu_vls_printf(&dreport, " Segment difference(%s):\n",
_nirt_seg_string(sd->left->type), j);
+ bu_vls_printf(&dreport, " Segment difference(%s)[%zu]:\n",
_nirt_seg_string(sd->left->type), j);
if (sd->gap_in_delta >
nss->i->diff_settings->dist_delta_tol &&
nss->i->diff_settings->report_gap_dists) {
std::string oval = _nirt_dbl_to_str(sd->gap_in_delta,
_nirt_digits(nss->i->diff_settings->dist_delta_tol));
bu_vls_printf(&dreport, "
DIST_PT_PT(gap_in_old,gap_in_new): %s\n", oval.c_str());
@@ -1073,7 +1073,7 @@
break;
case NIRT_OVERLAP_SEG:
if (!nss->i->diff_settings->report_overlaps) continue;
- bu_vls_printf(&dreport, " Segment difference(%s):\n",
_nirt_seg_string(sd->left->type), j);
+ bu_vls_printf(&dreport, " Segment difference(%s)[%zu]:\n",
_nirt_seg_string(sd->left->type), j);
if (bu_vls_strcmp(left->ov_reg1_name, right->ov_reg1_name)
&& nss->i->diff_settings->report_overlap_reg_names) {
bu_vls_printf(&dreport, " Region 1 Name: '%s' ->
'%s'\n", bu_vls_addr(left->ov_reg1_name), bu_vls_addr(right->ov_reg1_name));
reporting_diff = 1;
@@ -1344,7 +1344,7 @@
break;
case 's':
if ((size_t)p_num > pn.max_size()) {
- nerr(nss, "Error: precision specification in format
specifier substring \"%s\" of specifier \"%s\" exceeds allowed maximum (%d)\n",
pn.c_str(), fmt_sp.c_str(), pn.max_size());
+ nerr(nss, "Error: precision specification in format
specifier substring \"%s\" of specifier \"%s\" exceeds allowed maximum
(%zu)\n", pn.c_str(), fmt_sp.c_str(), pn.max_size());
return -1;
}
break;
@@ -2319,7 +2319,7 @@
have_ray = 1;
std::vector<std::string> substrs = _nirt_string_split(rstr);
if (substrs.size() != 6) {
- nerr(nss, "Error processing ray line \"%s\"!\nExpected 6
elements, found %d\n", line.c_str(), substrs.size());
+ nerr(nss, "Error processing ray line \"%s\"!\nExpected 6
elements, found %zu\n", line.c_str(), substrs.size());
delete df;
return -1;
}
@@ -2350,7 +2350,7 @@
std::string hstr = line.substr(7);
std::vector<std::string> substrs = _nirt_string_split(hstr);
if (substrs.size() != 15) {
- nerr(nss, "Error processing hit line \"%s\"!\nExpected 15
elements, found %d\n", hstr.c_str(), substrs.size());
+ nerr(nss, "Error processing hit line \"%s\"!\nExpected 15
elements, found %zu\n", hstr.c_str(), substrs.size());
return -1;
}
struct nirt_seg *seg;
@@ -2387,7 +2387,7 @@
std::string gstr = line.substr(7);
std::vector<std::string> substrs = _nirt_string_split(gstr);
if (substrs.size() != 7) {
- nerr(nss, "Error processing gap line \"%s\"!\nExpected 7
elements, found %d\n", gstr.c_str(), substrs.size());
+ nerr(nss, "Error processing gap line \"%s\"!\nExpected 7
elements, found %zu\n", gstr.c_str(), substrs.size());
return -1;
}
struct nirt_seg *seg;
@@ -2421,7 +2421,7 @@
std::string ostr = line.substr(11);
std::vector<std::string> substrs = _nirt_string_split(ostr);
if (substrs.size() != 11) {
- nerr(nss, "Error processing overlap line \"%s\"!\nExpected
11 elements, found %d\n", ostr.c_str(), substrs.size());
+ nerr(nss, "Error processing overlap line \"%s\"!\nExpected
11 elements, found %zu\n", ostr.c_str(), substrs.size());
return -1;
}
struct nirt_seg *seg;
Modified: brlcad/trunk/src/libbn/tests/bntester.c
===================================================================
--- brlcad/trunk/src/libbn/tests/bntester.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libbn/tests/bntester.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -232,7 +232,7 @@
case 'i': /* input file name */
string_length = strlen(bu_optarg);
if (string_length >= BUFSIZ) {
- bu_log("Input file name too long, length was %d but must be
less than %d\n",
+ bu_log("Input file name too long, length was %zu but must
be less than %d\n",
string_length, BUFSIZ);
bu_exit(EXIT_FAILURE, USAGE);
}
@@ -242,7 +242,7 @@
case 'o': /* output file name */
string_length = strlen(bu_optarg);
if (string_length >= BUFSIZ) {
- bu_log("Output file name too long, length was %d but must
be less than %d\n",
+ bu_log("Output file name too long, length was %zu but must
be less than %d\n",
string_length, BUFSIZ);
bu_exit(EXIT_FAILURE, USAGE);
}
Modified: brlcad/trunk/src/libbn/tests/plane_pt.c
===================================================================
--- brlcad/trunk/src/libbn/tests/plane_pt.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libbn/tests/plane_pt.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -168,7 +168,7 @@
actual_return = bn_mk_plane_3pts(plane, a, b, c, &tol);
- bu_log("return: %f\n", actual_return);
+ bu_log("return: %d\n", actual_return);
return (expected_return != actual_return);
}
Modified: brlcad/trunk/src/libdm/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/libdm/dm-tk.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -221,7 +221,7 @@
if (dmp->dm_debugLevel) {
bu_log("tk_drawVList()\n");
- bu_log("vp - %lu, perspective - %d\n", vp, dmp->dm_perspective);
+ bu_log("vp - %p, perspective - %d\n", (void *)vp, dmp->dm_perspective);
}
/* delta is used in clipping to insure clipped endpoint is slightly
Modified: brlcad/trunk/src/libgcv/plugins/stl/stl_write.c
===================================================================
--- brlcad/trunk/src/libgcv/plugins/stl/stl_write.c 2018-10-12 13:54:58 UTC
(rev 71964)
+++ brlcad/trunk/src/libgcv/plugins/stl/stl_write.c 2018-10-12 14:44:59 UTC
(rev 71965)
@@ -95,7 +95,7 @@
return bu_strdup(bu_units);
else {
struct bu_vls temp = BU_VLS_INIT_ZERO;
- bu_vls_printf(&temp, "%zu units per mm", scale_factor);
+ bu_vls_printf(&temp, "%g units per mm", scale_factor);
return bu_vls_strgrab(&temp);
}
}
Modified: brlcad/trunk/src/libgcv/plugins/vrml/vrml_write.c
===================================================================
--- brlcad/trunk/src/libgcv/plugins/vrml/vrml_write.c 2018-10-12 13:54:58 UTC
(rev 71964)
+++ brlcad/trunk/src/libgcv/plugins/vrml/vrml_write.c 2018-10-12 14:44:59 UTC
(rev 71965)
@@ -1178,7 +1178,7 @@
return bu_strdup(bu_units);
else {
struct bu_vls temp = BU_VLS_INIT_ZERO;
- bu_vls_printf(&temp, "%zu units per mm", scale_factor);
+ bu_vls_printf(&temp, "%g units per mm", scale_factor);
return bu_vls_strgrab(&temp);
}
}
Modified: brlcad/trunk/src/libged/comb.c
===================================================================
--- brlcad/trunk/src/libged/comb.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/libged/comb.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -509,7 +509,7 @@
edges_removed = rt_bot_decimate_gct(bot, fs);
if (edges_removed >= 0) {
not_solid = bg_trimesh_solid2((int)bot->num_vertices,
(int)bot->num_faces, bot->vertices, bot->faces, NULL);
- bu_log("%s: %d edges removed, %d faces removed, valid: %d\n",
bot_dp->d_namep, edges_removed, old_face_cnt - bot->num_faces, !not_solid);
+ bu_log("%s: %d edges removed, %zu faces removed, valid: %d\n",
bot_dp->d_namep, edges_removed, old_face_cnt - bot->num_faces, !not_solid);
} else {
bu_log("%s: decimation failure\n", bot_dp->d_namep);
}
@@ -521,7 +521,7 @@
edges_removed = rt_bot_decimate_gct(bot, fs);
if (edges_removed >= 0) {
not_solid = bg_trimesh_solid2((int)bot->num_vertices,
(int)bot->num_faces, bot->vertices, bot->faces, NULL);
- bu_log("%s(%d): %d edges removed, %d faces removed, valid:
%d\n", bot_dp->d_namep, scnt, edges_removed, old_face_cnt - bot->num_faces,
!not_solid);
+ bu_log("%s(%d): %d edges removed, %zu faces removed, valid:
%d\n", bot_dp->d_namep, scnt, edges_removed, old_face_cnt - bot->num_faces,
!not_solid);
} else {
bu_log("%s(%d): decimation failure\n", bot_dp->d_namep,
scnt);
}
Modified: brlcad/trunk/src/libged/facetize.c
===================================================================
--- brlcad/trunk/src/libged/facetize.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/libged/facetize.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -2470,7 +2470,7 @@
cdp = (struct directory *)BU_PTBL_GET(pc, i);
nparent = bu_avs_get(opts->c_map, cdp->d_namep);
if (!opts->quiet) {
- bu_log("Duplicating assembly (%d of %d) %s -> %s\n", i+1,
BU_PTBL_LEN(pc), cdp->d_namep, nparent);
+ bu_log("Duplicating assembly (%d of %ld) %s -> %s\n", i+1,
BU_PTBL_LEN(pc), cdp->d_namep, nparent);
}
if (_ged_facetize_add_children(gedp, cdp, opts) != GED_OK) {
if (!opts->quiet) {
Modified: brlcad/trunk/src/libged/pnts.cpp
===================================================================
--- brlcad/trunk/src/libged/pnts.cpp 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/libged/pnts.cpp 2018-10-12 14:44:59 UTC (rev 71965)
@@ -247,7 +247,7 @@
GED_DB_DIRADD(gedp, dp, bot_name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID,
(void *)&internal.idb_type, GED_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR);
- bu_vls_printf(gedp->ged_result_str, "Generated BoT object %s with %d
triangles", bot_name, pntcnt);
+ bu_vls_printf(gedp->ged_result_str, "Generated BoT object %s with %ld
triangles", bot_name, pntcnt);
rt_db_free_internal(&intern);
return GED_OK;
@@ -368,7 +368,7 @@
GED_DB_DIRADD(gedp, dp, pnt_prim, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID,
(void *)&internal.idb_type, GED_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR);
- bu_vls_printf(gedp->ged_result_str, "Generated pnts object %s with %d
points, avg. partition thickness %g", pnt_prim, pnts->count, avg_thickness);
+ bu_vls_printf(gedp->ged_result_str, "Generated pnts object %s with %ld
points, avg. partition thickness %g", pnt_prim, pnts->count, avg_thickness);
return GED_OK;
}
@@ -573,7 +573,7 @@
GED_DB_DIRADD(gedp, dp, pnt_prim, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID,
(void *)&internal.idb_type, GED_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR);
- bu_vls_printf(gedp->ged_result_str, "Generated pnts object %s with %d
points", pnt_prim, pnts->count);
+ bu_vls_printf(gedp->ged_result_str, "Generated pnts object %s with %ld
points", pnt_prim, pnts->count);
bu_vls_free(&fmt);
if (nums) bu_free(nums, "free old nums array");
Modified: brlcad/trunk/src/libged/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/libged/tables.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -174,7 +174,7 @@
struct table_obj *o;
for (i = 0; i < BU_PTBL_LEN(tabptr); i++) {
o = (struct table_obj *)BU_PTBL_GET(tabptr, i);
- bu_vls_printf(tabvls, " %-4zu %4ld %4ld %4ld %4ld ",
+ bu_vls_printf(tabvls, " %-4d %4d %4d %4d %4d ",
o->numreg, o->region_id, o->aircode, o->GIFTmater, o->los);
bu_vls_printf(tabvls, "%s", bu_vls_addr(o->path));
Modified: brlcad/trunk/src/libicv/tests/size_down.c
===================================================================
--- brlcad/trunk/src/libicv/tests/size_down.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libicv/tests/size_down.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -126,7 +126,7 @@
bif = icv_read(in_file, format, inx, iny);
icv_resize(bif, method, 0, 0, (unsigned int) factor);
- bu_log("File information width %d height%d\n", bif->width, bif->height);
+ bu_log("File information width %zu height %zu\n", bif->width, bif->height);
for (index = 0; index < 65536; index++)
bu_log("index = %ld, data = %f\n", index, bif->data[index]);
@@ -133,7 +133,7 @@
icv_write(bif,out_file, format);
- bu_log("File information width %d height%d channels = %d\n", bif->width,
bif->height, bif->channels);
+ bu_log("File information width %zu height %zu channels = %zu\n",
bif->width, bif->height, bif->channels);
icv_destroy(bif);
return 0;
Modified: brlcad/trunk/src/libnmg/tests/nmg_copy.c
===================================================================
--- brlcad/trunk/src/libnmg/tests/nmg_copy.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libnmg/tests/nmg_copy.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -372,7 +372,7 @@
/* Testing manifolds of model */
if (m1->manifolds != (char *)NULL && m2->manifolds != (char *)NULL) {
if (*m1->manifolds != *m2->manifolds) {
- bu_log("Error manifolds of model. m1: %ld, m2: %ld\n",
*m1->manifolds, *m2->manifolds);
+ bu_log("Error manifolds of model. m1: %d, m2: %d\n",
*m1->manifolds, *m2->manifolds);
result = -1;
}
} else {
Modified: brlcad/trunk/src/librt/db_open.c
===================================================================
--- brlcad/trunk/src/librt/db_open.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/librt/db_open.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -446,11 +446,11 @@
/* flush the file */
(void)fflush(dbip->dbi_fp);
-#if defined(HAVE_FSYNC) && !defined(STRICT_FLAGS)
+#if defined(HAVE_FSYNC)
/* make sure it's written out */
(void)fsync(fileno(dbip->dbi_fp));
#else
-# if defined(HAVE_SYNC) && !defined(STRICT_FLAGS)
+# if defined(HAVE_SYNC)
/* try the whole filesystem if sans fsync() */
sync();
# endif
Modified: brlcad/trunk/src/librt/tests/rt_datum.c
===================================================================
--- brlcad/trunk/src/librt/tests/rt_datum.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/librt/tests/rt_datum.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -154,7 +154,7 @@
}
if (rt_db_put_internal(dp, dbip, &intern, &rt_uniresource) < 0) {
rt_db_free_internal(&intern);
- bu_log("%s error: Database write error, aborting\n");
+ bu_log("Error: Database write error, aborting\n");
return 1;
}
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -4345,12 +4345,12 @@
goto bad;
if (bu_sscanf(argv[4], "%lf %lf", &vdir[X], &vdir[Y]) != 2) {
- bu_vls_printf(gedp->ged_result_str, "%s: bad dir", argv[0],
argv[4]);
+ bu_vls_printf(gedp->ged_result_str, "%s: bad dir: %s", argv[0],
argv[4]);
goto bad;
}
if (bu_sscanf(argv[5], "%lf", &vdelta) != 1) {
- bu_vls_printf(gedp->ged_result_str, "%s: bad delta", argv[0],
argv[5]);
+ bu_vls_printf(gedp->ged_result_str, "%s: bad delta: %s", argv[0],
argv[5]);
goto bad;
}
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/mged/mged.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -775,7 +775,7 @@
if (input_str_index == bu_vls_strlen(&input_str))
break;
pr_prompt(interactive);
- bu_log("%*V", input_str_index, &input_str);
+ bu_log("%*s", (int)input_str_index, bu_vls_addr(&input_str));
escaped = bracketed = 0;
break;
case CTRL_B: /* Back one character */
Modified: brlcad/trunk/src/nirt/main.cxx
===================================================================
--- brlcad/trunk/src/nirt/main.cxx 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/nirt/main.cxx 2018-10-12 14:44:59 UTC (rev 71965)
@@ -857,7 +857,7 @@
}
// Now, construct a dir command line from the m matrix
- bu_vls_sprintf(&ncmd, "dir %.*f %.*f %.*f", prec, -m[8], prec, -m[9],
prec, -m[10]);
+ bu_vls_sprintf(&ncmd, "dir %.*f %.*f %.*f", (int)prec, -m[8],
(int)prec, -m[9], (int)prec, -m[10]);
if (nirt_exec(ns, bu_vls_addr(&ncmd)) < 0) {
nirt_err(&io_data, "nirt: read_mat(): Failed to set the view
direction\n");
ret = EXIT_FAILURE;
Modified: brlcad/trunk/src/remrt/rtsrv.c
===================================================================
--- brlcad/trunk/src/remrt/rtsrv.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/remrt/rtsrv.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -320,7 +320,7 @@
RTG.rtg_parallel = 0;
}
- bu_log("using %d of %d cpus\n",
+ bu_log("using %zu of %d cpus\n",
npsw, avail_cpus);
/* Before option processing, do application-specific initialization */
Modified: brlcad/trunk/src/rt/do.c
===================================================================
--- brlcad/trunk/src/rt/do.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/do.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -1181,7 +1181,7 @@
bu_log("\nResource use summary, by processor:\n");
res = &resource[0];
for (i = 0; i < npsw; i++, res++) {
- bu_log("---CPU %d:\n", i);
+ bu_log("---CPU %zu:\n", i);
if (res->re_magic != RESOURCE_MAGIC) {
bu_log("Bad magic number!\n");
continue;
Modified: brlcad/trunk/src/rt/usage.cpp
===================================================================
--- brlcad/trunk/src/rt/usage.cpp 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/usage.cpp 2018-10-12 14:44:59 UTC (rev 71965)
@@ -224,7 +224,7 @@
* unless all option+description lines fit within 80chars
*/
if (longest_opt + longest_desc + 4 /* option padding */ <= 80) {
- bu_log(" %s%*s %s\n", j->option.c_str(),
longest_opt-(int)j->option.length(), "", j->description.c_str());
+ bu_log(" %s%*s %s\n", j->option.c_str(),
(int)(longest_opt-(int)j->option.length()), "", j->description.c_str());
} else {
/* arbitrary, 16 makes a nice 20/60 split */
@@ -235,9 +235,9 @@
if (j->option.length() > limitation) {
bu_log(" %s\n", j->option.c_str());
if (j->description.length() > 0)
- bu_log(" %*s%s\n", limitation, "",
j->description.c_str());
+ bu_log(" %*s%s\n", (int)limitation, "",
j->description.c_str());
} else {
- bu_log(" %s%*s %s\n", j->option.c_str(),
limitation-(int)j->option.length(), "", j->description.c_str());
+ bu_log(" %s%*s %s\n", j->option.c_str(),
(int)(limitation-(int)j->option.length()), "", j->description.c_str());
}
}
}
Modified: brlcad/trunk/src/rt/viewcell.c
===================================================================
--- brlcad/trunk/src/rt/viewcell.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/viewcell.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -105,7 +105,7 @@
* tree walking and database prepping to still be done in parallel.
*/
if ( npsw >= 1 ) {
- bu_log("Note: changing from %d cpus to 1 cpu\n", npsw );
+ bu_log("Note: changing from %zu cpus to 1 cpu\n", npsw );
npsw = 1; /* Disable parallel processing */
}
Modified: brlcad/trunk/src/rt/viewedge.c
===================================================================
--- brlcad/trunk/src/rt/viewedge.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/viewedge.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -428,7 +428,7 @@
nObjs = split_argc;
for (i=0; i<nObjs; ++i) {
- bu_log("rtedge: occlusion object %d = %s\n", i, objs[i]);
+ bu_log("rtedge: occlusion object %zu = %s\n", i, objs[i]);
}
@@ -459,7 +459,7 @@
if (rt_gettree(occlusion_rtip, objs[i]) < 0)
bu_log("rtedge: gettree failed for %s\n", objs[i]);
else
- bu_log("rtedge: got tree for object %d = %s\n", i, objs[i]);
+ bu_log("rtedge: got tree for object %zu = %s\n", i, objs[i]);
bu_free((char *)objs, "free occlusion objs array");
Modified: brlcad/trunk/src/rt/viewhide.c
===================================================================
--- brlcad/trunk/src/rt/viewhide.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/viewhide.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -133,7 +133,7 @@
* tree walking and database prepping to still be done in parallel.
*/
if ( npsw >= 1 ) {
- bu_log("Note: changing from %d cpus to 1 cpu\n", npsw );
+ bu_log("Note: changing from %zu cpus to 1 cpu\n", npsw );
npsw = 1; /* Disable parallel processing */
}
Modified: brlcad/trunk/src/rt/viewrange.c
===================================================================
--- brlcad/trunk/src/rt/viewrange.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/viewrange.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -113,7 +113,7 @@
* tree walking and database prepping to still be done in parallel.
*/
if ( npsw >= 1 ) {
- bu_log("Note: changing from %d cpus to 1 cpu\n", npsw );
+ bu_log("Note: changing from %zu cpus to 1 cpu\n", npsw );
npsw = 1; /* Disable parallel processing */
}
Modified: brlcad/trunk/src/rt/worker.c
===================================================================
--- brlcad/trunk/src/rt/worker.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rt/worker.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -836,7 +836,7 @@
/* Tally up the statistics */
for (cpu=0; cpu < npsw; cpu++) {
if (resource[cpu].re_magic != RESOURCE_MAGIC) {
- bu_log("ERROR: CPU %d resources corrupted, statistics bad\n", cpu);
+ bu_log("ERROR: CPU %zu resources corrupted, statistics bad\n", cpu);
continue;
}
rt_add_res_stats(APP.a_rt_i, &resource[cpu]);
Modified: brlcad/trunk/src/rtwizard/main.c
===================================================================
--- brlcad/trunk/src/rtwizard/main.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/rtwizard/main.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -566,9 +566,9 @@
bu_vls_printf(&slog, "log_file: %s\n", bu_vls_addr(s->log_file));
bu_vls_printf(&slog, "pid_file: %s\n", bu_vls_addr(s->pid_file));
- bu_vls_printf(&slog, "width(%d): %d\n", s->width_set, s->width);
- bu_vls_printf(&slog, "height(%d): %d\n", s->height_set, s->height);
- bu_vls_printf(&slog, "size(%d): %d\n", s->size_set, s->size);
+ bu_vls_printf(&slog, "width(%d): %zu\n", s->width_set, s->width);
+ bu_vls_printf(&slog, "height(%d): %zu\n", s->height_set, s->height);
+ bu_vls_printf(&slog, "size(%d): %zu\n", s->size_set, s->size);
bu_vls_printf(&slog, "bkg_color: %d,%d,%d\n",
(int)s->bkg_color->buc_rgb[0], (int)s->bkg_color->buc_rgb[1],
(int)s->bkg_color->buc_rgb[2]);
bu_vls_printf(&slog, "line_color: %d,%d,%d\n",
(int)s->line_color->buc_rgb[0], (int)s->line_color->buc_rgb[1],
(int)s->line_color->buc_rgb[2]);
bu_vls_printf(&slog, "non_line_color: %d,%d,%d\n",
(int)s->non_line_color->buc_rgb[0], (int)s->non_line_color->buc_rgb[1],
(int)s->non_line_color->buc_rgb[2]);
@@ -644,24 +644,24 @@
}
if (s->width_set) {
- bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(width) %d",
s->width);
+ bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(width) %zu",
s->width);
(void)Tcl_Eval(interp, bu_vls_addr(&tcl_cmd));
}
if (s->height_set) {
- bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(scanlines) %d",
s->height);
+ bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(scanlines) %zu",
s->height);
(void)Tcl_Eval(interp, bu_vls_addr(&tcl_cmd));
}
if (s->size_set) {
- bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(size) %d",
s->size);
+ bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(size) %zu",
s->size);
(void)Tcl_Eval(interp, bu_vls_addr(&tcl_cmd));
if (!s->width_set) {
- bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(width) %d",
s->size);
+ bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(width) %zu",
s->size);
(void)Tcl_Eval(interp, bu_vls_addr(&tcl_cmd));
}
if (!s->height_set) {
- bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(scanlines)
%d", s->size);
+ bu_vls_sprintf(&tcl_cmd, "set ::RtWizard::wizard_state(scanlines)
%zu", s->size);
(void)Tcl_Eval(interp, bu_vls_addr(&tcl_cmd));
}
}
Modified: brlcad/trunk/src/util/pixdiff.c
===================================================================
--- brlcad/trunk/src/util/pixdiff.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/util/pixdiff.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -90,7 +90,7 @@
stat(argv[2], &sf2);
if (sf1.st_size != sf2.st_size) {
- bu_exit(1, "Different file sizes found: %s(%d) and %s(%d). Cannot
perform pixdiff.\n", argv[1], sf1.st_size, argv[2], sf2.st_size);
+ bu_exit(1, "Different file sizes found: %s(%ld) and %s(%ld). Cannot
perform pixdiff.\n", argv[1], sf1.st_size, argv[2], sf2.st_size);
}
while (1) {
Modified: brlcad/trunk/src/util/plot3-dm.c
===================================================================
--- brlcad/trunk/src/util/plot3-dm.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/util/plot3-dm.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -837,9 +837,9 @@
linelen += len;
if (linelen > 80)
- bu_log("\n%-*V", len, &plp->pl_name);
+ bu_log("\n%-*s", len, bu_vls_addr(&plp->pl_name));
else
- bu_log("%-*V", len, &plp->pl_name);
+ bu_log("%-*s", len, bu_vls_addr(&plp->pl_name));
}
bu_log("\n");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
