Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/include/addstar.h
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/include/addstar.h	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/include/addstar.h	(revision 27296)
@@ -46,5 +46,5 @@
   unsigned int Nstars;
   Stars *stars;
-  int Nimages;
+  off_t Nimages;
   Image *images;
   Coords *mosaic;
@@ -76,5 +76,5 @@
 char   PASSWORD[80];
 char   HOSTNAME[80];
-int    NVALID, *VALID_IP;
+int    NVALID_IP, *VALID_IP;
 char   SKY_TABLE[256];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
@@ -167,5 +167,5 @@
 int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
-Image     *fakeimage              PROTO((char *rootname, int *Nimage, int photcode));
+Image     *fakeimage              PROTO((char *rootname, off_t *Nimage, int photcode));
 
 int        find_matches           	 PROTO((SkyRegion *region, Stars *stars,  unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
@@ -188,9 +188,9 @@
 Stars     *grefstars              PROTO((char *file, int photcode, unsigned int *Nstars));
 
-Stars     *LoadStars              PROTO((char *file, unsigned int *Nstars, Image **images, int *Nimages, AddstarClientOptions *options));
+Stars     *LoadStars              PROTO((char *file, unsigned int *Nstars, Image **images, off_t *Nimages, AddstarClientOptions *options));
 Header   **LoadHeaders            PROTO((FILE *f, int *mode, int *Nheader));
-HeaderSet *MatchHeaders           PROTO((off_t **extsize, int *nimage, int mode, Header **headers, int Nheaders));
-int        LoadData               PROTO((FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
-int        GetZeroPointExposure   PROTO((Header **headers, HeaderSet *headerSets, int Nimages));
+HeaderSet *MatchHeaders           PROTO((off_t **extsize, off_t *nimage, int mode, Header **headers, int Nheaders));
+int        LoadData               PROTO((FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
+int        GetZeroPointExposure   PROTO((Header **headers, HeaderSet *headerSets, off_t Nimages));
 
 int        in_image               PROTO((double r, double d, Image *image));
@@ -206,5 +206,5 @@
 Stars     *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader, unsigned int *nstars));
 Stars     *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
-Stars     *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, int *nimages, unsigned int *nstars));
+Stars     *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages, unsigned int *nstars));
 int        ReadImageHeader        PROTO((Header *header, Image *image, int photcode));
 Stars     *FilterStars            PROTO((Stars *instars, Image *image, unsigned int imageID));
@@ -232,5 +232,5 @@
 int 	   WaitServerSocket	  PROTO((int InitSocket, SockAddress *Address, int *validIP, int Nvalid));
 int 	   GetClientSocket	  PROTO((char *hostname));
-int 	   UpdateDatabase_Image	  PROTO((AddstarClientOptions *options, Image *images, int Nimages, Coords *mosaic, Stars *stars, unsigned int Nstars));
+int 	   UpdateDatabase_Image	  PROTO((AddstarClientOptions *options, Image *images, off_t Nimages, Coords *mosaic, Stars *stars, unsigned int Nstars));
 int 	   UpdateDatabase_Reflist PROTO((AddstarClientOptions *options, Stars *stars, unsigned int Nstars));
 int 	   UpdateDatabase_Refcat  PROTO((AddstarClientOptions *options, SkyRegion *UserPatch, char *refcat));
@@ -259,9 +259,9 @@
 int args_skycells (int argc, char **argv);
 int ConfigInit_skycells (int *argc, char **argv);
-int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, int Nimages);
-int LoadDataSDSS (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages);
-int altaz (double *alt, double *az, double ha, double dec, double latitude);
-
-int LoadDataPMM (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars);
+int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, off_t Nimages);
+
+int LoadDataSDSS (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages);
+int LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars);
+
 PhotCode *LoadMetadataPMM (char *datafile, Image *image);
 time_t pmm_date_to_sec (char *date, char *time);
@@ -273,4 +273,6 @@
 uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
 uint64_t CreatePSPSObjectID(double ra, double dec);
+
+int altaz (double *alt, double *az, double ha, double dec, double latitude);
 
 // this is a gnu extension?? caution!
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ConfigInit.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ConfigInit.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ConfigInit.c	(revision 27296)
@@ -130,10 +130,10 @@
   /* load valid ip list */
   {
-    int i, Nvalid, ip1, ip2, ip3, ip4, test, status;
+    int i, Nvalid_IP, ip1, ip2, ip3, ip4, test, status;
     char string[80];
 
-    Nvalid = 0;
-    NVALID = 10;
-    ALLOCATE (VALID_IP, int, NVALID);
+    Nvalid_IP = 0;
+    NVALID_IP = 10;
+    ALLOCATE (VALID_IP, int, NVALID_IP);
     for (i = 0; ScanConfig (config, "VALID_IP", "%s", i, string) != NULL; i++) {
       status = sscanf (string, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
@@ -148,11 +148,11 @@
 	exit (2);
       }
-      VALID_IP[Nvalid] = ip1 | (ip2 << 8) | (ip3 << 16) | (ip4 << 24);
-      Nvalid ++;
-      CHECK_REALLOCATE (VALID_IP, int, NVALID, Nvalid, 10);
-    }
-    NVALID = Nvalid;
-    REALLOCATE (VALID_IP, int, NVALID);
-    if (NVALID == 0) {
+      VALID_IP[Nvalid_IP] = ip1 | (ip2 << 8) | (ip3 << 16) | (ip4 << 24);
+      Nvalid_IP ++;
+      CHECK_REALLOCATE (VALID_IP, int, NVALID_IP, Nvalid_IP, 10);
+    }
+    NVALID_IP = Nvalid_IP;
+    REALLOCATE (VALID_IP, int, NVALID_IP);
+    if (NVALID_IP == 0) {
       free (VALID_IP);
       VALID_IP = NULL;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/GetZeroPointExposure.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/GetZeroPointExposure.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/GetZeroPointExposure.c	(revision 27296)
@@ -21,5 +21,5 @@
 // offset in ReadImageHeader based on the per-chip zero points in the photcode database
 
-int GetZeroPointExposure (Header **headers, HeaderSet *headerSets, int Nimages) {
+int GetZeroPointExposure (Header **headers, HeaderSet *headerSets, off_t Nimages) {
 
     // the zero point correction is not applied
@@ -37,4 +37,5 @@
     // the zero point correction is measured here and applied in ReadImageHeader
     if (!strcasecmp(ZERO_POINT_OPTION, "CHIP_AVERAGE")) {
+
 	int i, Nzpt, Nmid, Nhead;
 	float *zpt, ZPT_OBS;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ImageOptions.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ImageOptions.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ImageOptions.c	(revision 27296)
@@ -2,7 +2,8 @@
 
 /* set specific options based on the image collection */
-int ImageOptions (AddstarClientOptions *options, Image *images, int Nimages) {
+int ImageOptions (AddstarClientOptions *options, Image *images, off_t Nimages) {
 
-  int i, equivPhotcode, consistent;
+  off_t i;
+  int equivPhotcode, consistent;
   float maxError;
   PhotCode *photcode;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ListenClients_Thread.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ListenClients_Thread.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ListenClients_Thread.c	(revision 27296)
@@ -14,5 +14,5 @@
 
     /* wait for clients to make connection */
-    BindSocket = WaitServerSocket (InitSocket, &Address, VALID_IP, NVALID);
+    BindSocket = WaitServerSocket (InitSocket, &Address, VALID_IP, NVALID_IP);
     if (BindSocket == -1) continue;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadData.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadData.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadData.c	(revision 27296)
@@ -6,9 +6,9 @@
 
 // examine the header sets and set the Image entries for the the valid images
-int LoadData (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
+int LoadData (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
 
   char *name;
-  off_t Nskip;
-  int i, j, Nvalid, Nhead, Ndata;
+  off_t Nskip, Nvalid, NVALID;
+  int i, j, Nhead, Ndata;
   uint32_t parentID = UINT32_MAX;
   Stars *inStars;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataPMM.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataPMM.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataPMM.c	(revision 27296)
@@ -16,8 +16,9 @@
 # define MAG_INDEX_ASC 22
 
-int LoadDataPMM (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars) {
-
+int LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars) {
+
+  off_t Nvalid, NVALID;
   char *name, *buffer;
-  int i, fd, Nbyte, Nline, Nvalid, code;
+  int i, fd, Nbyte, Nline, code;
   double ra, dec, mag, airmass, az, ZeroPoint, ZeroPt;
   unsigned int Ninstars, NINSTARS;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataSDSS.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataSDSS.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadDataSDSS.c	(revision 27296)
@@ -4,9 +4,9 @@
 // there should only be a single data set (phu + table) in this file
 // each SDSS data set corresponds to 5 images (ugriz)
-int LoadDataSDSS (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages) {
+int LoadDataSDSS (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages) {
 
-  off_t Nskip;
+  off_t Nskip, Nvalid, NVALID;
   char *name;
-  int j, Nvalid, Nhead, Ndata;
+  int j, Nhead, Ndata;
   unsigned int Ninstars;
   Stars *inStars;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadStars.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadStars.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/LoadStars.c	(revision 27296)
@@ -1,8 +1,8 @@
 # include "addstar.h"
 
-Stars *LoadStars (char *filename, unsigned int *Nstars, Image **images, int *Nimages, AddstarClientOptions *options) {
+Stars *LoadStars (char *filename, unsigned int *Nstars, Image **images, off_t *Nimages, AddstarClientOptions *options) {
 
-  off_t *extsize;
-  int i, Nfile, NFILE, Nheaders, NheaderSets, mode;
+  off_t *extsize, NheaderSets;
+  int i, Nfile, NFILE, Nheaders, mode;
   char **file, line[1024];
   FILE *f;
@@ -81,5 +81,5 @@
       continue;
     }
-    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %d images\n", file[i], Nheaders, NheaderSets);
+    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %lld images\n", file[i], Nheaders, (long long) NheaderSets);
 
     /* supplied photcode is incompatible with multi-chip images */
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/MatchHeaders.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/MatchHeaders.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/MatchHeaders.c	(revision 27296)
@@ -3,5 +3,5 @@
 // XXX largely psphot specific
 
-HeaderSet *MatchHeaders (off_t **extsize, int *nimage, int mode, Header **headers, int Nheaders) {
+HeaderSet *MatchHeaders (off_t **extsize, off_t *nimage, int mode, Header **headers, int Nheaders) {
 
   int i, j, Nimage, NIMAGE;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsFITS.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 27296)
@@ -60,5 +60,6 @@
 Stars *Convert_SMPDATA (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars;
+  unsigned int i;
   char swapped;
   double ZeroPt;
@@ -100,5 +101,6 @@
 Stars *Convert_PS1_DEV_0 (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars;
+  unsigned int i;
   double ZeroPt;
   Stars *stars;
@@ -144,5 +146,6 @@
 Stars *Convert_PS1_DEV_1 (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars; 
+  unsigned int i;
   double ZeroPt;
   Stars *stars;
@@ -189,5 +192,6 @@
 Stars *Convert_PS1_V1 (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars; 
+  unsigned int i;
   double ZeroPt;
   Stars *stars;
@@ -265,5 +269,6 @@
 Stars *Convert_PS1_V1_Alt (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars; 
+  unsigned int i;
   double ZeroPt;
   Stars *stars;
@@ -336,5 +341,6 @@
 Stars *Convert_PS1_V2 (FTable *table, unsigned int *nstars) {
 
-  unsigned int i, Nstars;
+  off_t Nstars; 
+  unsigned int i;
   double ZeroPt;
   Stars *stars;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsSDSS.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsSDSS.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/ReadStarsSDSS.c	(revision 27296)
@@ -31,7 +31,7 @@
 // given a file with the pointer at the start of the table block and the 
 // corresponding image header, load the stars from the table
-Stars *ReadStarsSDSS (FILE *f, char *name, Header *header, Header *in_theader, Image *images, int *nimages, unsigned int *nstars) {
-
-  off_t Nskip;
+Stars *ReadStarsSDSS (FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages, unsigned int *nstars) {
+
+  off_t Nskip, Nrow;
   int i, j, N, Nstars, camcol;
   char type[80];
@@ -44,5 +44,5 @@
   char filtname[16][5];
   int photcode[5];
-  int Nrow, Ncol; // used in the GET_COLUMN_1,5 macros above
+  int Ncol; // used in the GET_COLUMN_1,5 macros above
   
   if (in_theader == NULL) {
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/UpdateImageIDs.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/UpdateImageIDs.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/UpdateImageIDs.c	(revision 27296)
@@ -1,5 +1,5 @@
 # include "addstar.h"
 
-int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, int Nimages) {
+int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, off_t Nimages) {
 
   int i, status, isEmpty;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstar.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstar.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstar.c	(revision 27296)
@@ -6,5 +6,5 @@
   unsigned int Nstars, Nsubset;
   int Nmatch, status, loadObjects;
-  int i, Nimages;
+  off_t i, Nimages;
   off_t Naverage, Nmeasure;
   Stars *stars, **subset;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstard.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstard.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/addstard.c	(revision 27296)
@@ -23,5 +23,5 @@
 
     /* wait for clients to make connection */
-    BindSocket = WaitServerSocket (InitSocket, &Address, VALID_IP, NVALID);
+    BindSocket = WaitServerSocket (InitSocket, &Address, VALID_IP, NVALID_ID);
     if (BindSocket == -1) continue;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/fakeimage.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/fakeimage.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/fakeimage.c	(revision 27296)
@@ -1,5 +1,5 @@
 # include "addstar.h"
 
-Image *fakeimage (char *rootname, int *Nimage, int photcode) {
+Image *fakeimage (char *rootname, off_t *Nimage, int photcode) {
 
   int i, j, Nx, Ny, Nchips;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/getgsc.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/getgsc.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/getgsc.c	(revision 27296)
@@ -9,5 +9,5 @@
 Stars *getgsc (SkyRegion *patch, unsigned int *NSTARS) {
   
-  int i, Ngsc, Nstars; 
+  unsigned int i, Ngsc, Nstars; 
   Stars *gsc;
   Stars *stars;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/greference.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/greference.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/greference.c	(revision 27296)
@@ -5,5 +5,5 @@
 Stars *greference (char *Refcat, SkyRegion *region, int photcode, unsigned int *nstars) {
 
-  int Nstars;
+  unsigned int Nstars;
   Stars *stars;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/sky_tessalation.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/sky_tessalation.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/addstar/src/sky_tessalation.c	(revision 27296)
@@ -947,5 +947,5 @@
   }
   REALLOCATE (db[0].vtable.buffer, char *, 1);
-  REALLOCATE (db[0].vtable.row, int, 1);
+  REALLOCATE (db[0].vtable.row, off_t, 1);
   db[0].vtable.Nrow   = 0;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfit.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfit.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfit.c	(revision 27296)
@@ -7,5 +7,5 @@
 int gfit (SStars *stars1, SStars *stars2, int N1, int N2, Coords *coords, int NX, int NY, double *Radius, double *DR, int *Nmatch, int mode) {
   
-  int i, j, iteration, Niter, last, halt, first_j, *Nextra, extras;
+  int i, j, iteration, Niter, last, halt, first_j, extras;
   off_t *tmpN1, *tmpN2;
   double X_O, X_X, X_Y, dX;
@@ -42,11 +42,9 @@
   ALLOCATE (tmpX1, double, N1);
   ALLOCATE (tmpY1, double, N1);
-  ALLOCATE (tmpN1, int, N1);
+  ALLOCATE (tmpN1, off_t, N1);
   
   ALLOCATE (tmpX2, double, N2);
   ALLOCATE (tmpY2, double, N2);
-  ALLOCATE (tmpN2, int, N2);
-  ALLOCATE (Nextra, int, N2);
-  bzero (Nextra, sizeof(int) * N2);
+  ALLOCATE (tmpN2, off_t, N2);
 
   dX = dY = N = 0;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfitpoly.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfitpoly.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/gastro/src/gfitpoly.c	(revision 27296)
@@ -52,9 +52,9 @@
   ALLOCATE (tmpX1, double, N1);
   ALLOCATE (tmpY1, double, N1);
-  ALLOCATE (tmpN1, int, N1);
+  ALLOCATE (tmpN1, off_t, N1);
 
   ALLOCATE (tmpX2, double, N2);
   ALLOCATE (tmpY2, double, N2);
-  ALLOCATE (tmpN2, int, N2);
+  ALLOCATE (tmpN2, off_t, N2);
 
   /* assign and sort list */
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageExtract.h
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageExtract.h	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageExtract.h	(revision 27296)
@@ -30,4 +30,4 @@
 
 int  WriteImageFITS (FILE *f, Image *image);
-int  WriteImages (char *filename, Image *images, int Nimages, int *matches, int Nmatches);
-int *SelectImages (char *filename, Image *dbImages, int NdbImages, int *Nmatch);
+int  WriteImages (char *filename, Image *images, off_t Nimages, off_t *matches, off_t Nmatches);
+off_t *SelectImages (char *filename, Image *dbImages, off_t NdbImages, off_t *Nmatch);
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageOverlaps.h
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageOverlaps.h	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImageOverlaps.h	(revision 27296)
@@ -29,8 +29,8 @@
 int  SetSignals       PROTO((void));
 
-Image *ReadImageFiles (char *filename, int *Nimages);
+Image *ReadImageFiles (char *filename, off_t *Nimages);
 int ReadImageHeader (Header *header, Image *image);
-int *MatchImage (Image *dbImages, int NdbImages, Image *image, int *Nmatch);
-int ListImageOverlaps (Image *dbImages, Image *image, int *matches, int Nmatches);
+off_t *MatchImage (Image *dbImages, off_t NdbImages, Image *image, off_t *Nmatch);
+int ListImageOverlaps (Image *dbImages, Image *image, off_t *matches, off_t Nmatches);
 
 int GetFileMode (Header *header);
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImagesAtCoords.h
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImagesAtCoords.h	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/include/dvoImagesAtCoords.h	(revision 27296)
@@ -44,7 +44,7 @@
 int  SetSignals       PROTO((void));
 
-Image *ReadImageFiles (char *filename, int *Nimages);
+Image *ReadImageFiles (char *filename, off_t *Nimages);
 int ReadImageHeader (Header *header, Image *image);
-int MatchCoords(Image *, int, Point *, int);
+off_t MatchCoords (Image *dbImages, off_t NdbImages, Point *points, int Npoints);
 
 int GetFileMode (Header *header);
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_coords.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_coords.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_coords.c	(revision 27296)
@@ -4,6 +4,4 @@
 
   char *config, *file;
-  char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +19,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
     SKY_DEPTH = 2;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_extract.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_extract.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_extract.c	(revision 27296)
@@ -4,6 +4,4 @@
 
   char *config, *file;
-  char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +19,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
     SKY_DEPTH = 2;
@@ -33,11 +30,4 @@
   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
 
-  /* XXX this does not yet write out the master photcode table */
-  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
-    exit (1);
-  }
-
   free (config);
   free (file);
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_overlaps.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_overlaps.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ConfigInit_overlaps.c	(revision 27296)
@@ -4,6 +4,4 @@
 
   char *config, *file;
-  char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +19,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
     SKY_DEPTH = 2;
@@ -33,11 +30,4 @@
   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
 
-  /* XXX this does not yet write out the master photcode table */
-  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, FALSE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
-    exit (1);
-  }
-
   free (config);
   free (file);
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ListImageOverlaps.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ListImageOverlaps.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ListImageOverlaps.c	(revision 27296)
@@ -2,7 +2,7 @@
 
 /* given image, find catalog images which overlap it */
-int ListImageOverlaps (Image *dbImages, Image *image, int *matches, int Nmatches) {
+int ListImageOverlaps (Image *dbImages, Image *image, off_t *matches, off_t Nmatches) {
   
-  int i, N;
+  off_t i, N;
 
   for (i = 0; i < Nmatches; i++) {
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchCoords.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchCoords.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchCoords.c	(revision 27296)
@@ -5,12 +5,10 @@
 
 /* given coordinate, find images in list that contain the point */
-int MatchCoords (Image *dbImages, int NdbImages, Point *points, int Npoints) {
+off_t MatchCoords (Image *dbImages, off_t NdbImages, Point *points, int Npoints) {
   
-  int i, j, N;
+  off_t i;
+  int j;
   int totalMatches = 0;
-  Coords tcoords;
-  double r, d;
-  double Xi[4], Yi[4], Xo[4], Yo[4];  /* image and original corners */
-  double Xmin, Xmax, Ymin, Ymax;
+  double Xi[4], Yi[4];  /* image and original corners */
   double xmin, xmax, ymin, ymax;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchImages.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchImages.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/MatchImages.c	(revision 27296)
@@ -5,8 +5,8 @@
 
 /* given image, find catalog images which overlap it */
-int *MatchImage (Image *dbImages, int NdbImages, Image *image, int *Nmatch) {
+off_t *MatchImage (Image *dbImages, off_t NdbImages, Image *image, off_t *Nmatch) {
   
-  int i, j, N, addtolist, status;
-  int NMATCH, nmatch, *match;
+  off_t i, NMATCH, nmatch, *match;
+  int j, N, addtolist, status;
   Coords tcoords;
   double r, d;
@@ -64,5 +64,5 @@
   nmatch = 0;
   NMATCH = 20;
-  ALLOCATE (match, int, NMATCH);
+  ALLOCATE (match, off_t, NMATCH);
 
   /* setup links for mosaic WRP and DIS entries */
@@ -128,9 +128,9 @@
     if (nmatch == NMATCH) {
       NMATCH += 20;
-      REALLOCATE (match, int, NMATCH);
+      REALLOCATE (match, off_t, NMATCH);
     }
   }
   
-  if (VERBOSE) fprintf (stderr, "found %d overlapping images\n", nmatch);
+  if (VERBOSE) fprintf (stderr, "found %lld overlapping images\n", (long long) nmatch);
 
   *Nmatch = nmatch;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ReadImageFiles.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ReadImageFiles.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/ReadImageFiles.c	(revision 27296)
@@ -2,9 +2,9 @@
 # define DVO_IMAGE_NAME_LEN 128
 
-Image *ReadImageFiles (char *filename, int *Nimages) {
+Image *ReadImageFiles (char *filename, off_t *Nimages) {
 
   off_t Nskip, *extsize;
   int i, j, N, Nfile, Nheader, Nimage, NHEADER, NIMAGE;
-  int Nskip, Nhead, Ndata, done, status, mode;
+  int Nhead, Ndata, done, status, mode;
   char **file, *name;
   FILE *f;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/SelectImages.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/SelectImages.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/SelectImages.c	(revision 27296)
@@ -2,8 +2,8 @@
 
 /* given image, find catalog images which overlap it */
-int *SelectImages (char *filename, Image *images, int Nimages, int *Nmatch) {
+off_t *SelectImages (char *filename, Image *images, off_t Nimages, off_t *Nmatch) {
   
-  int i, Nchar;
-  int NMATCH, nmatch, *match;
+  int Nchar;
+  off_t i, NMATCH, nmatch, *match;
 
   /* matches here are only based on string comparisons */
@@ -12,5 +12,5 @@
   nmatch = 0;
   NMATCH = 20;
-  ALLOCATE (match, int, NMATCH);
+  ALLOCATE (match, off_t, NMATCH);
 
   /* setup links for mosaic WRP and DIS entries */
@@ -27,9 +27,9 @@
     if (nmatch == NMATCH) {
       NMATCH += 20;
-      REALLOCATE (match, int, NMATCH);
+      REALLOCATE (match, off_t, NMATCH);
     }
   }  
 
-  if (VERBOSE) fprintf (stderr, "found %d matching images\n", nmatch);
+  if (VERBOSE) fprintf (stderr, "found %lld matching images\n", (long long) nmatch);
 
   *Nmatch = nmatch;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/WriteImages.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/WriteImages.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/WriteImages.c	(revision 27296)
@@ -2,5 +2,5 @@
 
 /* given image, find catalog images which overlap it */
-int WriteImages (char *filename, Image *images, int Nimages, int *matches, int Nmatches) {
+int WriteImages (char *filename, Image *images, off_t Nimages, off_t *matches, off_t Nmatches) {
   
   int i, N;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageExtract.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageExtract.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageExtract.c	(revision 27296)
@@ -3,6 +3,6 @@
 int main (int argc, char **argv) {
 
-  int Nimages, status;
-  int Nmatches, *matches;
+  off_t Nimages, Nmatches, *matches;
+  int status;
   Image *images;
   FITS_DB db;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageOverlaps.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageOverlaps.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImageOverlaps.c	(revision 27296)
@@ -3,6 +3,7 @@
 int main (int argc, char **argv) {
 
-  int i, Nimages, NdbImages, status;
-  int Nmatches, *matches;
+  off_t NdbImages, Nimages;
+  int status;
+  off_t i, Nmatches, *matches;
   Image *images, *dbImages;
   FITS_DB db;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImagesAtCoords.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImagesAtCoords.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/dvoImagesAtCoords.c	(revision 27296)
@@ -12,6 +12,6 @@
 int main (int argc, char **argv) {
 
-  int i, Nimages, NdbImages, status;
-  int Nmatches, *matches;
+  off_t NdbImages;
+  int status;
   Image *dbImages;
   int Npoints;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/select_by_region.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/select_by_region.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/getstar/src/select_by_region.c	(revision 27296)
@@ -156,6 +156,6 @@
   output[0].Nsecf_mem = Nave*Nsecfilt;
 
-  fprintf (stderr, "output catalog has %d stars (%d measures, %d secfilt)\n",
-	   output[0].Naverage, output[0].Nmeasure, output[0].Nsecfilt);
+  fprintf (stderr, "output catalog has %lld stars (%lld measures, %d secfilt)\n",
+	   (long long) output[0].Naverage, (long long) output[0].Nmeasure, output[0].Nsecfilt);
   return (TRUE);
 }
Index: branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/rtext.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/rtext.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/imregister/imphot/rtext.c	(revision 27296)
@@ -21,5 +21,5 @@
     Ndata = (filestatus.st_size - db[0].header.datasize) / sizeof (Image);
     if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
-    if (VERBOSE) fprintf (stderr, "header: %d, data: %d\n", Nimage, Ndata);
+    if (VERBOSE) fprintf (stderr, "header: %lld, data: %d\n", (long long) Nimage, Ndata);
     if (!FORCE_READ) exit (1);
     Nimage = Ndata;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/LoadPicture.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/LoadPicture.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/LoadPicture.c	(revision 27296)
@@ -85,8 +85,8 @@
   fcntl (sock, F_SETFL, !O_NONBLOCK);  
 
-  if (DEBUG) fprintf (stderr, "read %d bytes\n", image[0].image[0].matrix.datasize);
-  /* it it not obvious this condition should kill kii, but ... */
+  if (DEBUG) fprintf (stderr, "read %lld bytes\n", (long long) image[0].image[0].matrix.datasize);
+  /* it it not obvious this condition should kill kapa, but ... */
   if (image[0].image[0].matrix.datasize != header.datasize) {  
-    fprintf (stderr, "error: expected %lld bytes, but got only %lld\n", header.datasize, image[0].image[0].matrix.datasize);
+    fprintf (stderr, "error: expected %lld bytes, but got only %lld\n", (long long) header.datasize, (long long) image[0].image[0].matrix.datasize);
     return (FALSE);
   }
Index: branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PNGit.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PNGit.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PNGit.c	(revision 27296)
@@ -9,5 +9,4 @@
   int Npalette;
   char filename[1024];
-  int Nbytes, status;
   bDrawBuffer *buffer;
   Graphic *graphic;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PPMit.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PPMit.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/PPMit.c	(revision 27296)
@@ -5,5 +5,5 @@
   FILE *f;
   char *line, filename[1024];
-  int Nbytes, status, dx, dy, i, j, Npalette, color;
+  int dx, dy, i, j, Npalette, color;
   png_color *palette;
   bDrawBuffer *buffer;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/Relocate.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/Relocate.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/kapa2/src/Relocate.c	(revision 27296)
@@ -4,8 +4,6 @@
 int Relocate (int sock) {
  
-  int i, Nsection;
   int x, y, dX, dY;
   Graphic *graphic;
-  Section *section;
 
   graphic = GetGraphic();
Index: branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/dvo.h
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/dvo.h	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/dvo.h	(revision 27296)
@@ -282,10 +282,10 @@
 
 int isRegisteredMosaic (void);
-int GetRegisteredMosaic (void);
+off_t GetRegisteredMosaic (void);
 int GetMosaicCoords (Coords *coords);
-int FindMosaicForImage (Image *images, int Nimages, int entry);
-int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry);
-int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry);
-int BuildChipMatch (Image *images, int Nimages);
+int FindMosaicForImage (Image *images, off_t Nimages, off_t entry);
+int FindMosaicForImage_TableSearch (Image *images, off_t Nimages, off_t entry);
+int FindMosaicForImage_MatchSearch (Image *images, off_t Nimages, off_t entry);
+int BuildChipMatch (Image *images, off_t Nimages);
 void SetImageCorners (double *X, double *Y, Image *image);
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/mosaic_astrom.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/mosaic_astrom.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/mosaic_astrom.c	(revision 27296)
@@ -3,17 +3,17 @@
 /* chip-match table: j = ChipMatch[i], images[j] is DIS for images[i] WRP */
 
-static int    iDIS = -1;      // DIS entry in ChipMatch[]
-static int    Ndis = 0;
-static int    *DISentry = NULL;
+static off_t  iDIS = -1;      // DIS entry in ChipMatch[]
+static off_t  Ndis = 0;
+static off_t  *DISentry = NULL;
 static e_time *DIStzero = NULL;
-static int    *ChipMatch = NULL;
+static off_t  *ChipMatch = NULL;
 
 /* what is the currently registered mosaic image? */
-int GetRegisteredMosaic () {
+off_t GetRegisteredMosaic () {
   return (iDIS);
 }
 
 /* given an image array and a current entry of type WRP, find matching DIS & Register it */
-int FindMosaicForImage (Image *images, int Nimages, int entry) {
+int FindMosaicForImage (Image *images, off_t Nimages, off_t entry) {
 
   int status;
@@ -28,8 +28,8 @@
 
 /* given an image array and a current entry of type WRP, find matching DIS & Register it */
-int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry) {
+int FindMosaicForImage_TableSearch (Image *images, off_t Nimages, off_t entry) {
 
   e_time tzero;
-  int i;
+  off_t i;
 
   /* search backwards for image with same time and type DIS */
@@ -65,7 +65,7 @@
 
 /* given an image array and a current entry of type WRP, find matching DIS & Register it */
-int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry) {
+int FindMosaicForImage_MatchSearch (Image *images, off_t Nimages, off_t entry) {
 
-  int N;
+  off_t N;
 
   if (strcmp(&images[entry].coords.ctype[4], "-WRP")) {
@@ -85,7 +85,7 @@
 }
 
-int BuildChipMatch (Image *images, int Nimages) {
+int BuildChipMatch (Image *images, off_t Nimages) {
 
-  int i, j, NDIS;
+  off_t i, j, NDIS;
 
   if (DISentry != NULL) free (DISentry);
@@ -96,5 +96,5 @@
   Ndis = 0;
   NDIS = 100;
-  ALLOCATE (DISentry, int, NDIS);
+  ALLOCATE (DISentry, off_t, NDIS);
   ALLOCATE (DIStzero, e_time, NDIS);
 
@@ -106,5 +106,5 @@
     if (Ndis >= NDIS) {
       NDIS += 100;
-      REALLOCATE (DISentry, int, NDIS);
+      REALLOCATE (DISentry, off_t, NDIS);
       REALLOCATE (DIStzero, e_time, NDIS);
     }
@@ -112,5 +112,5 @@
 
   /* find all matched WRP images */
-  ALLOCATE (ChipMatch, int, Nimages);
+  ALLOCATE (ChipMatch, off_t, Nimages);
   for (i = 0; i < Nimages; i++) {
     ChipMatch[i] = -1;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/rfits.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/rfits.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/mosastro/src/rfits.c	(revision 27296)
@@ -30,5 +30,7 @@
   }
 
-  stars = gfits_table_get_SMPData (&table, &mychip[0].Nstars, NULL);
+  off_t Nstars;
+  stars = gfits_table_get_SMPData (&table, &Nstars, NULL);
+  mychip[0].Nstars = Nstars;
   gfits_scan (table.header, "NAXIS1", "%d", 1, &Nx);
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdata.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imdata.c	(revision 27296)
@@ -3,8 +3,8 @@
 int imdata (int argc, char **argv) {
   
-  int i, j, k, I;
-  int Nimage, N, NPTS, found, mode, TimeSelect;
-  int n, Nregions, NREGIONS, TimeFormat;
-  int *subset, Nsubset;
+  off_t i, j, k, n, I;
+  int N, NPTS, found, mode, TimeSelect, TimeFormat;
+  off_t Nregions, NREGIONS;
+  off_t *subset, Nsubset, Nimage;
   double trange;
   time_t tzero, start, stop, TimeReference;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lcurve.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lcurve.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lcurve.c	(revision 27296)
@@ -8,6 +8,6 @@
   int kapa, TimeFormat;
   int found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors;
-  off_t i, Nstars, *N1;
-  int j, m, N, NPTS;
+  off_t i, j, m, Nstars, *N1;
+  int N, NPTS;
   time_t TimeReference;
   struct tm *timeptr;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lightcurve.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lightcurve.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/lightcurve.c	(revision 27296)
@@ -5,7 +5,7 @@
   double Ra, Dec, Radius, Radius2, r;
   double *RA, *DEC;
-  off_t i, Nstars, *N1;
+  off_t i, j, k, m, Nstars, *N1;
   int found, PhotCodeSelect;
-  int j, k, m, N, NPTS, Nsecfilt, RELPHOT, TimeFormat;
+  int N, NPTS, Nsecfilt, RELPHOT, TimeFormat;
   time_t TimeReference;
 
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mextract.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mextract.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mextract.c	(revision 27296)
@@ -3,5 +3,6 @@
 int mextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  off_t i, j, k, m; // used for counter averages and measures
+  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
   char **cstack, name[1024];
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mmextract.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mmextract.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/mmextract.c	(revision 27296)
@@ -3,5 +3,6 @@
 int mmextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, Npts, NPTS, last, next, state;
+  off_t i, j, k, m;
+  int n, N, Npts, NPTS, last, next, state;
   int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2;
   int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/pmeasure.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/pmeasure.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/pmeasure.c	(revision 27296)
@@ -7,5 +7,6 @@
   
   FILE *f;
-  int i, j, k, m, kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
+  off_t i, j, k, m;
+  int kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
   double Mz, Mr, mag;
   double Radius, Rmin, Rmax, R, D, trange;
Index: branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/subpix.c
===================================================================
--- branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/subpix.c	(revision 27295)
+++ branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/subpix.c	(revision 27296)
@@ -3,8 +3,8 @@
 int subpix (int argc, char **argv) {
   
-  int i, j, I, Nlo, Nhi, *entry, Nentry;
-  off_t *index, Nstars, Nimage, Nmeasure;
-  int Nmin, Nsub, NSUB, status;
-  int TimeFormat;
+  off_t Nlo, Nhi, *entry, Nentry;
+  off_t j, i, I, *index, Nstars, Nimage, Nmeasure;
+  off_t Nmin, Nsub, NSUB;
+  int status, TimeFormat;
   time_t Timage, TimeReference;
   double X, Y, Mabs, t;
@@ -65,5 +65,5 @@
   Nlo = bracket (DEC, Nstars, FALSE, Dec - Radius);
   Nhi = bracket (DEC, Nstars, TRUE,  Dec + Radius);
-  ALLOCATE (entry, int, MAX (Nhi - Nlo, 1));
+  ALLOCATE (entry, off_t, MAX (Nhi - Nlo, 1));
   Nentry = 0;
 
@@ -111,5 +111,5 @@
   Nsub = 0;
   NSUB = 100;
-  ALLOCATE (index, int, NSUB);
+  ALLOCATE (index, off_t, NSUB);
 
   /* load all images, extract those touching Ra, Dec */
@@ -125,5 +125,5 @@
     if (Nsub == NSUB - 1) {
       NSUB += 100;
-      REALLOCATE (index, int, NSUB);
+      REALLOCATE (index, off_t, NSUB);
     }
   }