<!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>
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/932302b7b016a45d0d2c357417035ce3b6d5fc22">932302b7</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2016-09-17T21:25:59-04:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Fix for vint64 encapsulation patch.
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#diff-0" style="text-decoration: none">
libntp/ntp_calendar.c
</a>
</li>
<li class="file-stats">
<a href="#diff-1" style="text-decoration: none">
libntp/vint64ops.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="diff-0">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/932302b7b016a45d0d2c357417035ce3b6d5fc22#diff-0"><strong>libntp/ntp_calendar.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: 13px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.5">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="384" 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="384" 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">@@ -384,7 +384,7 @@ ntpcal_ntp_to_time(</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="384" 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">
384
</td>
<td class="diff-line-num new_line" data-linenumber="384" 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">
384
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC384" class="line"> <span class="n" style="color: #333">vint64</span> <span class="n" style="color: #333">res</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="385" 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">
385
</td>
<td class="diff-line-num new_line" data-linenumber="385" 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">
385
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC385" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="386" 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">
386
</td>
<td class="diff-line-num new_line" data-linenumber="386" 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">
386
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC386" class="line"> <span class="n" style="color: #333">setvint64s</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">,</span> <span class="p">(</span><span class="n" style="color: #333">pivot</span> <span class="o" style="font-weight: bold">!=</span> <span class="nb" style="color: #0086b3">NULL</span><span class="p">)</span> <span class="o" style="font-weight: bold">?</span> <span class="o" style="font-weight: bold">*</span><span class="n" style="color: #333">pivot</span> <span class="o" style="font-weight: bold">:</span> <span class="n" style="color: #333">now</span><span class="p">());</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.5">
<td class="diff-line-num old old_line" data-linenumber="387" 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">
387
</td>
<td class="diff-line-num new_line old" data-linenumber="387" 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="LC387" class="line"> <span class="n" style="color: #333">setvint64u</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">,</span> <span class="n" style="color: #333">vint64<span class="idiff left right">s</span></span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">)</span><span class="o" style="font-weight: bold">-</span><span class="mh" style="color: #099">0x80000000</span><span class="p">);</span> <span class="cm" style="color: #998; font-style: italic">/* unshift of half range */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="388" 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="387" 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">
387
</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="LC387" class="line"> <span class="n" style="color: #333">setvint64u</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">,</span> <span class="n" style="color: #333">vint64<span class="idiff left right">u</span></span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">)</span><span class="o" style="font-weight: bold">-</span><span class="mh" style="color: #099">0x80000000</span><span class="p">);</span> <span class="cm" style="color: #998; font-style: italic">/* unshift of half range */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="388" 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">
388
</td>
<td class="diff-line-num new_line" data-linenumber="388" 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">
388
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC388" class="line"> <span class="n" style="color: #333">ntp</span> <span class="o" style="font-weight: bold">-=</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">uint32_t</span><span class="p">)</span><span class="n" style="color: #333">JAN_1970</span><span class="p">;</span> <span class="cm" style="color: #998; font-style: italic">/* warp into UN*X domain */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="389" 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">
389
</td>
<td class="diff-line-num new_line" data-linenumber="389" 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">
389
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC389" class="line"> <span class="n" style="color: #333">ntp</span> <span class="o" style="font-weight: bold">-=</span> <span class="n" style="color: #333">vint64lo</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">);</span> <span class="cm" style="color: #998; font-style: italic">/* cycle difference */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="390" 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">
390
</td>
<td class="diff-line-num new_line" data-linenumber="390" 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">
390
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC390" class="line"> <span class="n" style="color: #333">setvint64u</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">,</span> <span class="n" style="color: #333">vint64u</span><span class="p">(</span><span class="n" style="color: #333">res</span><span class="p">)</span><span class="o" style="font-weight: bold">+</span><span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">uint64_t</span><span class="p">)</span><span class="n" style="color: #333">ntp</span><span class="p">);</span> <span class="cm" style="color: #998; font-style: italic">/* get expanded time */</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="diff-1">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/932302b7b016a45d0d2c357417035ce3b6d5fc22#diff-1"><strong>libntp/vint64ops.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: 13px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.5">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="211" 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="211" 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">@@ -211,7 +211,7 @@ addv64u32(</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="211" 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">
211
</td>
<td class="diff-line-num new_line" data-linenumber="211" 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">
211
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC211" class="line"> <span class="n" style="color: #333">vint64</span> <span class="n" style="color: #333">res</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="212" 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">
212
</td>
<td class="diff-line-num new_line" data-linenumber="212" 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">
212
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC212" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="213" 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">
213
</td>
<td class="diff-line-num new_line" data-linenumber="213" 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">
213
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC213" class="line"> <span class="n" style="color: #333">res</span> <span class="o" style="font-weight: bold">=</span> <span class="o" style="font-weight: bold">*</span><span class="n" style="color: #333">lhs</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.5">
<td class="diff-line-num old old_line" data-linenumber="214" 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">
214
</td>
<td class="diff-line-num new_line old" data-linenumber="214" 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="LC214" class="line"> <span class="n" style="color: #333"><span class="idiff left">res</span></span><span class="p"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">Q_s</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">+=</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff right">rhs</span></span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="215" 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="214" 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">
214
</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="LC214" class="line"> <span class="n" style="color: #333"><span class="idiff left">setvint64u</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff">res</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">vint64u</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff">res</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">+</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">rhs</span></span><span class="p"><span class="idiff right">)</span>;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="215" 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">
215
</td>
<td class="diff-line-num new_line" data-linenumber="215" 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">
215
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC215" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="216" 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">
216
</td>
<td class="diff-line-num new_line" data-linenumber="216" 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">
216
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC216" class="line"> <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">res</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="217" 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">
217
</td>
<td class="diff-line-num new_line" data-linenumber="217" 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">
217
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC217" class="line"><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/commit/932302b7b016a45d0d2c357417035ce3b6d5fc22">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/932302b7b016a45d0d2c357417035ce3b6d5fc22"}}</script>
</p>
</div>
</body>
</html>