Revision: 54292 http://brlcad.svn.sourceforge.net/brlcad/?rev=54292&view=rev Author: carlmoore Date: 2013-02-01 22:06:49 +0000 (Fri, 01 Feb 2013) Log Message: ----------- change d to ld in formatting
Modified Paths: -------------- brlcad/trunk/src/libged/tables.c brlcad/trunk/src/libged/wdb_comb_std.c brlcad/trunk/src/libged/wdb_obj.c brlcad/trunk/src/libged/whatid.c brlcad/trunk/src/liboptical/sh_grass.c brlcad/trunk/src/librt/primitives/nmg/nmg_index.c brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c brlcad/trunk/src/librt/regionfix.c brlcad/trunk/src/librt/tree.c Modified: brlcad/trunk/src/libged/tables.c =================================================================== --- brlcad/trunk/src/libged/tables.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/libged/tables.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -409,7 +409,7 @@ fprintf(tabptr, "\n\nNumber Primitives = %ld Number Regions = %ld\n", numsol, numreg); - bu_vls_printf(gedp->ged_result_str, "Processed %d Primitives and %d Regions\n", + bu_vls_printf(gedp->ged_result_str, "Processed %ld Primitives and %ld Regions\n", numsol, numreg); (void)fclose(tabptr); @@ -419,7 +419,7 @@ fprintf(tabptr, "* 9999999\n* 9999999\n* 9999999\n* 9999999\n* 9999999\n"); (void)fclose(tabptr); - bu_vls_printf(gedp->ged_result_str, "Processed %d Regions\n", numreg); + bu_vls_printf(gedp->ged_result_str, "Processed %ld Regions\n", numreg); /* make ordered idents - tries newer gnu 'sort' syntax if not successful */ bu_vls_strcpy(&cmd, sortcmd_orig); Modified: brlcad/trunk/src/libged/wdb_comb_std.c =================================================================== --- brlcad/trunk/src/libged/wdb_comb_std.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/libged/wdb_comb_std.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -658,7 +658,7 @@ comb->GIFTmater = wdbp->wdb_mat_default; bu_vls_printf(&tmp_vls, - "Creating region id=%d, air=%d, los=%d, GIFTmaterial=%d\n", + "Creating region id=%ld, air=%ld, los=%ld, GIFTmaterial=%ld\n", comb->region_id, comb->aircode, comb->los, comb->GIFTmater); Tcl_AppendResult(interp, bu_vls_addr(&tmp_vls), (char *)NULL); bu_vls_free(&tmp_vls); Modified: brlcad/trunk/src/libged/wdb_obj.c =================================================================== --- brlcad/trunk/src/libged/wdb_obj.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/libged/wdb_obj.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -7420,7 +7420,7 @@ comb = (struct rt_comb_internal *)intern.idb_ptr; bu_vls_init(&vls); - bu_vls_printf(&vls, "%d", comb->region_id); + bu_vls_printf(&vls, "%ld", comb->region_id); rt_db_free_internal(&intern); Tcl_AppendResult(wdbp->wdb_interp, bu_vls_addr(&vls), (char *)NULL); bu_vls_free(&vls); Modified: brlcad/trunk/src/libged/whatid.c =================================================================== --- brlcad/trunk/src/libged/whatid.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/libged/whatid.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -71,7 +71,7 @@ return GED_ERROR; comb = (struct rt_comb_internal *)intern.idb_ptr; - bu_vls_printf(gedp->ged_result_str, "%d", comb->region_id); + bu_vls_printf(gedp->ged_result_str, "%ld", comb->region_id); rt_db_free_internal(&intern); return GED_OK; Modified: brlcad/trunk/src/liboptical/sh_grass.c =================================================================== --- brlcad/trunk/src/liboptical/sh_grass.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/liboptical/sh_grass.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -920,7 +920,7 @@ CK_grass_SP(grass_sp); CELL_POS(cell_pos, grass_sp, cell); - bu_log("plotting cell %d, %d (%g, %g) %g %g\n", + bu_log("plotting cell %ld, %ld (%g, %g) %g %g\n", V2ARGS(cell), V2ARGS(cell_pos), V2ARGS(grass_sp->cell)); bu_semaphore_acquire(BU_SEM_SYSCALL); @@ -1101,7 +1101,7 @@ cell[Y] = cell_num[Y] + y; if (rdebug&RDEBUG_SHADE) - bu_log("checking relative cell %2d, %2d at(%d, %d)\n", + bu_log("checking relative cell %2d, %2d at(%ld, %ld)\n", x, y, V2ARGS(cell)); isect_cell(cell, r, swp, out_dist, grass_sp, curr_dist); @@ -1307,7 +1307,7 @@ if (rdebug&RDEBUG_SHADE) { bu_log("dist:%g (%g %g %g)\n", curr_dist, V3ARGS(curr_pt)); - bu_log("cell num: %d %d\n", V2ARGS(cell_num)); + bu_log("cell num: %ld %ld\n", V2ARGS(cell_num)); } CELL_POS(cell_pos, grass_sp, cell_num); Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_index.c =================================================================== --- brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -554,7 +554,7 @@ #define NMG_UNIQ_INDEX(_p, _type) \ if ((_p)->index > m->maxindex) { \ - bu_log("x%x (%s) has index %d, m->maxindex=%d\n", (_p), \ + bu_log("x%x (%s) has index %ld, m->maxindex=%ld\n", (_p), \ bu_identify_magic(*((uint32_t *)(_p))), (_p)->index, m->maxindex); \ bu_bomb("nmg_m_struct_count index overflow\n"); \ } \ Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c =================================================================== --- brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -487,7 +487,7 @@ fastf_t dist; NMG_GET_FU_PLANE(n, fu); dist = DIST_PT_PLANE(vg->coord, n); - bu_log("nmg_get_2d_vertex ERROR #%d (%g %g %g) becomes (%g, %g)\n\t%g != zero, dist3d=%g, %g*tol\n", + bu_log("nmg_get_2d_vertex ERROR #%ld (%g %g %g) becomes (%g, %g)\n\t%g != zero, dist3d=%g, %g*tol\n", v->index, V3ARGS(vg->coord), V3ARGS(pt), dist, dist/is->tol.dist); if (!NEAR_ZERO(dist, is->tol.dist) && @@ -500,7 +500,7 @@ } if (rt_g.NMG_debug & DEBUG_POLYSECT) { - bu_log("2d #%d (%g %g %g) becomes (%g, %g) %g\n", + bu_log("2d #%ld (%g %g %g) becomes (%g, %g) %g\n", v->index, V3ARGS(vg->coord), V3ARGS(pt)); } } Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c =================================================================== --- brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -1717,7 +1717,7 @@ } if (rt_g.NMG_debug & DEBUG_BASIC) { - bu_log("nmg_face_fix_radial_parity(fu=x%x) returns %d\n", fu, count); + bu_log("nmg_face_fix_radial_parity(fu=x%x) returns %ld\n", fu, count); } return count; Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c =================================================================== --- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -1840,7 +1840,7 @@ broken_tab_len = m->maxindex+1; } else { if (broken_tab_len < m->maxindex+1) { - bu_log("nmg_show_broken_classifier_stuff() maxindex increased! was %d, now %d\n", + bu_log("nmg_show_broken_classifier_stuff() maxindex increased! was %d, now %ld\n", broken_tab_len, m->maxindex+1); broken_tab = (long *)bu_realloc((char *)broken_tab, (m->maxindex+1) * sizeof(long), Modified: brlcad/trunk/src/librt/regionfix.c =================================================================== --- brlcad/trunk/src/librt/regionfix.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/regionfix.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -126,7 +126,7 @@ if (newid == 0) bu_log("%s, line %d Warning: new id = 0\n", file, linenum); } if (RT_G_DEBUG&DEBUG_INSTANCE) { - bu_log("%s instance %d: region id changed from %d to %d\n", + bu_log("%s instance %ld: region id changed from %d to %d\n", rp->reg_name, rp->reg_instnum, oldid, newid); } Modified: brlcad/trunk/src/librt/tree.c =================================================================== --- brlcad/trunk/src/librt/tree.c 2013-02-01 21:07:00 UTC (rev 54291) +++ brlcad/trunk/src/librt/tree.c 2013-02-01 22:06:49 UTC (rev 54292) @@ -243,7 +243,7 @@ } if (RT_G_DEBUG & DEBUG_REGIONS) { - bu_log("Add Region %s instnum %d\n", + bu_log("Add Region %s instnum %ld\n", rp->reg_name, rp->reg_instnum); } @@ -368,8 +368,8 @@ */ if (RT_G_DEBUG & DEBUG_SOLIDS) { bu_log(mat ? - "%s re-referenced %d\n" : - "%s re-referenced %d (identity mat)\n", + "%s re-referenced %ld\n" : + "%s re-referenced %ld (identity mat)\n", dp->d_namep, stp->st_uses); } @@ -570,7 +570,7 @@ if (RT_G_DEBUG&DEBUG_SOLIDS) { struct bu_vls str = BU_VLS_INIT_ZERO; - bu_log("\n---Primitive %d: %s\n", stp->st_bit, dp->d_namep); + bu_log("\n---Primitive %ld: %s\n", stp->st_bit, dp->d_namep); /* verbose=1, mm2local=1.0 */ ret = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_jan _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits