IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 21, 2007, 2:10:20 PM (19 years ago)
Author:
eugene
Message:

convert str_to_time and related functions to ohana_...; various cleanups for -Wall -Werror

Location:
trunk/Ohana/src/libohana
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libohana/include/ohana.h

    r14448 r14590  
    187187enum {TIME_NONE, TIME_DATE, TIME_DAYS, TIME_HOURS, TIME_MINUTES, TIME_SECONDS, TIME_JD, TIME_MJD};
    188188
    189 int     chk_time               PROTO((char *line));
    190 time_t  date_to_sec            PROTO((char *date));
    191 int     dms_to_ddd             PROTO((double *Value, char *string));
    192 time_t  jd_to_sec              PROTO((double jd));
    193 char   *sec_to_date            PROTO((time_t second));
    194 double  sec_to_jd              PROTO((time_t second));
    195 int     str_to_dtime           PROTO((char *line, double *second));
    196 int     str_to_time            PROTO((char *line, time_t *second));
    197 double  sec_to_mjd             PROTO((time_t second));
    198 time_t  mjd_to_sec             PROTO((double mjd));
     189int     ohana_chk_time         PROTO((char *line));
     190time_t  ohana_date_to_sec      PROTO((char *date));
     191int     ohana_dms_to_ddd       PROTO((double *Value, char *string));
     192time_t  ohana_jd_to_sec        PROTO((double jd));
     193time_t  ohana_mjd_to_sec       PROTO((double mjd));
     194char   *ohana_sec_to_date      PROTO((time_t second));
     195double  ohana_sec_to_jd        PROTO((time_t second));
     196int     ohana_str_to_dtime     PROTO((char *line, double *second));
     197int     ohana_str_to_time      PROTO((char *line, time_t *second));
     198double  ohana_sec_to_mjd       PROTO((time_t second));
    199199double  ohana_lst              PROTO((double jd, double longitude));
     200int     ohana_str_to_radec     PROTO((double *ra, double *dec, char *str1, char *str2));
    200201
    201202int     hstgsc_hms_to_deg      PROTO((double *h0, double *h1, double *d0, double *d1, char *string));
    202 int     str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
    203203
    204204/* IO Buffer functions */

  • trunk/Ohana/src/libohana/src/time.c

    r8385 r14590  
    22
    33/***** convert [-]00:00:00 to 0.0000 ****/
    4 int dms_to_ddd (double *Value, char *string) {
     4int ohana_dms_to_ddd (double *Value, char *string) {
    55 
    66  int valid, neg, status;
    … …  
    5858
    5959/**********/
    60 int str_to_radec (double *ra, double *dec, char *str1, char *str2) {
     60int ohana_str_to_radec (double *ra, double *dec, char *str1, char *str2) {
    6161
    6262  double Ra, Dec;
    6363
    6464  *ra = *dec = 0;
    65   switch (dms_to_ddd (&Ra, str1)) {
     65  switch (ohana_dms_to_ddd (&Ra, str1)) {
    6666    case 0:
    6767      fprintf (stderr, "syntax error in RA\n");
    … …  
    7373      break;
    7474  }
    75   switch (dms_to_ddd (&Dec, str2)) {
     75  switch (ohana_dms_to_ddd (&Dec, str2)) {
    7676    case 0:
    7777      fprintf (stderr, "syntax error in DEC\n");
    … …  
    8787
    8888/**********/
    89 int chk_time (char *line) {
     89int ohana_chk_time (char *line) {
    9090
    9191  char *p1, *p2;
    … …  
    120120
    121121/**********/
    122 int str_to_time (char *line, time_t *second) {
     122int ohana_str_to_time (char *line, time_t *second) {
    123123 
    124124  char *tmpline;
    … …  
    141141      gmt   = gmtime (&tsec);
    142142      sprintf (tmpline, "%04d/%02d/%02d,%s", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, &line[6]);
    143       *second = date_to_sec (tmpline);
     143      *second = ohana_date_to_sec (tmpline);
    144144      free (tmpline);
    145145      return (TRUE);
    … …  
    150150  }
    151151   
    152   switch (chk_time (line)) {
     152  switch (ohana_chk_time (line)) {
    153153    case 0:
    154154      return (FALSE);
    155155    case TIME_DATE:
    156       *second = date_to_sec (line);
     156      *second = ohana_date_to_sec (line);
    157157      return (TRUE);
    158158    case TIME_DAYS:
    … …  
    170170    case TIME_JD:
    171171      jd = strtod (line, 0);
    172       *second = jd_to_sec (jd);
     172      *second = ohana_jd_to_sec (jd);
    173173      return (TRUE);
    174174    case TIME_MJD:
    175175      jd = strtod (line, 0);
    176       *second = mjd_to_sec (jd);
     176      *second = ohana_mjd_to_sec (jd);
    177177      return (TRUE);
    178178  }
    … …  
    182182
    183183/**********/
    184 int str_to_dtime (char *line, double *second) {
    185  
    186   switch (chk_time (line)) {
     184int ohana_str_to_dtime (char *line, double *second) {
     185 
     186  switch (ohana_chk_time (line)) {
    187187    case 0:
    188188    case TIME_JD:
    … …  
    207207
    208208/**********/
    209 double sec_to_jd (time_t second) {
     209double ohana_sec_to_jd (time_t second) {
    210210
    211211  double jd;
    … …  
    216216
    217217/**********/
    218 time_t jd_to_sec (double jd) {
     218time_t ohana_jd_to_sec (double jd) {
    219219
    220220  time_t second;
    … …  
    225225
    226226/**********/
    227 double sec_to_mjd (time_t second) {
     227double ohana_sec_to_mjd (time_t second) {
    228228
    229229  double mjd;
    … …  
    234234
    235235/**********/
    236 time_t mjd_to_sec (double mjd) {
     236time_t ohana_mjd_to_sec (double mjd) {
    237237
    238238  time_t second;
    … …  
    243243
    244244/**********/
    245 char *sec_to_date (time_t second) {
     245char *ohana_sec_to_date (time_t second) {
    246246 
    247247  struct tm *gmt;
    … …  
    256256
    257257/***** date in format yyyy/mm/dd,hh:mm:ss *****/
    258 time_t date_to_sec (char *date) {
     258time_t ohana_date_to_sec (char *date) {
    259259 
    260260  time_t second;
Note: See TracChangeset for help on using the changeset viewer.