[brlcad-commits] SF.net SVN: brlcad:[36958] brlcad/trunk/src/librt/primitives
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-12-21 23:43:02
|
Revision: 36958 http://brlcad.svn.sourceforge.net/brlcad/?rev=36958&view=rev Author: brlcad Date: 2009-12-21 23:42:53 +0000 (Mon, 21 Dec 2009) Log Message: ----------- more quellage, verbose compilation warnings about unused and unchecked params. Modified Paths: -------------- brlcad/trunk/src/librt/primitives/ebm/ebm.c brlcad/trunk/src/librt/primitives/ehy/ehy.c brlcad/trunk/src/librt/primitives/ell/ell.c brlcad/trunk/src/librt/primitives/epa/epa.c brlcad/trunk/src/librt/primitives/eto/eto.c Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c =================================================================== --- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2009-12-21 23:22:00 UTC (rev 36957) +++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2009-12-21 23:42:53 UTC (rev 36958) @@ -633,6 +633,8 @@ union record *rec; struct bu_vls str; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EBM) return(-1); eip = (struct rt_ebm_internal *)ip->idb_ptr; @@ -776,6 +778,8 @@ struct rt_ebm_internal ebm; /* scaled version */ struct bu_vls str; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EBM) return(-1); eip = (struct rt_ebm_internal *)ip->idb_ptr; @@ -820,17 +824,19 @@ bu_vls_init(&substr); bu_vls_strcat(str, "extruded bitmap (EBM)\n\t"); - bu_vls_printf(&substr, " file=\"%s\" w=%d n=%d depth=%g\n mat=", - eip->file, eip->xdim, eip->ydim, INTCLAMP(eip->tallness*mm2local)); - bu_vls_vlscat(str, &substr); - for (i=0; i<15; i++) { + if (verbose) { + bu_vls_printf(&substr, " file=\"%s\" w=%d n=%d depth=%g\n mat=", + eip->file, eip->xdim, eip->ydim, INTCLAMP(eip->tallness*mm2local)); + bu_vls_vlscat(str, &substr); + for (i=0; i<15; i++) { + bu_vls_trunc2(&substr, 0); + bu_vls_printf(&substr, "%g, ", INTCLAMP(eip->mat[i])); + bu_vls_vlscat(str, &substr); + } bu_vls_trunc2(&substr, 0); - bu_vls_printf(&substr, "%g, ", INTCLAMP(eip->mat[i])); + bu_vls_printf(&substr, "%g\n", INTCLAMP(eip->mat[15])); bu_vls_vlscat(str, &substr); } - bu_vls_trunc2(&substr, 0); - bu_vls_printf(&substr, "%g\n", INTCLAMP(eip->mat[15])); - bu_vls_vlscat(str, &substr); bu_vls_free(&substr); @@ -892,6 +898,8 @@ vect_t diam; vect_t small1; + if (rtip) RT_CK_RTI(rtip); + eip = (struct rt_ebm_internal *)ip->idb_ptr; RT_EBM_CK_MAGIC(eip); @@ -1044,8 +1052,8 @@ void rt_ebm_curve(register struct curvature *cvp, register struct hit *hitp, struct soltab *stp) { -/* register struct rt_ebm_specific *ebmp = - (struct rt_ebm_specific *)stp->st_specific; */ + struct rt_ebm_specific *ebmp = (struct rt_ebm_specific *)stp->st_specific; + if (!ebmp) return; bn_vec_ortho(cvp->crv_pdir, hitp->hit_normal); cvp->crv_c1 = cvp->crv_c2 = 0; @@ -1061,6 +1069,9 @@ void rt_ebm_uv(struct application *ap, struct soltab *stp, register struct hit *hitp, register struct uvcoord *uvp) { + if (ap) RT_CK_APPLICATION(ap); + if (stp) RT_CK_SOLTAB(stp); + uvp->uv_u = hitp->hit_vpriv[X]; uvp->uv_v = hitp->hit_vpriv[Y]; @@ -1097,7 +1108,7 @@ * R T _ E B M _ P L O T */ int -rt_ebm_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_ebm_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol __attribute__((unused)), const struct bn_tol *tol __attribute__((unused))) { register struct rt_ebm_internal *eip; register int x, y; @@ -1357,7 +1368,7 @@ * R T _ E B M _ T E S S */ int -rt_ebm_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_ebm_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct rt_tess_tol *ttol __attribute__((unused)), const struct bn_tol *tol) { struct rt_ebm_internal *eip; struct shell *s; @@ -1704,8 +1715,11 @@ * */ int -rt_ebm_params(struct pc_pc_set * ps, const struct rt_db_internal *ip) +rt_ebm_params(struct pc_pc_set *ps, const struct rt_db_internal *ip) { + if (!ps) return(0); + if (ip) RT_CK_DB_INTERNAL(ip); + return(0); /* OK */ } Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c =================================================================== --- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2009-12-21 23:22:00 UTC (rev 36957) +++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2009-12-21 23:42:53 UTC (rev 36958) @@ -585,6 +585,8 @@ vect_t pprime; fastf_t len; + if (ap) RT_CK_APPLICATION(ap); + /* * hit_point is on surface; project back to unit ehy, creating a * vector from vertex to hit point. @@ -649,7 +651,7 @@ * R T _ E H Y _ P L O T */ int -rt_ehy_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_ehy_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol __attribute__((unused))) { fastf_t c, dtol, f, mag_a, mag_h, ntol, r1, r2; fastf_t **ellipses, theta_prev, theta_new, rt_ell_ang(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol); @@ -711,12 +713,11 @@ /* Convert rel to absolute by scaling by smallest side */ dtol = ttol->rel * 2 * r2; if (ttol->abs <= 0.0) { - if (dtol <= 0.0) + if (dtol <= 0.0) { /* No tolerance given, use a default */ dtol = 2 * 0.10 * r2; /* 10% */ - else - /* Use absolute-ized relative tolerance */ - ; + } + /* Use absolute-ized relative tolerance */ } else { /* Absolute tolerance was given, pick smaller */ if (ttol->rel <= 0.0 || dtol > ttol->abs) @@ -1014,12 +1015,11 @@ /* Convert rel to absolute by scaling by smallest side */ dtol = ttol->rel * 2 * r2; if (ttol->abs <= 0.0) { - if (dtol <= 0.0) + if (dtol <= 0.0) { /* No tolerance given, use a default */ dtol = 2 * 0.10 * r2; /* 10% */ - else - /* Use absolute-ized relative tolerance */ - ; + } + /* Use absolute-ized relative tolerance */ } else { /* Absolute tolerance was given, pick smaller */ if (ttol->rel <= 0.0 || dtol > ttol->abs) @@ -1419,6 +1419,8 @@ struct rt_ehy_internal *xip; union record *rp; + if (dbip) RT_CK_DBI(dbip); + BU_CK_EXTERNAL(ep); rp = (union record *)ep->ext_buf; /* Check record type */ @@ -1466,6 +1468,8 @@ struct rt_ehy_internal *xip; union record *ehy; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EHY) return(-1); xip = (struct rt_ehy_internal *)ip->idb_ptr; @@ -1528,6 +1532,7 @@ fastf_t vec[3*4]; BU_CK_EXTERNAL(ep); + if (dbip) RT_CK_DBI(dbip); BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3*4); @@ -1574,6 +1579,8 @@ struct rt_ehy_internal *xip; fastf_t vec[3*4]; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EHY) return(-1); xip = (struct rt_ehy_internal *)ip->idb_ptr; @@ -1652,15 +1659,17 @@ INTCLAMP(MAGNITUDE(xip->ehy_H) * mm2local)); bu_vls_strcat(str, buf); - sprintf(buf, "\tA=%g\n", INTCLAMP(xip->ehy_r1 * mm2local)); - bu_vls_strcat(str, buf); + if (verbose) { + sprintf(buf, "\tA=%g\n", INTCLAMP(xip->ehy_r1 * mm2local)); + bu_vls_strcat(str, buf); - sprintf(buf, "\tB=%g\n", INTCLAMP(xip->ehy_r2 * mm2local)); - bu_vls_strcat(str, buf); + sprintf(buf, "\tB=%g\n", INTCLAMP(xip->ehy_r2 * mm2local)); + bu_vls_strcat(str, buf); + + sprintf(buf, "\tc=%g\n", INTCLAMP(xip->ehy_c * mm2local)); + bu_vls_strcat(str, buf); + } - sprintf(buf, "\tc=%g\n", INTCLAMP(xip->ehy_c * mm2local)); - bu_vls_strcat(str, buf); - return(0); } @@ -1693,8 +1702,11 @@ * */ int -rt_ehy_params(struct pc_pc_set * ps, const struct rt_db_internal *ip) +rt_ehy_params(struct pc_pc_set *ps, const struct rt_db_internal *ip) { + if (!ps) return (0); + if (ip) RT_CK_DB_INTERNAL(ip); + return(0); /* OK */ } Modified: brlcad/trunk/src/librt/primitives/ell/ell.c =================================================================== --- brlcad/trunk/src/librt/primitives/ell/ell.c 2009-12-21 23:22:00 UTC (rev 36957) +++ brlcad/trunk/src/librt/primitives/ell/ell.c 2009-12-21 23:42:53 UTC (rev 36958) @@ -415,6 +415,8 @@ fastf_t k1, k2; /* distance constants of solution */ fastf_t root; /* root of radical */ + if (ap) RT_CK_APPLICATION(ap); + /* for each ray/ellipse pair */ for (i = 0; i < n; i++) { if (stp[i] == 0) continue; /* stp[i] == 0 signals skip ray */ @@ -625,7 +627,7 @@ * R T _ E L L _ P L O T */ int -rt_ell_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_ell_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol __attribute__((unused)), const struct bn_tol *tol __attribute__((unused))) { register int i; struct rt_ell_internal *eip; @@ -1100,6 +1102,8 @@ union record *rp; fastf_t vec[3*4]; + if (dbip) RT_CK_DBI(dbip); + BU_CK_EXTERNAL(ep); rp = (union record *)ep->ext_buf; /* Check record type */ @@ -1139,6 +1143,8 @@ struct rt_ell_internal *tip; union record *rec; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_ELL && ip->idb_type != ID_SPH) return(-1); tip = (struct rt_ell_internal *)ip->idb_ptr; @@ -1174,6 +1180,7 @@ struct rt_ell_internal *eip; fastf_t vec[ELEMENTS_PER_VECT*4]; + if (dbip) RT_CK_DBI(dbip); RT_CK_DB_INTERNAL(ip); BU_CK_EXTERNAL(ep); @@ -1216,6 +1223,8 @@ struct rt_ell_internal *eip; fastf_t vec[ELEMENTS_PER_VECT*4]; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_ELL && ip->idb_type != ID_SPH) return(-1); eip = (struct rt_ell_internal *)ip->idb_ptr; @@ -1636,10 +1645,13 @@ * @return -1 on failure */ int -rt_ell_params(struct pc_pc_set * pcs, const struct rt_db_internal *ip) +rt_ell_params(struct pc_pc_set *pcs, const struct rt_db_internal *ip) { struct rt_ell_internal *eip; eip = (struct rt_ell_internal *)ip->idb_ptr; + + if (!pcs) return (0); + #if 0 pcs->ps = bu_calloc(pcs->n_params, sizeof (struct pc_param), "pc_param"); pcs->cs = bu_calloc(pcs->n_constraints, sizeof (struct pc_constrnt), "pc_constrnt"); Modified: brlcad/trunk/src/librt/primitives/epa/epa.c =================================================================== --- brlcad/trunk/src/librt/primitives/epa/epa.c 2009-12-21 23:22:00 UTC (rev 36957) +++ brlcad/trunk/src/librt/primitives/epa/epa.c 2009-12-21 23:42:53 UTC (rev 36958) @@ -571,6 +571,8 @@ vect_t pprime; fastf_t len; + if (ap) RT_CK_APPLICATION(ap); + /* hit_point is on surface; project back to unit epa, creating a * vector from vertex to hit point. */ @@ -633,7 +635,7 @@ * R T _ E P A _ P L O T */ int -rt_epa_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_epa_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol __attribute__((unused))) { fastf_t dtol, f, mag_a, mag_h, ntol, r1, r2; fastf_t **ellipses, theta_new, theta_prev, rt_ell_ang(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol); @@ -697,12 +699,11 @@ /* Convert rel to absolute by scaling by smallest side */ dtol = ttol->rel * 2 * r2; if (ttol->abs <= 0.0) { - if (dtol <= 0.0) + if (dtol <= 0.0) { /* No tolerance given, use a default */ dtol = 2 * 0.10 * r2; /* 10% */ - else - /* Use absolute-ized relative tolerance */ - ; + } + /* Use absolute-ized relative tolerance */ } else { /* Absolute tolerance was given, pick smaller */ if (ttol->rel <= 0.0 || dtol > ttol->abs) @@ -1073,12 +1074,11 @@ /* Convert rel to absolute by scaling by smallest side */ dtol = ttol->rel * 2 * r2; if (ttol->abs <= 0.0) { - if (dtol <= 0.0) + if (dtol <= 0.0) { /* No tolerance given, use a default */ dtol = 2 * 0.10 * r2; /* 10% */ - else - /* Use absolute-ized relative tolerance */ - ; + } + /* Use absolute-ized relative tolerance */ } else { /* Absolute tolerance was given, pick smaller */ if (ttol->rel <= 0.0 || dtol > ttol->abs) @@ -1461,6 +1461,8 @@ struct rt_epa_internal *xip; union record *rp; + if (dbip) RT_CK_DBI(dbip); + BU_CK_EXTERNAL(ep); rp = (union record *)ep->ext_buf; /* Check record type */ @@ -1508,6 +1510,8 @@ union record *epa; fastf_t mag_h; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EPA) return(-1); xip = (struct rt_epa_internal *)ip->idb_ptr; @@ -1568,6 +1572,7 @@ struct rt_epa_internal *xip; fastf_t vec[11]; + if (dbip) RT_CK_DBI(dbip); BU_CK_EXTERNAL(ep); BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 11); @@ -1615,6 +1620,8 @@ fastf_t vec[11]; fastf_t mag_h; + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_EPA) return(-1); xip = (struct rt_epa_internal *)ip->idb_ptr; @@ -1692,11 +1699,13 @@ INTCLAMP(MAGNITUDE(xip->epa_H) * mm2local)); bu_vls_strcat(str, buf); - sprintf(buf, "\tA=%g\n", INTCLAMP(xip->epa_r1 * mm2local)); - bu_vls_strcat(str, buf); + if (verbose) { + sprintf(buf, "\tA=%g\n", INTCLAMP(xip->epa_r1 * mm2local)); + bu_vls_strcat(str, buf); - sprintf(buf, "\tB=%g\n", INTCLAMP(xip->epa_r2 * mm2local)); - bu_vls_strcat(str, buf); + sprintf(buf, "\tB=%g\n", INTCLAMP(xip->epa_r2 * mm2local)); + bu_vls_strcat(str, buf); + } return(0); } @@ -1730,8 +1739,11 @@ * */ int -rt_epa_params(struct pc_pc_set * ps, const struct rt_db_internal *ip) +rt_epa_params(struct pc_pc_set *ps, const struct rt_db_internal *ip) { + if (!ps) return(0); + if (ip) RT_CK_DB_INTERNAL(ip); + return(0); /* OK */ } Modified: brlcad/trunk/src/librt/primitives/eto/eto.c =================================================================== --- brlcad/trunk/src/librt/primitives/eto/eto.c 2009-12-21 23:22:00 UTC (rev 36957) +++ brlcad/trunk/src/librt/primitives/eto/eto.c 2009-12-21 23:42:53 UTC (rev 36958) @@ -173,6 +173,8 @@ fastf_t ch, cv, dh, f, phi; struct rt_eto_internal *tip; + if (rtip) RT_CK_RTI(rtip); + tip = (struct rt_eto_internal *)ip->idb_ptr; RT_ETO_CK_MAGIC(tip); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |