<!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>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Ian Bruene pushed to branch dgb-trace
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/b4880a308a70e38531bed5b86fd0c87548875301">b4880a30</a></strong>
<div>
<span>by Ian Bruene</span>
<i>at 2017-06-02T17:26:41-05:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Borked merge fix
</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/7ead8ea3a479473037dbfd93b37fe4f3a20ab04e">7ead8ea3</a></strong>
<div>
<span>by Ian Bruene</span>
<i>at 2017-06-02T18:01:01-05:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Fixed refclock_generic.c, hopefully
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#49e03c1714abb1870775ee9b9c283222a381b122">
ntpd/ntp_io.c
</a>
</li>
<li class="file-stats">
<a href="#89c89062b9ee8f8c7360bc70f69071faf1f4e71b">
ntpd/refclock_generic.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="49e03c1714abb1870775ee9b9c283222a381b122">
<a href="https://gitlab.com/NTPsec/ntpsec/compare/24baaba3cf534f8a9408dd24534510abadbb1f72...7ead8ea3a479473037dbfd93b37fe4f3a20ab04e#49e03c1714abb1870775ee9b9c283222a381b122"><strong>ntpd/ntp_io.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" 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="938" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="938" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -938,15 +938,9 @@ action_text(</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="938" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
938
</td>
<td class="diff-line-num new_line" data-linenumber="938" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
938
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC938" class="line" lang="c"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="939" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
939
</td>
<td class="diff-line-num new_line" data-linenumber="939" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
939
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC939" class="line" lang="c"> <span class="nl">default:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="940" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
940
</td>
<td class="diff-line-num new_line" data-linenumber="940" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
940
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC940" class="line" lang="c"> <span class="n" style="color: #333">t</span> <span class="o" style="font-weight: bold">=</span> <span class="s" style="color: #d14">"ERROR"</span><span class="p">;</span> <span class="cm" style="color: #998; font-style: italic">/* quiet uninit warning */</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="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
941
</td>
<td class="diff-line-num new_line old" data-linenumber="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC941" class="line" lang="c"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">dee3f727e0954f1aac9fe4b13225ef89364c2787</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="942" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
942
</td>
<td class="diff-line-num new_line old" data-linenumber="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC942" class="line" lang="c"> <span class="n" style="color: #333">DPRINTF</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">,</span> <span class="p">(</span><span class="s" style="color: #d14">"fatal: unknown nic_rule_action %u</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">,</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="943" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
943
</td>
<td class="diff-line-num new_line old" data-linenumber="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC943" class="line" lang="c"> <span class="n" style="color: #333">action</span><span class="p">));</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="944" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
944
</td>
<td class="diff-line-num new_line old" data-linenumber="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC944" class="line" lang="c"> <span class="n" style="color: #333">ENSURE</span><span class="p">(</span><span class="mi" style="color: #099">0</span><span class="p">);</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="945" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
945
</td>
<td class="diff-line-num new_line old" data-linenumber="941" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC945" class="line" lang="c"><span class="o" style="font-weight: bold">=======</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="946" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
946
</td>
<td class="diff-line-num new_line" data-linenumber="941" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
941
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC941" class="line" lang="c"> <span class="n" style="color: #333">DPRINT</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">,</span> <span class="p">(</span><span class="s" style="color: #d14">"fatal: unknown nic_rule_action %u</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</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="947" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
947
</td>
<td class="diff-line-num new_line" data-linenumber="942" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
942
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC942" class="line" lang="c"> <span class="n" style="color: #333">action</span><span class="p">));</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="948" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
948
</td>
<td class="diff-line-num new_line old" data-linenumber="943" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC948" class="line" lang="c"> <span class="n" style="color: #333">NTP_ENSURE</span><span class="p">(</span><span class="mi" style="color: #099">0</span><span class="p">);</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="949" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
949
</td>
<td class="diff-line-num new_line old" data-linenumber="943" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC949" class="line" lang="c"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Changed</span> <span class="n" style="color: #333">current</span> <span class="n" style="color: #333">debugging</span> <span class="n" style="color: #333">macros</span> <span class="n" style="color: #333">to</span> <span class="n" style="color: #333">DPRINT</span> <span class="n" style="color: #333">or</span> <span class="n" style="color: #333">TPRINT</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="950" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="943" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
943
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC943" class="line" lang="c"> <span class="n" style="color: #333">ENSURE</span><span class="p">(</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="950" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
950
</td>
<td class="diff-line-num new_line" data-linenumber="944" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
944
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC944" class="line" lang="c"> <span class="k" style="font-weight: bold">break</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="951" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
951
</td>
<td class="diff-line-num new_line" data-linenumber="945" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
945
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC945" class="line" lang="c"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="952" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
952
</td>
<td class="diff-line-num new_line" data-linenumber="946" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
946
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC946" class="line" lang="c"> <span class="k" style="font-weight: bold">case</span> <span class="n" style="color: #333">ACTION_LISTEN</span><span class="p">:</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="89c89062b9ee8f8c7360bc70f69071faf1f4e71b">
<a href="https://gitlab.com/NTPsec/ntpsec/compare/24baaba3cf534f8a9408dd24534510abadbb1f72...7ead8ea3a479473037dbfd93b37fe4f3a20ab04e#89c89062b9ee8f8c7360bc70f69071faf1f4e71b"><strong>ntpd/refclock_generic.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" 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="3481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="3481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -3481,6 +3481,7 @@ parse_process(</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="3481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3481
</td>
<td class="diff-line-num new_line" data-linenumber="3481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3481
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3481" class="line" lang="c"> <span class="n" style="color: #333">prettydate</span><span class="p">(</span><span class="n" style="color: #333">reftime</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="3482" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3482
</td>
<td class="diff-line-num new_line" data-linenumber="3482" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3482
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3482" class="line" lang="c"> <span class="n" style="color: #333">prettydate</span><span class="p">(</span><span class="n" style="color: #333">rectime</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="3483" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3483
</td>
<td class="diff-line-num new_line" data-linenumber="3483" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3483
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3483" class="line" lang="c"> <span class="n" style="color: #333">lfptoa</span><span class="p">(</span><span class="n" style="color: #333">off</span><span class="p">,</span><span class="mi" style="color: #099">6</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="3484" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3484" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3484
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC3484" class="line" lang="c"> <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="3484" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3484
</td>
<td class="diff-line-num new_line" data-linenumber="3485" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3485
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3485" class="line" lang="c"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="3485" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3485
</td>
<td class="diff-line-num new_line" data-linenumber="3486" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3486
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3486" class="line" lang="c"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">PARSE_PPS</span><span class="p">(</span><span class="n" style="color: #333">parsetime</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">parse_state</span><span class="p">)</span> <span class="o" style="font-weight: bold">&&</span> <span class="n" style="color: #333">CLK_PPS</span><span class="p">(</span><span class="n" style="color: #333">parse</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">peer</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="3486" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3486
</td>
<td class="diff-line-num new_line" data-linenumber="3487" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3487
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC3487" class="line" lang="c"> <span class="p">{</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/24baaba3cf534f8a9408dd24534510abadbb1f72...7ead8ea3a479473037dbfd93b37fe4f3a20ab04e">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.
</p>
</div>
</body>
</html>