Revision: 41160
http://brlcad.svn.sourceforge.net/brlcad/?rev=41160&view=rev
Author: brlcad
Date: 2010-10-29 05:21:33 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
quell a slew of strict compilation warnings. unused vars, k&r conversions to
stdc, and more.
Modified Paths:
--------------
brlcad/trunk/src/burst/Hm.c
brlcad/trunk/src/burst/Makefile.am
brlcad/trunk/src/burst/fb.c
brlcad/trunk/src/burst/grid.c
brlcad/trunk/src/burst/gridrotate.c
brlcad/trunk/src/burst/ui.c
Modified: brlcad/trunk/src/burst/Hm.c
===================================================================
--- brlcad/trunk/src/burst/Hm.c 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/Hm.c 2010-10-29 05:21:33 UTC (rev 41160)
@@ -112,7 +112,7 @@
void
HmBanner( const char *pgmname, int borderchr )
{
- int co;
+ int column;
char *p;
#define HmBUFLEN 81
static char HmPgmName[HmBUFLEN] = "No name";
@@ -122,11 +122,11 @@
HmBorderChr = borderchr;
}
(void) ScMvCursor( HmLftMenu, HmYBORDER );
- for ( co = 1; co <= 3; co++ )
+ for ( column = 1; column <= 3; column++ )
(void) putc( HmBorderChr, stdout );
- for ( p = HmPgmName; co <= ScCO && *p != '\0'; co++, p++ )
+ for ( p = HmPgmName; column <= ScCO && *p != '\0'; column++, p++ )
(void) putc( (int)(*p), stdout );
- for (; co <= ScCO; co++ )
+ for (; column <= ScCO; column++ )
(void) putc( HmBorderChr, stdout );
return;
}
Modified: brlcad/trunk/src/burst/Makefile.am
===================================================================
--- brlcad/trunk/src/burst/Makefile.am 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/Makefile.am 2010-10-29 05:21:33 UTC (rev 41160)
@@ -19,7 +19,11 @@
trie.c \
ui.c
-burst_CFLAGS = ${TERMLIB_CPPFLAGS} ${TCL_CPPFLAGS}
+burst_CFLAGS = \
+ ${STRICT_FLAGS} \
+ ${TERMLIB_CPPFLAGS} \
+ ${TCL_CPPFLAGS}
+
burst_LDADD = \
${RT} \
${FB} \
Modified: brlcad/trunk/src/burst/fb.c
===================================================================
--- brlcad/trunk/src/burst/fb.c 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/fb.c 2010-10-29 05:21:33 UTC (rev 41160)
@@ -78,13 +78,11 @@
return 1;
}
-/* openFbDevice( char *devname )
-
+/*
Must be called after gridInit() so that gridsz is setup.
*/
int
-openFbDevice( devname )
- char *devname;
+openFbDevice( char *fbdev )
{
int ret = 1;
notify( "Opening frame buffer", NOTIFY_APPEND );
@@ -113,7 +111,7 @@
goto safe_exit;
}
}
- fbiop = fb_open( devname, devwid, devhgt );
+ fbiop = fb_open( fbdev, devwid, devhgt );
if ( fbiop == NULL )
{
ret = 0;
Modified: brlcad/trunk/src/burst/grid.c
===================================================================
--- brlcad/trunk/src/burst/grid.c 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/grid.c 2010-10-29 05:21:33 UTC (rev 41160)
@@ -94,9 +94,7 @@
by regp.
*/
void
-colorPartition(regp, type)
- struct region *regp;
- int type;
+colorPartition(struct region *regp, int type)
{
Colors *colorp;
if (plotfile[0] == NUL)
@@ -194,9 +192,7 @@
too thin.
*/
static void
-enforceLOS(ap, pt_headp)
- struct application *ap;
- struct partition *pt_headp;
+enforceLOS(struct application *ap, struct partition *pt_headp)
{
struct partition *pp;
for (pp = pt_headp->pt_forw; pp != pt_headp;)
@@ -224,10 +220,7 @@
critical components were encountered.
*/
static int
-f_BurstHit(ap, pt_headp, segp)
- struct application *ap;
- struct partition *pt_headp;
- struct seg *segp;
+f_BurstHit(struct application *ap, struct partition *pt_headp, struct seg
*UNUSED(segp))
{
Pt_Queue *qshield = PT_Q_NULL;
struct partition *cpp, *spp;
@@ -312,11 +305,7 @@
*/
/*ARGSUSED*/
static int
-f_HushOverlap(ap, pp, reg1, reg2, pheadp)
- struct application *ap;
- struct partition *pp;
- struct region *reg1, *reg2;
- struct partition *pheadp;
+f_HushOverlap(struct application *UNUSED(ap), struct partition *pp, struct
region *reg1, struct region *reg2, struct partition *pheadp)
{
fastf_t depth;
depth = pp->pt_outhit->hit_dist - pp->pt_inhit->hit_dist;
@@ -358,11 +347,7 @@
*/
/*ARGSUSED*/
static int
-f_Overlap(ap, pp, reg1, reg2, pheadp)
- struct application *ap;
- struct partition *pp;
- struct region *reg1, *reg2;
- struct partition *pheadp;
+f_Overlap(struct application *ap, struct partition *pp, struct region *reg1,
struct region *reg2, struct partition *pheadp)
{
fastf_t depth;
point_t pt;
@@ -418,10 +403,7 @@
handed to rt_shootray() by burstRay(). Otherwise, 1 is returned.
*/
static int
-f_ShotHit(ap, pt_headp, segp)
- struct application *ap;
- struct partition *pt_headp;
- struct seg *segp;
+f_ShotHit(struct application *ap, struct partition *pt_headp, struct seg
*UNUSED(segp))
{
struct partition *pp;
struct partition *bp = PT_NULL;
@@ -698,9 +680,6 @@
/* See if inside air follows impl. outside air. */
if (voidflag && InsideAir(nregp))
{
- fastf_t slos =
- np->pt_outhit->hit_dist -
- np->pt_inhit->hit_dist;
#if DEBUG_GRID
brst_log("\t\tinside air follows impl. outside air\n");
#endif
@@ -714,8 +693,6 @@
&& DiffAir(nregp, regp)
)
{
- fastf_t slos = np->pt_outhit->hit_dist -
- np->pt_inhit->hit_dist;
#if DEBUG_GRID
brst_log("\t\tdiffering airs are adjacent\n");
#endif
@@ -780,22 +757,13 @@
because it can be instanced by other solids.
*/
void
-getRtHitNorm(hitp, stp, rayp, flipped, normvec)
- struct hit *hitp;
- struct soltab *stp;
- struct xray *rayp;
- int flipped;
- fastf_t normvec[3];
+getRtHitNorm(struct hit *hitp, struct soltab *stp, struct xray *UNUSED(rayp),
int flipped, fastf_t normvec[3])
{
RT_HIT_NORMAL(normvec, hitp, stp, rayp, flipped);
}
int
-chkEntryNorm(pp, rayp, normvec, purpose)
- struct partition *pp;
- struct xray *rayp;
- fastf_t normvec[3];
- char *purpose;
+chkEntryNorm(struct partition *pp, struct xray *rayp, fastf_t normvec[3], char
*purpose)
{
fastf_t f;
static int flipct = 0;
@@ -842,11 +810,7 @@
}
int
-chkExitNorm(pp, rayp, normvec, purpose)
- struct partition *pp;
- struct xray *rayp;
- fastf_t normvec[3];
- char *purpose;
+chkExitNorm(struct partition *pp, struct xray *rayp, fastf_t normvec[3], char
*purpose)
{
fastf_t f;
static int flipct = 0;
@@ -900,8 +864,7 @@
debugging.
*/
static int
-f_ShotMiss(ap)
- struct application *ap;
+f_ShotMiss(struct application *ap)
{
if (groundburst)
{
@@ -971,8 +934,7 @@
Burst ray missed the model, so do nothing.
*/
static int
-f_BurstMiss(ap)
- struct application *ap;
+f_BurstMiss(struct application *ap)
{
VSETALL(ap->a_color, 0.0); /* All misses black. */
return 0;
@@ -990,8 +952,7 @@
1 for success.
*/
static int
-getRayOrigin(ap)
- struct application *ap;
+getRayOrigin(struct application *ap)
{
fastf_t *vec = ap->a_uvec;
fastf_t gridyinc[3], gridxinc[3];
@@ -1402,12 +1363,7 @@
space.
*/
static void
-lgtModel(ap, pp, hitp, rayp, surfnorm)
- struct application *ap;
- struct partition *pp;
- struct hit *hitp;
- struct xray *rayp;
- fastf_t surfnorm[3];
+lgtModel(struct application *ap, struct partition *pp, struct hit *hitp,
struct xray *UNUSED(rayp), fastf_t surfnorm[3])
{
Colors *colorp;
fastf_t intensity = -VDOT(viewdir, surfnorm);
@@ -1438,8 +1394,7 @@
cause side-effects or redundant computation.
*/
static fastf_t
-max(a, b)
- fastf_t a, b;
+max(fastf_t a, fastf_t b)
{
return FMAX(a, b);
}
@@ -1451,8 +1406,7 @@
cause side-effects or redundant computation.
*/
static fastf_t
-min(a, b)
- fastf_t a, b;
+min(fastf_t a, fastf_t b)
{
return FMIN(a, b);
}
@@ -1502,8 +1456,7 @@
set to 1.
*/
static int
-readShot(vec)
- fastf_t *vec;
+readShot(fastf_t *vec)
{
assert(shotfp != (FILE *) NULL);
if (! TSTBIT(firemode, FM_3DIM)) /* absence of 3D flag means 2D */
@@ -1641,17 +1594,13 @@
static struct application a_burst; /* prototype spall ray */
/*
- int burstPoint(struct application *ap,
- fastf_t *normal, fastf_t *bpt)
-
- This routine dispatches the burst point ray tracing task burstRay().
- RETURN CODES: 0 for fatal ray tracing error, 1 otherwise.
-*/
+ * This routine dispatches the burst point ray tracing task burstRay().
+ * RETURN CODES: 0 for fatal ray tracing error, 1 otherwise.
+ *
+ * bpt is burst point coordinates.
+ */
static int
-burstPoint(ap, normal, bpt)
- struct application *ap;
- fastf_t *normal;
- fastf_t *bpt; /* burst point coordinates */
+burstPoint(struct application *ap, fastf_t *normal, fastf_t *bpt)
{
a_burst = *ap;
a_burst.a_miss = f_BurstMiss;
@@ -1753,9 +1702,7 @@
}
static void
-spallVec(dvec, s_rdir, phi, gammaval)
- fastf_t *dvec, *s_rdir;
- fastf_t phi, gammaval;
+spallVec(fastf_t *dvec, fastf_t *s_rdir, fastf_t phi, fastf_t gammaval)
{
fastf_t cosphi = cos(phi);
fastf_t singamma = sin(gammaval);
@@ -1790,9 +1737,7 @@
in radians, allocating storage for it and returning its address.
*/
static void
-consVector(vec, azim, elev)
- fastf_t *vec;
- fastf_t azim, elev;
+consVector(fastf_t *vec, fastf_t azim, fastf_t elev)
{
/* Store cosine of the elevation to save calculating twice. */
fastf_t cosE;
@@ -1804,36 +1749,17 @@
}
void
-abort_RT(int sig)
+abort_RT(int UNUSED(sig))
{
(void) signal(SIGINT, abort_RT);
userinterrupt = 1;
return;
}
-#if 0
-/* i p o w ()
- Integer exponent pow() function.
- Returns d to the nth power.
-*/
-static fastf_t
-ipow(d, n)
- fastf_t d;
- int n;
-{
- fastf_t result = 1.0;
- if (d == 0.0)
- return 0.0;
- while (n-- > 0)
- result *= d;
- return result;
-}
-#endif
/* v i e w _ p i x () */
static void
-view_pix(ap)
- struct application *ap;
+view_pix(struct application *ap)
{
bu_semaphore_acquire(BU_SEM_SYSCALL);
if (! TSTBIT(firemode, FM_BURST))
Modified: brlcad/trunk/src/burst/gridrotate.c
===================================================================
--- brlcad/trunk/src/burst/gridrotate.c 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/gridrotate.c 2010-10-29 05:21:33 UTC (rev 41160)
@@ -59,7 +59,7 @@
des_V[1] = -sn_elv*sn_azm;
des_V[2] = cos( elev );
- if ( roll != 0.0 ) {
+ if (!NEAR_ZERO(roll, SMALL_FASTF)) {
fastf_t tmp_V[3], tmp_H[3], prime_V[3];
fastf_t sn_roll = sin( roll );
fastf_t cs_roll = cos( roll );
Modified: brlcad/trunk/src/burst/ui.c
===================================================================
--- brlcad/trunk/src/burst/ui.c 2010-10-29 04:58:23 UTC (rev 41159)
+++ brlcad/trunk/src/burst/ui.c 2010-10-29 05:21:33 UTC (rev 41160)
@@ -169,7 +169,7 @@
"type in shotline coordinates",
0, Minput2dShot },
{ "execute", "begin ray tracing", 0, Mexecute },
- { 0 },
+ { NULL, NULL, 0, NULL },
};
Ftable shot3dmenu[] =
@@ -181,7 +181,7 @@
"type in shotline coordinates",
0, Minput3dShot },
{ "execute", "begin ray tracing", 0, Mexecute },
- { 0 },
+ { NULL, NULL, 0, NULL },
};
Ftable shotcoordmenu[] =
@@ -192,7 +192,7 @@
{ "shotline coordinate system",
"specify shotline location in attack coordinates (2-d)",
shot2dmenu, 0 },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable gridmenu[] =
@@ -204,7 +204,7 @@
"generate a grid which covers a portion of the target",
0, MenclosePortion },
{ "execute", "begin ray tracing", 0, Mexecute },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable locoptmenu[] =
@@ -213,7 +213,7 @@
"generate a grid of shotlines", gridmenu, 0 },
{ "discrete shots",
"specify each shotline by coordinates", shotcoordmenu, 0 },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable burstcoordmenu[] =
@@ -225,7 +225,7 @@
"specify each burst point in target coordinates (3-d)",
0, MinputBurst },
{ "execute", "begin ray tracing", 0, Mexecute },
- { 0 },
+ { NULL, NULL, 0, NULL },
};
Ftable burstoptmenu[] =
@@ -245,7 +245,7 @@
{ "max-barriers",
"maximum number of shielding components along spall ray",
0, MmaxBarriers },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable burstlocmenu[] =
@@ -259,7 +259,7 @@
{ "shotline-burst",
"burst along shotline on impact with critical components",
0, MautoBurst },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable burstmenu[] =
@@ -270,7 +270,7 @@
{ "bursting parameters",
"configure spall cone generation options",
burstoptmenu, 0 },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable shotlnmenu[] =
@@ -284,7 +284,7 @@
0, Mdither },
{ "shotline location",
"positioning of shotlines", locoptmenu, 0 },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable targetmenu[] =
@@ -303,7 +303,7 @@
0, McritComp },
{ "color-file", "file containing component ident to color mappings",
0, McolorFile },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable prefmenu[] =
@@ -311,7 +311,7 @@
{ "report-overlaps",
"enable or disable the reporting of overlaps",
0, Moverlaps },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable filemenu[] =
@@ -337,7 +337,7 @@
{ "write-input-file",
"save input up to this point in a session file",
0, MwriteCmdFile },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
Ftable mainmenu[] =
@@ -358,13 +358,11 @@
{ "preferences",
"options for tailoring behavior of user interface",
prefmenu, 0 },
- { 0 }
+ { NULL, NULL, 0, NULL },
};
static void
-addItem( tp, itemp )
- Ftable *tp;
- HmItem *itemp;
+addItem(Ftable *tp, HmItem *itemp)
{
itemp->text = tp->name;
itemp->help = tp->help;
@@ -376,8 +374,7 @@
}
static HmMenu *
-addMenu( tp )
- Ftable *tp;
+addMenu(Ftable *tp)
{
HmMenu *menup;
HmItem *itemp;
@@ -430,8 +427,7 @@
}
static int
-getInput( ip )
- Input *ip;
+getInput(Input *ip)
{
if ( ! batchmode )
{
@@ -472,8 +468,7 @@
Initialize the keyword commands.
*/
static void
-initCmds( tp )
- Ftable *tp;
+initCmds(Ftable *tp)
{
for (; tp->name != NULL; tp++ )
{
@@ -491,8 +486,7 @@
Initialize the hierarchical menus.
*/
static void
-initMenus( tp )
- Ftable *tp;
+initMenus(Ftable *tp)
{
mainhmenu = addMenu( tp );
return;
@@ -525,8 +519,7 @@
}
static int
-unitStrToInt( str )
- char *str;
+unitStrToInt(char *str)
{
if ( strcmp( str, UNITS_INCHES ) == 0 )
return U_INCHES;
@@ -543,8 +536,7 @@
/*ARGSUSED*/
static void
-MattackDir( itemp )
- HmItem *itemp;
+MattackDir(HmItem *itemp)
{
static Input input[] =
{
@@ -565,8 +557,7 @@
/*ARGSUSED*/
static void
-MautoBurst( itemp )
- HmItem *itemp;
+MautoBurst(HmItem *itemp)
{
static Input input[] =
{
@@ -596,8 +587,7 @@
/*ARGSUSED*/
static void
-MburstAir( itemp )
- HmItem *itemp;
+MburstAir(HmItem *itemp)
{
static Input input[] =
{
@@ -630,8 +620,7 @@
/*ARGSUSED*/
static void
-MburstArmor( itemp )
- HmItem *itemp;
+MburstArmor(HmItem *itemp)
{
static Input input[] =
{
@@ -664,8 +653,7 @@
/*ARGSUSED*/
static void
-MburstDist( itemp )
- HmItem *itemp;
+MburstDist(HmItem *itemp)
{
static Input input[] =
{
@@ -683,8 +671,7 @@
/*ARGSUSED*/
static void
-MburstFile( itemp )
- HmItem *itemp;
+MburstFile(HmItem *itemp)
{
static Input input[] =
{
@@ -712,8 +699,7 @@
/*ARGSUSED*/
static void
-McellSize( itemp )
- HmItem *itemp;
+McellSize(HmItem *itemp)
{
static Input input[] =
{
@@ -731,8 +717,7 @@
/*ARGSUSED*/
static void
-McolorFile( itemp )
- HmItem *itemp;
+McolorFile(HmItem *itemp)
{
static Input input[] =
{
@@ -765,8 +750,7 @@
/*ARGSUSED*/
static void
-Mcomment( itemp )
- HmItem *itemp;
+Mcomment(HmItem *UNUSED(itemp))
{
static Input input[] =
{
@@ -790,8 +774,7 @@
/*ARGSUSED*/
static void
-MconeHalfAngle( itemp )
- HmItem *itemp;
+MconeHalfAngle(HmItem *itemp)
{
static Input input[] =
{
@@ -809,8 +792,7 @@
/*ARGSUSED*/
static void
-McritComp( itemp )
- HmItem *itemp;
+McritComp(HmItem *itemp)
{
static Input input[] =
{
@@ -844,8 +826,7 @@
/*ARGSUSED*/
static void
-MdeflectSpallCone( itemp )
- HmItem *itemp;
+MdeflectSpallCone(HmItem *itemp)
{
static Input input[] =
{
@@ -862,8 +843,7 @@
/*ARGSUSED*/
static void
-Mdither( itemp )
- HmItem *itemp;
+Mdither(HmItem *itemp)
{
static Input input[] =
{
@@ -880,8 +860,7 @@
/*ARGSUSED*/
static void
-MenclosePortion( itemp )
- HmItem *itemp;
+MenclosePortion(HmItem *itemp)
{
static Input input[] =
{
@@ -910,8 +889,7 @@
/*ARGSUSED*/
static void
-MencloseTarget( itemp )
- HmItem *itemp;
+MencloseTarget(HmItem *itemp)
{
(void) snprintf( scrbuf, LNBUFSZ,
"%s",
@@ -922,8 +900,7 @@
}
static void
-MerrorFile( itemp )
- HmItem *itemp;
+MerrorFile(HmItem *itemp)
{
static Input input[] =
{
@@ -957,8 +934,7 @@
/*ARGSUSED*/
static void
-Mexecute( itemp )
- HmItem *itemp;
+Mexecute(HmItem *itemp)
{
static int gottree = 0;
int loaderror = 0;
@@ -1031,8 +1007,7 @@
/*ARGSUSED*/
static void
-MfbFile( itemp )
- HmItem *itemp;
+MfbFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1052,10 +1027,8 @@
/*ARGSUSED*/
static void
-MgedFile( itemp )
- HmItem *itemp;
+MgedFile(HmItem *itemp)
{
- struct stat sb;
static Input input[] = {
{ "Name of target (MGED) file", "", "%s", 0 },
};
@@ -1080,8 +1053,7 @@
/*ARGSUSED*/
static void
-MgridFile( itemp )
- HmItem *itemp;
+MgridFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1109,8 +1081,7 @@
/*ARGSUSED*/
static void
-MgroundPlane( itemp )
- HmItem *itemp;
+MgroundPlane(HmItem *itemp)
{
static Input input[] =
{
@@ -1155,8 +1126,7 @@
/*ARGSUSED*/
static void
-MhistFile( itemp )
- HmItem *itemp;
+MhistFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1183,8 +1153,7 @@
}
static void
-MinputBurst( itemp )
- HmItem *itemp;
+MinputBurst(HmItem *itemp)
{
static Input input[] =
{
@@ -1209,8 +1178,7 @@
/*ARGSUSED*/
static void
-Minput2dShot( itemp )
- HmItem *itemp;
+Minput2dShot(HmItem *itemp)
{
static Input input[] =
{
@@ -1232,8 +1200,7 @@
/*ARGSUSED*/
static void
-Minput3dShot( itemp )
- HmItem *itemp;
+Minput3dShot(HmItem *itemp)
{
static Input input[] =
{
@@ -1258,16 +1225,14 @@
/*ARGSUSED*/
static void
-Mnop( itemp )
- HmItem *itemp;
+Mnop(HmItem *UNUSED(itemp))
{
return;
}
/*ARGSUSED*/
static void
-Mobjects( itemp )
- HmItem *itemp;
+Mobjects(HmItem *itemp)
{
static Input input[] =
{
@@ -1285,8 +1250,7 @@
/*ARGSUSED*/
static void
-Moverlaps( itemp )
- HmItem *itemp;
+Moverlaps(HmItem *itemp)
{
static Input input[] =
{
@@ -1303,8 +1267,7 @@
/*ARGSUSED*/
static void
-MmaxBarriers( itemp )
- HmItem *itemp;
+MmaxBarriers(HmItem *itemp)
{
static Input input[] =
{
@@ -1321,8 +1284,7 @@
/*ARGSUSED*/
static void
-MmaxSpallRays( itemp )
- HmItem *itemp;
+MmaxSpallRays(HmItem *itemp)
{
static Input input[] =
{
@@ -1339,8 +1301,7 @@
/*ARGSUSED*/
static void
-MplotFile( itemp )
- HmItem *itemp;
+MplotFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1368,8 +1329,7 @@
/*ARGSUSED*/
static void
-Mread2dShotFile( itemp )
- HmItem *itemp;
+Mread2dShotFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1396,8 +1356,7 @@
/*ARGSUSED*/
static void
-Mread3dShotFile( itemp )
- HmItem *itemp;
+Mread3dShotFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1424,8 +1383,7 @@
/*ARGSUSED*/
static void
-MreadBurstFile( itemp )
- HmItem *itemp;
+MreadBurstFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1452,8 +1410,7 @@
/*ARGSUSED*/
static void
-MreadCmdFile( itemp )
- HmItem *itemp;
+MreadCmdFile(HmItem *UNUSED(itemp))
{
static Input input[] =
{
@@ -1479,8 +1436,7 @@
/*ARGSUSED*/
static void
-MshotlineFile( itemp )
- HmItem *itemp;
+MshotlineFile(HmItem *itemp)
{
static Input input[] =
{
@@ -1511,31 +1467,30 @@
{
UNITS_MILLIMETERS,
"interpret inputs and convert outputs to millimeters",
- 0, 0, 0, Mnop },
+ NULL, NULL, NULL, Mnop, 0 },
{
UNITS_CENTIMETERS,
"interpret inputs and convert outputs to centimeters",
- 0, 0, 0, Mnop },
+ NULL, NULL, NULL, Mnop, 0 },
{
UNITS_METERS,
"interpret inputs and convert outputs to meters",
- 0, 0, 0, Mnop },
+ NULL, NULL, NULL, Mnop, 0 },
{
UNITS_INCHES,
"interpret inputs and convert outputs to inches",
- 0, 0, 0, Mnop },
+ NULL, NULL, NULL, Mnop, 0 },
{
UNITS_FEET,
"interpret inputs and convert outputs to feet",
- 0, 0, 0, Mnop },
- { 0 }
+ NULL, NULL, NULL, Mnop, 0 },
+ { NULL, NULL, NULL, NULL, NULL, NULL, 0 },
};
HmMenu units_hmenu = { units_items, 0, 0, 0, 0 };
/*ARGSUSED*/
static void
-Munits( itemp )
- HmItem *itemp;
+Munits(HmItem *itemp)
{
char *unitstr;
HmItem *itemptr;
@@ -1581,8 +1536,7 @@
/*ARGSUSED*/
static void
-MwriteCmdFile( itemp )
- HmItem *itemp;
+MwriteCmdFile(HmItem *UNUSED(itemp))
{
static Input input[] =
{
@@ -1619,7 +1573,7 @@
}
void
-intr_sig( int sig )
+intr_sig( int UNUSED(sig) )
{
static Input input[] =
{
@@ -1645,8 +1599,7 @@
}
void
-logCmd( cmd )
- char *cmd;
+logCmd(char *cmd)
{
prntScr( "%s", cmd ); /* avoid possible problems with '%' in string */
if ( fprintf( tmpfp, "%s\n", cmd ) < 0 )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
