Re: [Merge] ~anj/epics-base/+git/base-3.15:vxworks-tz-support into epics-base:3.15

[Andrew Johnson via Core-talk <core-talk@aps.anl.gov>]

Review: Approve

Group 10/4: No major issues.

Diff comments:

> diff --git a/src/libCom/RTEMS/rtems_init.c b/src/libCom/RTEMS/rtems_init.c
> index 2b909ab..dcb6daa 100644
> --- a/src/libCom/RTEMS/rtems_init.c
> +++ b/src/libCom/RTEMS/rtems_init.c
> @@ -581,25 +581,11 @@ Init (rtems_task_argument ignored)
>              printf ("***** Can't set time: %s\n", rtems_status_text (sc));
>      }
>      if (getenv("TZ") == NULL) {
> -        const char *tzp = envGetConfigParamPtr(&EPICS_TIMEZONE);
> -        if (tzp == NULL) {
> -            printf("Warning -- no timezone information available -- times will be displayed as GMT.\n");
> -        }
> -        else {
> -            char tz[10];
> -            int minWest, toDst = 0, fromDst = 0;
> -            if(sscanf(tzp, "%9[^:]::%d:%d:%d", tz, &minWest, &toDst, &fromDst) < 2) {
> -                printf("Warning: EPICS_TIMEZONE (%s) unrecognizable -- times will be displayed as GMT.\n", tzp);
> -            }
> -            else {
> -                char posixTzBuf[40];
> -                char *p = posixTzBuf;
> -                p += sprintf(p, "%cST%d:%.2d", tz[0], minWest/60, minWest%60);
> -                if (toDst != fromDst)
> -                    p += sprintf(p, "%cDT", tz[0]);
> -                epicsEnvSet("TZ", posixTzBuf);
> -            }
> -        }
> +        const char *tzp = envGetConfigParamPtr(&EPICS_TZ);
> +        if (!tzp || *tzp)
> +            printf("Warning: No timezone information, times will be displayed in UTC.\n");
> +        else
> +            epicsEnvSet("TZ", tzp);

It does, see 2 lines below.

>      }
>      tzset();
>      osdTimeRegister();


-- 
https://code.launchpad.net/~anj/epics-base/+git/base-3.15/+merge/368570
Your team EPICS Core Developers is subscribed to branch epics-base:3.15.