From 8ecec15cee88462e46ec9d0ce361224c0fcdba31 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Tue, 6 May 2014 09:43:39 +0200 Subject: fix C warnings --- lib/Numeric/GSL/gsl-aux.c | 4 +++- lib/Numeric/GSL/gsl-ode.c | 2 +- lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 34 +++++++++++++-------------- 3 files changed, 21 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c index 1a4a3e6..410d157 100644 --- a/lib/Numeric/GSL/gsl-aux.c +++ b/lib/Numeric/GSL/gsl-aux.c @@ -810,7 +810,9 @@ int integrate_cquad(double f(double,void*), double a, double b, double aprec, do gsl_function F; F.function = f; F.params = NULL; - int res = gsl_integration_cquad (&F, a, b, aprec, prec, wk, result, error, neval); + size_t * sneval = NULL; + int res = gsl_integration_cquad (&F, a, b, aprec, prec, wk, result, error, sneval); + *neval = *sneval; CHECK(res,res); gsl_integration_cquad_workspace_free (wk); OK diff --git a/lib/Numeric/GSL/gsl-ode.c b/lib/Numeric/GSL/gsl-ode.c index 7386d10..3f2771b 100644 --- a/lib/Numeric/GSL/gsl-ode.c +++ b/lib/Numeric/GSL/gsl-ode.c @@ -148,7 +148,7 @@ int ode(int method, double h, double eps_abs, double eps_rel, double* y = (double*)calloc(xin,sizeof(double)); int i,j; - int status; + int status=0; for(i=0; i< xin; i++) { y[i] = xip[i]; solp[i] = xip[i]; diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c index 1c35376..51972eb 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c +++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c @@ -111,7 +111,7 @@ int svd_l_R(KDMAT(a),DMAT(u), DVEC(s),DMAT(v)) { integer n = ac; integer q = MIN(m,n); REQUIRES(sn==q,BAD_SIZE); - REQUIRES(up==NULL || ur==m && (uc==m || uc==q),BAD_SIZE); + REQUIRES(up==NULL || (ur==m && (uc==m || uc==q)),BAD_SIZE); char* jobu = "A"; if (up==NULL) { jobu = "N"; @@ -120,7 +120,7 @@ int svd_l_R(KDMAT(a),DMAT(u), DVEC(s),DMAT(v)) { jobu = "S"; } } - REQUIRES(vp==NULL || vc==n && (vr==n || vr==q),BAD_SIZE); + REQUIRES(vp==NULL || (vc==n && (vr==n || vr==q)),BAD_SIZE); char* jobvt = "A"; integer ldvt = n; if (vp==NULL) { @@ -174,10 +174,10 @@ int svd_l_Rdd(KDMAT(a),DMAT(u), DVEC(s),DMAT(v)) { integer n = ac; integer q = MIN(m,n); REQUIRES(sn==q,BAD_SIZE); - REQUIRES(up == NULL && vp == NULL - || ur==m && vc==n - && (uc == q && vr == q - || uc == m && vc==n),BAD_SIZE); + REQUIRES((up == NULL && vp == NULL) + || (ur==m && vc==n + && ((uc == q && vr == q) + || (uc == m && vc==n))),BAD_SIZE); char* jobz = "A"; integer ldvt = n; if (up==NULL) { @@ -224,7 +224,7 @@ int svd_l_C(KCMAT(a),CMAT(u), DVEC(s),CMAT(v)) { integer n = ac; integer q = MIN(m,n); REQUIRES(sn==q,BAD_SIZE); - REQUIRES(up==NULL || ur==m && (uc==m || uc==q),BAD_SIZE); + REQUIRES(up==NULL || (ur==m && (uc==m || uc==q)),BAD_SIZE); char* jobu = "A"; if (up==NULL) { jobu = "N"; @@ -233,7 +233,7 @@ int svd_l_C(KCMAT(a),CMAT(u), DVEC(s),CMAT(v)) { jobu = "S"; } } - REQUIRES(vp==NULL || vc==n && (vr==n || vr==q),BAD_SIZE); + REQUIRES(vp==NULL || (vc==n && (vr==n || vr==q)),BAD_SIZE); char* jobvt = "A"; integer ldvt = n; if (vp==NULL) { @@ -291,10 +291,10 @@ int svd_l_Cdd(KCMAT(a),CMAT(u), DVEC(s),CMAT(v)) { integer n = ac; integer q = MIN(m,n); REQUIRES(sn==q,BAD_SIZE); - REQUIRES(up == NULL && vp == NULL - || ur==m && vc==n - && (uc == q && vr == q - || uc == m && vc==n),BAD_SIZE); + REQUIRES((up == NULL && vp == NULL) + || (ur==m && vc==n + && ((uc == q && vr == q) + || (uc == m && vc==n))),BAD_SIZE); char* jobz = "A"; integer ldvt = n; if (up==NULL) { @@ -349,9 +349,9 @@ int svd_l_Cdd(KCMAT(a),CMAT(u), DVEC(s),CMAT(v)) { int eig_l_C(KCMAT(a), CMAT(u), CVEC(s),CMAT(v)) { integer n = ar; REQUIRES(ac==n && sn==n, BAD_SIZE); - REQUIRES(up==NULL || ur==n && uc==n, BAD_SIZE); + REQUIRES(up==NULL || (ur==n && uc==n), BAD_SIZE); char jobvl = up==NULL?'N':'V'; - REQUIRES(vp==NULL || vr==n && vc==n, BAD_SIZE); + REQUIRES(vp==NULL || (vr==n && vc==n), BAD_SIZE); char jobvr = vp==NULL?'N':'V'; DEBUGMSG("eig_l_C"); doublecomplex *B = (doublecomplex*)malloc(n*n*sizeof(doublecomplex)); @@ -404,9 +404,9 @@ int eig_l_C(KCMAT(a), CMAT(u), CVEC(s),CMAT(v)) { int eig_l_R(KDMAT(a),DMAT(u), CVEC(s),DMAT(v)) { integer n = ar; REQUIRES(ac==n && sn==n, BAD_SIZE); - REQUIRES(up==NULL || ur==n && uc==n, BAD_SIZE); + REQUIRES(up==NULL || (ur==n && uc==n), BAD_SIZE); char jobvl = up==NULL?'N':'V'; - REQUIRES(vp==NULL || vr==n && vc==n, BAD_SIZE); + REQUIRES(vp==NULL || (vr==n && vc==n), BAD_SIZE); char jobvr = vp==NULL?'N':'V'; DEBUGMSG("eig_l_R"); double *B = (double*)malloc(n*n*sizeof(double)); @@ -989,7 +989,7 @@ int schur_l_R(KDMAT(a), DMAT(u), DMAT(s)) { integer n = ac; REQUIRES(m>=1 && n==m && ur==n && uc==n && sr==n && sc==n, BAD_SIZE); DEBUGMSG("schur_l_R"); - int k; + //int k; //printf("---------------------------\n"); //printf("%p: ",ap); for(k=0;k