IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 19, 2010, 5:35:25 PM (16 years ago)
Author:
eugene
Message:

update ohana formatting functions to check format and associated types; fixes derived from format checks

Location:
branches/eam_branches/largefiles.20100314/Ohana/src
Files:
99 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/largefiles.20100314/Ohana/src/addstar/include/addstar.h

    r27296 r27368  
    158158void       SetProtect             PROTO((int mode));
    159159int        SetSignals             PROTO((void));
    160 int        Shutdown               PROTO((char *message, ...));
     160int        Shutdown               PROTO((char *message, ...)) OHANA_FORMAT(printf, 1, 2);
    161161void       TrapSignal             PROTO((int sig));
    162162float      airmass                PROTO((float secz_image, double ra, double dec, double st, double latitude));

  • branches/eam_branches/largefiles.20100314/Ohana/src/addstar/include/skycells.h

    r23914 r27368  
    7878void         SetProtect                     PROTO((int mode));
    7979int          SetSignals                     PROTO((void));
    80 int          Shutdown                       PROTO((char *message, ...); )
     80int          Shutdown                       PROTO((char *message, ...)) OHANA_FORMAT(printf, 1, 2);
    8181void         TrapSignal                     PROTO((int sig));
    8282

  • branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/GetFileMode.c

    r21508 r27368  
    44int GetFileMode (Header *header) {
    55
    6   char ctype[80];
     6  char ctype[80], ctmp;
    77  int Naxis;
    88  int simple, extend, haveNaxis, haveCTYPE;
    9   int tmp, havePHOT_VER, haveTARG_VER;
     9  int havePHOT_VER, haveTARG_VER;
    1010
    11   gfits_scan (header, "SIMPLE", "%t", 1, &simple);
     11  gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
    1212  haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
    1313  haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
    1414
    15   gfits_scan (header, "EXTEND", "%t", 1, &extend);
     15  gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
    1616   
    1717  // SDSS tsObj files have a version number for the PHOTO and
    1818  // TS (target selection) pipelines present as header keywords
    19   havePHOT_VER = gfits_scan (header, "PHOT_VER", "%s", 1, &tmp);
    20   haveTARG_VER = gfits_scan (header, "TARG_VER", "%s", 1, &tmp);
     19  havePHOT_VER = gfits_scan (header, "PHOT_VER", "%s", 1, &ctmp);
     20  haveTARG_VER = gfits_scan (header, "TARG_VER", "%s", 1, &ctmp);
    2121  if (havePHOT_VER && haveTARG_VER) return SDSS_OBJ;
    2222

  • branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/sky_tessalation.c

    r27296 r27368  
    951951
    952952  // reset db[0].theader(NAXIS1) to match Image
    953   gfits_modify (&db[0].theader, "NAXIS1", "%d", 1, sizeof(Image));
     953  gfits_modify (&db[0].theader, "NAXIS1", "%lld", 1, (long long) sizeof(Image));
    954954  db[0].theader.Naxis[0] = sizeof(Image);
    955955

  • branches/eam_branches/largefiles.20100314/Ohana/src/addstar/test/relastro.dvo

    r27357 r27368  
    5252
    5353  for N 0 3
    54     exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-objects -update
     54    exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-objects -update -plot -plotdelay 1.0
    5555    mextract RA DEC RA:AVE DEC:AVE dR dD mag
    5656    create n 0 RA[]
    … …  
    7777    end
    7878 
    79     exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-simple -update
     79    exec relastro -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update-simple -update -plot -plotdelay 1.0
    8080    mextract RA DEC RA:AVE DEC:AVE dR dD
    8181    create n 0 RA[]

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/include/delstar.h

    r27305 r27368  
    4444void       SetProtect             PROTO((int mode));
    4545int        SetSignals             PROTO((void));
    46 int        Shutdown               PROTO((char *format, ...));
     46int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
    4747void       TrapSignal             PROTO((int sig));
    4848int        args                   PROTO((int *argc, char **argv));

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/delete_imagename.c

    r27305 r27368  
    8080  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
    8181
    82   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, Noutimage);
    83   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, Noutimage);
     82  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Noutimage);
     83  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, (long long) Noutimage);
    8484  db[0].theader.Naxis[1] = Noutimage;
    8585  db[0].ftable.buffer = (char *) outimage;

  • branches/eam_branches/largefiles.20100314/Ohana/src/delstar/src/gimages.c

    r27295 r27368  
    5353  }     
    5454  if (!haveNx && !haveNy) {
    55       haveNx = gfits_scan (&header, "ZNAXIS1",   "%d", 1, &image[0].NX);
    56       haveNy = gfits_scan (&header, "ZNAXIS2",   "%d", 1, &image[0].NY);
     55      haveNx = gfits_scan (&header, "ZNAXIS1",   "%hd", 1, &image[0].NX);
     56      haveNy = gfits_scan (&header, "ZNAXIS2",   "%hd", 1, &image[0].NY);
    5757  }
    5858  if (!haveNx || !haveNy) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/dvomerge/include/dvomerge.h

    r24745 r27368  
    3535void       SetProtect             PROTO((int mode));
    3636void       TrapSignal             PROTO((int sig));
    37 int        Shutdown               PROTO((char *format, ...));
     37int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
    3838
    3939void       usage                  PROTO((void));

  • branches/eam_branches/largefiles.20100314/Ohana/src/dvosplit/include/dvosplit.h

    r24753 r27368  
    3535void       SetProtect             PROTO((int mode));
    3636void       TrapSignal             PROTO((int sig));
    37 int        Shutdown               PROTO((char *format, ...));
     37int        Shutdown               PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2));
    3838int        args                   PROTO((int argc, char **argv));
    3939

  • branches/eam_branches/largefiles.20100314/Ohana/src/fixcat/src/wcatalog.c

    r27295 r27368  
    3838  gfits_modify (&catalog[0].header, "NMISS",  "%lld", 1, catalog[0].Nmissing);
    3939
    40   gfits_modify (&catalog[0].header, "MARKSTAR", "%t", 1, TRUE);
     40  gfits_modify_alt (&catalog[0].header, "MARKSTAR", "%t", 1, TRUE);
    4141
    4242  nitems = Fwrite (catalog[0].header.buffer, 1, catalog[0].header.datasize, f, "char");

  • branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gheader.c

    r27295 r27368  
    2222  if (Nmatch < 2) {
    2323    gfits_modify (&header, "NASTRO", "%d", 1, 0);
    24     gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     24    gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    2525    goto skipstuff;
    2626  }
    2727 
    2828  gfits_modify (&header, "NASTRO", "%d", 1, Nmatch);
    29   gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     29  gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    3030
    3131  /*** use PutCoords to update header ***/
    … …  
    7373  }
    7474  gfits_modify (&header, "CERROR", "%lf", 1, dR);
    75   gfits_modify (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
     75  gfits_modify_alt (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
    7676  gfits_modify (&header, "CPRECISE", "%lf", 1, dR / sqrt(1.0*Nmatch));
    77   gfits_modify (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
     77  gfits_modify_alt (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
    7878  gfits_modify (&header, "EQUINOX", "%lf", 1, 2000.0);
    7979  /* we force equinox to be 2000.0 for all images */

  • branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/gheader2.c

    r27295 r27368  
    2121      if (Target[0].answer.N < 6) {
    2222        gfits_modify (&header, "NASTRO", "%d", 1, 0);
    23         gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     23        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    2424        goto skipstuff;
    2525      }
    … …  
    2828      if (Target[0].answer.N < 12) {
    2929        gfits_modify (&header, "NASTRO", "%d", 1, 0);
    30         gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     30        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    3131        goto skipstuff;
    3232      }
    … …  
    3535      if (Target[0].answer.N < 20) {
    3636        gfits_modify (&header, "NASTRO", "%d", 1, 0);
    37         gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     37        gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    3838        goto skipstuff;
    3939      }
    … …  
    4545 
    4646  gfits_modify (&header, "NASTRO", "%d", 1, Target[0].answer.N);
    47   gfits_modify (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
     47  gfits_modify_alt (&header, "NASTRO", "%C", 1, "number of stars used for astrometry");
    4848
    4949  /*** use PutCoords to update header ***/
    … …  
    5252  dR = fabs (Target[0].answer.dR*Target[0].coords.cdelt1*3600.0);
    5353  gfits_modify (&header, "CERROR", "%lf", 1, dR);
    54   gfits_modify (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
     54  gfits_modify_alt (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
    5555  gfits_modify (&header, "CPRECISE", "%lf", 1, dR / sqrt(1.0*Target[0].answer.N));
    56   gfits_modify (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
     56  gfits_modify_alt (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
    5757  gfits_modify (&header, "EQUINOX", "%lf", 1, 2000.0);
    5858  /* we force equinox to be 2000.0 for all images */

  • branches/eam_branches/largefiles.20100314/Ohana/src/gastro2/src/gstars2.c

    r27295 r27368  
    126126  /* Is NAXIS == 0 a better test?? */
    127127  extend = FALSE;
    128   gfits_scan (&Target[0].header, "NAXIS",  "%t", 1, &naxis);
     128  gfits_scan_alt (&Target[0].header, "NAXIS",  "%t", 1, &naxis);
    129129  if ((naxis == 0) && !TEXTMODE) {
    130130    Nskip = gfits_data_size (&Target[0].header);

  • branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageExtract.h

    r27296 r27368  
    2121int  args_extract        PROTO((int argc, char **argv));
    2222int  ConfigInit_extract  PROTO((int *argc, char **argv));
    23 int  Shutdown            PROTO((char *format, ...));
     23int  Shutdown            PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
    2424void TrapSignal          PROTO((int sig));
    2525void SetProtect          PROTO((int mode));

  • branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageOverlaps.h

    r27296 r27368  
    2424int  args_overlaps       PROTO((int argc, char **argv));
    2525int  ConfigInit_overlaps PROTO((int *argc, char **argv));
    26 int  Shutdown         PROTO((char *format, ...));
     26int  Shutdown         PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2));
    2727void TrapSignal       PROTO((int sig));
    2828void SetProtect       PROTO((int mode));

  • branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImagesAtCoords.h

    r27296 r27368  
    3939int  args_coords         PROTO((int argc, char **argv));
    4040int  ConfigInit_coords PROTO((int *argc, char **argv));
    41 int  Shutdown         PROTO((char *format, ...));
     41int  Shutdown         PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2));
    4242void TrapSignal       PROTO((int sig));
    4343void SetProtect       PROTO((int mode));

  • branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/getstar.h

    r21153 r27368  
    3737int  args                    PROTO((int argc, char **argv));
    3838int  ConfigInit              PROTO((int *argc, char **argv));
    39 int  Shutdown                PROTO((char *format, ...));
     39int  Shutdown                PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
    4040int  load_pt_catalog         PROTO((Catalog *catalog, SkyRegion *region));
    4141int  select_by_region        PROTO((Catalog *output, Catalog *catalog, SkyRegion *region, int start, int end));

  • branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/GetFileMode.c

    r19065 r27368  
    88  int simple, extend, haveNaxis, haveCTYPE;
    99
    10   gfits_scan (header, "SIMPLE", "%t", 1, &simple);
     10  gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
    1111  haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
    1212  haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
    1313
    14   gfits_scan (header, "EXTEND", "%t", 1, &extend);
     14  gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
    1515   
    1616  if ((Naxis == 2) || !simple) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/imclean/src/wfits.c

    r7080 r27368  
    1010  header[0].Naxes = 0;
    1111  gfits_modify (header, "NAXIS",   "%d", 1, 0);
    12   gfits_modify (header, "EXTEND",  "%t", 1, TRUE);
     12  gfits_modify_alt (header, "EXTEND",  "%t", 1, TRUE);
    1313  gfits_modify (header, "NEXTEND", "%d", 1, 1);
    1414

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/detrend/imdef.c

    r14590 r27368  
    4343  descriptor[0].mode = M_SPLIT;
    4444  Extend = FALSE;
    45   gfits_scan (&header, "EXTEND", "%t", 1, &Extend);
     45  gfits_scan_alt (&header, "EXTEND", "%t", 1, &Extend);
    4646  if (Extend) {
    4747    descriptor[0].mode      = M_MEF;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/rtext.c

    r27296 r27368  
    1010  /* check that file size makes sense */
    1111  Nimage = 0;
    12   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, &Nimage);
     12  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    1313  if (stat (db[0].filename, &filestatus) == -1) {
    1414    if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    4141  }
    4242  db[0].ftable.buffer = (char *) image;
    43   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, Nimage);
     43  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
    4444  db[0].theader.Naxis[1] = Nimage;
    4545  db[0].ftable.datasize = gfits_data_size (&db[0].theader);

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imreg/iminfo.c

    r14590 r27368  
    4242
    4343  /* determine data layout (SINGLE, SPLIT, MEF, CUBE, SLICE) */
    44   gfits_scan (&header, "EXTEND",  "%t", 1, &extend);
     44  gfits_scan_alt (&header, "EXTEND",  "%t", 1, &extend);
    4545  gfits_scan (&header, "NAXIS",  "%d", 1, &Naxes);
    4646  if (extend) { /* MEF file */
    … …  
    6868
    6969  /* extract other relevant data from header */
    70   gfits_scan (&header, ImagetypeKeyword,  "%s", 1, &Imagetype);
     70  gfits_scan (&header, ImagetypeKeyword,  "%s", 1, (char *)&Imagetype);
    7171
    7272  /* grab the image type : if not defined, set to 'none' */
    … …  
    108108      ohana_dms_to_ddd (&tmp, line);
    109109      image[0].ra = 15*tmp;
    110       gfits_scan (&header, DECSexigKeyword, "%s", 1, &line);
     110      gfits_scan (&header, DECSexigKeyword, "%s", 1, (char *)&line);
    111111      ohana_dms_to_ddd (&tmp, line);
    112112      image[0].dec = tmp;

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/include/imregister.h

    r27305 r27368  
    8989
    9090void warn_scan (Header *header, char *field, char *format, int N, void *var);
    91 int gfits_scan_nchar (Header *header, int size, char *field, int N,...);
     91int gfits_scan_nchar (Header *header, int size, char *field, int N,...) OHANA_FORMAT(scanf, 3, 5);
    9292void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);
    9393

  • branches/eam_branches/largefiles.20100314/Ohana/src/imregister/src/convertimreg.c

    r27305 r27368  
    4141
    4242  /* load existing data from database */
    43   gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     43  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    4444  ALLOCATE (pimage, RegImage, Nimage);
    4545  status = fread (pimage, sizeof(RegImage), Nimage, f);

  • branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/LoadPicture.c

    r27296 r27368  
    3232  gfits_init_header (&header);
    3333  header.Naxes = 2;
    34   KiiScanMessage (sock, "%d %d", &header.Naxis[0], &header.Naxis[1]);
     34  KiiScanMessage (sock, "%lld %lld", (long long *) &header.Naxis[0], (long long *) &header.Naxis[1]);
    3535
    3636  // internal image are 32 bit floats; sender must send in this format
    … …  
    4141
    4242  KiiScanMessage (sock, "%lf %lf %s %s",  &image[0].image[0].zero, &image[0].image[0].range, image[0].image[0].name, image[0].image[0].file);
    43   KiiScanMessage (sock, "%lf %lf %lld", &image[0].image[0].min,  &image[0].image[0].max, &header.datasize);
     43  KiiScanMessage (sock, "%lf %lf %lld", &image[0].image[0].min,  &image[0].image[0].max, (long long *) &header.datasize);
    4444  KiiScanMessage (sock, "%lf %f %f %f %f", &image[0].image[0].coords.crval1, &image[0].image[0].coords.crpix1, &image[0].image[0].coords.cdelt1, &image[0].image[0].coords.pc1_1, &image[0].image[0].coords.pc1_2);
    4545  KiiScanMessage (sock, "%lf %f %f %f %f", &image[0].image[0].coords.crval2, &image[0].image[0].coords.crpix2, &image[0].image[0].coords.cdelt2, &image[0].image[0].coords.pc2_1, &image[0].image[0].coords.pc2_2);

  • branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/SetImageData.c

    r16256 r27368  
    1717 
    1818  // get image data from client
    19   KiiScanMessage (sock, "%lf %lf %s",
     19  KiiScanMessage (sock, "%lf %lf %s %s",
    2020                  &image[0].image[0].zero,
    2121                  &image[0].image[0].range,

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_catalog.c

    r27351 r27368  
    253253  }
    254254  // check if the table has been sorted or not
    255   status = gfits_scan (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
     255  status = gfits_scan_alt (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
    256256  if (!status) catalog[0].sorted = TRUE;
    257257
    … …  
    302302
    303303  // set the 'sorted' header keyword
    304   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     304  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    305305
    306306  // XXX handle return status
    … …  
    327327
    328328  // set the 'sorted' header keyword
    329   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     329  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    330330
    331331  // XXX handle return status
    … …  
    353353  // set the 'sorted' header keyword
    354354  catalog[0].sorted = FALSE;
    355   gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     355  gfits_modify_alt (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    356356
    357357  /* update is only valid for catmode SPLIT */

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_catalog_mef.c

    r27295 r27368  
    33int dvo_catalog_load_mef (Catalog *catalog, int VERBOSE) {
    44 
    5   off_t Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt;
     5  int Nsecfilt;
     6  off_t Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing;
    67  FILE *f;
    78
    … …  
    2324  }
    2425  /* get the components from the header */
    25   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, &Naverage)) return (FALSE);
    26   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, &Nmeasure)) return (FALSE);
    27   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, &Nmissing)) return (FALSE);
    28   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%lld", 1, &Nsecfilt)) Nsecfilt = 0;
     26  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
     27  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
     28  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     29  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &Nsecfilt)) Nsecfilt = 0;
    2930
    3031  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    … …  
    207208  SecFilt *primary;
    208209  SecFilt *secfilt;
    209   off_t i, j, Nsecfilt, Nallfilt, Ntotal;
     210  off_t i, j, Nallfilt, Ntotal;
     211  int Nsecfilt;
    210212
    211213  if (catalog[0].Naverage == 0) {
    … …  
    236238
    237239  /* make sure header is consistent with data */
    238   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, catalog[0].Naverage);
    239   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, catalog[0].Nmeasure);
    240   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, catalog[0].Nmissing);
    241   gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, Nsecfilt);
    242   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     240  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) catalog[0].Naverage);
     241  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) catalog[0].Nmeasure);
     242  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) catalog[0].Nmissing);
     243  gfits_modify (&catalog[0].header, "NSECFILT", "%d",   1,                        Nsecfilt);
     244  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    243245  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    244246

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r27295 r27368  
    2121  /* get the components from the header */
    2222  catalog[0].Naverage = catalog[0].Nmeasure = catalog[0].Nmissing = catalog[0].Nsecfilt = 0;
    23   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, &catalog[0].Naverage)) return (FALSE);
    24   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, &catalog[0].Nmeasure)) return (FALSE);
    25   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, &catalog[0].Nmissing)) return (FALSE);
    26   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%lld", 1, &catalog[0].Nsecfilt)) catalog[0].Nsecfilt = 0;
     23  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &catalog[0].Naverage)) return (FALSE);
     24  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &catalog[0].Nmeasure)) return (FALSE);
     25  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &catalog[0].Nmissing)) return (FALSE);
     26  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &catalog[0].Nsecfilt)) catalog[0].Nsecfilt = 0;
    2727
    2828  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    … …  
    4545  }
    4646  /* special cases: old versions of the DB tables which were poorly identified */
    47   if (gfits_scan (&catalog[0].header, "NEWMEAS",  "%t", 1, &NewMeasure)) {
     47  if (gfits_scan_alt (&catalog[0].header, "NEWMEAS",  "%t", 1, &NewMeasure)) {
    4848    catalog[0].catformat = DVO_FORMAT_ELIXIR; // special case for ELIXIR
    4949    goto got_format;

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_catalog_split.c

    r27295 r27368  
    66// * ok
    77
    8 int dvo_catalog_secfilt_to_primary (Catalog *catalog, SecFilt **myPrimary, SecFilt **mySecfilt, off_t *myNsecfilt) {
     8int dvo_catalog_secfilt_to_primary (Catalog *catalog, SecFilt **myPrimary, SecFilt **mySecfilt, int *myNsecfilt) {
    99
    1010  off_t i, j, Nallfilt, Nsecfilt, Ntotal;
    … …  
    161161  off_t Nbytes;
    162162  off_t Naverage, Nmeasure, Nmissing;
    163   off_t Nitems, Nsecfilt;
    164   int status;
     163  off_t Nitems;
     164  int status, Nsecfilt;
    165165  Header header;
    166166  FTable ftable;
    … …  
    174174
    175175  /* get the components from the header - these duplicate information in the split files (NAXIS2) */
    176   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, &Naverage)) return (FALSE);
    177   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, &Nmeasure)) return (FALSE);
    178   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, &Nmissing)) return (FALSE);
    179   if (!gfits_scan (&catalog[0].header, "NSECFILT", "%lld", 1, &Nsecfilt)) Nsecfilt = 0;
     176  if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
     177  if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
     178  if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     179  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,              &Nsecfilt)) Nsecfilt = 0;
    180180
    181181  /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
    … …  
    490490  FTable ftable;
    491491  SecFilt *primary, *secfilt;
    492   off_t Nsecfilt;
     492  int Nsecfilt;
    493493  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    494494  off_t first, start, Nrows;
    … …  
    524524
    525525  /* make sure header is consistent with data */
    526   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, Naves_disk_new);
    527   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, Nmeas_disk_new);
    528   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, Nmiss_disk_new);
    529   gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, Nsecfilt);
    530   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     526  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     527  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     528  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     529  gfits_modify (&catalog[0].header, "NSECFILT", "%d",  1, Nsecfilt);
     530  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    531531  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    532532
    … …  
    671671  FTable ftable;
    672672  SecFilt *primary, *secfilt;
    673   off_t Nsecfilt;
     673  int Nsecfilt;
    674674  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    675675  off_t first, start, Nrows;
    … …  
    723723
    724724  /* make sure header is consistent with data */
    725   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, Naves_disk_new);
    726   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, Nmeas_disk_new);
    727   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, Nmiss_disk_new);
    728   gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, Nsecfilt);
    729   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     725  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     726  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     727  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     728  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
     729  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    730730  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    731731
    … …  
    869869  FTable ftable;
    870870  SecFilt *primary, *secfilt;
    871   off_t Nsecfilt;
     871  int Nsecfilt;
    872872  off_t Naves_disk_new, Nmeas_disk_new, Nmiss_disk_new, Nsecf_disk_new;
    873873  off_t first, start, Nrows;
    … …  
    902902
    903903  /* make sure header is consistent with data */
    904   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, Naves_disk_new);
    905   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, Nmeas_disk_new);
    906   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, Nmiss_disk_new);
    907   gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, Nsecfilt);
    908   gfits_modify (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
     904  gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
     905  gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
     906  gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     907  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
     908  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    909909  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    910910

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert.c

    r27295 r27368  
    261261    gfits_free_header (theader);
    262262    gfits_table_mkheader_Image (theader);
    263     gfits_modify (theader, "NAXIS2", "%lld", 1, Nimage);
     263    gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage);
    264264    theader[0].Naxis[1] = Nimage;
    265265    ftable[0].datasize = gfits_data_size (theader);
    … …  
    282282    gfits_free_header (theader); \
    283283    gfits_table_mkheader_Image (theader); \
    284     gfits_modify (theader, "NAXIS2", "%lld", 1, Nimage); \
     284    gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
    285285    theader[0].Naxis[1] = Nimage; \
    286286    ftable[0].datasize = gfits_data_size (theader); \
    … …  
    370370      } \
    371371      /* convert header from old format to new format */ \
    372       gfits_scan (theader, "NAXIS2", "%lld", 1, &Nimage); \
     372      gfits_scan (theader, "NAXIS2", "%lld", 1, (long long *) &Nimage); \
    373373      gfits_free_header (theader); \
    374374      gfits_table_mkheader_Image_##TYPE (theader); \
    375       gfits_modify (theader, "NAXIS2", "%lld", 1, Nimage); \
     375      gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
    376376      theader[0].Naxis[1] = Nimage; \
    377377      vtable[0].datasize = gfits_data_size (theader); \

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_image.c

    r27295 r27368  
    120120  /* adjust header */
    121121  Nimages = 0;
    122   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, &Nimages);
     122  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimages);
    123123  Nimages += Nnew;
    124   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, Nimages);
     124  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, (long long) Nimages);
    125125
    126126  gfits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
    … …  
    195195  gfits_table_set_Image (&db[0].ftable, NULL, 0);
    196196
    197   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, 0);
     197  gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, 0LL);
    198198  gfits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPoint);
    199199

  • branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_image_raw.c

    r27295 r27368  
    3939  /* find number of images */
    4040  Nimage = 0;
    41   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, &Nimage);
     41  gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    4242  if (stat (db[0].filename, &filestatus) == -1) {
    4343    if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    9494  }
    9595
    96   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, Nimage);
     96  gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
    9797  db[0].theader.Naxis[1] = Nimage;
    9898  db[0].ftable.datasize = gfits_data_size (&db[0].theader);
    … …  
    123123  Nrow = db[0].vtable.Nrow;
    124124  row = db[0].vtable.row;
    125   gfits_scan (db[0].vtable.header, "NAXIS1", "%lld", 1, &Nx);
    126   gfits_scan (db[0].vtable.header, "NAXIS2", "%lld", 1, &Ny);
     125  gfits_scan (db[0].vtable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     126  gfits_scan (db[0].vtable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    127127
    128128  /* file pointer is at beginning of desired table data */
    … …  
    156156  }
    157157
    158   gfits_scan (db[0].ftable.header, "NAXIS1", "%lld", 1, &Nx);
    159   gfits_scan (db[0].ftable.header, "NAXIS2", "%lld", 1, &Ny);
     158  gfits_scan (db[0].ftable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     159  gfits_scan (db[0].ftable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    160160  size = Nx * Ny;
    161161  Nbytes = fwrite (db[0].ftable.buffer, sizeof(char), size, db[0].f);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_create_H.c

    r27295 r27368  
    1717  strncpy (header[0].buffer, "END", 3);
    1818
    19   gfits_modify (header, "SIMPLE", "%t", 1, header[0].simple);
     19  gfits_modify_alt (header, "SIMPLE", "%t", 1, header[0].simple);
    2020  gfits_modify (header, "BITPIX", "%d", 1, header[0].bitpix);
    2121  gfits_modify (header, "NAXIS",  "%d", 1, header[0].Naxes);
    … …  
    2323  for (i = 0; i < header[0].Naxes; i++) {
    2424    snprintf (axis, 10, "NAXIS%d", i + 1);
    25     gfits_modify (header,  axis, "%lld", 1, header[0].Naxis[i]);
     25    gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
    2626  }
    2727
    … …  
    3030  gfits_modify (header, "BSCALE", "%lf", 1, header[0].bscale);
    3131  gfits_modify (header, "BZERO",  "%lf", 1, header[0].bzero);
    32   gfits_modify (header, "EXTEND", "%t",  1, header[0].extend);
     32  gfits_modify_alt (header, "EXTEND", "%t",  1, header[0].extend);
    3333  return (TRUE);
    3434

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_modify.c

    r27295 r27368  
    22# include <gfitsio.h>
    33
     4// this is only valid for the regular and non-boolean fields
    45int gfits_modify (Header *header, char *field, char *mode, int N,...) {
    56 
    … …  
    89
    910  char comment[82], string[82], data[82];
    10   char *p, *qs, *qe;
     11  char *p, *qe;
    1112  va_list argp;
    1213 
    … …  
    6667  if (!strcmp (mode, "%lg"))  snprintf (string, 81, "%-8s= %20.10G / %-s ", field, va_arg (argp, double),             comment);
    6768
     69  /* string value.  Quotes must be at least 18 chars apart */
     70  if (!strcmp (mode, "%s")) {
     71    strncpy (data, va_arg (argp, char *), 68);
     72    snprintf (string, 81, "%-8s= '%-18s' / %-s ", field, data, comment);
     73  }
     74
     75  strncpy (p, string, 80);
     76  va_end (argp);
     77  return (TRUE);
     78
     79}
     80
     81// alternate version for the special types (boolean, comments, COMMENT)
     82int gfits_modify_alt (Header *header, char *field, char *mode, int N,...) {
     83 
     84  /* this function expects one more argument, the value to be written */
     85  /* this function is extremely similar to gfits_print, except it allows for changing an existing field. */
     86
     87  char comment[82], string[82], data[82];
     88  char *p, *qs, *qe;
     89  va_list argp;
     90 
     91  va_start (argp, N);
     92  bzero (data, 82);
     93  bzero (string, 82);
     94  bzero (comment, 82);
     95
     96  if (mode[0] != '%') {
     97    fprintf (stderr, "gfits_print: weird mode:  %s\n", mode);
     98    return (FALSE);
     99  }
     100
     101  /* find location of desired entry */
     102  p = gfits_header_field (header, field, N);
     103  if (p == NULL)  {
     104    /* new entry, find the END of the header */
     105    p = gfits_header_field (header, "END", 1);
     106    if (p == NULL) return (FALSE);
     107   
     108    /* is there enough space for 1 more line? */
     109    if (header[0].datasize - (p - (header[0].buffer)) < 2*FT_LINE_LENGTH) {
     110      header[0].datasize += FT_RECORD_SIZE;
     111      REALLOCATE (header[0].buffer, char, header[0].datasize);
     112      p = gfits_header_field (header, "END", 1);
     113      if (p == NULL) return (FALSE);
     114      memset (p + FT_LINE_LENGTH, ' ', FT_RECORD_SIZE);
     115    }
     116   
     117    /* push END line back 1 */
     118    memmove ((p + FT_LINE_LENGTH), p, FT_LINE_LENGTH);
     119    memset (p, ' ', FT_LINE_LENGTH);
     120  } else {
     121    /* old entry, save the comment region (is this skipping a character for non-strings?) */
     122    qe = gfits_keyword_end (p);
     123    qe += 3;
     124    qe = MIN (p + 80, qe);
     125    strncpy (comment, qe, p + 80 - qe);
     126  }
     127  gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
     128
    68129  /* write the boolean mode */
    69130  if (!strcmp (mode, "%t")) {
    … …  
    72133    else
    73134      snprintf (string, 81, "%-8s= %18s F / %-s ", field, " ", comment);
    74   }
    75 
    76   /* string value.  Quotes must be at least 18 chars apart */
    77   if (!strcmp (mode, "%s")) {
    78     strncpy (data, va_arg (argp, char *), 68);
    79     snprintf (string, 81, "%-8s= '%-18s' / %-s ", field, data, comment);
    80135  }
    81136

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_print.c

    r27295 r27368  
    22# include <gfitsio.h>
    33
     4// this only prints the regular and non-boolean fields
    45int gfits_print (Header *header, char *field, char *mode, int N,...) {
    56 
    … …  
    89  static char blank[] = " ";
    910  char string[82], line[80];
    10   char *p, a;
     11  char *p;
    1112  va_list argp; 
    1213
    … …  
    6162  if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
    6263
     64  /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */
     65  if (!strcmp (mode, "%s")) {
     66    strcpy (line, va_arg (argp, char *));
     67    line[68] = 0;
     68    snprintf (string, 81, "%-8s= '%-18s' / %46s ", field, line, blank);
     69  }
     70
     71  strncpy (p, string, 80);
     72 
     73  va_end (argp);
     74  return (TRUE);
     75
     76}
     77
     78// alternate version for the special types (boolean, comments, COMMENT)
     79int gfits_print_alt (Header *header, char *field, char *mode, int N,...) {
     80 
     81  /* this function expects one more argument, the value to be written */
     82
     83  static char blank[] = " ";
     84  char string[82], line[80];
     85  char *p, a;
     86  va_list argp; 
     87
     88  va_start (argp, N);
     89 
     90  if (mode[0] != '%') {
     91    fprintf (stderr, "gfits_print: weird mode:  %s\n", mode);
     92    return (FALSE);
     93  }
     94
     95  /* this is supposed to create a new field, not modify an old one.  */
     96  p = gfits_header_field (header, field, N);
     97  if (p != NULL) return (FALSE);
     98
     99  /* find the END of the header */
     100  p = gfits_header_field (header, "END", 1);
     101  if (p == NULL) return (FALSE);
     102
     103  /* is there enough space for 1 more line? */
     104  if (header[0].datasize - (p - (header[0].buffer)) < 2*FT_LINE_LENGTH) {
     105    header[0].datasize += FT_RECORD_SIZE;
     106    REALLOCATE (header[0].buffer, char, header[0].datasize);
     107    /* re-find the "END" marker, in case new memory block is used */
     108    p = gfits_header_field (header, "END", 1);
     109    if (p == NULL) return (FALSE);
     110    memset (p + FT_LINE_LENGTH, ' ', FT_RECORD_SIZE);
     111  }
     112
     113  /* push END line back 1 */
     114  memmove ((p + FT_LINE_LENGTH), p, FT_LINE_LENGTH);
     115  memset (p, ' ', FT_LINE_LENGTH);
     116
    63117  /* write the boolean mode */
    64118  if (!strcmp (mode, "%t")) {
    … …  
    68122    else
    69123      snprintf (string, 81, "%-8s= %18s F / %46s ", field, blank, blank);
    70   }
    71 
    72   /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */
    73   if (!strcmp (mode, "%s")) {
    74     strcpy (line, va_arg (argp, char *));
    75     line[68] = 0;
    76     snprintf (string, 81, "%-8s= '%-18s' / %46s ", field, line, blank);
    77124  }
    78125

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_read_H.c

    r27295 r27368  
    6060    header[0].Naxis[i] = 0;
    6161
    62   gfits_scan (header,  "SIMPLE", "%t",   1, &header[0].simple);
     62  gfits_scan_alt (header,  "SIMPLE", "%t",   1, &header[0].simple);
    6363  gfits_scan (header,  "BITPIX", "%d",   1, &header[0].bitpix);
    6464  gfits_scan (header,  "NAXIS",  "%d",   1, &header[0].Naxes);
    6565                                                           
    66   gfits_scan (header,  "EXTEND", "%t",   1, &header[0].extend);
    67   gfits_scan (header,  "UNSIGN", "%t",   1, &header[0].unsign);
     66  gfits_scan_alt (header,  "EXTEND", "%t",   1, &header[0].extend);
     67  gfits_scan_alt (header,  "UNSIGN", "%t",   1, &header[0].unsign);
    6868  gfits_scan (header,  "BSCALE", "%lf",  1, &header[0].bscale);
    6969  gfits_scan (header,  "BZERO",  "%lf",  1, &header[0].bzero);
    7070                                       
    71   gfits_scan (header,  "NAXIS1", "%lld", 1, &header[0].Naxis[0]);
    72   gfits_scan (header,  "NAXIS2", "%lld", 1, &header[0].Naxis[1]);
    73   gfits_scan (header,  "NAXIS3", "%lld", 1, &header[0].Naxis[2]);
    74   gfits_scan (header,  "NAXIS4", "%lld", 1, &header[0].Naxis[3]);
    75   gfits_scan (header,  "NAXIS5", "%lld", 1, &header[0].Naxis[4]);
    76   gfits_scan (header,  "NAXIS6", "%lld", 1, &header[0].Naxis[5]);
    77   gfits_scan (header,  "NAXIS7", "%lld", 1, &header[0].Naxis[6]);
    78   gfits_scan (header,  "NAXIS8", "%lld", 1, &header[0].Naxis[7]);
    79   gfits_scan (header,  "NAXIS9", "%lld", 1, &header[0].Naxis[8]);
    80   gfits_scan (header, "NAXIS10", "%lld", 1, &header[0].Naxis[9]);
     71  gfits_scan (header,  "NAXIS1", "%lld", 1, (long long *) &header[0].Naxis[0]);
     72  gfits_scan (header,  "NAXIS2", "%lld", 1, (long long *) &header[0].Naxis[1]);
     73  gfits_scan (header,  "NAXIS3", "%lld", 1, (long long *) &header[0].Naxis[2]);
     74  gfits_scan (header,  "NAXIS4", "%lld", 1, (long long *) &header[0].Naxis[3]);
     75  gfits_scan (header,  "NAXIS5", "%lld", 1, (long long *) &header[0].Naxis[4]);
     76  gfits_scan (header,  "NAXIS6", "%lld", 1, (long long *) &header[0].Naxis[5]);
     77  gfits_scan (header,  "NAXIS7", "%lld", 1, (long long *) &header[0].Naxis[6]);
     78  gfits_scan (header,  "NAXIS8", "%lld", 1, (long long *) &header[0].Naxis[7]);
     79  gfits_scan (header,  "NAXIS9", "%lld", 1, (long long *) &header[0].Naxis[8]);
     80  gfits_scan (header, "NAXIS10", "%lld", 1, (long long *) &header[0].Naxis[9]);
    8181
    8282  if (!gfits_scan (header, "PCOUNT",  "%d", 1, &header[0].pcount)) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_scan.c

    r27295 r27368  
    22# include <gfitsio.h>
    33
     4// this only scans the regular and non-boolean fields
    45int gfits_scan (Header *header, char *field, char *mode, int N,...) {
    56
    … …  
    1314}
    1415 
     16// alternate version for the special types (boolean, comments, COMMENT)
     17int gfits_scan_alt (Header *header, char *field, char *mode, int N,...) {
     18
     19  int status;
     20  va_list argp;
     21 
     22  va_start (argp, N);
     23  status = gfits_vscan_alt (header, field, mode, N, argp);
     24  va_end (argp);
     25  return (status);
     26}
     27 
     28// this only scans the regular and non-boolean fields
    1529int gfits_vscan (Header *header, char *field, char *mode, int N, va_list argp) {
    1630
    … …  
    2741  }
    2842
    29   /* non-data entry (COMMENT, HISTORY) */
    30   if (!strcmp (mode, "%S")) {
    31     strncpy (va_arg (argp, char *), p + 8, FT_HISTORY_LENGTH);
    32     return (TRUE);
    33   }
    34 
    3543  /* all others require '=' in column 8 */
    3644  if (p[8] != '=') return (FALSE);
    37 
    38   /* comment from data line */
    39   if (!strcmp (mode, "%C")) {
    40     q = gfits_keyword_end (p) + 3;
    41     q = MIN (p + 80, q);
    42     bzero (tmp, 81);
    43     Nchar = MIN (80, p + 80 - q);
    44     memcpy (tmp, q, Nchar);
    45     stripwhite (tmp);
    46     strcpy (va_arg (argp, char *), tmp);
    47     return (TRUE);
    48   }
    4945
    5046  /* extract data into char array (exclude containing ' chars) */
    … …  
    6157  }
    6258 
    63   /* boolean data, requires int target */
    64   if (!strcmp (mode, "%t")) {
    65     s = gfits_keyword_start (p);
    66     if (*s == 'T') {
    67       *va_arg (argp, int *) = TRUE;
    68       return (TRUE);
    69     }
    70     if (*s == 'F') {
    71       *va_arg (argp, int *) = FALSE;   
    72       return (TRUE);
    73     }
    74   }
    75 
    7659  /* remaining options are numerical data */
    7760  /* need to interpret 1.0d5 as 1.0e5 */
    … …  
    10588}
    10689
     90// alternate version for the special types (boolean, comments, COMMENT)
     91int gfits_vscan_alt (Header *header, char *field, char *mode, int N, va_list argp) {
     92
     93  char *p, *q, *s, tmp[81];
     94  int Nchar, status;
     95
     96  /* find the correct line with field */
     97  p = gfits_header_field (header, field, N);
     98  if (p == NULL) {
     99    status = gfits_vscan_hierarch (header, field, mode, N, argp);
     100    return (status);
     101  }
     102
     103  /* non-data entry (COMMENT, HISTORY) */
     104  if (!strcmp (mode, "%S")) {
     105    strncpy (va_arg (argp, char *), p + 8, FT_HISTORY_LENGTH);
     106    return (TRUE);
     107  }
     108
     109  /* all others require '=' in column 8 */
     110  if (p[8] != '=') return (FALSE);
     111
     112  /* comment from data line */
     113  if (!strcmp (mode, "%C")) {
     114    q = gfits_keyword_end (p) + 3;
     115    q = MIN (p + 80, q);
     116    bzero (tmp, 81);
     117    Nchar = MIN (80, p + 80 - q);
     118    memcpy (tmp, q, Nchar);
     119    stripwhite (tmp);
     120    strcpy (va_arg (argp, char *), tmp);
     121    return (TRUE);
     122  }
     123
     124  /* boolean data, requires int target */
     125  if (!strcmp (mode, "%t")) {
     126    s = gfits_keyword_start (p);
     127    if (*s == 'T') {
     128      *va_arg (argp, int *) = TRUE;
     129      return (TRUE);
     130    }
     131    if (*s == 'F') {
     132      *va_arg (argp, int *) = FALSE;   
     133      return (TRUE);
     134    }
     135  }
     136
     137  /* no valid mode found */
     138  return (FALSE);
     139}
     140
    107141# define HIERARCH_LENGTH 71
    108142int gfits_vscan_hierarch (Header *header, char *field, char *mode, int N, va_list argp) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/include/gfitsio.h

    r27295 r27368  
    119119int     gfits_init_header              PROTO((Header *header));
    120120int     gfits_load_header              PROTO((FILE *f, Header *header));
    121 int     gfits_modify                   PROTO((Header *header, char *field, char *mode, int N,...));
    122 int     gfits_print                    PROTO((Header *header, char *field, char *mode, int N,...));
     121int     gfits_modify                   PROTO((Header *header, char *field, char *mode, int N,...)) OHANA_FORMAT(printf, 3, 5);
     122int     gfits_print                    PROTO((Header *header, char *field, char *mode, int N,...)) OHANA_FORMAT(printf, 3, 5);
     123int     gfits_modify_alt               PROTO((Header *header, char *field, char *mode, int N,...));
     124int     gfits_print_alt                PROTO((Header *header, char *field, char *mode, int N,...));
    123125int     gfits_read_Xheader             PROTO((char *filename, Header *header, int N));
    124126int     gfits_read_header              PROTO((char *filename, Header *header));
    125127int     gfits_save_header              PROTO((FILE *f, Header *header));
    126 int     gfits_scan                     PROTO((Header *header, char *field, char *mode, int N,...));
     128int     gfits_scan                     PROTO((Header *header, char *field, char *mode, int N,...)) OHANA_FORMAT(scanf, 3, 5);
     129int     gfits_scan_alt                 PROTO((Header *header, char *field, char *mode, int N,...));
    127130int     gfits_set_unsign_mode          PROTO((int mode));
    128131int     gfits_stripwhite               PROTO((char *string));
    129132int     gfits_vscan                    PROTO((Header *header, char *field, char *mode, int N, va_list argp));
     133int     gfits_vscan_alt                PROTO((Header *header, char *field, char *mode, int N, va_list argp));
    130134int     gfits_write_header             PROTO((char *filename, Header *header));
    131135off_t   gfits_data_size                PROTO((Header *header));
    … …  
    199203int     gfits_set_bintable_column      PROTO((Header *header, FTable *table, char *label, void *data, off_t Nrow));
    200204int     gfits_set_table_column         PROTO((Header *header, FTable *table, char *label, void *data, off_t Nrow));
    201 int     gfits_table_column             PROTO((FTable *ftable, char *field, char *mode,...));
     205int     gfits_table_column             PROTO((FTable *ftable, char *field, char *mode,...)) OHANA_FORMAT(printf, 3, 4);
    202206int     gfits_table_format             PROTO((char *format, char *type, int *Nval, int *Nbytes));
    203207int     gfits_table_scale_data         PROTO((FTable *ftable));

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/matrix/F_compress_M.c

    r27295 r27368  
    2424    gfits_delete (header, ZNAME, 1); }
    2525
     26# define MOD_KEYWORD_ALT(ZNAME,NAME,TYPE,IN,OUT) { \
     27    if (gfits_scan_alt (header, ZNAME, TYPE, 1, IN)) { \
     28      gfits_modify_alt (header, NAME, TYPE, 1, OUT); \
     29    } \
     30    gfits_delete (header, ZNAME, 1); }
     31
    2632# define MOD_KEYWORD_REQUIRED(ZNAME,NAME,TYPE,IN,OUT) { \
    2733  if (!gfits_scan (header, ZNAME, TYPE, 1, IN)) ESCAPE; \
    … …  
    5258
    5359  // is ZIMAGE present?
    54   status = gfits_scan (ftable->header, "ZIMAGE", "%t", 1, &zimage);
     60  status = gfits_scan_alt (ftable->header, "ZIMAGE", "%t", 1, &zimage);
    5561  if (!status || !zimage) ESCAPE;
    5662
    … …  
    7177    snprintf (zaxis, 10, "ZNAXIS%d", i + 1);
    7278    snprintf (naxis, 10, "NAXIS%d", i + 1);
    73     MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%d", &header->Naxis[i], header->Naxis[i]);
     79    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%lld", (long long *) &header->Naxis[i], (long long) header->Naxis[i]);
    7480  }   
    7581
    … …  
    119125  int have_ztension;
    120126
    121   have_zsimple  = gfits_scan (header, "ZSIMPLE", "%t", 1, &zsimple);
     127  have_zsimple  = gfits_scan_alt (header, "ZSIMPLE", "%t", 1, &zsimple);
    122128  have_ztension = gfits_scan (header, "ZTENSION", "%s", 1, exttype);
    123129
    … …  
    131137    gfits_extended_to_primary (header, header->simple, "Image data");
    132138
    133     MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
    134     MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
     139    MOD_KEYWORD_ALT ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
     140    MOD_KEYWORD_ALT ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
    135141  }
    136142
    … …  
    141147    gfits_extended_to_primary (header, header->simple, "Image data");
    142148
    143     MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
    144     MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
     149    MOD_KEYWORD_ALT ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
     150    MOD_KEYWORD_ALT ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
    145151  }
    146152
    … …  
    176182
    177183  zscale = 1;
    178   gfits_scan (header, "ZSCALE", "%lf", 1, &zscale);
     184  gfits_scan (header, "ZSCALE", "%f", 1, &zscale);
    179185
    180186  zblank = 32767;
    … …  
    185191
    186192  zzero = 0;
    187   gfits_scan (header, "ZZERO", "%lf", 1, &zzero);
     193  gfits_scan (header, "ZZERO", "%f", 1, &zzero);
    188194
    189195  // find the COMPRESSED_DATA column (format should be 1PB, 1PI, 1PJ)
    … …  
    474480    has_extension = gfits_scan (header, "XTENSION", "%s", 1, extension);
    475481    has_extname = gfits_scan (header, "EXTNAME", "%s", 1, extname);
    476     has_zimage  = gfits_scan (header, "ZIMAGE", "%t", 1, &zimage);
     482    has_zimage  = gfits_scan_alt (header, "ZIMAGE", "%t", 1, &zimage);
    477483
    478484    if (has_extension && !strcmp (extension, "IMAGE")) return (FALSE);
    … …  
    490496    int ztension, zimage;
    491497
    492     has_zimage   = gfits_scan (header, "ZIMAGE",   "%t", 1, &zimage);
    493     has_ztension = gfits_scan (header, "ZTENSION", "%t", 1, &ztension);
     498    has_zimage   = gfits_scan_alt (header, "ZIMAGE",   "%t", 1, &zimage);
     499    has_ztension = gfits_scan_alt (header, "ZTENSION", "%t", 1, &ztension);
    494500
    495501    if (has_zimage && zimage) return (TRUE);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/matrix/F_convert_format.c

    r27295 r27368  
    114114  gfits_modify (header, "BSCALE", "%lf", 1, outScale);
    115115  gfits_modify (header, "BZERO",  "%lf", 1, outZero);
    116   gfits_modify (header, "UNSIGN", "%t", 1, outUnsign);
     116  gfits_modify_alt (header, "UNSIGN", "%t", 1, outUnsign);
    117117
    118118  Npixels          = header[0].Naxis[0]*header[0].Naxis[1];

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_create_TH.c

    r27295 r27368  
    2727  for (i = 0; i < header[0].Naxes; i++) {
    2828    sprintf (axis, "NAXIS%d", i + 1);
    29     gfits_modify (header,  axis, "%lld", 1, header[0].Naxis[i]);
     29    gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
    3030  }
    3131 

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_define_column.c

    r27295 r27368  
    1313  Nfields = 0;
    1414  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    15   gfits_scan (header, "NAXIS1",  "%lld", 1, &Naxis1);
     15  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
    1616  Nfields ++;
    1717  Naxis1 += Nbytes*Nval;
    … …  
    1919  sprintf (field, "TTYPE%d", Nfields);
    2020  gfits_modify (header, field, "%s", 1, label);
    21   gfits_modify (header, field, "%C", 1, comment);
     21  gfits_modify_alt (header, field, "%C", 1, comment);
    2222  sprintf (field, "TUNIT%d", Nfields);
    2323  gfits_modify (header, field, "%s", 1, unit);
    … …  
    3535  /* update TFIELDS & NAXIS1 */
    3636  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    37   gfits_modify (header, "NAXIS1",  "%lld", 1, Naxis1);
     37  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
    3838  header[0].Naxis[0] = Naxis1;
    3939
    … …  
    5353  Nfields = 0;
    5454  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    55   gfits_scan (header, "NAXIS1",  "%lld", 1, &Naxis1);
     55  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
    5656  Nstart = Naxis1 + 1;
    5757  Nfields ++;
    … …  
    6060  sprintf (field, "TTYPE%d", Nfields);
    6161  gfits_modify (header, field, "%s", 1, label);
    62   gfits_modify (header, field, "%C", 1, comment);
     62  gfits_modify_alt (header, field, "%C", 1, comment);
    6363  sprintf (field, "TUNIT%d", Nfields);
    6464  gfits_modify (header, field, "%s", 1, unit);
    … …  
    7070
    7171  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    72   gfits_modify (header, "NAXIS1",  "%lld", 1, Naxis1);
     72  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
    7373  header[0].Naxis[0] = Naxis1;
    7474

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_get_column.c

    r27295 r27368  
    5151 
    5252  /* check existing table dimensions */
    53   gfits_scan (header, "NAXIS1",  "%lld", 1, &Nx);
    54   gfits_scan (header, "NAXIS2",  "%lld", 1, &Ny);
     53  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     54  gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    5555
    5656  /* scan columns to find insert point */
    … …  
    187187 
    188188  /* check existing table dimensions */
    189   gfits_scan (header, "NAXIS1",  "%lld", 1, &Nx);
    190   gfits_scan (header, "NAXIS2",  "%lld", 1, &Ny);
     189  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     190  gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    191191
    192192  /* scan columns to find insert point */
    … …  
    336336 
    337337  /* check existing table dimensions */
    338   gfits_scan (header, "NAXIS1",  "%lld", 1, &Nx);
    339   gfits_scan (header, "NAXIS2",  "%lld", 1, &Ny);
     338  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     339  gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    340340
    341341  /* scan columns to find insert point */

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_read_T.c

    r27295 r27368  
    109109  /* modify structure and header to match actual read rows Ny */
    110110  table[0].header[0].Naxis[1] = Nrows;
    111   gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, Nrows);
     111  gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, (long long) Nrows);
    112112  table[0].datasize = gfits_data_size (table[0].header);
    113113
    … …  
    185185    /* file pointer is at beginning of desired table data */
    186186    start = ftello (f);
    187     gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    188     gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     187    gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     188    gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    189189    for (i = 0; i < Nrow; i++) {
    190190      if (row[i] > Ny) { return (FALSE); }

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_read_TH.c

    r27295 r27368  
    7070  if (!status) return (FALSE);
    7171                                                           
    72   gfits_scan (Theader,  "NAXIS1", "%lld", 1, &Theader[0].Naxis[0]);
    73   gfits_scan (Theader,  "NAXIS2", "%lld", 1, &Theader[0].Naxis[1]);
    74   gfits_scan (Theader,  "NAXIS3", "%lld", 1, &Theader[0].Naxis[2]);
    75   gfits_scan (Theader,  "NAXIS4", "%lld", 1, &Theader[0].Naxis[3]);
    76   gfits_scan (Theader,  "NAXIS5", "%lld", 1, &Theader[0].Naxis[4]);
    77   gfits_scan (Theader,  "NAXIS6", "%lld", 1, &Theader[0].Naxis[5]);
    78   gfits_scan (Theader,  "NAXIS7", "%lld", 1, &Theader[0].Naxis[6]);
    79   gfits_scan (Theader,  "NAXIS8", "%lld", 1, &Theader[0].Naxis[7]);
    80   gfits_scan (Theader,  "NAXIS9", "%lld", 1, &Theader[0].Naxis[8]);
    81   gfits_scan (Theader, "NAXIS10", "%lld", 1, &Theader[0].Naxis[9]);
     72  gfits_scan (Theader,  "NAXIS1", "%lld", 1, (long long *) &Theader[0].Naxis[0]);
     73  gfits_scan (Theader,  "NAXIS2", "%lld", 1, (long long *) &Theader[0].Naxis[1]);
     74  gfits_scan (Theader,  "NAXIS3", "%lld", 1, (long long *) &Theader[0].Naxis[2]);
     75  gfits_scan (Theader,  "NAXIS4", "%lld", 1, (long long *) &Theader[0].Naxis[3]);
     76  gfits_scan (Theader,  "NAXIS5", "%lld", 1, (long long *) &Theader[0].Naxis[4]);
     77  gfits_scan (Theader,  "NAXIS6", "%lld", 1, (long long *) &Theader[0].Naxis[5]);
     78  gfits_scan (Theader,  "NAXIS7", "%lld", 1, (long long *) &Theader[0].Naxis[6]);
     79  gfits_scan (Theader,  "NAXIS8", "%lld", 1, (long long *) &Theader[0].Naxis[7]);
     80  gfits_scan (Theader,  "NAXIS9", "%lld", 1, (long long *) &Theader[0].Naxis[8]);
     81  gfits_scan (Theader, "NAXIS10", "%lld", 1, (long long *) &Theader[0].Naxis[9]);
    8282
    8383  return (TRUE);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_set_column.c

    r27295 r27368  
    4949 
    5050  /* check existing table dimensions */
    51   gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    52   gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     51  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     52  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    5353  if (Ny == 0) {
    5454    Ny = Nrow;
    5555    header[0].Naxis[1] = Ny;
    56     gfits_modify (header, "NAXIS2", "%lld", 1, Ny);
     56    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
    5757
    5858    nbytes = gfits_data_size (header);
    … …  
    181181 
    182182  /* check existing table dimensions */
    183   gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    184   gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     183  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     184  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    185185  if (Ny == 0) {
    186186    Ny = Nrow;
    187187    header[0].Naxis[1] = Ny;
    188     gfits_modify (header, "NAXIS2", "%lld", 1, Ny);
     188    gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
    189189
    190190    nbytes = gfits_data_size (header);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_table_format.c

    r27295 r27368  
    130130  off_t i, Nx, Ny;
    131131
    132   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, &Nx);
    133   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, &Ny);
     132  gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     133  gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    134134 
    135135  if (start + Nkeep > Ny) return (FALSE);
    … …  
    158158  off_t i, N, Nx, Ny;
    159159
    160   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, &Nx);
    161   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, &Ny);
     160  gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     161  gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    162162
    163163  /* make empty vtable from table */
    … …  
    191191  va_start (argp, table);
    192192
    193   gfits_scan (table[0].header, "NAXIS1",  "%lld", 1, &Nx);
     193  gfits_scan (table[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    194194  gfits_scan (table[0].header, "TFIELDS", "%d", 1, &Nfields);
    195195
    … …  
    236236  off = 0;
    237237
    238   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, &Nx);
    239   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, &Ny);
     238  gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     239  gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    240240  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    241241
    … …  
    320320  off = 0;
    321321
    322   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, &Nx);
    323   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, &Ny);
     322  gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     323  gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    324324  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    325325

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_table_row.c

    r27295 r27368  
    1111  header = table[0].header;
    1212
    13   gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    14   gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     13  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     14  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    1515 
    1616  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    2323  Ny += Nrow;
    2424  header[0].Naxis[1] = Ny;
    25   gfits_modify (header, "NAXIS2",  "%lld", 1, Ny);
     25  gfits_modify (header, "NAXIS2",  "%lld", 1, (long long) Ny);
    2626
    2727  nbytes = gfits_data_size (header);
    … …  
    4343  header = table[0].header;
    4444
    45   gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    46   gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     45  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     46  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    4747 
    4848  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    6464  Ny += Nrow;
    6565  header[0].Naxis[1] = Ny;
    66   gfits_modify (header, "NAXIS2", "%lld", 1, Ny);
     66  gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
    6767
    6868  table[0].datasize = gfits_data_size (table[0].header);
    … …  
    8181  header = table[0].header;
    8282
    83   gfits_scan (header, "NAXIS1", "%lld", 1, &Nx);
    84   gfits_scan (header, "NAXIS2", "%lld", 1, &Ny);
     83  gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     84  gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    8585 
    8686  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    9797  Ny -= Nrow;
    9898  header[0].Naxis[1] = Ny;
    99   gfits_modify (header, "NAXIS2", "%lld", 1, Ny);
     99  gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
    100100
    101101  nbytes = gfits_data_size (header);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_table_varlength.c

    r27295 r27368  
    6464
    6565  // heap_start must be long long so file may be very large
    66   if (!gfits_scan (ftable->header, "THEAP", "%lld", 1, &def->heap_start)) {
     66  if (!gfits_scan (ftable->header, "THEAP", "%lld", 1, (long long *) &def->heap_start)) {
    6767    def->heap_start = ftable->header->Naxis[0]*ftable->header->Naxis[1];
    6868  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/libfits/table/F_write_T.c

    r27295 r27368  
    4040  Nrow = table[0].Nrow;
    4141  row = table[0].row;
    42   gfits_scan (table[0].header, "NAXIS1", "%lld", 1, &Nx);
    43   gfits_scan (table[0].header, "NAXIS2", "%lld", 1, &Ny);
     42  gfits_scan (table[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     43  gfits_scan (table[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
    4444
    4545  /* file pointer is at beginning of desired table data */
    … …  
    7979 
    8080  /* modify vtable to represent full disk table */
    81   gfits_modify (ftable[0].header, "NAXIS2", "%lld", 1, Ntotal);
     81  gfits_modify (ftable[0].header, "NAXIS2", "%lld", 1, (long long) Ntotal);
    8282  ftable[0].header[0].Naxis[1] = Ntotal;
    8383

  • branches/eam_branches/largefiles.20100314/Ohana/src/libkapa/include/kapa.h

    r25757 r27368  
    109109
    110110/* IOfuncs.c */
    111 int KiiSendMessage (int device, char *format, ...);
    112 int KiiScanMessage (int device, char *format, ...);
    113 int KiiSendCommand (int device, int length, char *format, ...);
     111int KiiSendMessage (int device, char *format, ...) OHANA_FORMAT(printf, 2, 3);
     112int KiiScanMessage (int device, char *format, ...) OHANA_FORMAT(scanf, 2, 3);
     113int KiiSendCommand (int device, int length, char *format, ...) OHANA_FORMAT(printf, 3, 4);
     114int KiiScanCommand (int device, int length, char *format, ...) OHANA_FORMAT(scanf, 3, 4);
    114115int KiiSendCommandV (int device, int length, char *format, va_list argp);
    115 int KiiScanCommand (int device, int length, char *format, ...);
    116116int KiiSendData (int device, char *data, int Nbytes);
    117117char *KiiRecvData (int device);

  • branches/eam_branches/largefiles.20100314/Ohana/src/libohana/include/ohana.h

    r25757 r27368  
    6868# endif
    6969
     70#ifdef __GNUC__
     71#define OHANA_FORMAT(style, fmt, varargs) __attribute__((format(style, fmt, varargs)))
     72#else // __GNUC__
     73#define OHANA_FORMAT(style, fmt, varargs)
     74#endif // __GNUC__
     75
    7076enum {
    7177 LCK_UNLOCK,        /* file is unlocked */
    … …  
    177183char   *SelectConfigFile       PROTO((int *argc, char **argv, char *progname));
    178184char   *LoadConfigFile         PROTO((char *filename));
    179 char   *ScanConfig             PROTO((char *config, char *field, char *mode, int N,...));
     185char   *ScanConfig             PROTO((char *config, char *field, char *mode, int N,...)) OHANA_FORMAT(scanf, 3, 5);
    180186char   *expandline             PROTO((char *line, char *config));
    181187char   *fileextname            PROTO((char *file));
    … …  
    214220int     EmptyIOBuffer          PROTO((IOBuffer *buffer, int Nmax, int fd));
    215221void    FreeIOBuffer           PROTO((IOBuffer *buffer));
    216 int     PrintIOBuffer          PROTO((IOBuffer *buffer, char *format, ...));
     222int     PrintIOBuffer          PROTO((IOBuffer *buffer, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    217223int     vPrintIOBuffer         PROTO((IOBuffer *buffer, char *format, va_list argp));
    218224
    … …  
    220226int     ExpectMessage          PROTO((int device, double timeout, IOBuffer *message));
    221227int     ExpectCommand          PROTO((int device, int length, double timeout, IOBuffer *buffer));
    222 int     SendMessage            PROTO((int device, char *format, ...));
     228int     SendMessage            PROTO((int device, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    223229int     SendMessageFixed       PROTO((int device, int length, char *messge));
    224 int     SendCommand            PROTO((int device, int length, char *format, ...));
     230int     SendCommand            PROTO((int device, int length, char *format, ...)) OHANA_FORMAT(printf, 3, 4);
    225231int     SendCommandV           PROTO((int device, int length, char *format, va_list argp));
    226232

  • branches/eam_branches/largefiles.20100314/Ohana/src/lightcurve/src/alter_headers.c

    r7080 r27368  
    4646    gfits_modify (&header, "NMcal",  "%d", 1,  images[i].Nstars);
    4747
    48     gfits_modify (&header, "Mcal",   "%C", 1, "relphot: calibration magnitude");
    49     gfits_modify (&header, "dMcal",  "%C", 1, "relphot: calibration error");
    50     gfits_modify (&header, "clouds", "%C", 1, "relphot: cloud level");
    51     gfits_modify (&header, "NMcal",  "%C", 1, "relphot: number of stars");
     48    gfits_modify_alt (&header, "Mcal",   "%C", 1, "relphot: calibration magnitude");
     49    gfits_modify_alt (&header, "dMcal",  "%C", 1, "relphot: calibration error");
     50    gfits_modify_alt (&header, "clouds", "%C", 1, "relphot: cloud level");
     51    gfits_modify_alt (&header, "NMcal",  "%C", 1, "relphot: number of stars");
    5252
    5353    gfits_write_header (head, &header);

  • branches/eam_branches/largefiles.20100314/Ohana/src/misc/src/addastro.c

    r27295 r27368  
    5959  gfits_modify (&header,  "CPRECISE", "%lf", 1, tmp);
    6060
    61   gfits_modify (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
    62   gfits_modify (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
     61  gfits_modify_alt (&header, "CERROR", "%C", 1, "scatter in astrometry soln (arcsec)");
     62  gfits_modify_alt (&header, "CPRECISE", "%C", 1, "precision of astrometry soln (arcsec)");
    6363
    6464  /* write to file */

  • branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/LoadStars.c

    r19823 r27368  
    5050
    5151    extend = FALSE;
    52     gfits_scan (&chip[Nchip].header, "EXTEND",  "%t", 1, &extend);
     52    gfits_scan_alt (&chip[Nchip].header, "EXTEND",  "%t", 1, &extend);
    5353    if (extend) {
    5454      status = rfits (&chip[Nchip]);

  • branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/SaveResiduals.c

    r7080 r27368  
    1212  header[0].Naxes = 0;
    1313  gfits_modify (header, "NAXIS",   "%d", 1, 0);
    14   gfits_modify (header, "EXTEND",  "%t", 1, TRUE);
     14  gfits_modify_alt (header, "EXTEND",  "%t", 1, TRUE);
    1515  gfits_modify (header, "NEXTEND", "%d", 1, 1);
    1616

  • branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/wfits.c

    r7080 r27368  
    1010  header[0].Naxes = 0;
    1111  gfits_modify (header, "NAXIS",   "%d", 1, 0);
    12   gfits_modify (header, "EXTEND",  "%t", 1, TRUE);
     12  gfits_modify_alt (header, "EXTEND",  "%t", 1, TRUE);
    1313  gfits_modify (header, "NEXTEND", "%d", 1, 1);
    1414

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/altaz.c

    r17282 r27368  
    44# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
    55
     6int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat);
     7int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat);
     8
    69double atan2 (double y, double x);
    710
    811int altaz (int argc, char **argv) {
    912 
     13  int i;
    1014  double alt, az, lat, rot;
    1115  double ha, dec;
    12   double sind, sinh, cosh;
    1316  char *latstr;
     17  Vector *hvec, *dvec, *avec, *zvec, *rvec;
     18  opihi_flt *Hv, *Dv, *Av, *Zv, *Rv;
    1419
    15   if (argc != 6) goto usage;
    16 
    17   if (!strcmp (argv[1], "-h")) goto radec;
    18   if (!strcmp (argv[1], "-c")) goto altaz;
    19 
    20  radec:
    21   /* ha/dec -> alt/az */
    22   ha  = atof (argv[2]);
    23   dec = atof (argv[3]);
     20  if (argc != 7) goto usage;
     21  if (strcasecmp (argv[4], "to")) goto usage;
    2422
    2523  latstr = get_variable ("LATITUDE");
    2624  if (latstr == (char *) NULL) {
    2725    gprint (GP_ERR, "please define $LATITUDE\n");
    28     return (FALSE);
     26    return FALSE;
    2927  }
    3028  lat = atof (latstr);
     29  gprint (GP_ERR, "using latitude of %f\n", lat);
    3130  free (latstr);
    32  
     31
     32  if (!strcmp (argv[1], "-az")) goto radec;
     33  if (!strcmp (argv[1], "-hd")) goto altaz;
     34
     35 radec:
     36  if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) {
     37    /* ha/dec -> alt/az */
     38    ha  = atof (argv[2]);
     39    dec = atof (argv[3]);
     40 
     41    HD_to_AZ (&alt, &az, &rot, ha, dec, lat);
     42
     43    set_variable (argv[5], alt);
     44    set_variable (argv[6], az);
     45    set_variable ("ROT", rot);
     46    return TRUE;
     47  }
     48
     49  /* find vectors */
     50  if ((hvec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE;
     51  if ((dvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE;
     52  if ((avec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE;
     53  if ((zvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE;
     54  if ((rvec = SelectVector ("ROT",   ANYVECTOR, TRUE)) == NULL) return FALSE;
     55
     56  if (hvec[0].Nelements != dvec[0].Nelements) {
     57    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]);
     58    return FALSE;
     59  }
     60 
     61  // cast xvec or yvec to FLT if it is type INT
     62  CastVector (hvec, OPIHI_FLT);
     63  CastVector (dvec, OPIHI_FLT);
     64  ResetVector (avec, OPIHI_FLT, hvec[0].Nelements);
     65  ResetVector (zvec, OPIHI_FLT, hvec[0].Nelements);
     66  ResetVector (rvec, OPIHI_FLT, hvec[0].Nelements);
     67
     68  Hv = hvec[0].elements.Flt;
     69  Dv = dvec[0].elements.Flt;
     70  Av = avec[0].elements.Flt;
     71  Zv = zvec[0].elements.Flt;
     72  Rv = zvec[0].elements.Flt;
     73
     74  for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) {
     75    HD_to_AZ (Av, Zv, Rv, *Hv, *Dv, lat);
     76  }
     77  return TRUE;
     78 
     79 altaz:
     80  if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) {
     81    /* alt/az -> ha/dec */
     82    alt = atof (argv[2]);
     83    az  = atof (argv[3]);
     84
     85    AZ_to_HD (&ha, &dec, &rot, alt, az, lat);
     86
     87    set_variable (argv[5], ha);
     88    set_variable (argv[6], dec);
     89    set_variable ("ROT", rot);
     90    return TRUE;
     91  }
     92 
     93  /* find vectors */
     94  if ((avec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE;
     95  if ((zvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE;
     96  if ((hvec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE;
     97  if ((dvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE;
     98  if ((rvec = SelectVector ("ROT",   ANYVECTOR, TRUE)) == NULL) return FALSE;
     99
     100  if (avec[0].Nelements != zvec[0].Nelements) {
     101    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]);
     102    return FALSE;
     103  }
     104 
     105  // cast xvec or yvec to FLT if it is type INT
     106  CastVector (avec, OPIHI_FLT);
     107  CastVector (zvec, OPIHI_FLT);
     108  ResetVector (hvec, OPIHI_FLT, avec[0].Nelements);
     109  ResetVector (dvec, OPIHI_FLT, avec[0].Nelements);
     110  ResetVector (rvec, OPIHI_FLT, avec[0].Nelements);
     111
     112  Hv = hvec[0].elements.Flt;
     113  Dv = dvec[0].elements.Flt;
     114  Av = avec[0].elements.Flt;
     115  Zv = zvec[0].elements.Flt;
     116  Rv = zvec[0].elements.Flt;
     117
     118  for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) {
     119    AZ_to_HD (Hv, Dv, Rv, *Av, *Zv, lat);
     120  }
     121  return TRUE;
     122 
     123 usage:
     124  gprint (GP_ERR, "USAGE: altaz -az (ha) (dec) to (alt) (az)\n");
     125  gprint (GP_ERR, "USAGE: altaz -hd (alt) (az) to (ha) (dec)\n");
     126  gprint (GP_ERR, "       -hd alt/az to ha/dec, -az ha/dec to alt/az\n");
     127  gprint (GP_ERR, "       returned values in variables or vectors provided\n");
     128  return FALSE;
     129}
     130
     131int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat) {
     132
     133  double sind, sinh, cosh;
     134
    33135  sind = dSIN (dec) * dSIN (lat) + dCOS (dec) * dCOS (ha) * dCOS (lat);
    34   alt  = DEG_RAD * asin (sind);
     136  *alt  = DEG_RAD * asin (sind);
    35137
    36138  sinh = - dCOS (dec) * dSIN (ha);
    37139  cosh =   dSIN (dec) * dCOS (lat) - dCOS (dec) * dCOS (ha) * dSIN (lat);
    38140
    39   az = DEG_RAD * atan2 (sinh, cosh);
    40   set_variable (argv[4], alt);
    41   set_variable (argv[5], az);
     141  *az = DEG_RAD * atan2 (sinh, cosh);
     142 
     143  sinh = -dCOS(*az) * dSIN(*alt) * dSIN(ha) * dSIN(lat) + dSIN(*az) * dSIN(*alt) * dCOS(ha) - dSIN(ha) * dCOS(*alt) * dCOS(lat);
     144  cosh = -dSIN(*az) * dSIN(ha) * dSIN(lat) - dCOS(*az) * dCOS(ha);
     145  *rot = -DEG_RAD * atan2 (sinh, cosh);
     146 
     147  return TRUE;
     148}
    42149
    43   sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat);
    44   cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha);
    45   rot = -DEG_RAD * atan2 (sinh, cosh);
    46   set_variable ("ROT", rot);
     150int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat) {
    47151
    48   return (TRUE);
    49  
    50  altaz:
    51   /* alt/az -> ha/dec */
    52   alt = atof (argv[4]);
    53   az  = atof (argv[5]);
    54 
    55   latstr = get_variable ("LATITUDE");
    56   if (latstr == (char *) NULL) {
    57     gprint (GP_ERR, "please define $LATITUDE\n");
    58     return (FALSE);
    59   }
    60   lat = atof (latstr);
    61   free (latstr);
     152  double sind, sinh, cosh;
    62153
    63154  sind = dSIN (alt) * dSIN (lat) + dCOS (alt) * dCOS (az) * dCOS (lat);
    64   dec  = DEG_RAD * asin (sind);
     155  *dec  = DEG_RAD * asin (sind);
    65156
    66157  sinh = -dCOS (alt) * dSIN (az);
    67158  cosh =  dSIN (alt) * dCOS (lat) - dCOS (alt) * dCOS (az) * dSIN (lat);
    68159
    69   ha = DEG_RAD * atan2 (sinh, cosh);
    70   set_variable (argv[2], ha);
    71   set_variable (argv[3], dec);
     160  *ha = DEG_RAD * atan2 (sinh, cosh);
    72161
    73   sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat);
    74   cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha);
    75   rot = -DEG_RAD * atan2 (sinh, cosh);
    76   set_variable ("ROT", rot);
     162  sinh = -dCOS(az) * dSIN(alt) * dSIN(*ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(*ha) - dSIN(*ha) * dCOS(alt) * dCOS(lat);
     163  cosh = -dSIN(az) * dSIN(*ha) * dSIN(lat) - dCOS(az) * dCOS(*ha);
     164  *rot = -DEG_RAD * atan2 (sinh, cosh);
    77165
    78   return (TRUE);
    79  
    80  usage:
    81   gprint (GP_ERR, "USAGE: altaz -h (ha) (dec) (alt) (az)\n");
    82   gprint (GP_ERR, "USAGE: altaz -c (ha) (dec) (alt) (az)\n");
    83   gprint (GP_ERR, "       -h alt/az to ha/dec, -c ha/dec to alt/az\n");
    84   gprint (GP_ERR, "       returned values in variables provided\n");
    85   return (FALSE);
    86 
     166  return TRUE;
    87167}
    88 

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.astro/precess.c

    r20936 r27368  
    9797  opihi_flt *Dv = yvec[0].elements.Flt;
    9898
    99   for (i = 0; i < xvec[0].Nelements; i++, Av, Dv) {
     99  for (i = 0; i < xvec[0].Nelements; i++, Av++, Dv++) {
    100100    A = *Av;
    101101    D = *Dv;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.basic/date.c

    r12332 r27368  
    4040      set_int_variable (varName, now.tv_sec - REFTIME);
    4141    } else {
    42       gprint (GP_ERR, "%d\n", now.tv_sec - REFTIME);
     42      gprint (GP_ERR, "%d\n", (int) now.tv_sec - REFTIME);
    4343    }
    4444  } else {

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/extract.c

    r26884 r27368  
    7070    if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {
    7171      gprint (GP_ERR, "matrix sizes mis-matched\n");
    72       gprint (GP_ERR, "%d x %d  vs  %d x %d\n", Nx, Ny,
    73                out[0].header.Naxis[0], out[0].header.Naxis[1]);
     72      gprint (GP_ERR, "%d x %d  vs  %lld x %lld\n", Nx, Ny,
     73              (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]);
    7474      return (FALSE);
    7575    }

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/keyword.c

    r7917 r27368  
    107107      }
    108108      ivalue = !strcasecmp (line, "T");
    109       gfits_modify (&buf[0].header, argv[2], "%t", 1, ivalue);
     109      gfits_modify_alt (&buf[0].header, argv[2], "%t", 1, ivalue);
    110110      return (TRUE);
    111111    case KEYCOMMENT:
    112       gfits_modify (&buf[0].header, argv[2], "%C", 1, line);
     112      gfits_modify_alt (&buf[0].header, argv[2], "%C", 1, line);
    113113      return (TRUE);
    114114    case COMMENT:
    115       gfits_modify (&buf[0].header, argv[2], "%S", 0, line);
     115      gfits_modify_alt (&buf[0].header, argv[2], "%S", 0, line);
    116116      return (TRUE);
    117117    }
    … …  
    135135
    136136  if (ascomment) {
    137     status = gfits_scan (&buf[0].header, argv[2], "%C", 1, line);
     137    status = gfits_scan_alt (&buf[0].header, argv[2], "%C", 1, line);
    138138    if (!status) goto failure;
    139139    if (argc == 4)

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/list_header.c

    r7917 r27368  
    4949    gfits_modify (&buf[0].header, "BSCALE", "%lf", 1, bscale);
    5050    gfits_modify (&buf[0].header, "BZERO",  "%lf", 1, bzero);
    51     gfits_modify (&buf[0].header, "UNSIGN", "%t",  1, unsign);
     51    gfits_modify_alt (&buf[0].header, "UNSIGN", "%t",  1, unsign);
    5252   
    5353  } else {

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/matrix.c

    r26891 r27368  
    2323
    2424    if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
    25       gprint (GP_ERR, "size mis-match in matrices: (%d x %d) * (%d x %d)\n",
    26               bufB[0].matrix.Naxis[0], bufB[0].matrix.Naxis[1],
    27               bufC[0].matrix.Naxis[0], bufC[0].matrix.Naxis[1]);
     25      gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n",
     26              (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1],
     27              (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]);
    2828      return (FALSE);
    2929    }

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/rd.c

    r27295 r27368  
    223223
    224224  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n",
    225           buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
     225          (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
    226226
    227227  blank = 0xffff;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/rdseg.c

    r27295 r27368  
    6262  buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
    6363  buf[0].unsign = buf[0].header.unsign;
    64   gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
     64  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]);
    6565
    6666  gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/rebin.c

    r21064 r27368  
    6363    }     
    6464  }
    65   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);
     65  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);
    6666
    6767  Nx = in[0].header.Naxis[0];

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/rotate.c

    r25584 r27368  
    4343    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    4444    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    45     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     45    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    4646    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    4747    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    8282    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    8383    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    84     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     84    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    8585    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    8686    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    120120
    121121  if (!strcasecmp (argv[2], "UPSIDE") || (atof (argv[2]) == -180) || (atof (argv[2]) == 180)) {
    122     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     122    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    123123    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    124124    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    155155
    156156  if (!strcasecmp (argv[2], "FLIPY")) {
    157     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     157    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    158158    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    159159    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    190190
    191191  if (!strcasecmp (argv[2], "FLIPX")) {
    192     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     192    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    193193    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    194194    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    272272  gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
    273273  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    274   gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     274  gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    275275  out_buff = (float *)buf[0].matrix.buffer;
    276276  for (j = 0; j < Ly; j++) {

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/cmd.data/wd.c

    r27295 r27368  
    8888    gfits_modify (&temp_header, "BSCALE", "%lf", 1, outScale);
    8989    gfits_modify (&temp_header, "BZERO",  "%lf", 1, outZero);
    90     gfits_modify (&temp_header, "UNSIGN", "%t", 1, outUnsign);
     90    gfits_modify_alt (&temp_header, "UNSIGN", "%t", 1, outUnsign);
    9191  }
    9292
    … …  
    110110    }
    111111
    112     gfits_modify (&Xhead, "EXTEND", "%t", 1, TRUE);
     112    gfits_modify_alt (&Xhead, "EXTEND", "%t", 1, TRUE);
    113113
    114114    Nextend = 0;

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/avextract.c

    r27305 r27368  
    103103    catalog.Nsecfilt = 0;
    104104
    105     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     105    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    106106     
    107107    // an error exit status here is a significant error

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/badimages.c

    r27305 r27368  
    3939    ptr = &image[entry].coords.crpix1;
    4040    for (i = 0; i < 22; i++) {
    41       gprint (GP_LOG, "%2d: %g\n", i, ptr[i]);
     41      gprint (GP_LOG, "%2lld: %g\n", (long long) i, ptr[i]);
    4242    }
    4343    value = image[entry].coords.pc1_1*image[entry].coords.pc2_2 + image[entry].coords.pc1_2*image[entry].coords.pc2_1;
    … …  
    5858      value = image[i].coords.pc1_1*image[i].coords.pc2_2 + image[i].coords.pc1_2*image[i].coords.pc2_1;
    5959      if ((value > big) || (value < small)) {
    60         gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, value);
     60        gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, value);
    6161      }
    6262    }
    … …  
    6565      ptr = &image[i].coords.crpix1;
    6666      if ((ptr[entry] > big) || (ptr[entry] < small)) {
    67         gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, ptr[entry]);
     67        gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, ptr[entry]);
    6868      }
    6969    }

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmatch.c

    r12332 r27368  
    3737  }
    3838  dvo_catalog_unlock (&catalog1);
    39   gprint (GP_ERR, "read %d stars from phot catalog file %s\n", catalog1.Naverage, filename);
     39  gprint (GP_ERR, "read %lld stars from phot catalog file %s\n", (long long) catalog1.Naverage, filename);
    4040
    4141  /* this is for loading from a text file, presumably hstgsc or usno

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/cmpread.c

    r27305 r27368  
    6565
    6666  /* find expected number of stars */
    67   if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) {
     67  if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
    6868    gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
    6969    gfits_free_header (&header);
    … …  
    7777    /* allocate space for stars */
    7878    gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
    79     if (!gfits_scan (&header, "NSTARS", "%lld", 1, &Nstars)) {
     79    if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
    8080      gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
    8181      exit (1);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/detrend.c

    r27305 r27368  
    137137
    138138  /* load existing data from database */
    139   gfits_scan (&header, "NIMAGES", "%lld", 1, &Nimage);
     139  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    140140  ALLOCATE (pimage, RegImage, Nimage);
    141141  status = fread (pimage, sizeof(RegImage), Nimage, f);
    … …  
    143143
    144144  if (status != Nimage) {
    145     gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     145    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
    146146    gfits_free_header (&header);
    147147    free (pimage);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitcolors.c

    r27305 r27368  
    174174    // the selection criteria
    175175  }
    176   gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions);
     176  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
    177177
    178178  /* vectors to save data */

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/fitsed.c

    r27305 r27368  
    185185  /* loop over regions, extract data for each region */
    186186  // XXX add interrupt checks
    187   gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions);
     187  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
    188188  for (k = 0; k < skylist[0].Nregions; k++) {
    189189    /* lock, load, unlock catalog */

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/gstar.c

    r27305 r27368  
    159159      k = N1[i];
    160160      if (!QUIET) {
    161         gprint (GP_LOG, "star: %d\n", k);
     161        gprint (GP_LOG, "star: %lld\n", (long long) k);
    162162        gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
    163163        gprint (GP_LOG, "%11.7f ", catalog.average[k].D);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imlist.c

    r27305 r27368  
    104104      XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
    105105    }
    106     gprint (GP_LOG, "%3d %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n",
    107             i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
     106    gprint (GP_LOG, "%3lld %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n",
     107            (long long) i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
    108108  }
    109109

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c

    r27305 r27368  
    267267   
    268268    /* load existing data from database */
    269     gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     269    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    270270    ALLOCATE (image, RegImage, Nimage);
    271271    status = fread (image, sizeof(RegImage), Nimage, f);
    … …  
    273273   
    274274    if (status != Nimage) {
    275       gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     275      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
    276276      gfits_free_header (&header);
    277277      free (image);
    … …  
    304304  /* convert to internal format */
    305305  image = (RegImage *) table.buffer;
    306   gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
     306  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
    307307  gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
    308308

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imsearch.c

    r27295 r27368  
    106106
    107107  /* load existing data from database */
    108   gfits_scan (&header, "NIMAGES", "%lld", 1, &Nimage);
     108  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    109109  ALLOCATE (pimage, RegImage, Nimage);
    110110  status = fread (pimage, sizeof(RegImage), Nimage, f);
    … …  
    131131    obstime[strlen(obstime)-1] = 0;
    132132
    133     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);
     133    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);
    134134    gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
    135135    gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mextract.c

    r27296 r27368  
    120120    catalog.Nsecfilt = Nsecfilt;
    121121
    122     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     122    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    123123     
    124124    // an error exit status here is a significant error

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mmextract.c

    r27296 r27368  
    186186    catalog.Nsecfilt = Nsecfilt;
    187187
    188     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     188    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    189189     
    190190    // an error exit status here is a significant error

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/photometry.c

    r27305 r27368  
    336336int ListPhotSelections () {
    337337
    338   gprint (GP_ERR, "TimeSelect: %d, %d - %d\n",      TimeSelect, tzero, tend);
     338  gprint (GP_ERR, "TimeSelect: %d, %s - %s\n",      TimeSelect, ctime(&tzero), ctime(&tend));
    339339  gprint (GP_ERR, "MagSelect: %d, %f - %f\n",       MagSelect, MagMax, MagMin);
    340340  gprint (GP_ERR, "TypeSelect: %d, %d\n",           TypeSelect, TypeValue);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/display.h

    r21153 r27368  
    3636int SendLabel (char *string, int Xgraph, int mode);
    3737
    38 int SendGraphMessage (int device, char *format, ...);
    39 int SendGraphCommand (int device, int length, char *format, ...);
     38int SendGraphMessage (int device, char *format, ...) OHANA_FORMAT(printf, 2, 3);
     39int SendGraphCommand (int device, int length, char *format, ...) OHANA_FORMAT(printf, 3, 4);
    4040int SendGraphCommandV (int device, int length, char *format, va_list argp);
    4141

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/include/shell.h

    r27255 r27368  
    153153
    154154char         *memstr                    PROTO((char *m1, char *m2, int n));
    155 int           write_fmt                 PROTO((int fd, char *format, ...));
     155int           write_fmt                 PROTO((int fd, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    156156char         *opihi_version             PROTO((void));
    157157char         *strip_version             PROTO((char *input));
    … …  
    167167FILE         *gprintGetFile             PROTO((gpDest dest));
    168168char         *gprintGetName             PROTO((gpDest dest));
    169 int           gprint                    PROTO((gpDest dest, char *format, ...));
     169int           gprint                    PROTO((gpDest dest, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    170170int           gwrite                    PROTO((char *buffer, int size, int N, gpDest dest));
    171 int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...));
     171int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...)) OHANA_FORMAT(printf, 3, 4);
    172172int           gprintv                   PROTO((gpDest dest, char *format, va_list argp));
    173173

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/BufferOps.c

    r27295 r27368  
    8383  return (buffers[i]);
    8484
    85  error:
     85error:
    8686  if (verbose) gprint (GP_ERR, "invalid matrix %s\n", name);
    8787  return (NULL);
    … …  
    238238    gprint (GP_LOG, "    N       name                      file     X     Y    bytes BP  U   bzero     bscale  \n");
    239239    for (i = 0; i < Nbuffers; i++) {
    240       gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n",
    241                i, buffers[i][0].name, buffers[i][0].file,
    242                buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
    243               buffers[i][0].header.datasize + buffers[i][0].matrix.datasize, buffers[i][0].bitpix,
    244                buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
     240      gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld %3d %1d %10.4e %10.4e\n",
     241              i, buffers[i][0].name, buffers[i][0].file,
     242              (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
     243              (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize, buffers[i][0].bitpix,
     244              buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
    245245    }
    246246    return (TRUE);
    … …  
    249249  gprint (GP_LOG, "    N       name                      file     X     Y    bytes\n");
    250250  for (i = 0; i < Nbuffers; i++) {
    251     gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d\n",
    252              i, buffers[i][0].name, buffers[i][0].file,
    253              buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
    254             buffers[i][0].header.datasize + buffers[i][0].matrix.datasize);
    255   }
    256   return (TRUE);
    257 }
     251    gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld\n",
     252            i, buffers[i][0].name, buffers[i][0].file,
     253            (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
     254            (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize);
     255  }
     256  return (TRUE);
     257}

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/lib.shell/multicommand.c

    r26995 r27368  
    3232  /* here we can perform the security handshaking */
    3333  VarConfig ("PASSWORD", "%s", PASSWORD);
    34   SendCommand (server, strlen(PASSWORD), PASSWORD);
     34  SendCommand (server, strlen(PASSWORD), "%s", PASSWORD);
    3535 
    3636  return;
    … …  
    8282        if (server) {
    8383          // send the command to the server instead
    84           if (!SendMessage (server, outline)) {
     84          if (!SendMessage (server, "%s", outline)) {
    8585            switch (errno) {
    8686              case EPIPE:

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pcontrol/PclientCommand.c

    r17476 r27368  
    6363  }
    6464  if (status ==  0) {
    65     gprint (GP_ERR, "pclient read returns 0 for %s\n", command);
     65    gprint (GP_ERR, "pclient read returns 0 for %s\n", response);
    6666    return (PCLIENT_DOWN);
    6767  }

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pcontrol/StartHost.c

    r25872 r27368  
    1414  if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
    1515
    16   if (VerboseMode()) gprint (GP_ERR, "starting host within thread %d\n", pthread_self());
     16  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
    1717
    1818  pid = rconnect (command, host[0].hostname, shell, stdio);

  • branches/eam_branches/largefiles.20100314/Ohana/src/opihi/pcontrol/StopHosts.c

    r25872 r27368  
    121121  int i, result, waitstatus;
    122122
    123   if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %p\n", pthread_self());
     123  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
    124124  if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);
    125125 

  • branches/eam_branches/largefiles.20100314/Ohana/src/photdbc/include/photdbc.h

    r21153 r27368  
    104104void          check_directory (char *basefile);
    105105
    106 int Shutdown (char *format, ...);
     106int Shutdown (char *format, ...) OHANA_FORMAT(printf, 1, 2);
    107107void set_db (FITS_DB *in);
    108108void lock_image_db (FITS_DB *db, char *filename);

  • branches/eam_branches/largefiles.20100314/Ohana/src/relastro/include/relastro.h

    r27312 r27368  
    155155Image        *find_images         PROTO((FITS_DB *db, GSCRegion *region, off_t Nregion, off_t *Nimage, off_t **LineNum));
    156156void set_db (FITS_DB *in);
    157 int Shutdown (char *format, ...);
     157int Shutdown (char *format, ...) OHANA_FORMAT(printf, 1, 2);
    158158void TrapSignal (int sig);
    159159void SetProtect (int mode);

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/include/relphot.h

    r27312 r27368  
    129129
    130130void set_db (FITS_DB *in);
    131 int Shutdown (char *format, ...);
     131int Shutdown (char *format, ...) OHANA_FORMAT(printf, 1, 2) ;
    132132void TrapSignal (int sig);
    133133void SetProtect (int mode);
    … …  
    172172void          plot_grid           PROTO((Catalog *catalog));
    173173void          plot_images         PROTO((void));
    174 void          plot_list           PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *format, ...));
     174void          plot_list           PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *format, ...) OHANA_FORMAT(printf, 6, 7) );
    175175void          plot_mosaic_fields  PROTO((Catalog *catalog));
    176176void          plot_mosaics        PROTO((void));

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/GridOps.c

    r27312 r27368  
    703703  gfits_create_header (&header);
    704704  gfits_create_matrix (&header, &matrix);
    705   gfits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
     705  gfits_modify (&header, "NEXTEND", "%lld", 1, (long long) Nimage + 3);
    706706  gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
    707   gfits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
     707  gfits_modify_alt (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
    708708
    709709  // we need to add lines to the PHU to identify the camera and format; these are used by the ipp config system
    … …  
    782782    theader.Naxis[0] = RELPHOT_GRID_X;
    783783    theader.Naxis[1] = RELPHOT_GRID_Y;
    784     gfits_modify (&theader, "NAXIS1", "%lld", 1, RELPHOT_GRID_X);
    785     gfits_modify (&theader, "NAXIS2", "%lld", 1, RELPHOT_GRID_Y);
     784    gfits_modify (&theader, "NAXIS1", "%d", 1, RELPHOT_GRID_X);
     785    gfits_modify (&theader, "NAXIS2", "%d", 1, RELPHOT_GRID_Y);
    786786    gfits_create_matrix  (&theader, &matrix);
    787787

  • branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/load_images.c

    r27306 r27368  
    4747  vtable = &db[0].vtable;
    4848
    49   gfits_scan (vtable[0].header, "NAXIS1", "%lld", 1, &Nx);
     49  gfits_scan (vtable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    5050  for (i = 0; i < Nimage; i++) {
    5151    memcpy (vtable[0].buffer[i], &image[i], Nx);

  • branches/eam_branches/largefiles.20100314/Ohana/src/tools/src/ftable.c

    r27312 r27368  
    9595  table.datasize = Nbytes;
    9696
    97   gfits_scan (table.header, "NAXIS1",  "%lld", 1, &Nx);
    98   gfits_scan (table.header, "NAXIS2",  "%lld", 1, &Ny);
     97  gfits_scan (table.header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     98  gfits_scan (table.header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    9999
    100100  /* print a column */
    … …  
    125125  char field[16], type[16], format[16], *line;
    126126
    127   gfits_scan (header, "NAXIS1",  "%lld", 1, &Nx);
     127  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    128128  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    129129
    … …  
    209209    for (i = 0; i < Naxis; i++) {
    210210      sprintf (axisname, "NAXIS%d", i+1);
    211       status = gfits_scan (&header, axisname,  "%lld", 1, &Nelem);
     211      status = gfits_scan (&header, axisname,  "%lld", 1, (long long *) &Nelem);
    212212      if (!status) {
    213213        fprintf (stderr, "missing %s\n", axisname);
    … …  
    220220    if (Ncomp == 0) {
    221221      extend = FALSE;
    222       gfits_scan (&header, "EXTEND", "%t", 1, &extend);
     222      gfits_scan_alt (&header, "EXTEND", "%t", 1, &extend);
    223223      if (!extend) {
    224224        fprintf (stderr, "no extensions listed in file\n");
    … …  
    257257  /* check for existence of extensions */
    258258  extend = FALSE;
    259   gfits_scan (header, "EXTEND", "%t", 1, &extend);
     259  gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
    260260  if (!extend) {
    261261    fprintf (stderr, "no extensions listed in file\n");
    … …  
    294294
    295295  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    296   gfits_scan (header, "NAXIS1",  "%lld", 1, &Nx);
    297   gfits_scan (header, "NAXIS2",  "%lld", 1, &Ny);
     296  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     297  gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
    298298
    299299  if (Colname != (char *) NULL) {
    … …  
    388388    sprintf (field, "TTYPE%d", i);
    389389    gfits_scan (header, field, "%s", 1, type);
    390     gfits_scan (header, field, "%C", 1, comment);
     390    gfits_scan_alt (header, field, "%C", 1, comment);
    391391    sprintf (field, "TFORM%d", i);
    392392    gfits_scan (header, field, "%s", 1, format);

  • branches/eam_branches/largefiles.20100314/Ohana/src/uniphot/include/uniphot.h

    r27312 r27368  
    9898void          create_image_db    PROTO((FITS_DB *db));
    9999void          set_db             PROTO((FITS_DB *in));
    100 int           Shutdown           PROTO((char *format, ...));
     100int           Shutdown           PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2) );
    101101void          TrapSignal         PROTO((int sig));
    102102void          SetProtect         PROTO((int mode));
Note: See TracChangeset for help on using the changeset viewer.