diff --git a/src/h2d.c b/src/h2d.c index 002957f..0ec0986 100644 --- a/src/h2d.c +++ b/src/h2d.c @@ -54,7 +54,7 @@ remaph2d (SNP ** snpmarkers, int numsnps, Indiv ** indivmarkers, int *tind, tt, t, i, j, k, j1, j2; Indiv *indx; SNP *cupt; - char s1[50], s2[50]; + char s1[IDSIZE+10], s2[IDSIZE+10]; ZALLOC (g2, numind2, int); ZALLOC (g1, numindivs, int); diff --git a/src/mapfile.c b/src/mapfile.c index 8b17a57..6cd785b 100644 --- a/src/mapfile.c +++ b/src/mapfile.c @@ -74,7 +74,7 @@ genFile* constructMap(char* filename, long numrows, long rowSize, long hdrSize) geno -> hdrSize = hdrSize ; geno->snps = (char*) mmfaddr; - printf("mmfaddr: %x fileLength: %ld\n", geno -> snps, fileLength) ;; + printf("mmfaddr: %p fileLength: %ld\n", geno -> snps, fileLength) ;; fflush(stdout) ; return geno; diff --git a/src/qpAdm.c b/src/qpAdm.c index ad3184b..ad68848 100644 --- a/src/qpAdm.c +++ b/src/qpAdm.c @@ -2064,8 +2064,8 @@ void loadymv(double *ymean, double *yvar, char *fstatsname, char **popllist, ch int mkfstats(char *parname) { - char sss[256] ; - char fsx[256] ; + char sss[512] ; + char fsx[256+10] ; char ppp[256] ; char pops[256] ; char tpar[256] ; diff --git a/src/qpGraph.c b/src/qpGraph.c index c8ea1fe..a07fe1c 100644 --- a/src/qpGraph.c +++ b/src/qpGraph.c @@ -431,11 +431,6 @@ main (int argc, char **argv) printf ("graph: %s\n", graphname); -/** - sprintf(sss, "cat %s", graphname) ; - system(sss) ; - fflush(stdout) ; -*/ printnl (); printnl (); @@ -1351,7 +1346,7 @@ printfit (double *ww) double y, worstz, y1, y2, x1, x2, diff, sig, z; double *ffaa ; FILE *outff; - char ss[MAXSTR], ssworst[MAXSTR], *ssx ; + char ss[MAXSTR*2], ssworst[MAXSTR*2], *ssx ; int isworst ; char **ancnames ; @@ -2932,7 +2927,7 @@ int usage (char *prog, int exval) void mkfstats(char *parname) { - char sss[128] ; + char sss[512] ; char fsx[128] ; char ppp[128] ; char pops[128] ; diff --git a/src/qpWave.c b/src/qpWave.c index 38548dc..406f775 100644 --- a/src/qpWave.c +++ b/src/qpWave.c @@ -823,7 +823,7 @@ void loadymv(double *ymean, double *yvar, char *fstatsname, char **popllist, ch int mkfstats(char *parname) { - char sss[256] ; + char sss[512] ; char fsx[256] ; char ppp[256] ; char pops[256] ; diff --git a/src/qpmix.c b/src/qpmix.c index 2872f10..4ada873 100644 --- a/src/qpmix.c +++ b/src/qpmix.c @@ -1307,7 +1307,7 @@ void printcv(double *coeffs, double *var, int n) int mkfstats(char *parname) // modified from qpAdm { - char sss[256] ; + char sss[512] ; char fsx[256] ; char ppp[256] ; char pops[256] ; diff --git a/src/snpunion.c b/src/snpunion.c index bea4a45..9587a00 100644 --- a/src/snpunion.c +++ b/src/snpunion.c @@ -14,7 +14,7 @@ #include "mcio.h" #include "mcmcpars.h" -#define WVERSION "2500" +#define WVERSION "2501" #define MAXFL 50 #define MAXSTR 512 @@ -64,7 +64,7 @@ int lopos = -999999999 ; int hipos = 999999999 ; int minchrom = 1 ; int maxchrom = 97 ; -long rlen, packlen ; +extern long rlen, packlen ; /** docheck YES allele flipping check