Changeset 4810 for trunk/Ohana/src/relphot

Timestamp:

Aug 17, 2005, 9:36:55 AM (21 years ago)

Author:

eugene

Message:

renamed hms_to_deg hstgsc_hms_to_deg everywhere, moved into libohana

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/get_regions.c (modified) (1 diff)
• src/misc.c (modified) (1 diff)
• src/time.c (deleted)

trunk/Ohana/src/relphot/include/relphot.h

@@ -100 +100 @@
 /*** relphot prototypes ***/
 void          ConfigInit          PROTO((int *argc, char **argv));
-int           Fseek               PROTO((FILE *f, long offset, int whence));
 void          GetConfig           PROTO((char *config, char *field, char *format, int N, void *ptr));
 char         *GetPhotnamebyCode   PROTO((PhotCodeData *photcodes, int code));

trunk/Ohana/src/relphot/src/get_regions.c

@@ -114 +114 @@
       strncpy (temp, &buffer[i*48], 48);
       temp[49] = 0;
-      hms_to_deg (&RA0, &RA1, &DEC0, &DEC1, &temp[7]);
+      hstgsc_hms_to_deg (&RA0, &RA1, &DEC0, &DEC1, &temp[7]);
       if (RA1 < RA0) RA1 += 360.0;
       if ((DEC1 > 0) && (minDec < DEC1) && (maxDec > DEC0) && (minRa < RA1) && (maxRa > RA0)) {

trunk/Ohana/src/relphot/src/misc.c

@@ -181 +181 @@
   }
 }
-
-/* fseek with timeout - 0.5 sec */
-int Fseek (FILE *f, long offset, int whence) {
-
-  int status;
-
-  status = fseek (f, offset, whence);
-  if (status == -1) {
-    int k;
-    /* fprintf (stderr, "problem seeking position: %d\n", errno); */
-    for (k = 0; (k < 10) && ((status = fseek (f, 0, SEEK_SET)) == -1); k++) usleep (50000);
-    if (status == -1) {
-      /* fprintf (stderr, "ERROR: serious problem seeking position: %d\n", errno); */
-      /* clear lock at this point? */
-      return (0);
-    }
-  }
-  return (1);
-}