Revision: 50629
http://brlcad.svn.sourceforge.net/brlcad/?rev=50629&view=rev
Author: bob1961
Date: 2012-05-22 15:36:42 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Change bu_vls_printf format strings use of %llu to %zu. This fixes a recent
breakage on Windows.
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-05-22 05:06:16 UTC (rev
50628)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-05-22 15:36:42 UTC (rev
50629)
@@ -3264,7 +3264,7 @@
point_t pt;
if (sscanf(point_av[k], "%lf %lf %lf", &pt[X], &pt[Y], &pt[Z]) !=
3) {
- bu_vls_printf(gedp->ged_result_str, "contour %llu, point %llu:
bad data point - %s\n",
+ bu_vls_printf(gedp->ged_result_str, "contour %zu, point %zu:
bad data point - %s\n",
j, k, point_av[k]);
Tcl_Free((char *)point_av);
return GED_ERROR;
@@ -3364,7 +3364,7 @@
if (BU_STR_EQUAL(argv[2], "target_poly")) {
if (argc == 3) {
- bu_vls_printf(gedp->ged_result_str, "%llu",
gdpsp->gdps_target_polygon_i);
+ bu_vls_printf(gedp->ged_result_str, "%zu",
gdpsp->gdps_target_polygon_i);
return GED_OK;
}
@@ -4606,7 +4606,7 @@
}
if (found_top) {
- bu_vls_printf(gedp->ged_result_str, "%s {%llu %llu %llu} {%lf %lf %lf}",
+ bu_vls_printf(gedp->ged_result_str, "%s {%zu %zu %zu} {%lf %lf %lf}",
top_data_str, top_i, top_j, top_k, V3ARGS(top_point));
return GED_OK;
}
@@ -4674,7 +4674,7 @@
}
if (found_top) {
- bu_vls_printf(gedp->ged_result_str, "%s %llu {{%s} {%lf %lf %lf}}",
+ bu_vls_printf(gedp->ged_result_str, "%s %zu {{%s} {%lf %lf %lf}}",
top_data_str, top_i, top_data_label, V3ARGS(top_point));
return GED_OK;
}
@@ -7009,7 +7009,7 @@
}
bu_vls_printf(&plist, " }");
- bu_vls_printf(&i_vls, "%llu", gdpsp->gdps_curr_polygon_i);
+ bu_vls_printf(&i_vls, "%zu", gdpsp->gdps_curr_polygon_i);
gedp->ged_gvp = gdvp->gdv_view;
ac = 5;
@@ -7102,8 +7102,8 @@
struct bu_vls k_vls = BU_VLS_INIT_ZERO;
struct bu_vls plist = BU_VLS_INIT_ZERO;
- bu_vls_printf(&i_vls, "%llu", gdpsp->gdps_curr_polygon_i);
- bu_vls_printf(&k_vls, "%llu", gdpsp->gdps_curr_point_i);
+ bu_vls_printf(&i_vls, "%zu", gdpsp->gdps_curr_polygon_i);
+ bu_vls_printf(&k_vls, "%zu", gdpsp->gdps_curr_point_i);
bu_vls_printf(&plist, "%lf %lf %lf", V3ARGS(m_pt));
ac = 7;
@@ -7240,7 +7240,7 @@
}
bu_vls_printf(&plist, " }");
- bu_vls_printf(&i_vls, "%llu", gdpsp->gdps_curr_polygon_i);
+ bu_vls_printf(&i_vls, "%zu", gdpsp->gdps_curr_polygon_i);
gedp->ged_gvp = gdvp->gdv_view;
ac = 5;
@@ -7360,7 +7360,7 @@
MAT4X3PNT(m_pt, gdvp->gdv_view->gv_view2model, v_pt);
bu_vls_printf(&plist, "{%lf %lf %lf} }", V3ARGS(m_pt));
- bu_vls_printf(&i_vls, "%llu", gdpsp->gdps_curr_polygon_i);
+ bu_vls_printf(&i_vls, "%zu", gdpsp->gdps_curr_polygon_i);
gedp->ged_gvp = gdvp->gdv_view;
ac = 5;
@@ -9106,8 +9106,8 @@
struct bu_vls k_vls = BU_VLS_INIT_ZERO;
struct bu_vls plist = BU_VLS_INIT_ZERO;
- bu_vls_printf(&i_vls, "%llu", gdpsp->gdps_curr_polygon_i);
- bu_vls_printf(&k_vls, "%llu", gdpsp->gdps_curr_point_i);
+ bu_vls_printf(&i_vls, "%zu", gdpsp->gdps_curr_polygon_i);
+ bu_vls_printf(&k_vls, "%zu", gdpsp->gdps_curr_point_i);
bu_vls_printf(&plist, "%lf %lf %lf", V3ARGS(m_pt));
ac = 7;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
