luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rewrite to fix potential (actuall impossible) usage of variable `c'

This commit is contained in:
rlar 2011-08-05 19:29:57 +00:00
parent 49000cc7e2
commit 2c0144a849
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-05 Robert Larice
* src/maths/cmaths/cmath2.c :
rewrite to fix potential (actuall impossible) usage of variable `c'
2011-08-05 Robert Larice
* src/spicelib/parser/inp2m.c :
fix warning of potential (actuall impossible) usage of uninitialized node5..7

55
src/maths/cmaths/cmath2.c
View File

@ -325,41 +325,42 @@ cx_sgauss(void *data, short int type, int length, int *newlength, short int *new
void
*cx_avg(void *data, short int type, int length, int *newlength, short int *newtype)
{
ngcomplex_t *c;
double *d = NULL, sum_real = 0.0,sum_imag = 0.0;
ngcomplex_t *cc = (ngcomplex_t *) data;
double *dd = (double *) data;
double sum_real = 0.0, sum_imag = 0.0;
int i;
if (type == VF_REAL) {
d = alloc_d(length);
double *d = alloc_d(length);
double *dd = (double *) data;
*newtype = VF_REAL;
*newlength = length;
for (i = 0; i < length; i++) {
sum_real += dd[i];
d[i] = sum_real / (double)(i+1);
}
return ((void *) d);
} else {
c = alloc_c(length);
ngcomplex_t *c = alloc_c(length);
ngcomplex_t *cc = (ngcomplex_t *) data;
*newtype = VF_COMPLEX;
}
*newlength = length;
*newlength = length;
if (type == VF_COMPLEX)
{
for (i = 0; i < length; i++)
{
sum_real= sum_real + realpart(&cc[i]);
realpart(&c[i]) = sum_real / (double)(i+1);
for (i = 0; i < length; i++) {
sum_real += realpart(&cc[i]);
realpart(&c[i]) = sum_real / (double)(i+1);
sum_imag += imagpart(&cc[i]);
imagpart(&c[i]) = sum_imag / (double)(i+1);
}
return ((void *) c);
sum_imag = sum_imag + imagpart(&cc[i]);
imagpart(&c[i]) = sum_imag / (double)(i+1);
}
return ((char *) c);
}
else
{ //VF_REAL
for (i = 0; i < length; i++)
{
sum_real= sum_real + dd[i];
d[i] = sum_real / (double)(i+1);
}
return ((char *) d);
}
}