<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Eric S. Raymond pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/ee8ff57b0467d4740ef3e24ba11b1cc9002cf76b">ee8ff57b</a></strong>
<div>
<span>by Richard Laager</span>
<i>at 2019-01-21T11:04:04Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Simplify the PPS selection logic
If is_pps_driver is false, the left side of the || matches and the
comparison is short-circuited. Thus, on the right side of the ||,
is_pps_driver is guaranteed to be true.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#a9eeb2d7f139fd99254bacd1e507b63de174c843">
ntpd/ntp_proto.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="a9eeb2d7f139fd99254bacd1e507b63de174c843">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/ee8ff57b0467d4740ef3e24ba11b1cc9002cf76b#a9eeb2d7f139fd99254bacd1e507b63de174c843"><strong>ntpd/ntp_proto.c</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1924" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1924" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -1924,8 +1924,8 @@ clock_select(void)</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1924" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1924
</td>
<td class="diff-line-num new_line" data-linenumber="1924" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1924
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1924" class="line" lang="c"><span class="cm" style="color: #998; font-style: italic;"> */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1925" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1925
</td>
<td class="diff-line-num new_line" data-linenumber="1925" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1925
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1925" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="n" style="color: #333;">typepps</span> <span class="o" style="font-weight: 600;">!=</span> <span class="nb" style="color: #0086b3;">NULL</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">fabs</span><span class="p">(</span><span class="n" style="color: #333;">sys_offset</span><span class="p">)</span> <span class="o" style="font-weight: 600;"><</span> <span class="mi" style="color: #099;">0</span><span class="p">.</span><span class="mi" style="color: #099;">4</span> <span class="o" style="font-weight: 600;">&&</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1926" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1926
</td>
<td class="diff-line-num new_line" data-linenumber="1926" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1926
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1926" class="line" lang="c"> <span class="p">(</span><span class="o" style="font-weight: 600;">!</span><span class="n" style="color: #333;">typepps</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">is_pps_driver</span> <span class="o" style="font-weight: 600;">||</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1927" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1927
</td>
<td class="diff-line-num new_line old" data-linenumber="1927" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1927" class="line" lang="c"> <span class="p"><span class="idiff left">(</span></span><span class="n" style="color: #333;"><span class="idiff">typepps</span></span><span class="o" style="font-weight: 600;"><span class="idiff">-></span></span><span class="n" style="color: #333;"><span class="idiff">is_pps_driver</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">&&</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">sys_prefer</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff right">!=</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1928" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1928
</td>
<td class="diff-line-num new_line old" data-linenumber="1927" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1928" class="line" lang="c"> <span class="nb" style="color: #0086b3;"><span class="idiff left">NULL</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">||</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">typesystem</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">==</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">NULL</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">&&</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">sys_minsane</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">==</span></span><span class="idiff"> </span><span class="mi" style="color: #099;"><span class="idiff">0</span></span><span class="p"><span class="idiff right">))</span>)))</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="1929" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1927" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1927
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1927" class="line" lang="c"> <span class="idiff left"> </span><span class="n" style="color: #333;"><span class="idiff">sys_prefer</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">!=</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">NULL</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff right">||</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="1929" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1928" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1928
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1928" class="line" lang="c"> <span class="idiff left"> </span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">typesystem</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">==</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">NULL</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">&&</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">sys_minsane</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">==</span></span><span class="idiff"> </span><span class="mi" style="color: #099;"><span class="idiff right">0</span></span><span class="p">)))</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1929" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1929
</td>
<td class="diff-line-num new_line" data-linenumber="1929" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1929
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1929" class="line" lang="c"> <span class="n" style="color: #333;">typesystem</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">typepps</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1930" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1930
</td>
<td class="diff-line-num new_line" data-linenumber="1930" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1930
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1930" class="line" lang="c"> <span class="n" style="color: #333;">sys_clockhop</span> <span class="o" style="font-weight: 600;">=</span> <span class="mi" style="color: #099;">0</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1931" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1931
</td>
<td class="diff-line-num new_line" data-linenumber="1931" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1931
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1931" class="line" lang="c"> <span class="n" style="color: #333;">typesystem</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">new_status</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">CTL_PST_SEL_PPS</span><span class="p">;</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/ee8ff57b0467d4740ef3e24ba11b1cc9002cf76b">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/ee8ff57b0467d4740ef3e24ba11b1cc9002cf76b"}}</script>
</p>
</div>
</body>
</html>