Index: trunk/Ohana/src/opihi/cmd.astro/altaz.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/altaz.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/altaz.c (revision 27435) @@ -4,85 +4,164 @@ # define dSIN(A) ((double) sin ((double)RAD_DEG*A)) +int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat); +int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat); + double atan2 (double y, double x); int altaz (int argc, char **argv) { + int i; double alt, az, lat, rot; double ha, dec; - double sind, sinh, cosh; char *latstr; + Vector *hvec, *dvec, *avec, *zvec, *rvec; + opihi_flt *Hv, *Dv, *Av, *Zv, *Rv; - if (argc != 6) goto usage; - - if (!strcmp (argv[1], "-h")) goto radec; - if (!strcmp (argv[1], "-c")) goto altaz; - - radec: - /* ha/dec -> alt/az */ - ha = atof (argv[2]); - dec = atof (argv[3]); + if (argc != 7) goto usage; + if (strcasecmp (argv[4], "to")) goto usage; latstr = get_variable ("LATITUDE"); if (latstr == (char *) NULL) { gprint (GP_ERR, "please define $LATITUDE\n"); - return (FALSE); + return FALSE; } lat = atof (latstr); + gprint (GP_ERR, "using latitude of %f\n", lat); free (latstr); - + + if (!strcmp (argv[1], "-az")) goto radec; + if (!strcmp (argv[1], "-hd")) goto altaz; + + radec: + if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) { + /* ha/dec -> alt/az */ + ha = atof (argv[2]); + dec = atof (argv[3]); + + HD_to_AZ (&alt, &az, &rot, ha, dec, lat); + + set_variable (argv[5], alt); + set_variable (argv[6], az); + set_variable ("ROT", rot); + return TRUE; + } + + /* find vectors */ + if ((hvec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE; + if ((dvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE; + if ((avec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE; + if ((zvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE; + if ((rvec = SelectVector ("ROT", ANYVECTOR, TRUE)) == NULL) return FALSE; + + if (hvec[0].Nelements != dvec[0].Nelements) { + gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]); + return FALSE; + } + + // cast xvec or yvec to FLT if it is type INT + CastVector (hvec, OPIHI_FLT); + CastVector (dvec, OPIHI_FLT); + ResetVector (avec, OPIHI_FLT, hvec[0].Nelements); + ResetVector (zvec, OPIHI_FLT, hvec[0].Nelements); + ResetVector (rvec, OPIHI_FLT, hvec[0].Nelements); + + Hv = hvec[0].elements.Flt; + Dv = dvec[0].elements.Flt; + Av = avec[0].elements.Flt; + Zv = zvec[0].elements.Flt; + Rv = rvec[0].elements.Flt; + + for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) { + HD_to_AZ (Av, Zv, Rv, *Hv, *Dv, lat); + } + return TRUE; + + altaz: + if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) { + /* alt/az -> ha/dec */ + alt = atof (argv[2]); + az = atof (argv[3]); + + AZ_to_HD (&ha, &dec, &rot, alt, az, lat); + + set_variable (argv[5], ha); + set_variable (argv[6], dec); + set_variable ("ROT", rot); + return TRUE; + } + + /* find vectors */ + if ((avec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE; + if ((zvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE; + if ((hvec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE; + if ((dvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE; + if ((rvec = SelectVector ("ROT", ANYVECTOR, TRUE)) == NULL) return FALSE; + + if (avec[0].Nelements != zvec[0].Nelements) { + gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]); + return FALSE; + } + + // cast xvec or yvec to FLT if it is type INT + CastVector (avec, OPIHI_FLT); + CastVector (zvec, OPIHI_FLT); + ResetVector (hvec, OPIHI_FLT, avec[0].Nelements); + ResetVector (dvec, OPIHI_FLT, avec[0].Nelements); + ResetVector (rvec, OPIHI_FLT, avec[0].Nelements); + + Hv = hvec[0].elements.Flt; + Dv = dvec[0].elements.Flt; + Av = avec[0].elements.Flt; + Zv = zvec[0].elements.Flt; + Rv = rvec[0].elements.Flt; + + for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) { + AZ_to_HD (Hv, Dv, Rv, *Av, *Zv, lat); + } + return TRUE; + + usage: + gprint (GP_ERR, "USAGE: altaz -az (ha) (dec) to (alt) (az)\n"); + gprint (GP_ERR, "USAGE: altaz -hd (alt) (az) to (ha) (dec)\n"); + gprint (GP_ERR, " -hd alt/az to ha/dec, -az ha/dec to alt/az\n"); + gprint (GP_ERR, " returned values in variables or vectors provided\n"); + return FALSE; +} + +int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat) { + + double sind, sinh, cosh; + sind = dSIN (dec) * dSIN (lat) + dCOS (dec) * dCOS (ha) * dCOS (lat); - alt = DEG_RAD * asin (sind); + *alt = DEG_RAD * asin (sind); sinh = - dCOS (dec) * dSIN (ha); cosh = dSIN (dec) * dCOS (lat) - dCOS (dec) * dCOS (ha) * dSIN (lat); - az = DEG_RAD * atan2 (sinh, cosh); - set_variable (argv[4], alt); - set_variable (argv[5], az); + *az = DEG_RAD * atan2 (sinh, cosh); + + sinh = -dCOS(*az) * dSIN(*alt) * dSIN(ha) * dSIN(lat) + dSIN(*az) * dSIN(*alt) * dCOS(ha) - dSIN(ha) * dCOS(*alt) * dCOS(lat); + cosh = -dSIN(*az) * dSIN(ha) * dSIN(lat) - dCOS(*az) * dCOS(ha); + *rot = -DEG_RAD * atan2 (sinh, cosh); + + return TRUE; +} - sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat); - cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha); - rot = -DEG_RAD * atan2 (sinh, cosh); - set_variable ("ROT", rot); +int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat) { - return (TRUE); - - altaz: - /* alt/az -> ha/dec */ - alt = atof (argv[4]); - az = atof (argv[5]); - - latstr = get_variable ("LATITUDE"); - if (latstr == (char *) NULL) { - gprint (GP_ERR, "please define $LATITUDE\n"); - return (FALSE); - } - lat = atof (latstr); - free (latstr); + double sind, sinh, cosh; sind = dSIN (alt) * dSIN (lat) + dCOS (alt) * dCOS (az) * dCOS (lat); - dec = DEG_RAD * asin (sind); + *dec = DEG_RAD * asin (sind); sinh = -dCOS (alt) * dSIN (az); cosh = dSIN (alt) * dCOS (lat) - dCOS (alt) * dCOS (az) * dSIN (lat); - ha = DEG_RAD * atan2 (sinh, cosh); - set_variable (argv[2], ha); - set_variable (argv[3], dec); + *ha = DEG_RAD * atan2 (sinh, cosh); - sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat); - cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha); - rot = -DEG_RAD * atan2 (sinh, cosh); - set_variable ("ROT", rot); + sinh = -dCOS(az) * dSIN(alt) * dSIN(*ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(*ha) - dSIN(*ha) * dCOS(alt) * dCOS(lat); + cosh = -dSIN(az) * dSIN(*ha) * dSIN(lat) - dCOS(az) * dCOS(*ha); + *rot = -DEG_RAD * atan2 (sinh, cosh); - return (TRUE); - - usage: - gprint (GP_ERR, "USAGE: altaz -h (ha) (dec) (alt) (az)\n"); - gprint (GP_ERR, "USAGE: altaz -c (ha) (dec) (alt) (az)\n"); - gprint (GP_ERR, " -h alt/az to ha/dec, -c ha/dec to alt/az\n"); - gprint (GP_ERR, " returned values in variables provided\n"); - return (FALSE); - + return TRUE; } - Index: trunk/Ohana/src/opihi/cmd.astro/elliprofile.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/elliprofile.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/elliprofile.c (revision 27435) @@ -3,10 +3,10 @@ int elliprofile (int argc, char **argv) { - int i, ix, iy, Nx, Ny, N, center; + int i, ix, iy, Nx, Ny; float *in; - double Rmaj, Rmin, phi, alpha, Io, ARatio; + double Rmaj, Rmin, phi; double root1, root2, R, A1, A2, A3; double Sx, Sy, Sxy; - double x, y, r, f, Xo, Yo; + double x, y, Xo, Yo; Buffer *buf; Vector *rvec, *fvec; Index: trunk/Ohana/src/opihi/cmd.astro/galprofiles.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/galprofiles.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/galprofiles.c (revision 27435) @@ -5,5 +5,5 @@ int galprofiles (int argc, char **argv) { - int i, j, Nx, Ny, N, Nsec, NELEMENTS; + int i, Nx, Ny, N, Nsec, NELEMENTS; float *in; double theta, dtheta, x, y, Xo, Yo, r, Rmax, value; Index: trunk/Ohana/src/opihi/cmd.astro/galradbins.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/galradbins.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/galradbins.c (revision 27435) @@ -12,5 +12,5 @@ int i, Nbin; - double Rmin, Rmax; + double Rmax; Vector *fvec, *rvec, *Fvec, *Rvec, *Avec; Index: trunk/Ohana/src/opihi/cmd.astro/galradius.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/galradius.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/galradius.c (revision 27435) @@ -6,11 +6,9 @@ int galradius (int argc, char **argv) { - int i, j, Nx, Ny, N, Nsec, NELEMENTS, Rbin, Nout, above; - double theta, dtheta, x, y, Xo, Yo, r, Rmax, Rmin, value; + int i, j, N, Rbin, Nout, above; + double Rmax, Rmin; double Fmin, Fmax, dF, Fm, Fp, Fo, Rsum, Rnpt, Ro; opihi_flt *flux, *radius, *values; - Buffer *buf; - Vector *fvec, *rvec, *tvec, *Fvec, *Rvec; - char name[128]; + Vector *fvec, *rvec, *Fvec, *Rvec; if (argc != 5) { Index: trunk/Ohana/src/opihi/cmd.astro/petrosian.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/petrosian.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/petrosian.c (revision 27435) @@ -4,5 +4,4 @@ int i, above; - float *in; double Fsum, Asum, Area, R_90, rad_90, flux_90; Vector *rvec, *avec, *fvec, *Rvec, *Fvec, *Svec, *Avec; @@ -40,4 +39,5 @@ ResetVector (Avec, OPIHI_FLT, fvec[0].Nelements); + R_90 = 0.1; above = TRUE; Fsum = 0.0; Index: trunk/Ohana/src/opihi/cmd.astro/precess.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/precess.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/precess.c (revision 27435) @@ -97,5 +97,5 @@ opihi_flt *Dv = yvec[0].elements.Flt; - for (i = 0; i < xvec[0].Nelements; i++, Av, Dv) { + for (i = 0; i < xvec[0].Nelements; i++, Av++, Dv++) { A = *Av; D = *Dv; Index: trunk/Ohana/src/opihi/cmd.astro/region.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/region.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.astro/region.c (revision 27435) @@ -3,5 +3,4 @@ int region (int argc, char **argv) { - char string[256]; double Ra, Dec, Radius; float dx, dy; Index: trunk/Ohana/src/opihi/cmd.basic/cd.c =================================================================== --- trunk/Ohana/src/opihi/cmd.basic/cd.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.basic/cd.c (revision 27435) @@ -51,5 +51,5 @@ } - if ((cwd = getcwd(NULL, 64)) == NULL) { + if ((cwd = getcwd(NULL, 1024)) == NULL) { gprint (GP_ERR, "error getting cwd\n"); if (var != NULL) free (var); Index: trunk/Ohana/src/opihi/cmd.basic/date.c =================================================================== --- trunk/Ohana/src/opihi/cmd.basic/date.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.basic/date.c (revision 27435) @@ -40,5 +40,5 @@ set_int_variable (varName, now.tv_sec - REFTIME); } else { - gprint (GP_ERR, "%d\n", now.tv_sec - REFTIME); + gprint (GP_ERR, "%d\n", (int) now.tv_sec - REFTIME); } } else { Index: trunk/Ohana/src/opihi/cmd.basic/inthash.c =================================================================== --- trunk/Ohana/src/opihi/cmd.basic/inthash.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.basic/inthash.c (revision 27435) @@ -3,5 +3,5 @@ int inthash (int argc, char **argv) { - int i, N, modulus, value, input; + int N, modulus, value, input; char *varName; Index: trunk/Ohana/src/opihi/cmd.basic/test/for.sh =================================================================== --- trunk/Ohana/src/opihi/cmd.basic/test/for.sh (revision 27262) +++ trunk/Ohana/src/opihi/cmd.basic/test/for.sh (revision 27435) @@ -169,5 +169,5 @@ $PASS = 1 - if ($endmem - $startmem > 10) + if ($endmem - $startmem > 80) $PASS = 0 echo "growth: {$endmem-$startmem}" Index: trunk/Ohana/src/opihi/cmd.data/dbconnect.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/dbconnect.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/dbconnect.c (revision 27435) @@ -47,5 +47,4 @@ gprint (GP_ERR, "failed to set interactive timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -57,5 +56,4 @@ gprint (GP_ERR, "failed to set wait timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -71,5 +69,4 @@ gprint (GP_ERR, "failed to get timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } @@ -84,5 +81,4 @@ gprint (GP_ERR, "failed to get timout\n"); gprint (GP_ERR, "%s\n", mysql_error (connection)); - free (query); return (FALSE); } Index: trunk/Ohana/src/opihi/cmd.data/extract.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/extract.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/extract.c (revision 27435) @@ -70,6 +70,6 @@ if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) { gprint (GP_ERR, "matrix sizes mis-matched\n"); - gprint (GP_ERR, "%d x %d vs %d x %d\n", Nx, Ny, - out[0].header.Naxis[0], out[0].header.Naxis[1]); + gprint (GP_ERR, "%d x %d vs %lld x %lld\n", Nx, Ny, + (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]); return (FALSE); } Index: trunk/Ohana/src/opihi/cmd.data/keyword.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/keyword.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/keyword.c (revision 27435) @@ -107,11 +107,11 @@ } ivalue = !strcasecmp (line, "T"); - gfits_modify (&buf[0].header, argv[2], "%t", 1, ivalue); + gfits_modify_alt (&buf[0].header, argv[2], "%t", 1, ivalue); return (TRUE); case KEYCOMMENT: - gfits_modify (&buf[0].header, argv[2], "%C", 1, line); + gfits_modify_alt (&buf[0].header, argv[2], "%C", 1, line); return (TRUE); case COMMENT: - gfits_modify (&buf[0].header, argv[2], "%S", 0, line); + gfits_modify_alt (&buf[0].header, argv[2], "%S", 0, line); return (TRUE); } @@ -135,5 +135,5 @@ if (ascomment) { - status = gfits_scan (&buf[0].header, argv[2], "%C", 1, line); + status = gfits_scan_alt (&buf[0].header, argv[2], "%C", 1, line); if (!status) goto failure; if (argc == 4) Index: trunk/Ohana/src/opihi/cmd.data/list_header.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/list_header.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/list_header.c (revision 27435) @@ -49,5 +49,5 @@ gfits_modify (&buf[0].header, "BSCALE", "%lf", 1, bscale); gfits_modify (&buf[0].header, "BZERO", "%lf", 1, bzero); - gfits_modify (&buf[0].header, "UNSIGN", "%t", 1, unsign); + gfits_modify_alt (&buf[0].header, "UNSIGN", "%t", 1, unsign); } else { Index: trunk/Ohana/src/opihi/cmd.data/matrix.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/matrix.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/matrix.c (revision 27435) @@ -23,7 +23,7 @@ if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) { - gprint (GP_ERR, "size mis-match in matrices: (%d x %d) * (%d x %d)\n", - bufB[0].matrix.Naxis[0], bufB[0].matrix.Naxis[1], - bufC[0].matrix.Naxis[0], bufC[0].matrix.Naxis[1]); + gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n", + (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1], + (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]); return (FALSE); } Index: trunk/Ohana/src/opihi/cmd.data/rd.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/rd.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/rd.c (revision 27435) @@ -153,5 +153,5 @@ buf[0].header.Naxes = 0; ALLOCATE (buf[0].matrix.buffer, char, 1); - buf[0].matrix.size = 0; + buf[0].matrix.datasize = 0; buf[0].bitpix = 16; buf[0].bzero = 0; @@ -222,6 +222,6 @@ buf[0].unsign = buf[0].header.unsign; - gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", - buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]); + gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", + (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]); blank = 0xffff; Index: trunk/Ohana/src/opihi/cmd.data/rdseg.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/rdseg.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/rdseg.c (revision 27435) @@ -62,6 +62,5 @@ buf[0].bzero = buf[0].header.bzero; /* store the original values */ buf[0].unsign = buf[0].header.unsign; - gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", - buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]); + gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]); gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank); Index: trunk/Ohana/src/opihi/cmd.data/read_vectors.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/read_vectors.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/read_vectors.c (revision 27435) @@ -57,5 +57,5 @@ return (FALSE); } - fseek (f, 0, SEEK_SET); + fseeko (f, 0LL, SEEK_SET); Nvec = (argc - 1) / 2; @@ -159,5 +159,6 @@ int read_table_vectors (int argc, char **argv, char *extname) { - int i, j, k, N, Nbytes, Nextend, Ny, Binary, vecType; + off_t Nbytes; + int i, j, k, N, Nextend, Ny, Binary, vecType; char type[16], ID[80], *CCDKeyword; FTable table; @@ -184,5 +185,5 @@ if (f == NULL) ESCAPE ("file not found"); - fseek (f, 0, SEEK_SET); + fseeko (f, 0LL, SEEK_SET); table.header = &header; @@ -193,5 +194,5 @@ if (!gfits_load_header (f, &header)) ESCAPE ("error reading primary header for file"); Nbytes = gfits_data_size (&header); - fseek (f, Nbytes, SEEK_CUR); + fseeko (f, Nbytes, SEEK_CUR); gfits_free_header (&header); @@ -200,5 +201,5 @@ Nbytes = gfits_data_size (&header); /* skip the prior data buffers */ - fseek (f, Nbytes, SEEK_CUR); + fseeko (f, Nbytes, SEEK_CUR); gfits_free_header (&header); } @@ -215,14 +216,14 @@ while (1) { - if (!gfits_load_header (f, &header)) ESCAPE ("extensio not found in file"); + if (!gfits_load_header (f, &header)) ESCAPE ("extension not found in file"); Nbytes = gfits_data_size (&header); if (!gfits_scan (&header, CCDKeyword, "%s", 1, ID)) { - fseek (f, Nbytes, SEEK_CUR); + fseeko (f, Nbytes, SEEK_CUR); gfits_free_header (&header); continue; } if (strcmp (ID, extname)) { - fseek (f, Nbytes, SEEK_CUR); + fseeko (f, Nbytes, SEEK_CUR); gfits_free_header (&header); continue; Index: trunk/Ohana/src/opihi/cmd.data/rebin.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/rebin.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/rebin.c (revision 27435) @@ -63,5 +63,5 @@ } } - if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%d,%d to %d,%d)\n", argv[1], argv[2], in[0].header.Naxis[0], in[0].header.Naxis[1], nx, ny); + if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%lld,%lld to %d,%d)\n", argv[1], argv[2], (long long) in[0].header.Naxis[0], (long long) in[0].header.Naxis[1], nx, ny); Nx = in[0].header.Naxis[0]; Index: trunk/Ohana/src/opihi/cmd.data/relocate.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/relocate.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/relocate.c (revision 27435) @@ -3,5 +3,4 @@ int relocate (int argc, char **argv) { - char *end; int x, y; int N, kapa; Index: trunk/Ohana/src/opihi/cmd.data/rotate.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/rotate.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/rotate.c (revision 27435) @@ -43,5 +43,5 @@ gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY); gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX); - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); gfits_create_matrix (&buf[0].header, &buf[0].matrix); out_buff = (float *)buf[0].matrix.buffer; @@ -82,5 +82,5 @@ gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY); gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX); - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); gfits_create_matrix (&buf[0].header, &buf[0].matrix); out_buff = (float *)buf[0].matrix.buffer; @@ -120,5 +120,5 @@ if (!strcasecmp (argv[2], "UPSIDE") || (atof (argv[2]) == -180) || (atof (argv[2]) == 180)) { - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); gfits_create_matrix (&buf[0].header, &buf[0].matrix); out_buff = (float *)buf[0].matrix.buffer; @@ -155,5 +155,5 @@ if (!strcasecmp (argv[2], "FLIPY")) { - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); gfits_create_matrix (&buf[0].header, &buf[0].matrix); out_buff = (float *)buf[0].matrix.buffer; @@ -190,5 +190,5 @@ if (!strcasecmp (argv[2], "FLIPX")) { - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); gfits_create_matrix (&buf[0].header, &buf[0].matrix); out_buff = (float *)buf[0].matrix.buffer; @@ -272,5 +272,5 @@ gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly); gfits_create_matrix (&buf[0].header, &buf[0].matrix); - gfits_print (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); + gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!"); out_buff = (float *)buf[0].matrix.buffer; for (j = 0; j < Ly; j++) { Index: trunk/Ohana/src/opihi/cmd.data/test/dimendown.sh =================================================================== --- trunk/Ohana/src/opihi/cmd.data/test/dimendown.sh (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/test/dimendown.sh (revision 27435) @@ -42,5 +42,5 @@ $startmem = $word:1 - for i 0 1000 + for i 0 10000 dimendown timg val dimendown timg xc -x @@ -53,5 +53,5 @@ $PASS = 1 - if ($endmem - $startmem > 10) + if ($endmem - $startmem > 128) $PASS = 0 echo "growth: {$endmem-$startmem}" Index: trunk/Ohana/src/opihi/cmd.data/test/integrate.sh =================================================================== --- trunk/Ohana/src/opihi/cmd.data/test/integrate.sh (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/test/integrate.sh (revision 27435) @@ -40,5 +40,5 @@ $PASS = 1 - if ($endmem - $startmem > 10) + if ($endmem - $startmem > 128) $PASS = 0 echo "growth: {$endmem-$startmem}" Index: trunk/Ohana/src/opihi/cmd.data/test/interpolate.sh =================================================================== --- trunk/Ohana/src/opihi/cmd.data/test/interpolate.sh (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/test/interpolate.sh (revision 27435) @@ -41,5 +41,5 @@ $PASS = 1 - if ($endmem - $startmem > 10) + if ($endmem - $startmem > 128) $PASS = 0 echo "growth: {$endmem-$startmem}" Index: trunk/Ohana/src/opihi/cmd.data/test/periodogram.sh =================================================================== --- trunk/Ohana/src/opihi/cmd.data/test/periodogram.sh (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/test/periodogram.sh (revision 27435) @@ -136,5 +136,5 @@ $PASS = 1 - if ($endmem - $startmem > 10) + if ($endmem - $startmem > 180) $PASS = 0 echo "growth: {$endmem-$startmem}" Index: trunk/Ohana/src/opihi/cmd.data/wd.c =================================================================== --- trunk/Ohana/src/opihi/cmd.data/wd.c (revision 27262) +++ trunk/Ohana/src/opihi/cmd.data/wd.c (revision 27435) @@ -75,9 +75,9 @@ /* save the (float) version, write out a temporary buffer */ temp_matrix = buf[0].matrix; - ALLOCATE (temp_matrix.buffer, char, MAX(1, temp_matrix.size)); - memcpy (temp_matrix.buffer, buf[0].matrix.buffer, temp_matrix.size); + ALLOCATE (temp_matrix.buffer, char, MAX(1, temp_matrix.datasize)); + memcpy (temp_matrix.buffer, buf[0].matrix.buffer, temp_matrix.datasize); temp_header = buf[0].header; - ALLOCATE (temp_header.buffer, char, MAX(1, temp_header.size)); - memcpy (temp_header.buffer, buf[0].header.buffer, temp_header.size); + ALLOCATE (temp_header.buffer, char, MAX(1, temp_header.datasize)); + memcpy (temp_header.buffer, buf[0].header.buffer, temp_header.datasize); if (temp_header.Naxes) { @@ -88,5 +88,5 @@ gfits_modify (&temp_header, "BSCALE", "%lf", 1, outScale); gfits_modify (&temp_header, "BZERO", "%lf", 1, outZero); - gfits_modify (&temp_header, "UNSIGN", "%t", 1, outUnsign); + gfits_modify_alt (&temp_header, "UNSIGN", "%t", 1, outUnsign); } @@ -94,4 +94,5 @@ Header Xhead; FILE *f; + off_t nbytes; int status, Nextend; @@ -109,5 +110,5 @@ } - gfits_modify (&Xhead, "EXTEND", "%t", 1, TRUE); + gfits_modify_alt (&Xhead, "EXTEND", "%t", 1, TRUE); Nextend = 0; @@ -125,7 +126,7 @@ /* position to begining of file to write header */ - fseek (f, 0, SEEK_SET); - status = fwrite (Xhead.buffer, 1, Xhead.size, f); - if (status != Xhead.size) { + fseeko (f, 0LL, SEEK_SET); + nbytes = fwrite (Xhead.buffer, 1, Xhead.datasize, f); + if (nbytes != Xhead.datasize) { gprint (GP_ERR, "ERROR: failed writing data to image header\n"); status = FALSE; @@ -144,8 +145,8 @@ /* position to end of file to write new extend */ - fseek (f, 0, SEEK_END); - status = fwrite (temp_header.buffer, 1, temp_header.size, f); + fseeko (f, 0LL, SEEK_END); + nbytes = fwrite (temp_header.buffer, 1, temp_header.datasize, f); fclose (f); - if (status != temp_header.size) { + if (nbytes != temp_header.datasize) { gprint (GP_ERR, "failed to write file\n"); status = FALSE; Index: trunk/Ohana/src/opihi/dvo/ImageOps.c =================================================================== --- trunk/Ohana/src/opihi/dvo/ImageOps.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/ImageOps.c (revision 27435) @@ -1,12 +1,12 @@ # include "dvoshell.h" -void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset, +void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect) { - int i, j, flipped, status, InPic; - int *subset; - int N, n, npts; + int j, flipped, status, InPic; + off_t i, n, *subset; + int npts; double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid; Graphdata graph; @@ -44,6 +44,6 @@ npts = 200; - ALLOCATE (subset, int, npts); - n = N = 0; + ALLOCATE (subset, off_t, npts); + n = 0; for (i = 0; i < Nimage; i++) { if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue; @@ -114,9 +114,9 @@ if (n > npts - 1) { npts += 200; - REALLOCATE (subset, int, npts); + REALLOCATE (subset, off_t, npts); } } - REALLOCATE (subset, int, MAX (n, 1)); + REALLOCATE (subset, off_t, MAX (n, 1)); *Subset = subset; *Nsubset = n; Index: trunk/Ohana/src/opihi/dvo/ImageSelection.c =================================================================== --- trunk/Ohana/src/opihi/dvo/ImageSelection.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/ImageSelection.c (revision 27435) @@ -3,7 +3,7 @@ /* db image table */ static Image *image = NULL; -static int *subset = NULL; -static int Nimage = 0; -static int Nsubset = 0; +static off_t *subset = NULL; +static off_t Nimage = 0; +static off_t Nsubset = 0; static Coords mosaic; Index: trunk/Ohana/src/opihi/dvo/LoadImages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/LoadImages.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/LoadImages.c (revision 27435) @@ -1,5 +1,5 @@ # include "dvoshell.h" -Image *LoadImages (int *nimage) { +Image *LoadImages (off_t *Nimage) { int status; @@ -25,5 +25,5 @@ gprint (GP_ERR, "note: image catalog is empty\n"); ALLOCATE (image, Image, 1); - *nimage = 1; + *Nimage = 1; return (image); } @@ -37,5 +37,5 @@ } - image = gfits_table_get_Image (&db.ftable, nimage, &db.swapped); + image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped); return (image); } Index: trunk/Ohana/src/opihi/dvo/Makefile =================================================================== --- trunk/Ohana/src/opihi/dvo/Makefile (revision 27262) +++ trunk/Ohana/src/opihi/dvo/Makefile (revision 27435) @@ -26,7 +26,7 @@ $(SRC)/compare.$(ARCH).o \ $(SRC)/match_image.$(ARCH).o \ -$(SRC)/photometry.$(ARCH).o \ $(SRC)/dvomisc.$(ARCH).o \ $(SRC)/region_list.$(ARCH).o \ +$(SRC)/photometry.$(ARCH).o \ $(SRC)/dbBooleanCond.$(ARCH).o \ $(SRC)/dbCheckStack.$(ARCH).o \ Index: trunk/Ohana/src/opihi/dvo/aregion.c =================================================================== --- trunk/Ohana/src/opihi/dvo/aregion.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/aregion.c (revision 27435) @@ -44,5 +44,5 @@ NLINES += NDecLines[i]; } - fseek (f, 5*2880 + 48*NLINES, SEEK_SET); + fseeko (f, 5*2880 + 48*NLINES, SEEK_SET); done = FALSE; Index: trunk/Ohana/src/opihi/dvo/avextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/avextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/avextract.c (revision 27435) @@ -3,5 +3,6 @@ int avextract (int argc, char **argv) { - int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; + off_t i, j, n, m; + int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; int Nsecfilt, mode, VERBOSE; char **cstack, name[1024]; @@ -79,4 +80,6 @@ /* create output storage vectors */ + Npts = 0; + NPTS = 100; ALLOCATE (values, dbValue, Nfields); ALLOCATE (vec, Vector *, Nreturn); @@ -90,7 +93,4 @@ ResetVector (vec[i], fields[i].type, NPTS); } - - Npts = 0; - NPTS = 1; // grab data from all selected sky regions @@ -103,5 +103,5 @@ catalog.Nsecfilt = 0; - if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions); + if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions); // an error exit status here is a significant error Index: trunk/Ohana/src/opihi/dvo/badimages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/badimages.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/badimages.c (revision 27435) @@ -8,5 +8,6 @@ int badimages (int argc, char **argv) { - int i, Nimage, entry, First, Cross; + off_t i, Nimage; + int entry, First, Cross; float *ptr; double nominal, big, small, value; @@ -38,5 +39,5 @@ ptr = &image[entry].coords.crpix1; for (i = 0; i < 22; i++) { - gprint (GP_LOG, "%2d: %g\n", i, ptr[i]); + gprint (GP_LOG, "%2lld: %g\n", (long long) i, ptr[i]); } value = image[entry].coords.pc1_1*image[entry].coords.pc2_2 + image[entry].coords.pc1_2*image[entry].coords.pc2_1; @@ -57,5 +58,5 @@ value = image[i].coords.pc1_1*image[i].coords.pc2_2 + image[i].coords.pc1_2*image[i].coords.pc2_1; if ((value > big) || (value < small)) { - gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, value); + gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, value); } } @@ -64,5 +65,5 @@ ptr = &image[i].coords.crpix1; if ((ptr[entry] > big) || (ptr[entry] < small)) { - gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, ptr[entry]); + gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, ptr[entry]); } } Index: trunk/Ohana/src/opihi/dvo/calextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/calextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/calextract.c (revision 27435) @@ -5,6 +5,6 @@ int calextract (int argc, char **argv) { - int i, N, Nr, mode[2]; - int Nsecfilt, NSTAR; + off_t i, Nr; + int Nsecfilt, NSTAR, N, mode[2]; PhotCode *code[2]; Index: trunk/Ohana/src/opihi/dvo/calmextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/calmextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/calmextract.c (revision 27435) @@ -6,6 +6,6 @@ int calmextract (int argc, char **argv) { - int i, k, N, Nr, mode[2]; - int NSTAR, Nstar, Nsecfilt; + off_t i, k, Nr; + int NSTAR, Nstar, Nsecfilt, N, mode[2]; Catalog catalog; @@ -169,5 +169,6 @@ int ConcatMeasures (Vector *vec, PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int Nin, int param) { - int i, Ns, N; + off_t i, N; + int Ns; double *value; Index: trunk/Ohana/src/opihi/dvo/ccd.c =================================================================== --- trunk/Ohana/src/opihi/dvo/ccd.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/ccd.c (revision 27435) @@ -4,6 +4,7 @@ double *M1, *M2; - int i, m, k, Npts, NPTS, N; - int N1, N2, i1, i2, mode[4]; + off_t i, m, k, N1, N2, i1, i2; + int Npts, NPTS, N; + int mode[4]; int Nsecfilt, KeepNulls; void *Signal; Index: trunk/Ohana/src/opihi/dvo/cmatch.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmatch.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/cmatch.c (revision 27435) @@ -37,5 +37,5 @@ } dvo_catalog_unlock (&catalog1); - gprint (GP_ERR, "read %d stars from phot catalog file %s\n", catalog1.Naverage, filename); + gprint (GP_ERR, "read %lld stars from phot catalog file %s\n", (long long) catalog1.Naverage, filename); /* this is for loading from a text file, presumably hstgsc or usno Index: trunk/Ohana/src/opihi/dvo/cmd.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmd.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/cmd.c (revision 27435) @@ -4,5 +4,6 @@ double *M1, *M3; - int i, j, m, i1, i3, N1, N3, N; + off_t i, j, m, N1, N3, i1, i3; + int N; int Npts, NPTS, mode[3]; int Nsecfilt, KeepNulls; Index: trunk/Ohana/src/opihi/dvo/cmpReadFile.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmpReadFile.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/cmpReadFile.c (revision 27435) @@ -4,7 +4,7 @@ # define BLOCK 1000 -CMPstars *cmpReadFits (FILE *f, int *nstars) { +CMPstars *cmpReadFits (FILE *f, off_t *nstars) { - int i, Nstars; + off_t i, Nstars; Header theader; FTable table; @@ -44,7 +44,8 @@ } -CMPstars *cmpReadText (FILE *f, int *nstars) { +CMPstars *cmpReadText (FILE *f, off_t *nstars) { - int j, N, Nextra, Ninstar, Nskip, Nbytes, nbytes; + off_t N; + int j, Nextra, Ninstar, Nskip, Nbytes, nbytes; int done; char *buffer, *c, *c2; Index: trunk/Ohana/src/opihi/dvo/cmpload.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmpload.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/cmpload.c (revision 27435) @@ -56,5 +56,5 @@ return (FALSE); } - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); Noverlay = 0; Index: trunk/Ohana/src/opihi/dvo/cmpread.c =================================================================== --- trunk/Ohana/src/opihi/dvo/cmpread.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/cmpread.c (revision 27435) @@ -6,5 +6,6 @@ int cmpread (int argc, char **argv) { - int i, field, Naxis, Nbytes, Nstars; + off_t i, Nbytes, Nstars; + int field, Naxis; double tR, tD; float value; @@ -61,8 +62,8 @@ return (FALSE); } - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); /* find expected number of stars */ - if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) { + if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) { gprint (GP_ERR, "ERROR: can't get NSTARS from header\n"); gfits_free_header (&header); @@ -76,5 +77,5 @@ /* allocate space for stars */ gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]); - if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) { + if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) { gprint (GP_ERR, "ERROR: failed to find NSTARS\n"); exit (1); @@ -84,5 +85,5 @@ gprint (GP_ERR, "reading from FITS cmp file %s\n", argv[2]); Nbytes = gfits_data_size (&header); - fseek (f, Nbytes, SEEK_CUR); + fseeko (f, Nbytes, SEEK_CUR); stars = cmpReadFits (f, &Nstars); } @@ -138,5 +139,5 @@ free (stars); gfits_free_header (&header); - gprint (GP_ERR, "loaded %d objects\n", Nstars); + gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars); return (TRUE); } Index: trunk/Ohana/src/opihi/dvo/compare.c =================================================================== --- trunk/Ohana/src/opihi/dvo/compare.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/compare.c (revision 27435) @@ -5,5 +5,5 @@ Vector *rvec, Vector *dvec, Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) { - int i, j, first_j, Nmatch, NMATCH; + off_t i, j, first_j, Nmatch, NMATCH; double dX, dY, dR; Index: trunk/Ohana/src/opihi/dvo/dbExtractAverages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 27435) @@ -42,5 +42,6 @@ dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) { - int i, Nsec; + off_t i; + int Nsec; dbValue value; Index: trunk/Ohana/src/opihi/dvo/dbExtractImages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dbExtractImages.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/dbExtractImages.c (revision 27435) @@ -54,5 +54,5 @@ /* return image.field based on the selection */ -dbValue dbExtractImages (Image *image, int Nimage, int N, dbField *field) { +dbValue dbExtractImages (Image *image, off_t Nimage, off_t N, dbField *field) { double x, y; Index: trunk/Ohana/src/opihi/dvo/detrend.c =================================================================== --- trunk/Ohana/src/opihi/dvo/detrend.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/detrend.c (revision 27435) @@ -7,5 +7,6 @@ FILE *f; - int i, Nimage, status, N, TimeSelect; + off_t i, Nimage, status; + int N, TimeSelect; char DataBase[256]; time_t tzero, tend; @@ -133,8 +134,8 @@ return (FALSE); } - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); /* load existing data from database */ - gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage); + gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage); ALLOCATE (pimage, RegImage, Nimage); status = fread (pimage, sizeof(RegImage), Nimage, f); @@ -142,5 +143,5 @@ if (status != Nimage) { - gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status); + gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status); gfits_free_header (&header); free (pimage); Index: trunk/Ohana/src/opihi/dvo/dmt.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dmt.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/dmt.c (revision 27435) @@ -10,6 +10,7 @@ # if (0) - int i, m, k, N, kapa, SaveVectors; - int Nsec, Nsecfilt, NPTS; + int kapa, SaveVectors; + int Nsec, Nsecfilt; + off_t i, m, k, N, NPTS; double Radius; float dt1, dt2, dmt1, dmt2; Index: trunk/Ohana/src/opihi/dvo/dvomisc.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dvomisc.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/dvomisc.c (revision 27435) @@ -1,7 +1,7 @@ # include "dvoshell.h" -void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) { +void cprecess (Average *average, off_t Naverage, double in_epoch, double out_epoch) { - int i; + off_t i; double T; double A, D, RA, DEC, zeta, z, theta; Index: trunk/Ohana/src/opihi/dvo/elixir.c =================================================================== --- trunk/Ohana/src/opihi/dvo/elixir.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/elixir.c (revision 27435) @@ -73,5 +73,5 @@ /* write message to end of file */ - fseek (f, 0, SEEK_END); + fseeko (f, 0LL, SEEK_END); fprintf (f, "%s\n", message); Index: trunk/Ohana/src/opihi/dvo/find_regions.c =================================================================== --- trunk/Ohana/src/opihi/dvo/find_regions.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/find_regions.c (revision 27435) @@ -13,5 +13,6 @@ double RA0, RA1, DEC0, DEC1; int i, j, NBigDec; - int NLINES, done, NREGIONS, nregion; + int done, NREGIONS, nregion; + off_t NLINES; VarConfig ("GSCFILE", "%s", filename); @@ -91,5 +92,5 @@ NLINES += NDecLines[i]; } - fseek (f, 5*2880 + 48*NLINES, SEEK_SET); + fseeko (f, 5*2880 + 48*NLINES, SEEK_SET); /* should be in this section. if not, there is a problem counting... */ @@ -140,5 +141,5 @@ NLINES += NDecLines[i]; } - fseek (f, 5*2880 + 48*NLINES, SEEK_SET); + fseeko (f, 5*2880 + 48*NLINES, SEEK_SET); done = FALSE; j = 12; Index: trunk/Ohana/src/opihi/dvo/fitcolors.c =================================================================== --- trunk/Ohana/src/opihi/dvo/fitcolors.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/fitcolors.c (revision 27435) @@ -10,6 +10,7 @@ int *list, Nlist; - int i, k, m, N, NP1, NP2, NP, Np, Npts, NPTS; - int N1, N2, i1, i2, mode[4]; + off_t i, k, m, N1, N2, i1, i2; + int N, NP1, NP2, NP, Np, Npts, NPTS; + int mode[4]; int Nsecfilt, status; void *oldsignal; @@ -173,5 +174,5 @@ // the selection criteria } - gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions); + gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions); /* vectors to save data */ Index: trunk/Ohana/src/opihi/dvo/fitsed.c =================================================================== --- trunk/Ohana/src/opihi/dvo/fitsed.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/fitsed.c (revision 27435) @@ -24,5 +24,6 @@ int *hashcode; - int i, j, k, m, N, done, Nfit; + off_t i, j, k, m; + int N, done, Nfit; int Nsecfilt, status; void *oldsignal; @@ -184,5 +185,5 @@ /* loop over regions, extract data for each region */ // XXX add interrupt checks - gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions); + gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions); for (k = 0; k < skylist[0].Nregions; k++) { /* lock, load, unlock catalog */ Index: trunk/Ohana/src/opihi/dvo/gimages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/gimages.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/gimages.c (revision 27435) @@ -5,5 +5,6 @@ int gimages (int argc, char **argv) { - int i, j, N, Nimage, Nfound, *subset, Nsubset, status; + off_t i, j, Nimage, *subset, Nsubset; + int N, Nfound, status; double ra, dec, Ra, Dec, X, Y, Yo; double trange, t; @@ -114,5 +115,5 @@ { Coords local; - double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius; + double Ro, Do, Xo, Yo, Xs, Ys, Radius; if (typehash == DistortImage) { Index: trunk/Ohana/src/opihi/dvo/gstar.c =================================================================== --- trunk/Ohana/src/opihi/dvo/gstar.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/gstar.c (revision 27435) @@ -11,6 +11,8 @@ double Mcat, Mrel; double *RA, *DEC; - int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST; - int Nstars, found, GetMeasures, Nlo, Nhi; + off_t i, Nstars, *N1; + off_t j, k, m, N, Nlo, Nhi; + int Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST; + int found, GetMeasures; int SaveVectors; Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6; @@ -102,5 +104,5 @@ ALLOCATE (RA, double, Nstars); ALLOCATE (DEC, double, Nstars); - ALLOCATE (N1, int, Nstars); + ALLOCATE (N1, off_t, Nstars); /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */ @@ -157,5 +159,5 @@ k = N1[i]; if (!QUIET) { - gprint (GP_LOG, "star: %d\n", k); + gprint (GP_LOG, "star: %lld\n", (long long) k); gprint (GP_LOG, "%11.7f ", catalog.average[k].R); gprint (GP_LOG, "%11.7f ", catalog.average[k].D); Index: trunk/Ohana/src/opihi/dvo/images.c =================================================================== --- trunk/Ohana/src/opihi/dvo/images.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/images.c (revision 27435) @@ -11,5 +11,6 @@ int images (int argc, char **argv) { - int i, j, Nimage, status, InPic, leftside, *plist, TimeSelect, ByName; + off_t i, Nimage; + int j, status, InPic, leftside, *plist, TimeSelect, ByName; int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN; time_t tzero, tend; Index: trunk/Ohana/src/opihi/dvo/imbox.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imbox.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imbox.c (revision 27435) @@ -1,7 +1,9 @@ # include "dvoshell.h" +// LARGEFILES: this function is currently limited to images with Nx,Ny each < 2^31 int imbox (int argc, char **argv) { - int j, kapa, Nskip, status, InPic, flipped, N, haveNx, haveNy, Nx, Ny, SOLO_PHU, Npts, NPTS; + off_t Nskip; + int j, kapa, status, InPic, flipped, N, haveNx, haveNy, Nx, Ny, SOLO_PHU, Npts, NPTS; Vector Xvec, Yvec; double r, d, x[4], y[4], Rmin, Rmax, Rmid; @@ -112,5 +114,5 @@ skip: Nskip = gfits_data_size (&header); - fseek (f, Nskip, SEEK_CUR); + fseeko (f, Nskip, SEEK_CUR); gfits_free_header (&header); } Index: trunk/Ohana/src/opihi/dvo/imdata.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imdata.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imdata.c (revision 27435) @@ -3,8 +3,8 @@ int imdata (int argc, char **argv) { - int i, j, k, I; - int Nimage, N, NPTS, found, mode, TimeSelect; - int n, Nregions, NREGIONS, TimeFormat; - int *subset, Nsubset; + off_t i, j, k, n, I; + int N, NPTS, found, mode, TimeSelect, TimeFormat; + off_t Nregions, NREGIONS; + off_t *subset, Nsubset, Nimage; double trange; time_t tzero, start, stop, TimeReference; Index: trunk/Ohana/src/opihi/dvo/imdense.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imdense.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imdense.c (revision 27435) @@ -5,5 +5,6 @@ long A, B; - int i, kapa, N, Nimage, status, NPTS; + off_t i, Nimage; + int kapa, N, status, NPTS; double r, d, x, y, Rmin, Rmax; Vector Xvec, Yvec; Index: trunk/Ohana/src/opihi/dvo/imextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imextract.c (revision 27435) @@ -3,8 +3,7 @@ int imextract (int argc, char **argv) { - // int *subset, Nsubset; -- not sure if we need to use this or not... - - int i, j, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; - int Nimage, VERBOSE; + off_t i, j, Nimage; + int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; + int VERBOSE; char **cstack, name[1024]; void *Signal; @@ -73,4 +72,6 @@ /* create output storage vectors */ + Npts = 0; + NPTS = 100; ALLOCATE (values, dbValue, Nfields); ALLOCATE (vec, Vector *, Nreturn); @@ -84,7 +85,4 @@ ResetVector (vec[i], fields[i].type, NPTS); } - - Npts = 0; - NPTS = 1; if ((image = LoadImages (&Nimage)) == NULL) goto escape; Index: trunk/Ohana/src/opihi/dvo/imlist.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imlist.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imlist.c (revision 27435) @@ -3,5 +3,6 @@ int imlist (int argc, char **argv) { - int i, j, N, Nimage, *subset, Nsubset, TimeSelect, RegionSelect, TimeFormat, NameSelect; + off_t i, j, Nimage, *subset, Nsubset; + int N, TimeSelect, RegionSelect, TimeFormat, NameSelect; int PhotcodeSelect; time_t tzero, TimeReference; @@ -103,6 +104,6 @@ XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords); } - gprint (GP_LOG, "%3d %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", - i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal); + gprint (GP_LOG, "%3lld %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", + (long long) i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal); } Index: trunk/Ohana/src/opihi/dvo/imphot.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imphot.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imphot.c (revision 27435) @@ -6,5 +6,5 @@ double trange; int N, GreyScale; - int i, j, Nimage, Nsubset, *subset; + off_t i, j, Nimage, Nsubset, *subset; char bufname[64]; float *p; Index: trunk/Ohana/src/opihi/dvo/imrough.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imrough.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imrough.c (revision 27435) @@ -1,4 +1,4 @@ # include "dvoshell.h" -RegImage *load_imreg (char *DataBase, int *nimage); +RegImage *load_imreg (char *DataBase, off_t *nimage); # define NVALUE 22 @@ -8,5 +8,6 @@ int imrough (int argc, char **argv) { - int i, N, Nimage, TimeSelect; + off_t i, Nimage; + int N, TimeSelect; int ModeSelect, TypeSelect, CCDSelect, FilterSelect, TimeFormat; int type, value, mode, CCD, NVEC; @@ -231,7 +232,8 @@ } -RegImage *load_imreg (char *DataBase, int *nimage) { - - int Nimage, status; +RegImage *load_imreg (char *DataBase, off_t *nimage) { + + off_t Nimage; + int status; char line[80]; FILE *f; @@ -262,8 +264,8 @@ if (!strcmp (line, "MDM Observatory")) { - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); /* load existing data from database */ - gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage); + gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage); ALLOCATE (image, RegImage, Nimage); status = fread (image, sizeof(RegImage), Nimage, f); @@ -271,5 +273,5 @@ if (status != Nimage) { - gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status); + gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status); gfits_free_header (&header); free (image); @@ -302,5 +304,5 @@ /* convert to internal format */ image = (RegImage *) table.buffer; - gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage); + gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage); gfits_convert_RegImage (image, sizeof (RegImage), Nimage); Index: trunk/Ohana/src/opihi/dvo/imsearch.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imsearch.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imsearch.c (revision 27435) @@ -7,5 +7,6 @@ Header header; RegImage *pimage; - int i, Nimage, status, N, TimeSelect, SaveNames; + off_t i, Nimage, status; + int N, TimeSelect, SaveNames; int ModeSelect, TypeSelect, CCDSelect, FilterSelect; char *Filter, *obstime; @@ -102,13 +103,13 @@ return (FALSE); } - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); /* load existing data from database */ - gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage); + gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage); ALLOCATE (pimage, RegImage, Nimage); status = fread (pimage, sizeof(RegImage), Nimage, f); fclose (f); if (status != Nimage) { - gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status); + gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status); gfits_free_header (&header); free (pimage); @@ -130,5 +131,5 @@ obstime[strlen(obstime)-1] = 0; - gprint (GP_LOG, "%5d %6s %6s %2d %2d ", i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type); + gprint (GP_LOG, "%5lld %6s %6s %2d %2d ", (long long) i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type); gprint (GP_LOG, "%s %s ", pimage[i].pathname, pimage[i].filename); gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime); Index: trunk/Ohana/src/opihi/dvo/imstats.c =================================================================== --- trunk/Ohana/src/opihi/dvo/imstats.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/imstats.c (revision 27435) @@ -3,5 +3,6 @@ int imstats (int argc, char **argv) { - int i, kapa, Nimage, N; + off_t i, Nimage; + int kapa, N; int Mcal, AutoLimits; double r, d; Index: trunk/Ohana/src/opihi/dvo/lcurve.c =================================================================== --- trunk/Ohana/src/opihi/dvo/lcurve.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/lcurve.c (revision 27435) @@ -7,6 +7,7 @@ double *RA, *DEC; int kapa, TimeFormat; - int Nstars, found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors; - int i, j, m, N, NPTS, *N1; + int found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors; + off_t i, j, m, Nstars, *N1; + int N, NPTS; time_t TimeReference; struct tm *timeptr; @@ -88,5 +89,5 @@ ALLOCATE (RA, double, Nstars); ALLOCATE (DEC, double, Nstars); - ALLOCATE (N1, int, Nstars); + ALLOCATE (N1, off_t, Nstars); /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */ Index: trunk/Ohana/src/opihi/dvo/lightcurve.c =================================================================== --- trunk/Ohana/src/opihi/dvo/lightcurve.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/lightcurve.c (revision 27435) @@ -5,6 +5,7 @@ double Ra, Dec, Radius, Radius2, r; double *RA, *DEC; - int Nstars, found, PhotCodeSelect; - int i, j, k, m, N, NPTS, Nsecfilt, RELPHOT, *N1, TimeFormat; + off_t i, j, k, m, Nstars, *N1; + int found, PhotCodeSelect; + int N, NPTS, Nsecfilt, RELPHOT, TimeFormat; time_t TimeReference; @@ -71,5 +72,5 @@ ALLOCATE (RA, double, Nstars); ALLOCATE (DEC, double, Nstars); - ALLOCATE (N1, int, Nstars); + ALLOCATE (N1, off_t, Nstars); /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */ Index: trunk/Ohana/src/opihi/dvo/match_image.c =================================================================== --- trunk/Ohana/src/opihi/dvo/match_image.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/match_image.c (revision 27435) @@ -1,7 +1,7 @@ # include "dvoshell.h" -int match_image (Image *image, int Nimage, unsigned int T, short int S) { +off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) { - int N, Nlo, Nhi, N1, N2; + off_t N, Nlo, Nhi, N1, N2; /* bracket first value of interest */ @@ -37,7 +37,7 @@ } -int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S) { +off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) { - int N, Nlo, Nhi, N1, N2; + off_t N, Nlo, Nhi, N1, N2; /* bracket first value of interest */ Index: trunk/Ohana/src/opihi/dvo/mextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/mextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/mextract.c (revision 27435) @@ -3,5 +3,6 @@ int mextract (int argc, char **argv) { - int i, j, k, m, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; + off_t i, j, k, m; // used for counter averages and measures + int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack; int Nsecfilt, VERBOSE, loadImages, mosaicMode; char **cstack, name[1024]; @@ -119,5 +120,5 @@ catalog.Nsecfilt = Nsecfilt; - if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions); + if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions); // an error exit status here is a significant error Index: trunk/Ohana/src/opihi/dvo/mmextract.c =================================================================== --- trunk/Ohana/src/opihi/dvo/mmextract.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/mmextract.c (revision 27435) @@ -3,5 +3,6 @@ int mmextract (int argc, char **argv) { - int i, j, k, m, n, N, Npts, NPTS, last, next, state; + off_t i, j, k, m; + int n, N, Npts, NPTS, last, next, state; int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2; int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2; @@ -185,5 +186,5 @@ catalog.Nsecfilt = Nsecfilt; - if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions); + if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions); // an error exit status here is a significant error Index: trunk/Ohana/src/opihi/dvo/paverage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/paverage.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/paverage.c (revision 27435) @@ -5,5 +5,6 @@ FILE *f; - int i, j, kapa, Narg, Npts, NPTS, status, VERBOSE; + off_t i, j; + int kapa, Narg, Npts, NPTS, status, VERBOSE; int Nsecfilt, Nsec, Nloaded; double Mz, Mr, mag; Index: trunk/Ohana/src/opihi/dvo/photometry.c =================================================================== --- trunk/Ohana/src/opihi/dvo/photometry.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/photometry.c (revision 27435) @@ -336,5 +336,5 @@ int ListPhotSelections () { - gprint (GP_ERR, "TimeSelect: %d, %d - %d\n", TimeSelect, tzero, tend); + gprint (GP_ERR, "TimeSelect: %d, %s - %s\n", TimeSelect, ctime(&tzero), ctime(&tend)); gprint (GP_ERR, "MagSelect: %d, %f - %f\n", MagSelect, MagMax, MagMin); gprint (GP_ERR, "TypeSelect: %d, %d\n", TypeSelect, TypeValue); @@ -555,7 +555,7 @@ /* extract a list of measure parameters from the specified average entry based on the pre-set selections */ -double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int i, Nlist, NLIST; +double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t i, Nlist, NLIST; double M, *list; @@ -585,5 +585,5 @@ double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) { - int i; + off_t i; double value; @@ -714,5 +714,6 @@ double frac; - int k, Nc, Nt; + int Nc, Nt; + off_t k; Nt = Nc = 0; @@ -730,5 +731,6 @@ int DetermineTypeCode (Average *average, Measure *measure, int code) { - int k, N, Nt[3]; + off_t k; + int N, Nt[3]; Nt[0] = Nt[1] = Nt[2] = 0; @@ -788,5 +790,6 @@ int TestAverage (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) { - int i, Nm, Type, Select; + off_t i, Nm; + int Type, Select; double fwhm, typefrac, dM, Xm; @@ -937,8 +940,8 @@ -double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n) { +double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n) { double *M, mag; - int N; + off_t N; if ((mode == MAG_AVE) || (mode == MAG_REF)) { @@ -960,7 +963,8 @@ /* extract delta-mag pairs applying specified selections */ -double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) { - - int i, j, A1, A2, N1, N2, Np, Nlist, NLIST; +double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) { + + int A1, A2; + off_t i, j, N1, N2, Np, Nlist, NLIST; double *M1, *M2, *list; @@ -1009,7 +1013,8 @@ /* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections - does not return self-matched measurements */ -double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) { - - int i, j, Np0, Np1, Nlist, NLIST; +double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) { + + int Np0, Np1; + off_t i, j, Nlist, NLIST; double *list, M1, M2; @@ -1056,7 +1061,8 @@ /* extract a measurement list matching the number of dmag entries */ -double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int A1, A2, N1; +double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t N1; + int A1, A2; double *list; @@ -1080,7 +1086,7 @@ /* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections */ -double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) { - - int i, j, n, Nlist, NLIST; +double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) { + + off_t i, j, n, Nlist, NLIST; double *list, M1, M2; Index: trunk/Ohana/src/opihi/dvo/pmeasure.c =================================================================== --- trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 27435) @@ -7,5 +7,6 @@ FILE *f; - int i, j, k, m, kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded; + off_t i, j, k, m; + int kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded; double Mz, Mr, mag; double Radius, Rmin, Rmax, R, D, trange; Index: trunk/Ohana/src/opihi/dvo/simage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/simage.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/simage.c (revision 27435) @@ -89,5 +89,5 @@ return (FALSE); } - fseek (f, header.size, SEEK_SET); + fseeko (f, header.datasize, SEEK_SET); /* set up storage buffers */ Index: trunk/Ohana/src/opihi/dvo/skycoverage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/skycoverage.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/skycoverage.c (revision 27435) @@ -6,5 +6,6 @@ int WITH_MOSAIC, SOLO_MOSAIC; - int i, N, Nimage, status, TimeSelect, ByName, xs, ys; + off_t i, Nimage; + int N, status, TimeSelect, ByName, xs, ys; time_t tzero, tend; double pixscale, dX, dY, Npts, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange, RaCenter, DecCenter; Index: trunk/Ohana/src/opihi/dvo/subpix.c =================================================================== --- trunk/Ohana/src/opihi/dvo/subpix.c (revision 27262) +++ trunk/Ohana/src/opihi/dvo/subpix.c (revision 27435) @@ -3,8 +3,8 @@ int subpix (int argc, char **argv) { - int i, j, I, Nlo, Nhi, Nentry, Nstars, Nimage, Nmeasure; - int *index, *entry; - int Nmin, Nsub, NSUB, status; - int TimeFormat; + off_t Nlo, Nhi, *entry, Nentry; + off_t j, i, I, *index, Nstars, Nimage, Nmeasure; + off_t Nmin, Nsub, NSUB; + int status, TimeFormat; time_t Timage, TimeReference; double X, Y, Mabs, t; @@ -54,5 +54,5 @@ ALLOCATE (RA, double, Nstars); ALLOCATE (DEC, double, Nstars); - ALLOCATE (index, int, Nstars); + ALLOCATE (index, off_t, Nstars); for (i = 0; i < Nstars; i++) { RA[i] = catalog.average[i].R; @@ -65,5 +65,5 @@ Nlo = bracket (DEC, Nstars, FALSE, Dec - Radius); Nhi = bracket (DEC, Nstars, TRUE, Dec + Radius); - ALLOCATE (entry, int, MAX (Nhi - Nlo, 1)); + ALLOCATE (entry, off_t, MAX (Nhi - Nlo, 1)); Nentry = 0; @@ -111,5 +111,5 @@ Nsub = 0; NSUB = 100; - ALLOCATE (index, int, NSUB); + ALLOCATE (index, off_t, NSUB); /* load all images, extract those touching Ra, Dec */ @@ -125,5 +125,5 @@ if (Nsub == NSUB - 1) { NSUB += 100; - REALLOCATE (index, int, NSUB); + REALLOCATE (index, off_t, NSUB); } } Index: trunk/Ohana/src/opihi/include/data.h =================================================================== --- trunk/Ohana/src/opihi/include/data.h (revision 27262) +++ trunk/Ohana/src/opihi/include/data.h (revision 27435) @@ -77,5 +77,5 @@ /* in fft.c */ void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward); -int fftND (float *dataRe, float *dataIm, int Ndim, int *Nsize, int forward); +int fftND (float *dataRe, float *dataIm, int Ndim, off_t *Nsize, int forward); void dfft1D (double *dataRe, double *dataIm, int N, int Nbit, int forward); int dfftND (double *dataRe, double *dataIm, int Ndim, int *Nsize, int forward); Index: trunk/Ohana/src/opihi/include/display.h =================================================================== --- trunk/Ohana/src/opihi/include/display.h (revision 27262) +++ trunk/Ohana/src/opihi/include/display.h (revision 27435) @@ -36,6 +36,6 @@ int SendLabel (char *string, int Xgraph, int mode); -int SendGraphMessage (int device, char *format, ...); -int SendGraphCommand (int device, int length, char *format, ...); +int SendGraphMessage (int device, char *format, ...) OHANA_FORMAT(printf, 2, 3); +int SendGraphCommand (int device, int length, char *format, ...) OHANA_FORMAT(printf, 3, 4); int SendGraphCommandV (int device, int length, char *format, va_list argp); Index: trunk/Ohana/src/opihi/include/dvoshell.h =================================================================== --- trunk/Ohana/src/opihi/include/dvoshell.h (revision 27262) +++ trunk/Ohana/src/opihi/include/dvoshell.h (revision 27435) @@ -260,10 +260,10 @@ double DetermineTypefrac PROTO((Average *average, Measure *measure, PhotCode *code)); double ExtractAverages PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param)); -double *ExtractByDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist)); -double *ExtractMagnitudes PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n)); -double *ExtractMeasures PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); -double *ExtractMeasuresDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist)); +double *ExtractByDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist)); +double *ExtractMagnitudes PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n)); +double *ExtractMeasures PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param)); +double *ExtractMeasuresDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist)); void FreeImageSelection PROTO((void)); void FreeImageSelection PROTO((void)); @@ -280,5 +280,5 @@ void FreeDVO PROTO((void)); int InitPhotcodes PROTO((void)); -Image *LoadImages PROTO((int *Nimage)); +Image *LoadImages PROTO((off_t *Nimage)); Image *MatchImage PROTO((unsigned int time, short int source)); Coords *MatchMosaic PROTO((unsigned int time, short int source)); @@ -300,14 +300,11 @@ int TestPhotSelections PROTO((PhotCode **code, int *mode, int param)); void compare PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec, Vector *dvec, Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius)); -void cprecess PROTO((Average *average, int Naverage, double in_epoch, double out_epoch)); -void image_subset PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect)); -int match_image PROTO((Image *image, int Nimage, unsigned int T, short int S)); -int match_image_subset PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S)); +void cprecess PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch)); +void image_subset PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect)); +off_t match_image PROTO((Image *image, off_t Nimage, unsigned int T, short int S)); +off_t match_image_subset PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S)); void print_value PROTO((double value, short int ival)); -void sort_image_subset PROTO((Image *image, int *subset, int N)); -void sort_images PROTO((Image *image, int N)); -void sortave PROTO((Average *ave, int N)); -CMPstars *cmpReadFits PROTO((FILE *f, int *nstars)); -CMPstars *cmpReadText PROTO((FILE *f, int *nstars)); +CMPstars *cmpReadFits PROTO((FILE *f, off_t *nstars)); +CMPstars *cmpReadText PROTO((FILE *f, off_t *nstars)); int RD_to_XYpic PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside)); @@ -334,5 +331,5 @@ dbValue dbExtractAverages PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); dbValue dbExtractMeasures PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); -dbValue dbExtractImages PROTO((Image *image, int Nimage, int N, dbField *field)); +dbValue dbExtractImages PROTO((Image *image, off_t Nimage, off_t N, dbField *field)); void dbInitField PROTO((dbField *field)); Index: trunk/Ohana/src/opihi/include/pantasks.h =================================================================== --- trunk/Ohana/src/opihi/include/pantasks.h (revision 27262) +++ trunk/Ohana/src/opihi/include/pantasks.h (revision 27435) @@ -269,7 +269,4 @@ int CheckJobsGetState (void); -// void *CheckTasksThread (void *data); -// void *CheckJobsThread (void *data); - void CheckControllerSetState (int state); int CheckControllerGetState (void); @@ -287,12 +284,12 @@ void CheckInputs (void); -void ClientThreadLock (void); -void ClientThreadUnlock (void); -void CommandThreadLock (void); -void CommandThreadUnlock (void); -void ControlThreadLock (void); -void ControlThreadUnlock (void); -void JobTaskThreadLock (void); -void JobTaskThreadUnlock (void); +void ClientLock (void); +void ClientUnlock (void); +void CommandLock (void); +void CommandUnlock (void); +void ControlLock (const char *func); +void ControlUnlock (const char *func); +void JobTaskLock (void); +void JobTaskUnlock (void); int InitPassword (void); Index: trunk/Ohana/src/opihi/include/shell.h =================================================================== --- trunk/Ohana/src/opihi/include/shell.h (revision 27262) +++ trunk/Ohana/src/opihi/include/shell.h (revision 27435) @@ -153,5 +153,5 @@ char *memstr PROTO((char *m1, char *m2, int n)); -int write_fmt PROTO((int fd, char *format, ...)); +int write_fmt PROTO((int fd, char *format, ...)) OHANA_FORMAT(printf, 2, 3); char *opihi_version PROTO((void)); char *strip_version PROTO((char *input)); @@ -167,7 +167,7 @@ FILE *gprintGetFile PROTO((gpDest dest)); char *gprintGetName PROTO((gpDest dest)); -int gprint PROTO((gpDest dest, char *format, ...)); +int gprint PROTO((gpDest dest, char *format, ...)) OHANA_FORMAT(printf, 2, 3); int gwrite PROTO((char *buffer, int size, int N, gpDest dest)); -int gprint_syserror PROTO((gpDest dest, int myError, char *format, ...)); +int gprint_syserror PROTO((gpDest dest, int myError, char *format, ...)) OHANA_FORMAT(printf, 3, 4); int gprintv PROTO((gpDest dest, char *format, va_list argp)); Index: trunk/Ohana/src/opihi/lib.data/fft.c =================================================================== --- trunk/Ohana/src/opihi/lib.data/fft.c (revision 27262) +++ trunk/Ohana/src/opihi/lib.data/fft.c (revision 27435) @@ -72,5 +72,5 @@ // This requires 2(Nx*Ny*...) mem copies, but the fft operations are likely to happen in // cache. -int fftND (float *x, float *y, int Ndim, int *Nsize, int forward) { +int fftND (float *x, float *y, int Ndim, off_t *Nsize, int forward) { int i, nIndex, minor, major, iDim; Index: trunk/Ohana/src/opihi/lib.shell/BufferOps.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/BufferOps.c (revision 27262) +++ trunk/Ohana/src/opihi/lib.shell/BufferOps.c (revision 27435) @@ -83,5 +83,5 @@ return (buffers[i]); - error: +error: if (verbose) gprint (GP_ERR, "invalid matrix %s\n", name); return (NULL); @@ -238,9 +238,9 @@ gprint (GP_LOG, " N name file X Y bytes BP U bzero bscale \n"); for (i = 0; i < Nbuffers; i++) { - gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n", - i, buffers[i][0].name, buffers[i][0].file, - buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1], - buffers[i][0].header.size + buffers[i][0].matrix.size, buffers[i][0].bitpix, - buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale); + gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld %3d %1d %10.4e %10.4e\n", + i, buffers[i][0].name, buffers[i][0].file, + (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1], + (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize, buffers[i][0].bitpix, + buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale); } return (TRUE); @@ -249,9 +249,9 @@ gprint (GP_LOG, " N name file X Y bytes\n"); for (i = 0; i < Nbuffers; i++) { - gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d\n", - i, buffers[i][0].name, buffers[i][0].file, - buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1], - buffers[i][0].header.size + buffers[i][0].matrix.size); - } - return (TRUE); -} + gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld\n", + i, buffers[i][0].name, buffers[i][0].file, + (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1], + (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize); + } + return (TRUE); +} Index: trunk/Ohana/src/opihi/lib.shell/gprint.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/gprint.c (revision 27262) +++ trunk/Ohana/src/opihi/lib.shell/gprint.c (revision 27435) @@ -352,8 +352,8 @@ // there are two strerror_r implementations; choose the right one: #if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) - errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); -#else strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); errorMsg = errorBuf; +#else + errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH); #endif @@ -362,5 +362,5 @@ va_end (argp); - gprintv (dest, "%s\n", errorMsg); + gprint (dest, "%s\n", errorMsg); return TRUE; } Index: trunk/Ohana/src/opihi/lib.shell/multicommand.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/multicommand.c (revision 27262) +++ trunk/Ohana/src/opihi/lib.shell/multicommand.c (revision 27435) @@ -32,5 +32,5 @@ /* here we can perform the security handshaking */ VarConfig ("PASSWORD", "%s", PASSWORD); - SendCommand (server, strlen(PASSWORD), PASSWORD); + SendCommand (server, strlen(PASSWORD), "%s", PASSWORD); return; @@ -82,5 +82,5 @@ if (server) { // send the command to the server instead - if (!SendMessage (server, outline)) { + if (!SendMessage (server, "%s", outline)) { switch (errno) { case EPIPE: Index: trunk/Ohana/src/opihi/lib.shell/stack_math.c =================================================================== --- trunk/Ohana/src/opihi/lib.shell/stack_math.c (revision 27262) +++ trunk/Ohana/src/opihi/lib.shell/stack_math.c (revision 27435) @@ -1135,13 +1135,13 @@ /* copy all but the matrix */ - matrix2[0].unsign = matrix1[0].unsign; - matrix2[0].bitpix = matrix1[0].bitpix; - matrix2[0].size = matrix1[0].size; - matrix2[0].bzero = matrix1[0].bzero; - matrix2[0].bscale = matrix1[0].bscale; - matrix2[0].Naxes = matrix1[0].Naxes; - for (i = 0; i < FT_MAX_NAXES; i++) + matrix2[0].unsign = matrix1[0].unsign; + matrix2[0].bitpix = matrix1[0].bitpix; + matrix2[0].datasize = matrix1[0].datasize; + matrix2[0].bzero = matrix1[0].bzero; + matrix2[0].bscale = matrix1[0].bscale; + matrix2[0].Naxes = matrix1[0].Naxes; + for (i = 0; i < FT_MAX_NAXES; i++) { matrix2[0].Naxis[i] = matrix1[0].Naxis[i]; - + } return (TRUE); Index: trunk/Ohana/src/opihi/pantasks/JobOps.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/JobOps.c (revision 27262) +++ trunk/Ohana/src/opihi/pantasks/JobOps.c (revision 27435) @@ -73,7 +73,4 @@ int i; - int status; - char command[1024]; - IOBuffer buffer; gprint (GP_LOG, "\n"); Index: trunk/Ohana/src/opihi/pantasks/ListenClients.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/ListenClients.c (revision 27262) +++ trunk/Ohana/src/opihi/pantasks/ListenClients.c (revision 27435) @@ -70,5 +70,5 @@ int i, Ncurrent, Nmax, status, Nread; - char *line, log_stdout[128], log_stderr[128]; + char *line; fd_set fdSet; struct timeval timeout; Index: trunk/Ohana/src/opihi/pantasks/status_server.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/status_server.c (revision 27262) +++ trunk/Ohana/src/opihi/pantasks/status_server.c (revision 27435) @@ -1,3 +1,5 @@ # include "pantasks.h" + +int status_scheduler(void); int status_server (int argc, char **argv) { @@ -103,5 +105,5 @@ } -int status_scheduler() { +int status_scheduler(void) { gprint (GP_LOG, "\n"); Index: trunk/Ohana/src/opihi/pantasks/thread_locks.c =================================================================== --- trunk/Ohana/src/opihi/pantasks/thread_locks.c (revision 27262) +++ trunk/Ohana/src/opihi/pantasks/thread_locks.c (revision 27435) @@ -4,9 +4,9 @@ static pthread_mutex_t ClientMutex = PTHREAD_MUTEX_INITIALIZER; -void ClientLock () { +void ClientLock (void) { pthread_mutex_lock (&ClientMutex); } -void ClientUnlock () { +void ClientUnlock (void) { pthread_mutex_unlock (&ClientMutex); } @@ -15,10 +15,10 @@ static pthread_mutex_t CommandMutex = PTHREAD_MUTEX_INITIALIZER; -void CommandLock () { +void CommandLock (void) { // fprintf (stderr, "command lock\n"); pthread_mutex_lock (&CommandMutex); } -void CommandUnlock () { +void CommandUnlock (void) { // fprintf (stderr, "command unlock\n"); pthread_mutex_unlock (&CommandMutex); @@ -28,10 +28,10 @@ static pthread_mutex_t ControlMutex = PTHREAD_MUTEX_INITIALIZER; -void ControlLock (char *func) { +void ControlLock (const char *func) { // fprintf (stderr, "control lock %s\n", func); pthread_mutex_lock (&ControlMutex); } -void ControlUnlock (char *func) { +void ControlUnlock (const char *func) { // fprintf (stderr, "control unlock %s\n", func); pthread_mutex_unlock (&ControlMutex); @@ -41,10 +41,10 @@ static pthread_mutex_t JobTaskMutex = PTHREAD_MUTEX_INITIALIZER; -void JobTaskLock () { +void JobTaskLock (void) { // fprintf (stderr, "jobtask lock\n"); pthread_mutex_lock (&JobTaskMutex); } -void JobTaskUnlock () { +void JobTaskUnlock (void) { // fprintf (stderr, "jobtask unlock\n"); pthread_mutex_unlock (&JobTaskMutex); Index: trunk/Ohana/src/opihi/pcontrol/PclientCommand.c =================================================================== --- trunk/Ohana/src/opihi/pcontrol/PclientCommand.c (revision 27262) +++ trunk/Ohana/src/opihi/pcontrol/PclientCommand.c (revision 27435) @@ -63,5 +63,5 @@ } if (status == 0) { - gprint (GP_ERR, "pclient read returns 0 for %s\n", command); + gprint (GP_ERR, "pclient read returns 0 for %s\n", response); return (PCLIENT_DOWN); } Index: trunk/Ohana/src/opihi/pcontrol/StartHost.c =================================================================== --- trunk/Ohana/src/opihi/pcontrol/StartHost.c (revision 27262) +++ trunk/Ohana/src/opihi/pcontrol/StartHost.c (revision 27435) @@ -14,5 +14,5 @@ if (VarConfig ("SHELL", "%s", shell) == NULL) strcpy (shell, "pclient"); - if (VerboseMode()) gprint (GP_ERR, "starting host within thread %d\n", pthread_self()); + if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self()); pid = rconnect (command, host[0].hostname, shell, stdio); Index: trunk/Ohana/src/opihi/pcontrol/StopHosts.c =================================================================== --- trunk/Ohana/src/opihi/pcontrol/StopHosts.c (revision 27262) +++ trunk/Ohana/src/opihi/pcontrol/StopHosts.c (revision 27435) @@ -121,5 +121,5 @@ int i, result, waitstatus; - if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %p\n", pthread_self()); + if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self()); if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);