Index: trunk/Ohana/src/delstar/include/delstar.h
===================================================================
--- trunk/Ohana/src/delstar/include/delstar.h	(revision 4680)
+++ trunk/Ohana/src/delstar/include/delstar.h	(revision 4805)
@@ -30,61 +30,47 @@
 enum {MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED};
 
-enum {TIME_NONE, TIME_JD, TIME_MJD, TIME_DATE, TIME_DAYS, TIME_HOURS, TIME_MINUTES, TIME_SECONDS};
-
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
 
-/*** conversion functions ***/
-FILE 	  *GetDB		  PROTO((int *state));
-Image 	  *GetImages		  PROTO((int *nimage));
-GSCRegion *LoadRegions		  PROTO((int *nregions));
-Image 	  *find_images		  PROTO((FILE *f, CatStats *catstats, int *Nimages));
-int 	  *find_images_data	  PROTO((Image *timage, int *nlist));
-int 	  *find_images_name	  PROTO((char *filename, int *nlist));
-int 	  *find_images_time	  PROTO((time_t start, time_t end, PhotCode *code, int *nlist));
-Image 	  *gimages		  PROTO((char *filename));
-GSCRegion *gregion_image	  PROTO((Image *image, int *Nregions));
-GSCRegion *gregion_patch	  PROTO((GSCRegion *patch, int *nregions));
-Image 	  *gtimes		  PROTO((int *NIMAGE));
-char      *sec_to_date            PROTO((time_t second));
-void	   ConfigInit		  PROTO((int *argc, char **argv));
-int	   FindDecBand		  PROTO((double dec, double *DEC0, double *DEC1));
-int	   FindRegionByPoint	  PROTO((GSCRegion *region, double ra, double dec, GSCRegion *gsc, int Ngsc));
-int	   FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
-int	   FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
-int 	   SetImages		  PROTO((Image *new, int Nnew));
-void 	   SetProtect		  PROTO((int mode));
-int 	   SetSignals		  PROTO(());
-int 	   Shutdown		  PROTO((char *format, ...));
-void 	   TrapSignal		  PROTO((int sig));
-int 	   args			  PROTO((int *argc, char **argv));
-void	   check_permissions	  PROTO((char *basefile));
-int        chk_time               PROTO((char *line));
-time_t     date_to_sec            PROTO((char *date));
-void 	   delete_imagefile	  PROTO((char *filename));
-void 	   delete_imagename	  PROTO((char *name));
-void 	   delete_times		  PROTO(());
-int 	   dimages		  PROTO((int *imlist, int Nimlist));
-int 	   dms_to_ddd		  PROTO((double *Value, char *string));
-int 	   edge_check		  PROTO((double *x1, double *y1, double *x2, double *y2));
-void 	   find_matches		  PROTO((Catalog *catalog, int photcode, int start, int end));
-int	   gcatalog		  PROTO((Catalog *catalog));
-void 	   help			  PROTO(());
-int 	   hms_to_deg		  PROTO((double *h0, double *h1, double *d0, double *d1, char *string));
-time_t     jd_to_sec              PROTO((double jd));
-int 	   load_image_db	  PROTO(());
-void 	   lock_image_db	  PROTO(());
-void 	   match_images		  PROTO((Catalog *catalog, Image *image, int Nimage));
-time_t     mjd_to_sec             PROTO((double mjd));
-double     opening_angle	  PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
-int	   parse_time		  PROTO((Header *header));
-int 	   save_image_db	  PROTO(());
-double     sec_to_jd              PROTO((time_t second));
-double     sec_to_mjd             PROTO((time_t second));
-void 	   sort_lists		  PROTO((float *X, float *Y, int *S, int N));
-void 	   sort_regions		  PROTO((GSCRegion *region, int N));
-int        str_to_dtime           PROTO((char *line, double *second));
-int        str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
-int        str_to_time            PROTO((char *line, time_t *second));
-void 	   unlock_image_db	  PROTO(());
-void 	   usage		  PROTO(());
-int 	   wcatalog		  PROTO((Catalog *catalog));
+/*** delstar prototypes ***/
+void       ConfigInit             PROTO((int *argc, char **argv));
+int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
+int        FindRegionByPoint      PROTO((GSCRegion *region, double ra, double dec, GSCRegion *gsc, int Ngsc));
+int        FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
+int        FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
+FILE      *GetDB                  PROTO((int *state));
+Image     *GetImages              PROTO((int *nimage));
+GSCRegion *LoadRegions            PROTO((int *nregions));
+int        SetImages              PROTO((Image *new, int Nnew));
+void       SetProtect             PROTO((int mode));
+int        SetSignals             PROTO(());
+int        Shutdown               PROTO((char *format, ...));
+void       TrapSignal             PROTO((int sig));
+int        args                   PROTO((int *argc, char **argv));
+void       check_permissions      PROTO((char *basefile));
+void       delete_imagefile       PROTO((char *filename));
+void       delete_imagename       PROTO((char *name));
+void       delete_times           PROTO(());
+int        dimages                PROTO((int *imlist, int Nimlist));
+int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
+Image     *find_images            PROTO((FILE *f, CatStats *catstats, int *Nimages));
+int       *find_images_data       PROTO((Image *timage, int *nlist));
+int       *find_images_name       PROTO((char *filename, int *nlist));
+int       *find_images_time       PROTO((time_t start, time_t end, PhotCode *code, int *nlist));
+void       find_matches           PROTO((Catalog *catalog, int photcode, int start, int end));
+int        gcatalog               PROTO((Catalog *catalog));
+Image     *gimages                PROTO((char *filename));
+GSCRegion *gregion_image          PROTO((Image *image, int *Nregions));
+GSCRegion *gregion_patch          PROTO((GSCRegion *patch, int *nregions));
+Image     *gtimes                 PROTO((int *NIMAGE));
+void       help                   PROTO(());
+int        load_image_db          PROTO(());
+void       lock_image_db          PROTO(());
+void       match_images           PROTO((Catalog *catalog, Image *image, int Nimage));
+double     opening_angle          PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
+int        parse_time             PROTO((Header *header));
+int        save_image_db          PROTO(());
+void       sort_lists             PROTO((float *X, float *Y, int *S, int N));
+void       sort_regions           PROTO((GSCRegion *region, int N));
+void       unlock_image_db        PROTO(());
+void       usage                  PROTO(());
+int        wcatalog               PROTO((Catalog *catalog));
