Revision: 41847
http://brlcad.svn.sourceforge.net/brlcad/?rev=41847&view=rev
Author: brlcad
Date: 2010-12-30 07:27:40 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
quell remainder of verbose compilation warnings on 10.4 including double const
decls, unused var, unnecessary %lf, and bad magic checking (would have been a
runtime failure)
Modified Paths:
--------------
brlcad/trunk/src/mged/adc.c
brlcad/trunk/src/mged/chgmodel.c
brlcad/trunk/src/mged/chgview.c
brlcad/trunk/src/mged/clone.c
brlcad/trunk/src/mged/cmd.h
brlcad/trunk/src/mged/edpipe.c
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/adc.c
===================================================================
--- brlcad/trunk/src/mged/adc.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/adc.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -36,7 +36,7 @@
#include "./mged_dm.h"
-static char adc_syntax[] = "\
+static char adc_syntax1[] = "\
adc toggle display of angle/distance cursor\n\
adc vars print a list of all variables (i.e. var = val)\n\
adc draw [0|1] set or get the draw parameter\n\
@@ -46,6 +46,9 @@
adc odst [#] set or get radius (distance) of tick (+-2047)\n\
adc hv [# #] set or get position (grid coordinates)\n\
adc xyz [# # #] set or get position (model coordinates)\n\
+";
+
+static char adc_syntax2[] = "\
adc x [#] set or get horizontal position (+-2047)\n\
adc y [#] set or get vertical position (+-2047)\n\
adc dh # add to horizontal position (grid coordinates)\n\
@@ -53,6 +56,9 @@
adc dx # add to X position (model coordinates)\n\
adc dy # add to Y position (model coordinates)\n\
adc dz # add to Z position (model coordinates)\n\
+";
+
+static char adc_syntax3[] = "\
adc anchor_pos [0|1] anchor ADC to current position in model
coordinates\n\
adc anchor_a1 [0|1] anchor angle1 to go through anchorpoint_a1\n\
adc anchor_a2 [0|1] anchor angle2 to go through anchorpoint_a2\n\
@@ -60,6 +66,9 @@
adc anchorpoint_a1 [# # #] set or get anchor point for angle1\n\
adc anchorpoint_a2 [# # #] set or get anchor point for angle2\n\
adc anchorpoint_dst [# # #] set or get anchor point for tick distance\n\
+";
+
+static char adc_syntax4[] = "\
adc -i any of the above appropriate commands will
interpret parameters as increments\n\
adc reset reset angles, location, and tick distance\n\
adc help prints this help message\n\
@@ -1050,12 +1059,12 @@
}
if (strcmp(parameter, "help") == 0) {
- Tcl_AppendResult(interp, "Usage:\n", adc_syntax, (char *)NULL);
+ Tcl_AppendResult(interp, "Usage:\n", adc_syntax1, adc_syntax2,
adc_syntax3, adc_syntax4, (char *)NULL);
return TCL_OK;
}
Tcl_AppendResult(interp, "ADC: unrecognized command: '",
- argv[1], "'\nUsage:\n", adc_syntax, (char *)NULL);
+ argv[1], "'\nUsage:\n", adc_syntax1, adc_syntax2,
adc_syntax3, adc_syntax4, (char *)NULL);
return TCL_ERROR;
}
Modified: brlcad/trunk/src/mged/chgmodel.c
===================================================================
--- brlcad/trunk/src/mged/chgmodel.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/chgmodel.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -83,11 +83,11 @@
char center[512];
char scale[128];
- sprintf(center, "%lf %lf %lf",
+ sprintf(center, "%f %f %f",
-view_state->vs_gvp->gv_center[MDX],
-view_state->vs_gvp->gv_center[MDY],
-view_state->vs_gvp->gv_center[MDZ]);
- sprintf(scale, "%lf", view_state->vs_gvp->gv_scale * 2.0);
+ sprintf(scale, "%f", view_state->vs_gvp->gv_scale * 2.0);
av[0] = argv[0];
av[1] = "-o";
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/chgview.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -172,9 +172,9 @@
if (gedp == GED_NULL)
return;
- snprintf(xbuf, 32, "%lf", center[X]);
- snprintf(ybuf, 32, "%lf", center[Y]);
- snprintf(zbuf, 32, "%lf", center[Z]);
+ snprintf(xbuf, 32, "%f", center[X]);
+ snprintf(ybuf, 32, "%f", center[Y]);
+ snprintf(zbuf, 32, "%f", center[Z]);
av[0] = "center";
av[1] = xbuf;
@@ -2696,7 +2696,7 @@
if (gedp == GED_NULL)
return TCL_OK;
- snprintf(buf, 32, "%lf", val);
+ snprintf(buf, 32, "%f", val);
av[0] = "zoom";
av[1] = buf;
@@ -3023,9 +3023,9 @@
if (gedp == GED_NULL)
return;
- snprintf(xbuf, 32, "%lf", a1);
- snprintf(ybuf, 32, "%lf", a2);
- snprintf(zbuf, 32, "%lf", a3);
+ snprintf(xbuf, 32, "%f", a1);
+ snprintf(ybuf, 32, "%f", a2);
+ snprintf(zbuf, 32, "%f", a3);
av[0] = "setview";
av[1] = xbuf;
@@ -3069,9 +3069,9 @@
/* this is for the ModelDelta calculation below */
MAT_DELTAS_GET_NEG(old_model_center, view_state->vs_gvp->gv_center);
- snprintf(xbuf, 32, "%lf", view_pos[X]);
- snprintf(ybuf, 32, "%lf", view_pos[Y]);
- snprintf(zbuf, 32, "%lf", view_pos[Z]);
+ snprintf(xbuf, 32, "%f", view_pos[X]);
+ snprintf(ybuf, 32, "%f", view_pos[Y]);
+ snprintf(zbuf, 32, "%f", view_pos[Z]);
av[0] = "slew";
av[1] = xbuf;
Modified: brlcad/trunk/src/mged/clone.c
===================================================================
--- brlcad/trunk/src/mged/clone.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/clone.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -1037,7 +1037,7 @@
/* Write out interpolation info ******************/
fprintf(stdout, "%ld Iterations; Final link lengths:\n", i);
for (i = 0; i < n_links; i++)
- fprintf(stdout, " %s\t%.15lf\n", bu_vls_addr(&links[i].name),
links[i].len);
+ fprintf(stdout, " %s\t%.15f\n", bu_vls_addr(&links[i].name),
links[i].len);
fflush(stdin);
/* Place links on vertices ***********************/
fprintf(stdout, "Continue? [y/n] ");
Modified: brlcad/trunk/src/mged/cmd.h
===================================================================
--- brlcad/trunk/src/mged/cmd.h 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/cmd.h 2010-12-30 07:27:40 UTC (rev 41847)
@@ -109,11 +109,11 @@
BU_EXTERN(int f_amtrack, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_arbdef, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_area, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_attach, (ClientData, Tcl_Interp *, int, const const char *[]));
+BU_EXTERN(int f_attach, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_bev, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_bo, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_bomb, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_closedb, (ClientData, Tcl_Interp *, int, const const char
*[]));
+BU_EXTERN(int f_closedb, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_comm, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_copy_inv, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_delay, (ClientData, Tcl_Interp *, int, const char *[]));
@@ -157,19 +157,19 @@
BU_EXTERN(int f_nirt, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_oedit_apply, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_oedit_reset, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_opendb, (ClientData, Tcl_Interp *, int, const const char *[]));
+BU_EXTERN(int f_opendb, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_param, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_permute, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_pl, (ClientData, Tcl_Interp *, int, const const char *[]));
+BU_EXTERN(int f_pl, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_plot, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_polybinout, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_prefix, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_press, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_ps, (ClientData, Tcl_Interp *, int, const const char *[]));
+BU_EXTERN(int f_ps, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_put_sedit, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_qorot, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_qray, (ClientData, Tcl_Interp *, int, const char *[]));
-BU_EXTERN(int f_quit, (ClientData, Tcl_Interp *, int, const const char *[]));
+BU_EXTERN(int f_quit, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_rcodes, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_read_muves, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_red, (ClientData, Tcl_Interp *, int, const char *[]));
Modified: brlcad/trunk/src/mged/edpipe.c
===================================================================
--- brlcad/trunk/src/mged/edpipe.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/edpipe.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -369,7 +369,7 @@
struct wdb_pipept *first;
struct wdb_pipept *new;
- RT_PIPE_CK_MAGIC(pipe);
+ RT_PIPE_CK_MAGIC(pipeip);
if (pp)
BU_CKMAG(pp, WDB_PIPESEG_MAGIC, "pipe point");
@@ -465,7 +465,7 @@
{
point_t old_pt;
- RT_PIPE_CK_MAGIC(pipe);
+ RT_PIPE_CK_MAGIC(pipeip);
BU_CKMAG(ps, WDB_PIPESEG_MAGIC, "pipe segment");
VMOVE(old_pt, ps->pp_coord);
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2010-12-30 07:10:03 UTC (rev 41846)
+++ brlcad/trunk/src/mged/mged.c 2010-12-30 07:27:40 UTC (rev 41847)
@@ -2511,7 +2511,7 @@
mged_finish(int exitcode)
{
char place[64];
- struct dm_list *p, *dml;
+ struct dm_list *p;
struct cmd_list *c;
(void)sprintf(place, "exit_status=%d", exitcode);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
