[brlcad-commits] SF.net SVN: brlcad:[43235] brlcad/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[43235] brlcad/trunk
|
From: <br...@us...> - 2011-02-11 20:09:23
|
Revision: 43235
http://brlcad.svn.sourceforge.net/brlcad/?rev=43235&view=rev
Author: brlcad
Date: 2011-02-11 20:09:14 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
minimize differences, merge r43219 from cmake branch. provides lots of quellage goodness that was caught by the llvm compiler, but that should've been applied to trunk instead of branch.
Modified Paths:
--------------
brlcad/trunk/src/burst/prnt.c
brlcad/trunk/src/conv/dem-g.c
brlcad/trunk/src/conv/tankill/tankill-g.c
brlcad/trunk/src/libbn/tcl.c
brlcad/trunk/src/libbu/cmdhist_obj.c
brlcad/trunk/src/libbu/list.c
brlcad/trunk/src/libbu/tcl.c
brlcad/trunk/src/libfb/fbserv_obj.c
brlcad/trunk/src/libged/tables.c
brlcad/trunk/src/liboptical/shade.c
brlcad/trunk/src/libpc/pcMathLF.h
brlcad/trunk/src/libpkg/pkg.c
brlcad/trunk/src/librt/bool.c
brlcad/trunk/src/librt/constraint.c
brlcad/trunk/src/librt/opennurbs_ext.h
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/arbn/arbn.c
brlcad/trunk/src/librt/primitives/ars/ars.c
brlcad/trunk/src/librt/primitives/cline/cline.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hf/hf.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/metaball/metaball.c
brlcad/trunk/src/librt/primitives/nmg/nmg.c
brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c
brlcad/trunk/src/librt/primitives/nmg/nmg_tri_mc.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/pipe/pipe.c
brlcad/trunk/src/librt/primitives/poly/poly.c
brlcad/trunk/src/librt/primitives/rec/rec.c
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/sketch/sketch.c
brlcad/trunk/src/librt/primitives/sph/sph.c
brlcad/trunk/src/librt/primitives/submodel/submodel.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/vol/vol.c
brlcad/trunk/src/libsysv/tcl.c
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/src/adrt/load.c
brlcad/trunk/src/adrt/load.h
brlcad/trunk/src/adrt/master/tienet_master.c
brlcad/trunk/src/adrt/master/tienet_master.h
brlcad/trunk/src/adrt/slave/tienet_slave.c
brlcad/trunk/src/adrt/slave/tienet_slave.h
brlcad/trunk/src/libbn/randmt.c
brlcad/trunk/src/libpc/pcVCSet.cpp
brlcad/trunk/src/libpc/pcVCSet.h
brlcad/trunk/src/util/pc_test.c
Property changes on: brlcad/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /brlcad/branches/cmake:43219
Property changes on: brlcad/trunk/src/adrt/load.c
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/adrt/load.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/adrt/master/tienet_master.c
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/adrt/master/tienet_master.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/adrt/slave/tienet_slave.c
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/adrt/slave/tienet_slave.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: brlcad/trunk/src/burst/prnt.c
===================================================================
--- brlcad/trunk/src/burst/prnt.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/burst/prnt.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -102,14 +102,12 @@
Thickness returned in "a_rbeam".
*/
static int
-f_Normal(struct application *ap, struct partition *pt_headp, struct seg *segp)
+f_Normal(struct application *ap, struct partition *pt_headp, struct seg *UNUSED(segp))
{
struct partition *pp = pt_headp->pt_forw;
struct partition *cp;
struct hit *ohitp;
- segp = segp; /* quell */
-
for (cp = pp->pt_forw;
cp != pt_headp && SameCmp(pp->pt_regionp, cp->pt_regionp);
cp = cp->pt_forw
Modified: brlcad/trunk/src/conv/dem-g.c
===================================================================
--- brlcad/trunk/src/conv/dem-g.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/conv/dem-g.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -861,7 +861,7 @@
*/
int process_manual_dem_max_raw_elevation(
double *out_raw_dem_2_raw_dsp_scale_factor_ptr,
- double *in_raw_dem_2_raw_dsp_auto_scale_factor_ptr,
+ double *UNUSED(in_raw_dem_2_raw_dsp_auto_scale_factor_ptr),
long int *in_manual_dem_max_raw_elevation_ptr,
double *in_derived_dem_max_raw_elevation_ptr,
double *in_z_spatial_resolution_ptr,
@@ -871,9 +871,6 @@
long int manual_dem_max_raw_elevation_lowerlimit = 1;
long int manual_dem_max_raw_elevation_upperlimit = 999999;
- /* unused variable quelling */
- in_raw_dem_2_raw_dsp_auto_scale_factor_ptr = in_raw_dem_2_raw_dsp_auto_scale_factor_ptr;
-
/* compute raw_dem_2_raw_dsp_scale_factor based on the user entered */
/* dem max raw elevation */
/* test for zero to avoid divide by 0 math error */
@@ -957,9 +954,9 @@
*/
int process_manual_dem_max_real_elevation(
double *out_raw_dem_2_raw_dsp_scale_factor_ptr,
- double *in_raw_dem_2_raw_dsp_auto_scale_factor_ptr,
+ double *UNUSED(in_raw_dem_2_raw_dsp_auto_scale_factor_ptr),
double *in_manual_dem_max_real_elevation_ptr,
- double *in_derived_dem_max_raw_elevation_ptr,
+ double *UNUSED(in_derived_dem_max_raw_elevation_ptr),
double *in_z_spatial_resolution_ptr,
double *in_datum_elevation_in_curr_b_record_ptr)
{
@@ -969,10 +966,6 @@
double adjusted_manual_dem_max_real_elevation = 0; /* value adjusted to multiple of z_spatial */
/* resolution then add datum elevation */
- /* unused variable quelling */
- in_raw_dem_2_raw_dsp_auto_scale_factor_ptr = in_raw_dem_2_raw_dsp_auto_scale_factor_ptr;
- in_derived_dem_max_raw_elevation_ptr = in_derived_dem_max_raw_elevation_ptr;
-
/* makes sure *in_manual_dem_max_real_elevation_ptr >= *in_datum_elevation_in_curr_b_record_ptr */
manual_dem_max_real_elevation_lowerlimit = *in_z_spatial_resolution_ptr + *in_datum_elevation_in_curr_b_record_ptr;
manual_dem_max_real_elevation_upperlimit = (999999 * *in_z_spatial_resolution_ptr) + *in_datum_elevation_in_curr_b_record_ptr;
Modified: brlcad/trunk/src/conv/tankill/tankill-g.c
===================================================================
--- brlcad/trunk/src/conv/tankill/tankill-g.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/conv/tankill/tankill-g.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -215,7 +215,7 @@
output_file = bu_optarg;
break;
default:
- usage(argv[0]);
+ usage();
bu_exit( EXIT_FAILURE, NULL );
break;
}
Property changes on: brlcad/trunk/src/libbn/randmt.c
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: brlcad/trunk/src/libbn/tcl.c
===================================================================
--- brlcad/trunk/src/libbn/tcl.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libbn/tcl.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -674,7 +674,7 @@
int
-bn_cmd_noise_perlin(ClientData clientData,
+bn_cmd_noise_perlin(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
char **argv)
@@ -682,8 +682,6 @@
point_t pt;
double v;
- clientData = clientData; /* quell warning */
-
if (argc != 4) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " X Y Z \"",
@@ -707,7 +705,7 @@
*
*/
int
-bn_cmd_noise(ClientData clientData,
+bn_cmd_noise(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
char **argv)
@@ -718,8 +716,6 @@
double octaves;
double val;
- clientData = clientData; /* quell warning */
-
if (argc != 7) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " X Y Z h_val lacunarity octaves\"",
@@ -760,7 +756,7 @@
* avoiding the overhead of doing this in Tcl.
*/
int
-bn_cmd_noise_slice(ClientData clientData,
+bn_cmd_noise_slice(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
char **argv)
@@ -781,8 +777,6 @@
double val;
point_t pt;
- clientData = clientData; /* quell warning */
-
if (argc != 7) {
Tcl_AppendResult(interp, "wrong # args: should be \"",
argv[0], " Xdim Ydim Zval h_val lacunarity octaves\"",
@@ -854,7 +848,7 @@
int
-bn_cmd_random(ClientData clientData,
+bn_cmd_random(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
char **argv)
@@ -864,8 +858,6 @@
double rnd;
char buf[32];
- clientData = clientData; /* quell warning */
-
if (argc != 2) {
Tcl_AppendResult(interp, "Wrong # args: Should be \"",
argv[0], " varname\"", NULL);
Modified: brlcad/trunk/src/libbu/cmdhist_obj.c
===================================================================
--- brlcad/trunk/src/libbu/cmdhist_obj.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libbu/cmdhist_obj.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -88,13 +88,10 @@
HIDDEN struct bu_cmdhist_obj *
-cho_open(ClientData clientData, Tcl_Interp *interp, char *name)
+cho_open(ClientData UNUSED(clientData), Tcl_Interp *interp, char *name)
{
struct bu_cmdhist_obj *chop;
- /* quell compilation warning */
- clientData = clientData;
-
/* check to see if command history object exists */
for (BU_LIST_FOR(chop, bu_cmdhist_obj, &HeadCmdHistObj.l)) {
if (BU_STR_EQUAL(name, bu_vls_addr(&chop->cho_name))) {
Modified: brlcad/trunk/src/libbu/list.c
===================================================================
--- brlcad/trunk/src/libbu/list.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libbu/list.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -219,11 +219,10 @@
/* XXX - apparently needed by muves */
struct bu_list *
-bu_list_dequeue_next(struct bu_list *hp, struct bu_list *p)
+bu_list_dequeue_next(struct bu_list *UNUSED(hp), struct bu_list *p)
{
struct bu_list *p2;
- hp = hp;
p2 = BU_LIST_NEXT(bu_list, p);
BU_LIST_DEQUEUE(p2);
Modified: brlcad/trunk/src/libbu/tcl.c
===================================================================
--- brlcad/trunk/src/libbu/tcl.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libbu/tcl.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -159,16 +159,13 @@
int
-bu_tcl_mem_barriercheck(ClientData clientData,
+bu_tcl_mem_barriercheck(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
int ret;
- /* quell usage warning */
- clientData = clientData;
-
if (argc > 1) {
Tcl_AppendResult(interp, "Usage: ", argv[0], "\n", (char *)NULL);
return TCL_ERROR;
@@ -184,16 +181,13 @@
int
-bu_tcl_ck_malloc_ptr(ClientData clientData,
+bu_tcl_ck_malloc_ptr(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
void *voidp;
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 3) {
Tcl_AppendResult(interp, "Usage: bu_ck_malloc_ptr ascii-ptr description\n");
return TCL_ERROR;
@@ -210,16 +204,13 @@
int
-bu_tcl_malloc_len_roundup(ClientData clientData,
+bu_tcl_malloc_len_roundup(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
int val;
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 2) {
Tcl_AppendResult(interp, "Usage: bu_malloc_len_roundup nbytes\n", NULL);
return TCL_ERROR;
@@ -231,14 +222,11 @@
int
-bu_tcl_prmem(ClientData clientData,
+bu_tcl_prmem(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 2) {
Tcl_AppendResult(interp, "Usage: bu_prmem title\n");
return TCL_ERROR;
@@ -250,16 +238,13 @@
int
-bu_tcl_printb(ClientData clientData,
+bu_tcl_printb(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
struct bu_vls str;
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 4) {
Tcl_AppendResult(interp, "Usage: bu_printb title integer-to-format bit-format-string\n", NULL);
return TCL_ERROR;
@@ -273,7 +258,7 @@
int
-bu_tcl_get_value_by_keyword(ClientData clientData,
+bu_tcl_get_value_by_keyword(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -284,9 +269,6 @@
const char **listv = (const char **)NULL;
const char **tofree = (const char **)NULL;
- /* quell usage warning */
- clientData = clientData;
-
if (argc < 3) {
char buf[TINYBUFSIZ];
snprintf(buf, TINYBUFSIZ, "%d", argc);
@@ -351,7 +333,7 @@
int
-bu_tcl_get_all_keyword_values(ClientData clientData,
+bu_tcl_get_all_keyword_values(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -362,9 +344,6 @@
const char **tofree = (const char **)NULL;
int i;
- /* quell usage warning */
- clientData = clientData;
-
if (argc < 2) {
char buf[TINYBUFSIZ];
snprintf(buf, TINYBUFSIZ, "%d", argc);
@@ -435,7 +414,7 @@
int
-bu_tcl_rgb_to_hsv(ClientData clientData,
+bu_tcl_rgb_to_hsv(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -445,9 +424,6 @@
fastf_t hsv[3];
struct bu_vls result;
- /* quell usage warning */
- clientData = clientData;
-
bu_vls_init(&result);
if (argc != 4) {
Tcl_AppendResult(interp, "Usage: bu_rgb_to_hsv R G B\n",
@@ -480,7 +456,7 @@
int
-bu_tcl_hsv_to_rgb(ClientData clientData,
+bu_tcl_hsv_to_rgb(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -489,9 +465,6 @@
unsigned char rgb[3];
struct bu_vls result;
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 4) {
Tcl_AppendResult(interp, "Usage: bu_hsv_to_rgb H S V\n",
(char *)NULL);
@@ -518,7 +491,7 @@
int
-bu_tcl_key_eq_to_key_val(ClientData clientData,
+bu_tcl_key_eq_to_key_val(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -527,9 +500,6 @@
char *next;
int i=0;
- /* quell usage warning */
- clientData = clientData;
-
bu_vls_init(&vls);
while (++i < argc) {
@@ -553,16 +523,13 @@
int
-bu_tcl_shader_to_key_val(ClientData clientData,
+bu_tcl_shader_to_key_val(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
struct bu_vls vls;
- /* quell usage warning */
- clientData = clientData;
-
if (argc < 2) {
Tcl_AppendResult(interp, "Usage: ", argv[0], " shader [key1=value ...]\n", (char *)NULL);
return TCL_ERROR;
@@ -585,16 +552,13 @@
int
-bu_tcl_key_val_to_key_eq(ClientData clientData,
+bu_tcl_key_val_to_key_eq(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
int i=0;
- /* quell usage warning */
- clientData = clientData;
-
for (i=1; i<argc; i += 2) {
if (i+1 < argc-1)
Tcl_AppendResult(interp, argv[i], "=", argv[i+1], " ", NULL);
@@ -608,16 +572,13 @@
int
-bu_tcl_shader_to_key_eq(ClientData clientData,
+bu_tcl_shader_to_key_eq(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
struct bu_vls vls;
- /* quell usage warning */
- clientData = clientData;
-
if (argc < 2) {
Tcl_AppendResult(interp, "Usage: ", argv[0], " shader { tcl list }\n", (char *)NULL);
return TCL_ERROR;
@@ -639,14 +600,11 @@
int
-bu_tcl_brlcad_root(ClientData clientData,
+bu_tcl_brlcad_root(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 2) {
Tcl_AppendResult(interp, "Usage: bu_brlcad_root subdir\n",
(char *)NULL);
@@ -658,14 +616,11 @@
int
-bu_tcl_brlcad_data(ClientData clientData,
+bu_tcl_brlcad_data(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
{
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 2) {
Tcl_AppendResult(interp, "Usage: bu_brlcad_data subdir\n",
(char *)NULL);
@@ -677,7 +632,7 @@
int
-bu_tcl_units_conversion(ClientData clientData,
+bu_tcl_units_conversion(ClientData UNUSED(clientData),
Tcl_Interp *interp,
int argc,
const char **argv)
@@ -685,9 +640,6 @@
double conv_factor;
struct bu_vls result;
- /* quell usage warning */
- clientData = clientData;
-
if (argc != 2) {
Tcl_AppendResult(interp, "Usage: bu_units_conversion units_string\n",
(char *)NULL);
Modified: brlcad/trunk/src/libfb/fbserv_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fbserv_obj.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libfb/fbserv_obj.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -174,6 +174,7 @@
/*
* N E W _ C L I E N T
*/
+#if defined(_WIN32) && !defined(__CYGWIN__)
HIDDEN void
new_client(struct fbserv_obj *fbsp, struct pkg_conn *pcp, Tcl_Channel chan)
{
@@ -193,26 +194,48 @@
fbsp->fbs_clients[i].fbsc_fbsp = fbsp;
setup_socket(pcp->pkc_fd);
-#if defined(_WIN32) && !defined(__CYGWIN__)
fbsp->fbs_clients[i].fbsc_chan = chan;
fbsp->fbs_clients[i].fbsc_handler = existing_client_handler;
Tcl_CreateChannelHandler(fbsp->fbs_clients[i].fbsc_chan, TCL_READABLE,
fbsp->fbs_clients[i].fbsc_handler,
(ClientData)&fbsp->fbs_clients[i]);
+ return;
+ }
+
+ bu_log("new_client: too many clients\n");
+ pkg_close(pcp);
+}
+
#else /* if defined(_WIN32) && !defined(__CYGWIN__) */
- chan = chan; /* quellage */
+HIDDEN void
+new_client(struct fbserv_obj *fbsp, struct pkg_conn *pcp, Tcl_Channel UNUSED(chan))
+{
+ int i;
+
+ if (pcp == PKC_ERROR)
+ return;
+
+ for (i = MAX_CLIENTS-1; i >= 0; i--) {
+ /* this slot is being used */
+ if (fbsp->fbs_clients[i].fbsc_fd != 0)
+ continue;
+
+ /* Found an available slot */
+ fbsp->fbs_clients[i].fbsc_fd = pcp->pkc_fd;
+ fbsp->fbs_clients[i].fbsc_pkg = pcp;
+ fbsp->fbs_clients[i].fbsc_fbsp = fbsp;
+ setup_socket(pcp->pkc_fd);
+
Tcl_CreateFileHandler(fbsp->fbs_clients[i].fbsc_fd, TCL_READABLE,
existing_client_handler, (ClientData)&fbsp->fbs_clients[i]);
-#endif /* if defined(_WIN32) && !defined(__CYGWIN__) */
-
return;
}
bu_log("new_client: too many clients\n");
pkg_close(pcp);
}
+#endif /* if defined(_WIN32) && !defined(__CYGWIN__) */
-
#if defined(_WIN32) && !defined(__CYGWIN__)
HIDDEN struct pkg_conn *
fbs_makeconn(int fd, const struct pkg_switch *switchp)
@@ -785,6 +808,7 @@
/*
* Accept any new client connections.
*/
+#if defined(_WIN32) && !defined(__CYGWIN__)
HIDDEN void
new_client_handler(ClientData clientData,
Tcl_Channel chan,
@@ -829,16 +853,58 @@
{ 0, NULL, NULL, NULL }
};
-#if defined(_WIN32) && !defined(__CYGWIN__)
if (Tcl_GetChannelHandle(chan, TCL_READABLE, (ClientData *)&fd) == TCL_OK)
new_client(fbsp, fbs_makeconn(fd, pswitch), chan);
+}
#else /* if defined(_WIN32) && !defined(__CYGWIN__) */
- chan = chan; /* quellage */
+HIDDEN void
+new_client_handler(ClientData clientData,
+ Tcl_Channel UNUSED(chan),
+ char *UNUSED(host),
+ int UNUSED(port))
+{
+ struct fbserv_listener *fbslp = (struct fbserv_listener *)clientData;
+ struct fbserv_obj *fbsp = fbslp->fbsl_fbsp;
+ int fd = fbslp->fbsl_fd;
+
+ static struct pkg_switch pswitch[] = {
+ { MSG_FBOPEN, fbs_rfbopen, "Open Framebuffer", NULL },
+ { MSG_FBCLOSE, fbs_rfbclose, "Close Framebuffer", NULL },
+ { MSG_FBCLEAR, fbs_rfbclear, "Clear Framebuffer", NULL },
+ { MSG_FBREAD, fbs_rfbread, "Read Pixels", NULL },
+ { MSG_FBWRITE, fbs_rfbwrite, "Write Pixels", NULL },
+ { MSG_FBWRITE + MSG_NORETURN, fbs_rfbwrite, "Asynch write", NULL },
+ { MSG_FBCURSOR, fbs_rfbcursor, "Cursor", NULL },
+ { MSG_FBGETCURSOR, fbs_rfbgetcursor, "Get Cursor", NULL }, /*NEW*/
+ { MSG_FBSCURSOR, fbs_rfbscursor, "Screen Cursor", NULL }, /*OLD*/
+ { MSG_FBWINDOW, fbs_rfbwindow, "Window", NULL }, /*OLD*/
+ { MSG_FBZOOM, fbs_rfbzoom, "Zoom", NULL }, /*OLD*/
+ { MSG_FBVIEW, fbs_rfbview, "View", NULL }, /*NEW*/
+ { MSG_FBGETVIEW, fbs_rfbgetview, "Get View", NULL }, /*NEW*/
+ { MSG_FBRMAP, fbs_rfbrmap, "R Map", NULL },
+ { MSG_FBWMAP, fbs_rfbwmap, "W Map", NULL },
+ { MSG_FBHELP, fbs_rfbhelp, "Help Request", NULL },
+ { MSG_ERROR, fbs_rfbunknown, "Error Message", NULL },
+ { MSG_CLOSE, fbs_rfbunknown, "Close Connection", NULL },
+ { MSG_FBREADRECT, fbs_rfbreadrect, "Read Rectangle", NULL },
+ { MSG_FBWRITERECT, fbs_rfbwriterect, "Write Rectangle", NULL },
+ { MSG_FBWRITERECT + MSG_NORETURN, fbs_rfbwriterect, "Write Rectangle", NULL },
+ { MSG_FBBWREADRECT, fbs_rfbbwreadrect, "Read BW Rectangle", NULL },
+ { MSG_FBBWWRITERECT, fbs_rfbbwwriterect, "Write BW Rectangle", NULL },
+ { MSG_FBBWWRITERECT+MSG_NORETURN, fbs_rfbbwwriterect, "Write BW Rectangle", NULL },
+ { MSG_FBFLUSH, fbs_rfbflush, "Flush Output", NULL },
+ { MSG_FBFLUSH + MSG_NORETURN, fbs_rfbflush, "Flush Output", NULL },
+ { MSG_FBFREE, fbs_rfbfree, "Free Resources", NULL },
+ { MSG_FBPOLL, fbs_rfbpoll, "Handle Events", NULL },
+ { MSG_FBSETCURSOR, fbs_rfbsetcursor, "Set Cursor Shape", NULL },
+ { MSG_FBSETCURSOR + MSG_NORETURN, fbs_rfbsetcursor, "Set Cursor Shape", NULL },
+ { 0, NULL, NULL, NULL }
+ };
+
new_client(fbsp, pkg_getclient(fd, pswitch, comm_error, 0), 0);
+}
#endif /* if defined(_WIN32) && !defined(__CYGWIN__) */
-}
-
int
fbs_open(struct fbserv_obj *fbsp, int port)
{
Modified: brlcad/trunk/src/libged/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libged/tables.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -54,8 +54,6 @@
#define REG_TABLE 2
#define ID_TABLE 3
-static struct identt identt = {0, {0}, MAT_INIT_ZERO};
-
static int idfd = 0;
static int rd_idfd = 0;
static FILE *tabptr = NULL;
@@ -78,6 +76,7 @@
{
int i;
struct identt idbuf1, idbuf2;
+ static struct identt identt = {0, {0}, MAT_INIT_ZERO};
int readval;
memset(&idbuf1, 0, sizeof(struct identt));
Modified: brlcad/trunk/src/liboptical/shade.c
===================================================================
--- brlcad/trunk/src/liboptical/shade.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/liboptical/shade.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -61,7 +61,7 @@
bu_log("Shadework%s: 0x%x\n", str ? str : "", swp);
bu_printb(" sw_inputs", swp->sw_inputs, MFI_FORMAT);
- if (swp->sw_inputs && MFI_HIT)
+ if (swp->sw_inputs & MFI_HIT)
bu_log(" sw_hit.dist:%g @ sw_hit.point(%g %g %g)\n",
swp->sw_hit.hit_dist,
V3ARGS(swp->sw_hit.hit_point));
Modified: brlcad/trunk/src/libpc/pcMathLF.h
===================================================================
--- brlcad/trunk/src/libpc/pcMathLF.h 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libpc/pcMathLF.h 2011-02-11 20:09:14 UTC (rev 43235)
@@ -135,7 +135,7 @@
template <typename T>
void operator()(boost::shared_ptr<T> *shptr, T *ptr = 0) const
{
- shptr.reset(ptr);
+ shptr->reset(ptr);
}
};
phoenix::function<reset_impl> const reset = reset_impl();
Property changes on: brlcad/trunk/src/libpc/pcVCSet.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: brlcad/trunk/src/libpc/pcVCSet.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: brlcad/trunk/src/libpkg/pkg.c
===================================================================
--- brlcad/trunk/src/libpkg/pkg.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libpkg/pkg.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -332,7 +332,7 @@
struct pkg_conn *
-pkg_open(const char *host, const char *service, const char *protocol, const char *uname, const char *passwd, const struct pkg_switch *switchp, void (*errlog) (char *msg))
+pkg_open(const char *host, const char *service, const char *protocol, const char *uname, const char *UNUSED(passwd), const struct pkg_switch *switchp, void (*errlog) (char *msg))
{
#ifdef HAVE_WINSOCK_H
LPHOSTENT lpHostEntry;
@@ -352,9 +352,6 @@
size_t addrlen; /* length of address */
#endif
- /* presently unused */
- passwd = passwd;
-
_pkg_ck_debug();
if (_pkg_debug) {
_pkg_timestamp();
Modified: brlcad/trunk/src/librt/bool.c
===================================================================
--- brlcad/trunk/src/librt/bool.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/bool.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1208,12 +1208,11 @@
* just set ap->a_logoverlap = rt_silent_logoverlap.
*/
void
-rt_silent_logoverlap(struct application *ap, const struct partition *pp, const struct bu_ptbl *regiontable, const struct partition *InputHdp)
+rt_silent_logoverlap(struct application *ap, const struct partition *pp, const struct bu_ptbl *regiontable, const struct partition *UNUSED(InputHdp))
{
RT_CK_AP(ap);
RT_CK_PT(pp);
BU_CK_PTBL(regiontable);
- InputHdp = InputHdp; /* quell */
return;
}
@@ -1227,7 +1226,7 @@
* replaced by an application setting a_logoverlap().
*/
void
-rt_default_logoverlap(struct application *ap, const struct partition *pp, const struct bu_ptbl *regiontable, const struct partition *InputHdp)
+rt_default_logoverlap(struct application *ap, const struct partition *pp, const struct bu_ptbl *regiontable, const struct partition *UNUSED(InputHdp))
{
point_t pt;
static long count = 0; /* Not PARALLEL, shouldn't hurt */
@@ -1238,7 +1237,6 @@
RT_CK_AP(ap);
RT_CK_PT(pp);
BU_CK_PTBL(regiontable);
- InputHdp = InputHdp; /* quell */
/* Attempt to control tremendous error outputs */
if (++count > 100) {
Modified: brlcad/trunk/src/librt/constraint.c
===================================================================
--- brlcad/trunk/src/librt/constraint.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/constraint.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -82,7 +82,7 @@
rt_constraint_export5(
struct bu_external *ep,
const struct rt_db_internal *ip,
- double local2mm,
+ double UNUSED(local2mm),
const struct db_i *dbip,
struct resource *resp)
{
@@ -99,8 +99,6 @@
/*RT_CONSTRAINT_CK_MAGIC(cip);*/
constraint = *cip;
- local2mm = local2mm; /* quell */
-
BU_INIT_EXTERNAL(ep);
bu_vls_init(&str);
@@ -120,11 +118,10 @@
*
*/
int
-rt_constraint_import5(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct resource *resp)
+rt_constraint_import5(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t UNUSED(mat), const struct db_i *dbip, struct resource *resp)
{
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- mat = mat;
RT_CK_DBI(dbip);
if (resp) RT_CK_RESOURCE(resp);
Modified: brlcad/trunk/src/librt/opennurbs_ext.h
===================================================================
--- brlcad/trunk/src/librt/opennurbs_ext.h 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/opennurbs_ext.h 2011-02-11 20:09:14 UTC (rev 43235)
@@ -802,7 +802,7 @@
// of the node - if so, and node is not a leaf node, query
// children. If leaf node, and intersects, add to list.
bool intersectedBy(ON_Ray& ray, double* tnear = 0, double* tfar = 0);
- bool intersectsHierarchy(ON_Ray& ray, std::list<BVNode<ON_BoundingBox>*>& results = 0);
+ bool intersectsHierarchy(ON_Ray& ray, std::list<BVNode<ON_BoundingBox>*>& results);
// Report if a given uv point is within the uv boundardies
// defined by a node.
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -2142,9 +2142,8 @@
*
*/
int
-rt_arb_params(struct pc_pc_set * ps, const struct rt_db_internal *ip)
+rt_arb_params(struct pc_pc_set * UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/arbn/arbn.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arbn/arbn.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/arbn/arbn.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1236,7 +1236,7 @@
*
*/
int
-rt_arbn_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_arbn_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
struct rt_arbn_internal *aip;
@@ -1244,8 +1244,6 @@
aip = (struct rt_arbn_internal *)ip->idb_ptr;
RT_ARBN_CK_MAGIC(aip);
- ps = ps; /* quellage */
-
return 0; /* OK */
}
Modified: brlcad/trunk/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ars/ars.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/ars/ars.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1403,9 +1403,8 @@
*
*/
int
-rt_ars_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_ars_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/cline/cline.c
===================================================================
--- brlcad/trunk/src/librt/primitives/cline/cline.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/cline/cline.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1104,9 +1104,8 @@
*
*/
int
-rt_cline_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_cline_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/grip/grip.c
===================================================================
--- brlcad/trunk/src/librt/primitives/grip/grip.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/grip/grip.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -518,9 +518,8 @@
*
*/
int
-rt_grp_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_grp_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/half/half.c
===================================================================
--- brlcad/trunk/src/librt/primitives/half/half.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/half/half.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -797,9 +797,8 @@
*
*/
int
-rt_hlf_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_hlf_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/hf/hf.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hf/hf.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/hf/hf.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -2166,9 +2166,8 @@
*
*/
int
-rt_hf_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_hf_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1333,9 +1333,8 @@
* R T _ H Y P _ P A R A M S
*/
int
-rt_hyp_params(struct pc_pc_set * ps, const struct rt_db_internal *ip)
+rt_hyp_params(struct pc_pc_set * UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/metaball/metaball.c
===================================================================
--- brlcad/trunk/src/librt/primitives/metaball/metaball.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/metaball/metaball.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -885,9 +885,8 @@
*
*/
int
-rt_metaball_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_metaball_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -2985,9 +2985,8 @@
* R T _ N M G _ P A R A M S
*/
int
-rt_nmg_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_nmg_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_extrude.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -353,7 +353,7 @@
/* skip this checking until we get by the first edgeuse */
if (edges) {
/* Are we back to the begining? */
- if ((eu->vu_p->v_p == start_eu->vu_p->v_p)) {
+ if (eu->vu_p->v_p == start_eu->vu_p->v_p) {
/* done with this loop */
done = 1;
break;
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_tri_mc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_tri_mc.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_tri_mc.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -469,14 +469,12 @@
};
static int
-bangbang(struct application * a, struct partition *PartHeadp, struct seg * s)
+bangbang(struct application * a, struct partition *PartHeadp, struct seg * UNUSED(s))
{
struct partition *pp;
struct whack *t = (struct whack *)a->a_uptr;
int intersects = 0;
- s=s;
-
for (pp = PartHeadp->pt_forw; pp != PartHeadp; pp = pp->pt_forw) {
if(pp->pt_outhit->hit_dist>0.0) {
if(pp->pt_inhit->hit_dist>0.0) {
Modified: brlcad/trunk/src/librt/primitives/part/part.c
===================================================================
--- brlcad/trunk/src/librt/primitives/part/part.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/part/part.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1791,9 +1791,8 @@
*
*/
int
-rt_part_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_part_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/pipe/pipe.c
===================================================================
--- brlcad/trunk/src/librt/primitives/pipe/pipe.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/pipe/pipe.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -3894,9 +3894,8 @@
*
*/
int
-rt_pipe_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_pipe_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/poly/poly.c
===================================================================
--- brlcad/trunk/src/librt/primitives/poly/poly.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/poly/poly.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -900,9 +900,8 @@
*
*/
int
-rt_pg_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_pg_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/rec/rec.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rec/rec.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/rec/rec.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -845,9 +845,8 @@
*
*/
int
-rt_rec_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_rec_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/rhc/rhc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rhc/rhc.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/rhc/rhc.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1468,9 +1468,8 @@
*
*/
int
-rt_rhc_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_rhc_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/rpc/rpc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rpc/rpc.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/rpc/rpc.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1434,9 +1434,8 @@
*
*/
int
-rt_rpc_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_rpc_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -2453,9 +2453,8 @@
*
*/
int
-rt_sketch_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_sketch_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/sph/sph.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sph/sph.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/sph/sph.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -429,9 +429,8 @@
*
*/
int
-rt_sph_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_sph_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/submodel/submodel.c
===================================================================
--- brlcad/trunk/src/librt/primitives/submodel/submodel.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/submodel/submodel.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1036,9 +1036,8 @@
*
*/
int
-rt_submodel_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_submodel_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/superell/superell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/superell/superell.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/superell/superell.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1038,9 +1038,8 @@
*
*/
int
-rt_superell_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_superell_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -3054,9 +3054,8 @@
*
*/
int
-rt_tgc_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_tgc_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/tor/tor.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tor/tor.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/tor/tor.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1622,9 +1622,8 @@
*
*/
int
-rt_tor_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_tor_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/librt/primitives/vol/vol.c
===================================================================
--- brlcad/trunk/src/librt/primitives/vol/vol.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/librt/primitives/vol/vol.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -1316,9 +1316,8 @@
*
*/
int
-rt_vol_params(struct pc_pc_set *ps, const struct rt_db_internal *ip)
+rt_vol_params(struct pc_pc_set *UNUSED(ps), const struct rt_db_internal *ip)
{
- ps = ps; /* quellage */
if (ip) RT_CK_DB_INTERNAL(ip);
return 0; /* OK */
Modified: brlcad/trunk/src/libsysv/tcl.c
===================================================================
--- brlcad/trunk/src/libsysv/tcl.c 2011-02-11 20:04:14 UTC (rev 43234)
+++ brlcad/trunk/src/libsysv/tcl.c 2011-02-11 20:09:14 UTC (rev 43235)
@@ -13,9 +13,8 @@
#include <stdio.h>
SYSV_EXPORT int
-Sysv_Init(Tcl_Interp *interp)
+Sysv_Init(Tcl_Interp *UNUSED(interp))
{
- interp = interp; /* quell warning */
return TCL_OK;
}
Property changes on: brlcad/trunk/src/util/pc_test.c
___________________________________________________________________
Deleted: svn:mergeinfo
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|