Revision: 44896
http://brlcad.svn.sourceforge.net/brlcad/?rev=44896&view=rev
Author: brlcad
Date: 2011-06-10 23:32:52 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
stop using BU_ARGS, just list the arguments. c89/posix lets us move forward.
Modified Paths:
--------------
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/conv/iges/g-iges.c
brlcad/trunk/src/libbu/parallel.c
brlcad/trunk/src/liboptical/sh_wood.c
brlcad/trunk/src/librt/cut.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/many.c
brlcad/trunk/src/librt/primitives/nmg/nmg_class.c
brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c
brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/include/raytrace.h 2011-06-10 23:32:52 UTC (rev 44896)
@@ -1040,21 +1040,21 @@
struct bu_attribute_value_set ts_attrs; /**< @brief
attribute/value structure */
int ts_stop_at_regions; /**< @brief else stop
at solids */
- int (*ts_region_start_func) BU_ARGS((struct
db_tree_state * /**< @brief tsp*/,
+ int (*ts_region_start_func)(struct db_tree_state *
/**< @brief tsp*/,
const struct
db_full_path * /**< @brief pathp*/,
const struct
rt_comb_internal * /**< @brief combp */,
genptr_t client_data
- ));
- union tree * (*ts_region_end_func) BU_ARGS((struct db_tree_state *
/**< @brief tsp*/,
+ );
+ union tree * (*ts_region_end_func)(struct db_tree_state * /**<
@brief tsp*/,
const struct
db_full_path * /**< @brief pathp*/,
union tree * /**< @brief
curtree*/,
genptr_t client_data
- ));
- union tree * (*ts_leaf_func) BU_ARGS((struct db_tree_state * /**<
@brief tsp*/,
+ );
+ union tree * (*ts_leaf_func)(struct db_tree_state * /**< @brief
tsp*/,
const struct db_full_path *
/**< @brief pathp*/,
struct rt_db_internal * /**<
@brief ip*/,
genptr_t client_data
- ));
+ );
const struct rt_tess_tol * ts_ttol; /**< @brief Tessellation
tolerance */
const struct bn_tol * ts_tol; /**< @brief Math
tolerance */
struct model ** ts_m; /**< @brief ptr to ptr to NMG
"model" */
@@ -1978,96 +1978,96 @@
char ft_name[16];
char ft_label[8];
int ft_use_rpp;
- int (*ft_prep) BU_ARGS((struct soltab * /**< @brief stp*/,
+ int (*ft_prep)(struct soltab * /**< @brief stp*/,
struct rt_db_internal * /**< @brief ip*/,
- struct rt_i * /**< @brief rtip*/));
- int (*ft_shot) BU_ARGS((struct soltab * /**< @brief stp*/,
+ struct rt_i * /**< @brief rtip*/);
+ int (*ft_shot)(struct soltab * /**< @brief stp*/,
struct xray * /**< @brief rp*/,
struct application * /**< @brief ap*/, /**<
@brief has resource */
- struct seg * /**< @brief seghead*/));
- void (*ft_print) BU_ARGS((const struct soltab * /**< @brief stp*/));
- void (*ft_norm) BU_ARGS((struct hit * /**< @brief hitp*/,
+ struct seg * /**< @brief seghead*/);
+ void (*ft_print)(const struct soltab * /**< @brief stp*/);
+ void (*ft_norm)(struct hit * /**< @brief hitp*/,
struct soltab * /**< @brief stp*/,
- struct xray * /**< @brief rp*/));
- int (*ft_piece_shot) BU_ARGS((struct rt_piecestate * /**< @brief psp*/,
+ struct xray * /**< @brief rp*/);
+ int (*ft_piece_shot)(struct rt_piecestate * /**< @brief psp*/,
struct rt_piecelist * /**< @brief plp*/,
double /**< @brief dist_correction to apply
to hit distances */,
struct xray * /**< @brief ray transformed to
be near cut cell */,
struct application * /**< @brief ap*/,
/**< @brief has resource */
- struct seg * /**< @brief seghead*/)); /**<
@brief used only for PLATE mode hits */
- void (*ft_piece_hitsegs) BU_ARGS((struct rt_piecestate * /**< @brief psp*/,
+ struct seg * /**< @brief seghead*/); /**<
@brief used only for PLATE mode hits */
+ void (*ft_piece_hitsegs)(struct rt_piecestate * /**< @brief psp*/,
struct seg * /**< @brief seghead*/,
- struct application * /**< @brief ap*/));
/**< @brief has resource */
- void (*ft_uv) BU_ARGS((struct application * /**< @brief ap*/, /**<
@brief has resource */
+ struct application * /**< @brief ap*/);
/**< @brief has resource */
+ void (*ft_uv)(struct application * /**< @brief ap*/, /**< @brief
has resource */
struct soltab * /**< @brief stp*/,
struct hit * /**< @brief hitp*/,
- struct uvcoord * /**< @brief uvp*/));
- void (*ft_curve) BU_ARGS((struct curvature * /**< @brief cvp*/,
+ struct uvcoord * /**< @brief uvp*/);
+ void (*ft_curve)(struct curvature * /**< @brief cvp*/,
struct hit * /**< @brief hitp*/,
- struct soltab * /**< @brief stp*/));
- int (*ft_classify) BU_ARGS((const struct soltab * /*stp*/, const vect_t
/*min*/, const vect_t /*max*/, const struct bn_tol * /*tol*/));
- void (*ft_free) BU_ARGS((struct soltab * /*stp*/));
- int (*ft_plot) BU_ARGS((struct bu_list * /*vhead*/,
+ struct soltab * /**< @brief stp*/);
+ int (*ft_classify)(const struct soltab * /*stp*/, const vect_t /*min*/,
const vect_t /*max*/, const struct bn_tol * /*tol*/);
+ void (*ft_free)(struct soltab * /*stp*/);
+ int (*ft_plot)(struct bu_list * /*vhead*/,
struct rt_db_internal * /*ip*/,
const struct rt_tess_tol * /*ttol*/,
- const struct bn_tol * /*tol*/));
- void (*ft_vshot) BU_ARGS((struct soltab * /*stp*/[],
+ const struct bn_tol * /*tol*/);
+ void (*ft_vshot)(struct soltab * /*stp*/[],
struct xray *[] /*rp*/,
struct seg * /*segp*/,
int /*n*/,
- struct application * /*ap*/));
- int (*ft_tessellate) BU_ARGS((struct nmgregion ** /*r*/,
+ struct application * /*ap*/);
+ int (*ft_tessellate)(struct nmgregion ** /*r*/,
struct model * /*m*/,
struct rt_db_internal * /*ip*/,
const struct rt_tess_tol * /*ttol*/,
- const struct bn_tol * /*tol*/));
- int (*ft_tnurb) BU_ARGS((struct nmgregion ** /*r*/,
+ const struct bn_tol * /*tol*/);
+ int (*ft_tnurb)(struct nmgregion ** /*r*/,
struct model * /*m*/,
struct rt_db_internal * /*ip*/,
- const struct bn_tol * /*tol*/));
- void (*ft_brep) BU_ARGS((ON_Brep ** /*b*/,
+ const struct bn_tol * /*tol*/);
+ void (*ft_brep)(ON_Brep ** /*b*/,
struct rt_db_internal * /*ip*/,
- const struct bn_tol * /*tol*/));
- int (*ft_import5) BU_ARGS((struct rt_db_internal * /*ip*/,
+ const struct bn_tol * /*tol*/);
+ int (*ft_import5)(struct rt_db_internal * /*ip*/,
const struct bu_external * /*ep*/,
const mat_t /*mat*/,
const struct db_i * /*dbip*/,
- struct resource * /*resp*/));
- int (*ft_export5) BU_ARGS((struct bu_external * /*ep*/,
+ struct resource * /*resp*/);
+ int (*ft_export5)(struct bu_external * /*ep*/,
const struct rt_db_internal * /*ip*/,
double /*local2mm*/,
const struct db_i * /*dbip*/,
- struct resource * /*resp*/));
- int (*ft_import4) BU_ARGS((struct rt_db_internal * /*ip*/,
+ struct resource * /*resp*/);
+ int (*ft_import4)(struct rt_db_internal * /*ip*/,
const struct bu_external * /*ep*/,
const mat_t /*mat*/,
const struct db_i * /*dbip*/,
- struct resource * /*resp*/));
- int (*ft_export4) BU_ARGS((struct bu_external * /*ep*/,
+ struct resource * /*resp*/);
+ int (*ft_export4)(struct bu_external * /*ep*/,
const struct rt_db_internal * /*ip*/,
double /*local2mm*/,
const struct db_i * /*dbip*/,
- struct resource * /*resp*/));
- void (*ft_ifree) BU_ARGS((struct rt_db_internal * /*ip*/));
- int (*ft_describe) BU_ARGS((struct bu_vls * /*str*/,
+ struct resource * /*resp*/);
+ void (*ft_ifree)(struct rt_db_internal * /*ip*/);
+ int (*ft_describe)(struct bu_vls * /*str*/,
const struct rt_db_internal * /*ip*/,
int /*verbose*/,
double /*mm2local*/,
struct resource * /*resp*/,
- struct db_i *));
- int (*ft_xform) BU_ARGS((struct rt_db_internal * /*op*/,
+ struct db_i *);
+ int (*ft_xform)(struct rt_db_internal * /*op*/,
const mat_t /*mat*/, struct rt_db_internal *
/*ip*/,
int /*free*/, struct db_i * /*dbip*/,
- struct resource * /*resp*/));
+ struct resource * /*resp*/);
const struct bu_structparse *ft_parsetab; /**< @brief rt_xxx_parse */
size_t ft_internal_size; /**< @brief sizeof(struct rt_xxx_internal) */
unsigned long ft_internal_magic; /**< @brief RT_XXX_INTERNAL_MAGIC */
- int (*ft_get) BU_ARGS((struct bu_vls *, const struct rt_db_internal
*, const char *item));
- int (*ft_adjust) BU_ARGS((struct bu_vls *, struct rt_db_internal *,
int /*argc*/, const char ** /*argv*/));
- int (*ft_form) BU_ARGS((struct bu_vls *, const struct rt_functab
*));
+ int (*ft_get)(struct bu_vls *, const struct rt_db_internal *, const
char *item);
+ int (*ft_adjust)(struct bu_vls *, struct rt_db_internal *, int
/*argc*/, const char ** /*argv*/);
+ int (*ft_form)(struct bu_vls *, const struct rt_functab *);
- void (*ft_make) BU_ARGS((const struct rt_functab *, struct rt_db_internal
*/*ip*/));
- int (*ft_params) BU_ARGS((struct pc_pc_set *, const struct rt_db_internal
*/*ip*/));
+ void (*ft_make)(const struct rt_functab *, struct rt_db_internal */*ip*/);
+ int (*ft_params)(struct pc_pc_set *, const struct rt_db_internal */*ip*/);
};
RT_EXPORT extern const struct rt_functab rt_functab[];
Modified: brlcad/trunk/src/conv/iges/g-iges.c
===================================================================
--- brlcad/trunk/src/conv/iges/g-iges.c 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/src/conv/iges/g-iges.c 2011-06-10 23:32:52 UTC (rev 44896)
@@ -135,7 +135,7 @@
struct iges_functab
{
- int (*do_iges_write) BU_ARGS((struct rt_db_internal *, char *, FILE *,
FILE *));
+ int (*do_iges_write)(struct rt_db_internal *, char *, FILE *, FILE *);
};
Modified: brlcad/trunk/src/libbu/parallel.c
===================================================================
--- brlcad/trunk/src/libbu/parallel.c 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/src/libbu/parallel.c 2011-06-10 23:32:52 UTC (rev 44896)
@@ -577,7 +577,7 @@
static int _bu_nthreads_started = 0; /* # threads started */
static int _bu_nthreads_finished = 0; /* # threads properly finished */
static genptr_t _bu_parallel_arg; /* User's arg to his threads */
-static void (*_bu_parallel_func) BU_ARGS((int, genptr_t)); /* user
function to run in parallel */
+static void (*_bu_parallel_func)(int, genptr_t); /* user function to run
in parallel */
/**
Modified: brlcad/trunk/src/liboptical/sh_wood.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_wood.c 2011-06-10 21:03:20 UTC (rev
44895)
+++ brlcad/trunk/src/liboptical/sh_wood.c 2011-06-10 23:32:52 UTC (rev
44896)
@@ -86,10 +86,10 @@
HIDDEN int wood_init(void), wood_setup(register struct region *rp, struct
bu_vls *matparm, char **dpp, struct mfuncs *mfp, struct rt_i *rtip),
wood_render(struct application *ap, struct partition *partp, struct shadework
*swp, char *dp);
HIDDEN void wood_print(register struct region *rp);
-HIDDEN void wood_free BU_ARGS((char *));
+HIDDEN void wood_free(char *);
-HIDDEN void wood_V_set BU_ARGS((const struct bu_structparse *, const char *,
const char *, char *));
-HIDDEN void wood_D_set BU_ARGS((const struct bu_structparse *, const char *,
const char *, char *));
+HIDDEN void wood_V_set(const struct bu_structparse *, const char *, const char
*, char *);
+HIDDEN void wood_D_set(const struct bu_structparse *, const char *, const char
*, char *);
/*
* functions block for the shader
@@ -154,7 +154,7 @@
};
-HIDDEN void wood_setup_2 BU_ARGS((struct wood_specific *));
+HIDDEN void wood_setup_2(struct wood_specific *);
/*
* Flags and useful offset declarations
Modified: brlcad/trunk/src/librt/cut.c
===================================================================
--- brlcad/trunk/src/librt/cut.c 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/src/librt/cut.c 2011-06-10 23:32:52 UTC (rev 44896)
@@ -48,15 +48,15 @@
#include "plot3.h"
-HIDDEN int rt_ck_overlap BU_ARGS((const vect_t min, const vect_t max, const
struct soltab *stp, const struct rt_i *rtip));
-HIDDEN int rt_ct_box BU_ARGS((struct rt_i *rtip, union cutter *cutp, int axis,
double where, int force));
-HIDDEN void rt_ct_optim BU_ARGS((struct rt_i *rtip, union cutter *cutp, size_t
depth));
-HIDDEN void rt_ct_free BU_ARGS((struct rt_i *rtip, union cutter *cutp));
-HIDDEN void rt_ct_release_storage BU_ARGS((union cutter *cutp));
+HIDDEN int rt_ck_overlap(const vect_t min, const vect_t max, const struct
soltab *stp, const struct rt_i *rtip);
+HIDDEN int rt_ct_box(struct rt_i *rtip, union cutter *cutp, int axis, double
where, int force);
+HIDDEN void rt_ct_optim(struct rt_i *rtip, union cutter *cutp, size_t depth);
+HIDDEN void rt_ct_free(struct rt_i *rtip, union cutter *cutp);
+HIDDEN void rt_ct_release_storage(union cutter *cutp);
-HIDDEN void rt_ct_measure BU_ARGS((struct rt_i *rtip, union cutter *cutp, int
depth));
-HIDDEN union cutter *rt_ct_get BU_ARGS((struct rt_i *rtip));
-HIDDEN void rt_plot_cut BU_ARGS((FILE *fp, struct rt_i *rtip, union cutter
*cutp, int lvl));
+HIDDEN void rt_ct_measure(struct rt_i *rtip, union cutter *cutp, int depth);
+HIDDEN union cutter *rt_ct_get(struct rt_i *rtip);
+HIDDEN void rt_plot_cut(FILE *fp, struct rt_i *rtip, union cutter *cutp, int
lvl);
BU_EXTERN(void rt_pr_cut_info, (const struct rt_i *rtip, const char *str));
HIDDEN int rt_ct_old_assess(register union cutter *, register int, double *,
double *);
@@ -167,12 +167,12 @@
(*(const struct soltab **)(_p2))->_memb[_ind] ? 1 : 0
/* Functions for use with qsort */
-HIDDEN int rt_projXmin_comp BU_ARGS((const void * p1, const void * p2));
-HIDDEN int rt_projXmax_comp BU_ARGS((const void * p1, const void * p2));
-HIDDEN int rt_projYmin_comp BU_ARGS((const void * p1, const void * p2));
-HIDDEN int rt_projYmax_comp BU_ARGS((const void * p1, const void * p2));
-HIDDEN int rt_projZmin_comp BU_ARGS((const void * p1, const void * p2));
-HIDDEN int rt_projZmax_comp BU_ARGS((const void * p1, const void * p2));
+HIDDEN int rt_projXmin_comp(const void * p1, const void * p2);
+HIDDEN int rt_projXmax_comp(const void * p1, const void * p2);
+HIDDEN int rt_projYmin_comp(const void * p1, const void * p2);
+HIDDEN int rt_projYmax_comp(const void * p1, const void * p2);
+HIDDEN int rt_projZmin_comp(const void * p1, const void * p2);
+HIDDEN int rt_projZmax_comp(const void * p1, const void * p2);
HIDDEN int
rt_projXmin_comp(const void *p1, const void *p2)
@@ -211,8 +211,8 @@
}
HIDDEN struct cmp_pair {
- int (*cmp_min) BU_ARGS((const void *, const void *));
- int (*cmp_max) BU_ARGS((const void *, const void *));
+ int (*cmp_min)(const void *, const void *);
+ int (*cmp_max)(const void *, const void *);
} pairs[] = {
{ rt_projXmin_comp, rt_projXmax_comp },
{ rt_projYmin_comp, rt_projYmax_comp },
Modified: brlcad/trunk/src/librt/db_tree.c
===================================================================
--- brlcad/trunk/src/librt/db_tree.c 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/src/librt/db_tree.c 2011-06-10 23:32:52 UTC (rev 44896)
@@ -2071,7 +2071,7 @@
_db_walk_subtree(
union tree *tp,
struct combined_tree_state **region_start_statepp,
- union tree *(*leaf_func) BU_ARGS((struct db_tree_state *, const struct
db_full_path *, struct rt_db_internal *, void *)),
+ union tree *(*leaf_func)(struct db_tree_state *, const struct db_full_path
*, struct rt_db_internal *, void *),
genptr_t client_data,
struct resource *resp)
{
Modified: brlcad/trunk/src/librt/many.c
===================================================================
--- brlcad/trunk/src/librt/many.c 2011-06-10 21:03:20 UTC (rev 44895)
+++ brlcad/trunk/src/librt/many.c 2011-06-10 23:32:52 UTC (rev 44896)
@@ -46,7 +46,7 @@
long max_index;
const struct application *proto_ap;
struct resource *resources;
- int (*callback) BU_ARGS((struct application *, int
index));
+ int (*callback)(struct application *, int index);
int stop_worker;
int sem_chunk;
};
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_class.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_class.c 2011-06-10 21:03:20 UTC
(rev 44895)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_class.c 2011-06-10 23:32:52 UTC
(rev 44896)
@@ -73,20 +73,20 @@
};
-static void nmg_class_pt_e BU_ARGS((struct neighbor *closest,
+static void nmg_class_pt_e(struct neighbor *closest,
const point_t pt, const struct edgeuse *eu,
- const struct bn_tol *tol));
-static void nmg_class_pt_l BU_ARGS((struct neighbor *closest,
+ const struct bn_tol *tol);
+static void nmg_class_pt_l(struct neighbor *closest,
const point_t pt, const struct loopuse *lu,
- const struct bn_tol *tol));
-static int class_vu_vs_s BU_ARGS((struct vertexuse *vu, struct shell *sB,
- char **classlist, const struct bn_tol *tol));
-static int class_eu_vs_s BU_ARGS((struct edgeuse *eu, struct shell *s,
- char **classlist, const struct bn_tol *tol));
-static int class_lu_vs_s BU_ARGS((struct loopuse *lu, struct shell *s,
- char **classlist, const struct bn_tol *tol));
-static void class_fu_vs_s BU_ARGS((struct faceuse *fu, struct shell *s,
- char **classlist, const struct bn_tol *tol));
+ const struct bn_tol *tol);
+static int class_vu_vs_s(struct vertexuse *vu, struct shell *sB,
+ char **classlist, const struct bn_tol *tol);
+static int class_eu_vs_s(struct edgeuse *eu, struct shell *s,
+ char **classlist, const struct bn_tol *tol);
+static int class_lu_vs_s(struct loopuse *lu, struct shell *s,
+ char **classlist, const struct bn_tol *tol);
+static void class_fu_vs_s(struct faceuse *fu, struct shell *s,
+ char **classlist, const struct bn_tol *tol);
/**
* N M G _ C L A S S _ S T A T U S
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c 2011-06-10 21:03:20 UTC
(rev 44895)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_eval.c 2011-06-10 23:32:52 UTC
(rev 44896)
@@ -49,8 +49,8 @@
};
-HIDDEN void nmg_eval_shell BU_ARGS((struct shell *s, struct nmg_bool_state
*bs));
-HIDDEN void nmg_eval_plot BU_ARGS((struct nmg_bool_state *bs, int num));
+HIDDEN void nmg_eval_shell(struct shell *s, struct nmg_bool_state *bs);
+HIDDEN void nmg_eval_plot(struct nmg_bool_state *bs, int num);
#define BACTION_KILL 1
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2011-06-10 21:03:20 UTC
(rev 44895)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_inter.c 2011-06-10 23:32:52 UTC
(rev 44896)
@@ -80,9 +80,9 @@
};
-static int nmg_isect_edge2p_face2p BU_ARGS((struct nmg_inter_struct *is,
+static int nmg_isect_edge2p_face2p(struct nmg_inter_struct *is,
struct edgeuse *eu, struct
faceuse *fu,
- struct faceuse *eu_fu));
+ struct faceuse *eu_fu);
static struct nmg_inter_struct *nmg_hack_last_is; /* see
nmg_isect2d_final_cleanup() */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
