[med-svn] [Git][med-team/cufflinks][master] 2 commits: More old style function definitions
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Dec 7 15:54:20 GMT 2025
Andreas Tille pushed to branch master at Debian Med / cufflinks
Commits:
903b0575 by Andreas Tille at 2025-12-07T16:52:17+01:00
More old style function definitions
- - - - -
04de8053 by Andreas Tille at 2025-12-07T16:52:58+01:00
-std=gnu11 (or -std=c11) seems to accept old function definitions but there are also issues (reference to 'byte' is ambiguous)
- - - - -
2 changed files:
- debian/patches/gcc15.patch
- debian/rules
Changes:
=====================================
debian/patches/gcc15.patch
=====================================
@@ -5,7 +5,7 @@ Description: Build with gcc-15
--- a/src/locfit/lffuns.h
+++ b/src/locfit/lffuns.h
-@@ -4,8 +4,10 @@
+@@ -4,17 +4,21 @@
/* FILES IN THE src DIRECTORY */
/* adap.c */
@@ -17,8 +17,24 @@ Description: Build with gcc-15
+extern INT ainitband(design *des, lfit *lf);
/* band.c */
- extern void band(), kdeselect();
-@@ -86,8 +88,9 @@ extern void setstrval();
+-extern void band(), kdeselect();
++extern void band(vari *v);
++extern void kdeselect(double *band, double *x, INT *ind, double h0, double h1, INT *meth, INT nm, INT ker, INT n)
+
+ /* density.c */
+-extern INT densinit();
+-extern INT fact[];
+-extern int likeden();
+-extern void prodint_resp(), prresp();
++INT densinit(lfit *lf, design *des, double h, double *cf, INT m);
++INT fact[];
++int likeden(double *coef, double *lk0, double *f1, double *A);
++void prodint_resp(double *resp, double prod_wk[MXDIM][2*MXDEG+1], int dim, int deg, int p);
++void prresp(double *coef, double *resp, INT p);
+
+ /* dens_haz.c */
+ extern void haz_init();
+@@ -86,8 +90,9 @@ extern void setstrval();
extern INT ppwhat(), restyp();
/* lf_vari.c */
@@ -30,7 +46,7 @@ Description: Build with gcc-15
/* linalg.c */
extern void svd(), hsvdsolve();
-@@ -99,19 +102,23 @@ extern double innerprod(), m_trace();
+@@ -99,19 +104,23 @@ extern double innerprod(), m_trace();
extern INT svdsolve();
/* locfit.c or parfit.c (most) */
@@ -57,7 +73,7 @@ Description: Build with gcc-15
/* odint.c */
extern INT onedint();
-@@ -148,8 +155,9 @@ extern int stm(), pmatch(), matchlf(), m
+@@ -148,8 +157,9 @@ extern int stm(), pmatch(), matchlf(), m
extern void strip();
/* wdiag.c */
@@ -487,3 +503,260 @@ Description: Build with gcc-15
{ int i, j, p;
double *m2, *V, ww, link[LLEN];
+--- a/src/locfit/band.c
++++ b/src/locfit/band.c
+@@ -15,10 +15,7 @@ static double hmin, gmin, sig2, pen, vr,
+ #define BCP 2
+ #define BIND 3
+
+-INT procvbind(des,lf,v)
+-design *des;
+-lfit *lf;
+-INT v;
++INT procvbind(design *des, lfit *lf, INT v)
+ { double s0, s1, bi;
+ int i, ii, k;
+ k = procvraw(des,lf,v);
+@@ -35,9 +32,7 @@ INT v;
+ return(k);
+ }
+
+-double bcri(h,c,cri)
+-double h;
+-INT c, cri;
++double bcri(double h, INT c, INT cri)
+ { double num, den;
+ INT (*pv)();
+ lf.dp[c] = h;
+@@ -63,9 +58,7 @@ INT c, cri;
+ return(0.0);
+ }
+
+-void bsel2(h0,g0,ifact,c,cri)
+-double h0, g0, ifact;
+-INT c, cri;
++void bsel2(double h0, double g0, double ifact, INT c, INT cri)
+ { INT done, inc;
+ double h1, g1;
+ h1 = h0; g1 = g0;
+@@ -86,9 +79,7 @@ INT c, cri;
+ }
+ }
+
+-void bsel3(h0,g0,ifact,c,cri)
+-double h0, g0, ifact;
+-INT c, cri;
++void bsel3(double h0, double g0, double ifact, INT c, INT cri)
+ { double h1, g1;
+ INT i;
+ hmin = h0; gmin = g0;
+@@ -100,9 +91,7 @@ INT c, cri;
+ return;
+ }
+
+-void bselect(c,cri,pn)
+-INT c, cri;
+-double pn;
++void bselect(INT c, INT cri, double pn)
+ { double h0, g0, ifact;
+ INT i;
+ pen = pn;
+@@ -130,9 +119,7 @@ double pn;
+ ressumm(&lf,&des);
+ }
+
+-double compsda(x,h,n)
+-double *x, h;
+-INT n;
++double compsda(double x, double h, INT n)
+ /* n/(n-1) * int( fhat''(x)^2 dx ); bandwidth h */
+ { INT i, j;
+ double ik, sd, z;
+@@ -148,9 +135,7 @@ INT n;
+ return(sd);
+ }
+
+-double widthsj(x,lambda,n)
+-double *x, lambda;
+-INT n;
++double widthsj(double x, double lambda, INT n)
+ { double ik, a, b, td, sa, z, c, c1, c2, c3;
+ INT i, j;
+ a = GFACT*0.920*lambda*exp(-log((double)n)/7)/SQRT2;
+@@ -174,9 +159,7 @@ INT n;
+ return(c);
+ }
+
+-void kdecri(x,h,res,c,k,ker,n)
+-double *x, h, *res, c;
+-INT k, ker, n;
++void kdecri(double x, double h, double res, double c, INT k, INT ker, INT n)
+ { INT i, j;
+ double degfree, dfd, pen, s, r0, r1, d0, d1, ik, wij;
+
+@@ -279,9 +262,7 @@ INT k, ker, n;
+ return;
+ }
+
+-double esolve(x,j,h0,h1,k,c,ker,n)
+-double *x, h0, h1, c;
+-INT j, k, ker, n;
++double esolve(double *x, INT j, double h0, double h1, INT k, double c, INT ker, INT n)
+ {
+ double h[7], d[7], r[7], res[4], min, minh, fact;
+ INT i, nc;
+@@ -325,9 +306,7 @@ INT j, k, ker, n;
+ return(minh);
+ }
+
+-void kdeselect(band,x,ind,h0,h1,meth,nm,ker,n)
+-double h0, h1, *band, *x;
+-INT *ind, *meth, nm, ker, n;
++void kdeselect(double *band, double *x, INT *ind, double h0, double h1, INT *meth, INT nm, INT ker, INT n)
+ { double scale, c;
+ INT i, k;
+ k = n/4;
+@@ -339,8 +318,7 @@ INT *ind, *meth, nm, ker, n;
+ }
+
+ #ifdef CVERSION
+-void band(v)
+-vari *v;
++void band(vari *v)
+ { INT i, c, cri;
+ double pen;
+ char *z;
+@@ -371,9 +349,7 @@ vari *v;
+ #endif
+
+ #ifdef SVERSION
+-void slscv(x,n,h,z)
+-double *x, *h, *z;
+-int *n;
++void slscv(double *x, INT *n, double *h, double *z)
+ { INT i;
+ double res[4];
+ kdecri(x,*h,res,0.0,3,WGAUS,*n);
+--- a/src/locfit/density.c
++++ b/src/locfit/density.c
+@@ -13,8 +13,7 @@ INT fact[] = {1, 1, 2, 6, 24, 120, 720,
+
+ INT multint(), prodint(), gausint(), mlinint();
+
+-void prresp(coef,resp,p)
+-double *coef, *resp;
++void prresp(double *coef, double *resp, INT p)
+ INT p;
+ { INT i, j;
+ printf("Coefficients:\n");
+@@ -27,9 +26,7 @@ INT p;
+ }
+ }
+
+-INT multint(t,resp1,resp2,lf,cf,h)
+-lfit *lf;
+-double *t, *resp1, *resp2, *cf, h;
++INT multint(double *t, double *resp1, double *resp2, lfit *lf, double *cf, double h)
+ { INT d, p, i, j, k, m, m1, w, z, z1;
+ double th, wt, dj[MXDIM];
+ d = lf->mi[MDIM]; p = lf->mi[MP];
+@@ -72,9 +69,7 @@ double *t, *resp1, *resp2, *cf, h;
+ return(LF_OK);
+ }
+
+-INT mlinint(t,resp1,resp2,lf,cf,h)
+-lfit *lf;
+-double *t, *resp1, *resp2, *cf, h;
++INT mlinint(double *t, double *resp1, double *resp2, lfit *lf, double *cf, double h)
+ {
+ double hd, nb, wt, wu, g[4], w0, w1, v, *sca;
+ INT d, p, i, j, jmax, k, l, z, jj[2];
+@@ -162,9 +157,7 @@ double *t, *resp1, *resp2, *cf, h;
+ return(LF_ERR);
+ }
+
+-void prodint_resp(resp,prod_wk,dim,deg,p)
+-double *resp, prod_wk[MXDIM][2*MXDEG+1];
+-int dim, deg, p;
++void prodint_resp(double *resp, double prod_wk[MXDIM][2*MXDEG+1], int dim, int deg, int p)
+ { double prod;
+ int i, j, k, j1, k1;
+
+@@ -194,9 +187,7 @@ int dim, deg, p;
+ }
+ }
+
+-INT prodint(t,resp,resp2,lf,coef,h)
+-lfit *lf;
+-double *t, *resp, *resp2, *coef, h;
++INT prodint(double *t, double *resp, double *resp2, lfit *lf, double *coef, double h)
+ { INT dim, deg, p, i, j, k, st;
+ double cf[MXDEG+1], hj, hs, prod_wk[MXDIM][2*MXDEG+1];
+
+@@ -238,9 +229,7 @@ double *t, *resp, *resp2, *coef, h;
+ return(st);
+ }
+
+-INT gausint(t,resp,C,cf,h,mi,sca)
+-double *t, *resp, *C, *cf, h, *sca;
+-INT *mi;
++INT gausint(double *t, double *resp, double *C, double *cf, double h, INT *mi, double *sca)
+ { double nb, det, z, *P;
+ INT d, p, i, j, k, l, m1, m2, f;
+ d = mi[MDIM]; p = mi[MP];
+@@ -290,8 +279,7 @@ INT *mi;
+ return(LF_OK);
+ }
+
+-int likeden(coef, lk0, f1, A)
+-double *coef, *lk0, *f1, *A;
++int likeden(double *coef, double *lk0, double *f1, double *A)
+ { double lk, r;
+ int i, j, p, rstat;
+
+@@ -340,9 +328,7 @@ double *coef, *lk0, *f1, *A;
+ return(rstat);
+ }
+
+-INT inre(x,bound,d)
+-double *x, *bound;
+-INT d;
++INT inre(double *x, double *bound, INT d)
+ { INT i, z;
+ z = 1;
+ for (i=0; i<d; i++)
+@@ -351,10 +337,7 @@ INT d;
+ return(z);
+ }
+
+-INT setintlimits(lf, x, h, ang, lset)
+-lfit *lf;
+-INT *ang, *lset;
+-double *x, h;
++INT setintlimits(lfit *lf, double *x, double h, INT *ang, INT *lset)
+ { INT d, i;
+ d = lf->mi[MDIM];
+ *ang = *lset = 0;
+@@ -383,8 +366,7 @@ double *x, h;
+ return(LF_OK);
+ }
+
+-INT selectintmeth(mi,lset,ang)
+-INT *mi, lset, ang;
++INT selectintmeth(INT *mi, INT lset, INT ang)
+ {
+ if (mi[MIT]==IDEFA) /* select the default method */
+ { if (mi[MTG]==THAZ)
+@@ -434,11 +416,7 @@ INT *mi, lset, ang;
+ return(INVLD);
+ }
+
+-INT densinit(lf,des,h,cf,m)
+-lfit *lf;
+-design *des;
+-double h, *cf;
+-INT m;
++INT densinit(lfit *lf, design *des, double h, double *cf, INT m)
+ { INT deg, p, i, ii, j, nnz, rnz, lset, ang, status;
+ double w;
+
=====================================
debian/rules
=====================================
@@ -6,7 +6,7 @@ pkg := cufflinks
mandir := $(CURDIR)/debian/$(pkg)/usr/share/man/man1
bindir := $(CURDIR)/debian/$(pkg)/usr/bin
-export DEB_CFLAGS_MAINT_APPEND=-std=c++14
+export DEB_CFLAGS_MAINT_APPEND=-std=gnu11 # -std=c11
%:
dh $@ --with python3
View it on GitLab: https://salsa.debian.org/med-team/cufflinks/-/compare/f196f2715ade8164355cc2ba8db1f12340fec5bc...04de8053a6ef61757be1e5b52de53153de58c8eb
--
View it on GitLab: https://salsa.debian.org/med-team/cufflinks/-/compare/f196f2715ade8164355cc2ba8db1f12340fec5bc...04de8053a6ef61757be1e5b52de53153de58c8eb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251207/ae60eec3/attachment-0001.htm>
More information about the debian-med-commit
mailing list