faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: simplify UTI_Ntp64ToTimespec() callers

Browse source 
Since UTI_Ntp64ToTimespec() was modified to handle zero timestamps, some
of its callers don't need to do that anymore.
This commit is contained in:
Miroslav Lichvar 2017-01-20 12:05:02 +01:00
parent 86acea5c46
commit 4b98dadae9
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ntp_core.c
View file

@ -1943,10 +1943,7 @@ NCR_ProcessRxUnknown(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_a
!UTI_CompareNtp64(&message->originate_ts, local_ntp_rx); !UTI_CompareNtp64(&message->originate_ts, local_ntp_rx);
if (interleaved) { if (interleaved) {
if (!UTI_IsZeroNtp64(local_ntp_tx)) UTI_Ntp64ToTimespec(local_ntp_tx, &local_tx.ts);
UTI_Ntp64ToTimespec(local_ntp_tx, &local_tx.ts);
else
interleaved = 0;
tx_ts = &local_tx; tx_ts = &local_tx;
} else { } else {
UTI_ZeroNtp64(local_ntp_tx); UTI_ZeroNtp64(local_ntp_tx);
@ -2041,9 +2038,6 @@ NCR_ProcessTxUnknown(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_a
CLG_GetNtpTimestamps(log_index, &local_ntp_rx, &local_ntp_tx); CLG_GetNtpTimestamps(log_index, &local_ntp_rx, &local_ntp_tx);
if (UTI_IsZeroNtp64(local_ntp_tx))
return;
UTI_Ntp64ToTimespec(local_ntp_tx, &local_tx.ts); UTI_Ntp64ToTimespec(local_ntp_tx, &local_tx.ts);
update_tx_timestamp(&local_tx, tx_ts, local_ntp_rx, NULL, message); update_tx_timestamp(&local_tx, tx_ts, local_ntp_rx, NULL, message);
UTI_TimespecToNtp64(&local_tx.ts, local_ntp_tx, NULL); UTI_TimespecToNtp64(&local_tx.ts, local_ntp_tx, NULL);