Skip to content

Fix: MdsShr->LibTimeToVMSTime: Avoid separate calls for current seconds and microseconds (#2467) again #2469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshStillerman merged 1 commit into from
Jun 29, 2022
Merged

Fix: MdsShr->LibTimeToVMSTime: Avoid separate calls for current seconds and microseconds (#2467) again #2469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions mdsshr/librtl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,14 +1133,22 @@ EXPORT int LibConvertDateString(const char *asc_time, int64_t *const qtime)
EXPORT int LibTimeToVMSTime(const time_t *const time_in,
int64_t *const time_out)
{
time_t time_to_use = time_in ? *time_in : time(NULL);
struct timeval tv;
if (time_in)
{
tv.tv_sec = *time_in;
tv.tv_usec = 0;
}
else
gettimeofday(&tv, 0);
#ifdef _WIN32
/* MinGW defines timeval as (long,long) so an explicit cast is needed */
time_t time_to_use = tv.tv_sec;
time_t tz_offset = get_tz_offset(&time_to_use);
*time_out = (int64_t)(time_to_use + tz_offset) * (int64_t)10000000 +
#else
time_t tz_offset = get_tz_offset(&tv.tv_sec);
#endif
*time_out = (int64_t)(tv.tv_sec + tz_offset) * (int64_t)10000000 +
tv.tv_usec * 10 + VMS_TIME_OFFSET;
return MDSplusSUCCESS;
}
Expand Down