Changeset 23487 for trunk/ppSim

Timestamp:

Mar 23, 2009, 9:42:42 AM (17 years ago)

Author:

Paul Price

Message:

Functions declared as 'type function()' cause errors with the Intel compiler ('error #310: old-style parameter list (anachronism)'), which wants 'type function()'. These instances haven't caused problems yet, and I'm trying to avoid that.

Location:

trunk/ppSim/src

Files:

• ppSim.h (modified) (3 diffs)
• ppSimRandomGaussian.c (modified) (6 diffs)
• ppSimStars.c (modified) (2 diffs)

trunk/ppSim/src/ppSim.h

@@ -67 +67 @@
 } ppSimGalaxy;
 
-ppSimStar *ppSimStarAlloc ();
-ppSimGalaxy *ppSimGalaxyAlloc ();
+ppSimStar *ppSimStarAlloc(void);
+ppSimGalaxy *ppSimGalaxyAlloc(void);
 
 /// Parse command-line arguments
@@ -136 +136 @@
 
 // add a bad CTE region
-bool ppSimBadCTE(psImage *image,        // Signal image, modified and returned
-                 const pmConfig *config // configuration
+bool ppSimBadCTE(psImage *image,        // Signal image, modified and returned
+                 const pmConfig *config // configuration
   );
 
@@ -189 +189 @@
 double ppSimRandomGaussian (const psRandom *rnd, double mean, double sigma);
 double ppSimRandomGaussianNorm (const psRandom *rnd);
-void ppSimRandomGaussianFree();
+void ppSimRandomGaussianFree(void);
 
 bool ppSimPhotomFiles (pmConfig *config, pmFPAfile *fakeFile, pmFPAfile *forceFile);

trunk/ppSim/src/ppSimRandomGaussian.c

@@ -29 +29 @@
 
 /* integrate a gaussian from -5 sigma to +5 sigma */
-void p_ppSimRandomGaussianInit () {
- 
+void p_ppSimRandomGaussianInit (void) {
+
   int i;
   long A, B;
   double val, x, dx, dx1, dx2, dx3, df;
   double mean, sigma;
- 
+
   /* no need to generate this if it already exists */
   if (gaussint) return;
@@ -42 +42 @@
   for (B = 0; A == time(NULL); B++);
   srand48(B);
- 
+
   Ngaussint = 0x1000;
   ppSimRandomGaussianAlloc (Ngaussint + 1);
@@ -53 +53 @@
   mean = 0.0;
   sigma = 1.0;
- 
+
   for (i = 0, x = -7.0; (i < Ngaussint) && (x < 7.0); x += dx)  {
-    df = (3.0*p_ppSimGaussian(x    , mean, sigma) + 
+    df = (3.0*p_ppSimGaussian(x    , mean, sigma) +
           9.0*p_ppSimGaussian(x+dx1, mean, sigma) +
-          9.0*p_ppSimGaussian(x+dx2, mean, sigma) + 
+          9.0*p_ppSimGaussian(x+dx2, mean, sigma) +
           3.0*p_ppSimGaussian(x+dx3, mean, sigma)) * (dx1/8.0);
     val += df;
@@ -67 +67 @@
 }
 
-// XXX we are using drand48() rather than the random var supplied by rnd 
+// XXX we are using drand48() rather than the random var supplied by rnd
 double ppSimRandomGaussian (const psRandom *rnd, double mean, double sigma) {
- 
+
   int i;
   double y;
- 
+
   if (gaussint == NULL) {
       p_ppSimRandomGaussianInit ();
@@ -80 +80 @@
   i = Ngaussint*y;
   y = gaussint[i]*sigma + mean;
- 
+
   return (y);
- 
+
 }
- 
-// XXX we are using drand48() rather than the random var supplied by rnd 
+
+// XXX we are using drand48() rather than the random var supplied by rnd
 double ppSimRandomGaussianNorm (const psRandom *rnd) {
- 
+
   int i;
   double y;
- 
+
   if (gaussint == NULL) {
       p_ppSimRandomGaussianInit ();
@@ -98 +98 @@
   i = Ngaussint*y;
   y = gaussint[i];
- 
+
   return (y);
 }

trunk/ppSim/src/ppSimStars.c

@@ -6 +6 @@
 }
 
-ppSimStar *ppSimStarAlloc () {
+ppSimStar *ppSimStarAlloc(void) {
 
     ppSimStar *star = (ppSimStar *) psAlloc(sizeof(ppSimStar));
@@ -19 +19 @@
 }
 
-ppSimGalaxy *ppSimGalaxyAlloc () {
+ppSimGalaxy *ppSimGalaxyAlloc(void) {
 
     ppSimGalaxy *galaxy = (ppSimGalaxy *) psAlloc(sizeof(ppSimGalaxy));