[brlcad-commits] SF.net SVN: brlcad:[36956] brlcad/trunk/src/librt/primitives
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-12-21 23:02:37
|
Revision: 36956 http://brlcad.svn.sourceforge.net/brlcad/?rev=36956&view=rev Author: brlcad Date: 2009-12-21 23:02:26 +0000 (Mon, 21 Dec 2009) Log Message: ----------- quell verbose compilation warnings, mostly unused/unchecked params and missing structparse initializers and sign warnings Modified Paths: -------------- brlcad/trunk/src/librt/primitives/dsp/dsp.c 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 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/part/part.c brlcad/trunk/src/librt/primitives/revolve/revolve.h brlcad/trunk/src/librt/primitives/rhc/rhc.c brlcad/trunk/src/librt/primitives/rpc/rpc.c brlcad/trunk/src/librt/primitives/submodel/submodel.c brlcad/trunk/src/librt/primitives/superell/superell.c brlcad/trunk/src/librt/primitives/table.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 Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c =================================================================== --- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -105,8 +105,8 @@ */ #define LAYER(l, x, y) l->p[l->dim[1]*y+x] struct dsp_bb_layer { - int dim[2]; /* the dimensions of the array at element p */ - struct dsp_bb *p; /* array of dsp_bb's for this level */ + unsigned int dim[2]; /* the dimensions of the array at element p */ + struct dsp_bb *p; /* array of dsp_bb's for this level */ }; @@ -232,10 +232,14 @@ const struct bu_structparse *ip, const char *sp_name, genptr_t base, - char *p) + char *p __attribute__((unused))) { struct rt_dsp_internal *dsp_ip = (struct rt_dsp_internal *)base; + if (ip) RT_CK_DB_INTERNAL(ip); + if (!sp_name) return; + if (!base) return; + bn_mat_inv(dsp_ip->dsp_mtos, dsp_ip->dsp_stom); } @@ -245,10 +249,14 @@ const struct bu_structparse *ip, const char *sp_name, genptr_t base, - char *p) + char *p __attribute__((unused))) { struct rt_dsp_internal *dsp_ip = (struct rt_dsp_internal *)base; + if (ip) RT_CK_DB_INTERNAL(ip); + if (!sp_name) return; + if (!base) return; + dsp_ip->dsp_datasrc = RT_DSP_SRC_V4_FILE; dsp_ip->dsp_bip = (struct rt_db_internal *)NULL; } @@ -259,23 +267,23 @@ /** only used when editing a v4 database */ const struct bu_structparse rt_dsp_parse[] = { - {"%V", 1, "file", DSP_O(dsp_name), hook_file }, - {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 16, "stom", DSP_AO(dsp_stom), hook_mtos_from_stom }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%V", 1, "file", DSP_O(dsp_name), hook_file, NULL, NULL }, + {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 16, "stom", DSP_AO(dsp_stom), hook_mtos_from_stom, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; /** only used when editing a v4 database */ const struct bu_structparse rt_dsp_ptab[] = { - {"%V", 1, "file", DSP_O(dsp_name), BU_STRUCTPARSE_FUNC_NULL }, - {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 16, "stom", DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%V", 1, "file", DSP_O(dsp_name), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 16, "stom", DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; @@ -382,7 +390,8 @@ plot_layers(struct dsp_specific *dsp_sp) { FILE *fp; - int l, x, y, n; + int l, n; + unsigned int x, y; char buf[32]; static int colors[7][3] = { {255, 0, 0}, @@ -672,7 +681,8 @@ HIDDEN void dsp_layers(struct dsp_specific *dsp, unsigned short *d_min, unsigned short *d_max) { - int idx, i, j, k, curr_layer, x, y, xs, ys, xv, yv, tot; + int idx, curr_layer, xs, ys, xv, yv, tot; + unsigned int x, y, i, j, k; unsigned short dsp_min, dsp_max, cell_min, cell_max; unsigned short elev; struct dsp_bb *dsp_bb; @@ -906,6 +916,8 @@ if (RT_G_DEBUG & DEBUG_HF) bu_log("rt_dsp_prep()\n"); + if (rtip) RT_CK_RTI(rtip); + RT_CK_DB_INTERNAL(ip); dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr; RT_DSP_CK_MAGIC(dsp_ip); @@ -2116,9 +2128,9 @@ recurse_dsp_bb(struct isect_stuff *isect, struct dsp_bb *dsp_bb, point_t minpt, /* entry point of dsp_bb */ - point_t maxpt, /* exit point of dsp_bb */ + point_t maxpt __attribute__((unused)), /* exit point of dsp_bb */ point_t bbmin, /* min point of bb (Z=0) */ - point_t bbmax) /* max point of bb */ + point_t bbmax __attribute__((unused))) /* max point of bb */ { double tDX; /* dist along ray to span 1 cell in X dir */ double tDY; /* dist along ray to span 1 cell in Y dir */ @@ -2651,10 +2663,9 @@ HIDDEN void compute_normal_at_gridpoint(vect_t N, struct dsp_specific *dsp, - int x, - int y, + unsigned int x, + unsigned int y, FILE *fd, - int boolean, double len) { /* Gridpoint specified is "B" we compute normal by taking the @@ -2858,11 +2869,10 @@ x = hitp->hit_vpriv[X]; y = hitp->hit_vpriv[Y]; - compute_normal_at_gridpoint(Anorm, dsp, x, y, fd, 1, len); - compute_normal_at_gridpoint(Anorm, dsp, x, y, fd, 0, len); - compute_normal_at_gridpoint(Bnorm, dsp, x+1, y, fd, 0, len); - compute_normal_at_gridpoint(Dnorm, dsp, x+1, y+1, fd, 0, len); - compute_normal_at_gridpoint(Cnorm, dsp, x, y+1, fd, 0, len); + compute_normal_at_gridpoint(Anorm, dsp, x, y, fd, len); + compute_normal_at_gridpoint(Bnorm, dsp, x+1, y, fd, len); + compute_normal_at_gridpoint(Dnorm, dsp, x+1, y+1, fd, len); + compute_normal_at_gridpoint(Cnorm, dsp, x, y+1, fd, len); /* transform the hit point into DSP space for determining * interpolation @@ -2952,6 +2962,7 @@ void rt_dsp_curve(register struct curvature *cvp, register struct hit *hitp, struct soltab *stp) { + if (stp) RT_CK_SOLTAB(stp); if (RT_G_DEBUG & DEBUG_HF) bu_log("rt_dsp_curve()\n"); @@ -3108,17 +3119,17 @@ * R T _ D S P _ P L O T */ int -rt_dsp_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_dsp_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol __attribute__((unused))) { struct rt_dsp_internal *dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr; point_t m_pt; point_t s_pt; point_t o_pt; - int x, y; + unsigned int x, y; int step; - int xlim = dsp_ip->dsp_xcnt - 1; - int ylim = dsp_ip->dsp_ycnt - 1; + unsigned int xlim = dsp_ip->dsp_xcnt - 1; + unsigned int ylim = dsp_ip->dsp_ycnt - 1; int xfudge, yfudge; int drawing; @@ -3234,7 +3245,7 @@ /* now draw the body of the top */ if (ttol->rel) { - int rstep; + unsigned int rstep; rstep = dsp_ip->dsp_xcnt; V_MAX(rstep, dsp_ip->dsp_ycnt); step = (int)(ttol->rel * rstep); @@ -3413,7 +3424,6 @@ */ int height[8]; int xx, yy; - double h1, h2, h3, h4; double c02, c13; /* curvature in direction 0<->2, and 1<->3 */ if (dsp_ip->dsp_cuttype != DSP_CUT_DIR_ADAPT) { @@ -3479,7 +3489,7 @@ * 0 OK. *r points to nmgregion that holds this tessellation. */ int -rt_dsp_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol) +rt_dsp_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_dsp_internal *dsp_ip; struct shell *s; @@ -3981,11 +3991,7 @@ * !0 Failure */ HIDDEN int -get_file_data(struct rt_dsp_internal *dsp_ip, - struct rt_db_internal *ip, - const struct bu_external *ep, - register const mat_t mat, - const struct db_i *dbip) +get_file_data(struct rt_dsp_internal *dsp_ip, const struct db_i *dbip) { struct bu_mapped_file *mf; int count, in_cookie, out_cookie; @@ -4002,7 +4008,7 @@ return 0; } - if (dsp_ip->dsp_mp->buflen != dsp_ip->dsp_xcnt*dsp_ip->dsp_ycnt*2) { + if ((size_t)dsp_ip->dsp_mp->buflen != (size_t)(dsp_ip->dsp_xcnt*dsp_ip->dsp_ycnt*2)) { bu_log("DSP buffer wrong size: %d s/b %d ", dsp_ip->dsp_mp->buflen, dsp_ip->dsp_xcnt*dsp_ip->dsp_ycnt*2); return -1; @@ -4040,11 +4046,7 @@ * Retrieve data for DSP from a database object. */ HIDDEN int -get_obj_data(struct rt_dsp_internal *dsp_ip, - struct rt_db_internal *ip, - const struct bu_external *ep, - register const mat_t mat, - const struct db_i *dbip) +get_obj_data(struct rt_dsp_internal *dsp_ip, const struct db_i *dbip) { struct rt_binunif_internal *bip; int in_cookie, out_cookie, got; @@ -4104,11 +4106,7 @@ * !0 failure */ HIDDEN int -dsp_get_data(struct rt_dsp_internal *dsp_ip, - struct rt_db_internal *ip, - const struct bu_external *ep, - register const mat_t mat, - const struct db_i *dbip) +dsp_get_data(struct rt_dsp_internal *dsp_ip, const mat_t mat, const struct db_i *dbip) { mat_t tmp; char *p; @@ -4128,7 +4126,7 @@ if (RT_G_DEBUG & DEBUG_HF) bu_log("getting data from file \"%s\"\n", p); - if (get_file_data(dsp_ip, ip, ep, mat, dbip) != 0) { + if (get_file_data(dsp_ip, dbip) != 0) { p = "file"; } else { return 0; @@ -4140,7 +4138,7 @@ if (RT_G_DEBUG & DEBUG_HF) bu_log("getting data from object \"%s\"\n", p); - if (get_obj_data(dsp_ip, ip, ep, mat, dbip) != 0) { + if (get_obj_data(dsp_ip, dbip) != 0) { p = "object"; } else { RT_CK_DB_INTERNAL(dsp_ip->dsp_bip); @@ -4240,7 +4238,7 @@ } if (mat == NULL) mat = bn_mat_identity; - if (dsp_get_data(dsp_ip, ip, ep, mat, dbip)!=0) { + if (dsp_get_data(dsp_ip, mat, dbip)!=0) { IMPORT_FAIL("unable to load displacement map data"); } @@ -4273,6 +4271,7 @@ union record *rec; struct bu_vls str; + if (dbip) RT_CK_DBI(dbip); RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_DSP) return(-1); @@ -4280,7 +4279,6 @@ RT_DSP_CK_MAGIC(dsp_ip); BU_CK_VLS(&dsp_ip->dsp_name); - BU_CK_EXTERNAL(ep); ep->ext_nbytes = sizeof(union record)*DB_SS_NGRAN; ep->ext_buf = bu_calloc(1, ep->ext_nbytes, "dsp external"); @@ -4317,11 +4315,13 @@ * Apply modeling transformations as well. */ int -rt_dsp_import5(struct rt_db_internal *ip, const struct bu_external *ep, register const fastf_t *mat, const struct db_i *dbip, struct resource *resp, const int minor_type) +rt_dsp_import5(struct rt_db_internal *ip, const struct bu_external *ep, register const fastf_t *mat, const struct db_i *dbip, struct resource *resp, const int minor_type __attribute__((unused))) { struct rt_dsp_internal *dsp_ip; unsigned char *cp; + if (resp) RT_CK_RESOURCE(resp); + if (RT_G_DEBUG & DEBUG_HF) bu_log("rt_dsp_import4_v5()\n"); @@ -4405,7 +4405,7 @@ ep->ext_nbytes - (cp - (unsigned char *)ep->ext_buf)); if (mat == NULL) mat = bn_mat_identity; - if (dsp_get_data(dsp_ip, ip, ep, mat, dbip)!=0) { + if (dsp_get_data(dsp_ip, mat, dbip)!=0) { IMPORT_FAIL("unable to load displacement map data"); } @@ -4419,13 +4419,16 @@ * The name is added by the caller, in the usual place. */ int -rt_dsp_export5(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp, const int minor_type) +rt_dsp_export5(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp, const int minor_type __attribute__((unused))) { struct rt_dsp_internal *dsp_ip; unsigned long name_len; unsigned char *cp; int rem; + if (resp) RT_CK_RESOURCE(resp); + if (dbip) RT_CK_DBI(dbip); + RT_CK_DB_INTERNAL(ip); if (ip->idb_type != ID_DSP) return(-1); dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr; @@ -4518,8 +4521,8 @@ int rt_dsp_describe(struct bu_vls *str, const struct rt_db_internal *ip, - int verbose, - double mm2local, + int verbose __attribute__((unused)), + double mm2local __attribute__((unused)), struct resource *resp, struct db_i *db_ip) { @@ -4527,7 +4530,8 @@ (struct rt_dsp_internal *)ip->idb_ptr; struct bu_vls vls; - RT_CK_DBI(db_ip); + if (resp) RT_CK_RESOURCE(resp); + if (db_ip) RT_CK_DBI(db_ip); bu_vls_init(&vls); @@ -4572,6 +4576,7 @@ if (!resp) { resp = &rt_uniresource; } + if (resp) RT_CK_RESOURCE(resp); dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr; RT_DSP_CK_MAGIC(dsp_ip); @@ -4600,13 +4605,15 @@ HIDDEN void -hook_verify(const struct bu_structparse *ip, +hook_verify(const struct bu_structparse *sp, const char *sp_name, genptr_t base, - char *p) + char *p __attribute__((unused))) { struct rt_dsp_internal *dsp_ip = (struct rt_dsp_internal *)base; + if (!sp || !sp_name || !base) return; + if (!strcmp(sp_name, "src")) { switch (dsp_ip->dsp_datasrc) { case RT_DSP_SRC_V4_FILE: @@ -4646,14 +4653,14 @@ const struct bu_structparse fake_dsp_printab[] = { - {"%c", 1, "src", DSP_O(dsp_datasrc), hook_verify }, - {"%V", 1, "name", DSP_O(dsp_name), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "w", DSP_O(dsp_xcnt), hook_verify }, - {"%d", 1, "n", DSP_O(dsp_ycnt), hook_verify }, - {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL }, - {"%c", 1, "cut", DSP_O(dsp_cuttype), hook_verify }, - {"%f", 16, "stom", DSP_AO(dsp_stom), hook_verify }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%c", 1, "src", DSP_O(dsp_datasrc), hook_verify, NULL, NULL }, + {"%V", 1, "name", DSP_O(dsp_name), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "w", DSP_O(dsp_xcnt), hook_verify, NULL, NULL }, + {"%d", 1, "n", DSP_O(dsp_ycnt), hook_verify, NULL, NULL }, + {"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%c", 1, "cut", DSP_O(dsp_cuttype), hook_verify, NULL, NULL }, + {"%f", 16, "stom", DSP_AO(dsp_stom), hook_verify, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; @@ -4763,7 +4770,7 @@ void -rt_dsp_make(const struct rt_functab *ftp, struct rt_db_internal *intern, double diameter) +rt_dsp_make(const struct rt_functab *ftp, struct rt_db_internal *intern, double diameter __attribute__((unused))) { struct rt_dsp_internal *dsp; @@ -4792,8 +4799,11 @@ * */ int -rt_dsp_params(struct pc_pc_set * ps, const struct rt_db_internal *ip) +rt_dsp_params(struct pc_pc_set *ps, const struct rt_db_internal *ip) { + if (!ps) return(0); + RT_CK_DB_INTERNAL(ip); + return(0); /* OK */ } @@ -4988,7 +4998,7 @@ { struct dsp_specific *dsp; point_t pt, tri_pt; - int x, y; + unsigned int x, y; int A[3], B[3], C[3], D[3]; struct dsp_rpp dsp_rpp; @@ -5009,8 +5019,8 @@ x = pt[X]; y = pt[Y]; - CLAMP(x, 0, XSIZ(dsp)-1); - CLAMP(y, 0, YSIZ(dsp)-1); + V_MIN(x, XSIZ(dsp)-1); + V_MIN(y, YSIZ(dsp)-1); if (RT_G_DEBUG & DEBUG_HF) bu_log("x:%d y:%d\n", x, y); Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c =================================================================== --- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -63,12 +63,12 @@ #define RT_EBM_O(m) bu_offsetof(struct rt_ebm_internal, m) const struct bu_structparse rt_ebm_parse[] = { - {"%s", RT_EBM_NAME_LEN, "file", bu_offsetofarray(struct rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "w", RT_EBM_O(xdim), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", RT_EBM_O(ydim), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "d", RT_EBM_O(tallness), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 16, "mat", bu_offsetofarray(struct rt_ebm_internal, mat), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%s", RT_EBM_NAME_LEN, "file", bu_offsetofarray(struct rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "w", RT_EBM_O(xdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", RT_EBM_O(ydim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "d", RT_EBM_O(tallness), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 16, "mat", bu_offsetofarray(struct rt_ebm_internal, mat), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c =================================================================== --- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -174,13 +174,13 @@ const struct bu_structparse rt_ehy_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_ehy_internal, ehy_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_ehy_internal, ehy_H[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_ehy_internal, ehy_Au[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_1", bu_offsetof(struct rt_ehy_internal, ehy_r1), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_2", bu_offsetof(struct rt_ehy_internal, ehy_r2), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "c", bu_offsetof(struct rt_ehy_internal, ehy_c), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_ehy_internal, ehy_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_ehy_internal, ehy_H[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_ehy_internal, ehy_Au[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_1", bu_offsetof(struct rt_ehy_internal, ehy_r1), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_2", bu_offsetof(struct rt_ehy_internal, ehy_r2), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "c", bu_offsetof(struct rt_ehy_internal, ehy_c), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/ell/ell.c =================================================================== --- brlcad/trunk/src/librt/primitives/ell/ell.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/ell/ell.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -45,11 +45,11 @@ struct rt_i *rtip)); const struct bu_structparse rt_ell_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_ell_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_ell_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "B", bu_offsetof(struct rt_ell_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "C", bu_offsetof(struct rt_ell_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_ell_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_ell_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "B", bu_offsetof(struct rt_ell_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "C", bu_offsetof(struct rt_ell_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/epa/epa.c =================================================================== --- brlcad/trunk/src/librt/primitives/epa/epa.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/epa/epa.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -173,12 +173,12 @@ const struct bu_structparse rt_epa_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_epa_internal, epa_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_epa_internal, epa_H[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_epa_internal, epa_Au[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_1", bu_offsetof(struct rt_epa_internal, epa_r1), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_2", bu_offsetof(struct rt_epa_internal, epa_r2), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_epa_internal, epa_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_epa_internal, epa_H[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_epa_internal, epa_Au[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_1", bu_offsetof(struct rt_epa_internal, epa_r1), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_2", bu_offsetof(struct rt_epa_internal, epa_r2), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/eto/eto.c =================================================================== --- brlcad/trunk/src/librt/primitives/eto/eto.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/eto/eto.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -139,12 +139,12 @@ const struct bu_structparse rt_eto_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_eto_internal, eto_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "N", bu_offsetof(struct rt_eto_internal, eto_N[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "C", bu_offsetof(struct rt_eto_internal, eto_C[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r", bu_offsetof(struct rt_eto_internal, eto_r), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_d", bu_offsetof(struct rt_eto_internal, eto_rd), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_eto_internal, eto_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "N", bu_offsetof(struct rt_eto_internal, eto_N[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "C", bu_offsetof(struct rt_eto_internal, eto_C[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r", bu_offsetof(struct rt_eto_internal, eto_r), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_d", bu_offsetof(struct rt_eto_internal, eto_rd), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/grip/grip.c =================================================================== --- brlcad/trunk/src/librt/primitives/grip/grip.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/grip/grip.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -56,10 +56,10 @@ #define GRIP_NULL ((struct grip_specific *)0) const struct bu_structparse rt_grp_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_grip_internal, center[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "N", bu_offsetof(struct rt_grip_internal, normal[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "L", bu_offsetof(struct rt_grip_internal, mag), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_grip_internal, center[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "N", bu_offsetof(struct rt_grip_internal, normal[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "L", bu_offsetof(struct rt_grip_internal, mag), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/half/half.c =================================================================== --- brlcad/trunk/src/librt/primitives/half/half.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/half/half.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -59,9 +59,9 @@ #define HALF_NULL ((struct half_specific *)0) const struct bu_structparse rt_hlf_parse[] = { - { "%f", 3, "N", bu_offsetof(struct rt_half_internal, eqn[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "d", bu_offsetof(struct rt_half_internal, eqn[W]), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "N", bu_offsetof(struct rt_half_internal, eqn[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "d", bu_offsetof(struct rt_half_internal, eqn[W]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/hf/hf.c =================================================================== --- brlcad/trunk/src/librt/primitives/hf/hf.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/hf/hf.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -64,30 +64,30 @@ /* All fields valid in string solid */ const struct bu_structparse rt_hf_parse[] = { - {"%s", 128, "cfile", bu_offsetofarray(struct rt_hf_internal, cfile), BU_STRUCTPARSE_FUNC_NULL}, - {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL}, - {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL}, - {"%d", 1, "w", HF_O(w), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", HF_O(n), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "shorts", HF_O(shorts), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "file2mm", HF_O(file2mm), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 3, "v", HF_O(v[0]), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 3, "x", HF_O(x[0]), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 3, "y", HF_O(y[0]), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "xlen", HF_O(xlen), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "ylen", HF_O(ylen), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "zscale", HF_O(zscale), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%s", 128, "cfile", bu_offsetofarray(struct rt_hf_internal, cfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%d", 1, "w", HF_O(w), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", HF_O(n), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "shorts", HF_O(shorts), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "file2mm", HF_O(file2mm), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 3, "v", HF_O(v[0]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 3, "x", HF_O(x[0]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 3, "y", HF_O(y[0]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "xlen", HF_O(xlen), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "ylen", HF_O(ylen), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "zscale", HF_O(zscale), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; /* Subset of fields found in cfile */ const struct bu_structparse rt_hf_cparse[] = { - {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL}, - {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL}, - {"%d", 1, "w", HF_O(w), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", HF_O(n), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "shorts", HF_O(shorts), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 1, "file2mm", HF_O(file2mm), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%d", 1, "w", HF_O(w), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", HF_O(n), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "shorts", HF_O(shorts), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 1, "file2mm", HF_O(file2mm), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c =================================================================== --- brlcad/trunk/src/librt/primitives/hyp/hyp.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/hyp/hyp.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -103,12 +103,12 @@ const struct bu_structparse rt_hyp_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_hyp_internal, hyp_A[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "b", bu_offsetof(struct rt_hyp_internal, hyp_b), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "bnr", bu_offsetof(struct rt_hyp_internal, hyp_bnr), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_hyp_internal, hyp_A[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "b", bu_offsetof(struct rt_hyp_internal, hyp_b), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "bnr", bu_offsetof(struct rt_hyp_internal, hyp_bnr), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/part/part.c =================================================================== --- brlcad/trunk/src/librt/primitives/part/part.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/part/part.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -212,11 +212,11 @@ #define RT_PARTICLE_SURF_HSPHERE 3 const struct bu_structparse rt_part_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_part_internal, part_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_part_internal, part_H[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_v", bu_offsetof(struct rt_part_internal, part_vrad), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r_h", bu_offsetof(struct rt_part_internal, part_hrad), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_part_internal, part_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_part_internal, part_H[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_v", bu_offsetof(struct rt_part_internal, part_vrad), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r_h", bu_offsetof(struct rt_part_internal, part_hrad), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/revolve/revolve.h =================================================================== --- brlcad/trunk/src/librt/primitives/revolve/revolve.h 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/revolve/revolve.h 2009-12-21 23:02:26 UTC (rev 36956) @@ -25,12 +25,12 @@ const struct bu_structparse rt_revolve_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_revolve_internal, v3d[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "axis", bu_offsetof(struct rt_revolve_internal, axis3d[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "R", bu_offsetof(struct rt_revolve_internal, r[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "ang", bu_offsetof(struct rt_revolve_internal, ang), BU_STRUCTPARSE_FUNC_NULL }, - { "%V", 1, "sk_name", bu_offsetof(struct rt_revolve_internal, sketch_name), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_revolve_internal, v3d[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "axis", bu_offsetof(struct rt_revolve_internal, axis3d[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "R", bu_offsetof(struct rt_revolve_internal, r[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "ang", bu_offsetof(struct rt_revolve_internal, ang), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%V", 1, "sk_name", bu_offsetof(struct rt_revolve_internal, sketch_name), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/rhc/rhc.c =================================================================== --- brlcad/trunk/src/librt/primitives/rhc/rhc.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/rhc/rhc.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -192,12 +192,12 @@ const struct bu_structparse rt_rhc_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_rhc_internal, rhc_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_rhc_internal, rhc_H[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "B", bu_offsetof(struct rt_rhc_internal, rhc_B[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r", bu_offsetof(struct rt_rhc_internal, rhc_r), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "c", bu_offsetof(struct rt_rhc_internal, rhc_c), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_rhc_internal, rhc_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_rhc_internal, rhc_H[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "B", bu_offsetof(struct rt_rhc_internal, rhc_B[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r", bu_offsetof(struct rt_rhc_internal, rhc_r), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "c", bu_offsetof(struct rt_rhc_internal, rhc_c), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/rpc/rpc.c =================================================================== --- brlcad/trunk/src/librt/primitives/rpc/rpc.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/rpc/rpc.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -188,11 +188,11 @@ const struct bu_structparse rt_rpc_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_rpc_internal, rpc_V[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_rpc_internal, rpc_H[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "B", bu_offsetof(struct rt_rpc_internal, rpc_B[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "r", bu_offsetof(struct rt_rpc_internal, rpc_r), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_rpc_internal, rpc_V[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_rpc_internal, rpc_H[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "B", bu_offsetof(struct rt_rpc_internal, rpc_B[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "r", bu_offsetof(struct rt_rpc_internal, rpc_r), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/submodel/submodel.c =================================================================== --- brlcad/trunk/src/librt/primitives/submodel/submodel.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/submodel/submodel.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -52,10 +52,10 @@ #define RT_SUBMODEL_O(m) bu_offsetof(struct rt_submodel_internal, m) const struct bu_structparse rt_submodel_parse[] = { - {"%V", 1, "file", RT_SUBMODEL_O(file), BU_STRUCTPARSE_FUNC_NULL }, - {"%V", 1, "treetop", RT_SUBMODEL_O(treetop), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "meth", RT_SUBMODEL_O(meth), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%V", 1, "file", RT_SUBMODEL_O(file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%V", 1, "treetop", RT_SUBMODEL_O(treetop), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "meth", RT_SUBMODEL_O(meth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/superell/superell.c =================================================================== --- brlcad/trunk/src/librt/primitives/superell/superell.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/superell/superell.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -47,13 +47,13 @@ const struct bu_structparse rt_superell_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_superell_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_superell_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "B", bu_offsetof(struct rt_superell_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "C", bu_offsetof(struct rt_superell_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "n", bu_offsetof(struct rt_superell_internal, n), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 1, "e", bu_offsetof(struct rt_superell_internal, e), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_superell_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_superell_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "B", bu_offsetof(struct rt_superell_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "C", bu_offsetof(struct rt_superell_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "n", bu_offsetof(struct rt_superell_internal, n), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 1, "e", bu_offsetof(struct rt_superell_internal, e), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/table.c =================================================================== --- brlcad/trunk/src/librt/primitives/table.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/table.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -42,7 +42,7 @@ const struct bu_structparse rt_nul_parse[] = { - {""} + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c =================================================================== --- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -76,13 +76,13 @@ #define ALPHA(x, y, c, d) ((x)*(x)*(c) + (y)*(y)*(d)) const struct bu_structparse rt_tgc_parse[] = { - { "%f", 3, "V", bu_offsetof(struct rt_tgc_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "H", bu_offsetof(struct rt_tgc_internal, h[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "A", bu_offsetof(struct rt_tgc_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "B", bu_offsetof(struct rt_tgc_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "C", bu_offsetof(struct rt_tgc_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL }, - { "%f", 3, "D", bu_offsetof(struct rt_tgc_internal, d[X]), BU_STRUCTPARSE_FUNC_NULL }, - { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL } + { "%f", 3, "V", bu_offsetof(struct rt_tgc_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "H", bu_offsetof(struct rt_tgc_internal, h[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "A", bu_offsetof(struct rt_tgc_internal, a[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "B", bu_offsetof(struct rt_tgc_internal, b[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "C", bu_offsetof(struct rt_tgc_internal, c[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { "%f", 3, "D", bu_offsetof(struct rt_tgc_internal, d[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + { {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; Modified: brlcad/trunk/src/librt/primitives/tor/tor.c =================================================================== --- brlcad/trunk/src/librt/primitives/tor/tor.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/tor/tor.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -134,11 +134,11 @@ */ const struct bu_structparse rt_tor_parse[] = { - {"%f", 3, "V", bu_offsetof(struct rt_tor_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL}, - {"%f", 3, "H", bu_offsetof(struct rt_tor_internal, h[X]), BU_STRUCTPARSE_FUNC_NULL}, - {"%f", 1, "r_a", bu_offsetof(struct rt_tor_internal, r_a), BU_STRUCTPARSE_FUNC_NULL}, - {"%f", 1, "r_h", bu_offsetof(struct rt_tor_internal, r_h), BU_STRUCTPARSE_FUNC_NULL}, - {{'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL} + {"%f", 3, "V", bu_offsetof(struct rt_tor_internal, v[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%f", 3, "H", bu_offsetof(struct rt_tor_internal, h[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%f", 1, "r_a", bu_offsetof(struct rt_tor_internal, r_a), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {"%f", 1, "r_h", bu_offsetof(struct rt_tor_internal, r_h), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}, + {{'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL} }; Modified: brlcad/trunk/src/librt/primitives/vol/vol.c =================================================================== --- brlcad/trunk/src/librt/primitives/vol/vol.c 2009-12-21 22:55:22 UTC (rev 36955) +++ brlcad/trunk/src/librt/primitives/vol/vol.c 2009-12-21 23:02:26 UTC (rev 36956) @@ -65,15 +65,15 @@ #define VOL_O(m) bu_offsetof(struct rt_vol_internal, m) const struct bu_structparse rt_vol_parse[] = { - {"%s", RT_VOL_NAME_LEN, "file", bu_offsetofarray(struct rt_vol_internal, file), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "w", VOL_O(xdim), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "n", VOL_O(ydim), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "d", VOL_O(zdim), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "lo", VOL_O(lo), BU_STRUCTPARSE_FUNC_NULL }, - {"%d", 1, "hi", VOL_O(hi), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", ELEMENTS_PER_VECT, "size", bu_offsetofarray(struct rt_vol_internal, cellsize), BU_STRUCTPARSE_FUNC_NULL }, - {"%f", 16, "mat", bu_offsetofarray(struct rt_vol_internal, mat), BU_STRUCTPARSE_FUNC_NULL }, - {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL } + {"%s", RT_VOL_NAME_LEN, "file", bu_offsetofarray(struct rt_vol_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "w", VOL_O(xdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "n", VOL_O(ydim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "d", VOL_O(zdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "lo", VOL_O(lo), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%d", 1, "hi", VOL_O(hi), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", ELEMENTS_PER_VECT, "size", bu_offsetofarray(struct rt_vol_internal, cellsize), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"%f", 16, "mat", bu_offsetofarray(struct rt_vol_internal, mat), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, + {"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |