o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use va_args in cosadd/sinadd (Michael Teichgräber)

Browse source
This commit is contained in:
rsc 2006-05-27 18:35:26 +00:00
parent dfbaaaa650
commit 2ad582ee88
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/astro/astro.h
View file

@ -152,7 +152,7 @@ extern void args(int, char**);
extern void bdtsetup(double, Tim*); extern void bdtsetup(double, Tim*);
extern double betcross(double); extern double betcross(double);
extern double convdate(Tim*); extern double convdate(Tim*);
extern double cosadd(int, double, ...); extern double cosadd(int, ...);
extern double cosx(double, int, int, int, int, double); extern double cosx(double, int, int, int, int, double);
extern double dist(Obj1*, Obj1*); extern double dist(Obj1*, Obj1*);
extern double dsrc(double, Tim*, int); extern double dsrc(double, Tim*, int);
@ -201,7 +201,7 @@ extern void setime(double);
extern void setobj(Obj1*); extern void setobj(Obj1*);
extern void setpt(Occ*, double); extern void setpt(Occ*, double);
extern void shad(void); extern void shad(void);
extern double sinadd(int, double, ...); extern double sinadd(int, ...);
extern double sinx(double, int, int, int, int, double); extern double sinx(double, int, int, int, int, double);
extern char* skip(int); extern char* skip(int);
extern double solstice(int); extern double solstice(int);

22
src/cmd/astro/cosadd.c
View file

@ -10,15 +10,20 @@ icosadd(double *fp, char *cp)
} }
double double
cosadd(int n, double coef, ...) cosadd(int n, ...)
{ {
double *coefp; double *coefp, coef[10];
char *cp; char *cp;
int i; int i;
double sum, a1, a2; double sum, a1, a2;
va_list arg;
sum = 0; sum = 0;
cp = cacp; cp = cacp;
va_start(arg, n);
for(i=0; i<n; i++)
coef[i] = va_arg(arg, double);
va_end(arg);
loop: loop:
a1 = *cafp++; a1 = *cafp++;
@ -28,7 +33,7 @@ loop:
} }
a2 = *cafp++; a2 = *cafp++;
i = n; i = n;
coefp = &coef; coefp = coef;
do do
a2 += *cp++ * *coefp++; a2 += *cp++ * *coefp++;
while(--i); while(--i);
@ -37,15 +42,20 @@ loop:
} }
double double
sinadd(int n, double coef, ...) sinadd(int n, ...)
{ {
double *coefp; double *coefp, coef[10];
char *cp; char *cp;
int i; int i;
double sum, a1, a2; double sum, a1, a2;
va_list arg;
sum = 0; sum = 0;
cp = cacp; cp = cacp;
va_start(arg, n);
for(i=0; i<n; i++)
coef[i] = va_arg(arg, double);
va_end(arg);
loop: loop:
a1 = *cafp++; a1 = *cafp++;
@ -55,7 +65,7 @@ loop:
} }
a2 = *cafp++; a2 = *cafp++;
i = n; i = n;
coefp = &coef; coefp = coef;
do do
a2 += *cp++ * *coefp++; a2 += *cp++ * *coefp++;
while(--i); while(--i);