<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Amar Takhar 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/da0cfa0f701f61cfc0890f61f2ec1cb82791d084">da0cfa0f</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-12-04T16:50:06Z</i>
</div>
<pre class='commit-message'>Wrap CLang pragmas under __clang__ to avoid non-clang compiler warnings.</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
tests/libntp/msyslog.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
tests/ntpdig/packetProcessing.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/da0cfa0f701f61cfc0890f61f2ec1cb82791d084#diff-0'>
<strong>
tests/libntp/msyslog.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/msyslog.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/libntp/msyslog.c
</span><span style="color: #aaaaaa">@@ -90,11 +90,15 @@ TEST(msyslog, msnprintfHangingPercent)
</span> ZERO(exp_buf);
ZERO(act_buf);
/* warning: format string contains '\0' within the string body [-Wformat] */
<span style="color: #000000;background-color: #ffdddd">-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wformat"
</span><span style="color: #000000;background-color: #ddffdd">+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wformat"
+#endif
</span> exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "percent then nul term then non-nul %\0oops!");
act_cnt = msnprintf(act_buf, sizeof(act_buf), "percent then nul term then non-nul %\0oops!");
<span style="color: #000000;background-color: #ffdddd">-#pragma clang diagnostic pop
</span><span style="color: #000000;background-color: #ddffdd">+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
</span>
TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/da0cfa0f701f61cfc0890f61f2ec1cb82791d084#diff-1'>
<strong>
tests/ntpdig/packetProcessing.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/ntpdig/packetProcessing.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/ntpdig/packetProcessing.c
</span><span style="color: #aaaaaa">@@ -101,10 +101,14 @@ TEST(packetProcessing, TooShortExtensionFieldLength) {
</span> * This lengths must be multiples of 4 bytes, which gives
* a minimum of 4 byte extension field length. */
/* warning: array index 7 is past the end of the array (which contains 6 elements) [-Warray-bounds] */
<span style="color: #000000;background-color: #ddffdd">+#ifdef __clang__
</span> #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warray-bounds"
<span style="color: #000000;background-color: #ddffdd">+#endif
</span> testpkt.exten[7] = htonl(3); // 3 bytes is too short.
<span style="color: #000000;background-color: #ddffdd">+#ifdef __clang__
</span> #pragma clang diagnostic pop
<span style="color: #000000;background-color: #ddffdd">+#endif
</span>
/* We send in a pkt_len of header size + 4 byte extension
* header + 24 byte MAC, this prevents the length error to
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/da0cfa0f701f61cfc0890f61f2ec1cb82791d084">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/da0cfa0f701f61cfc0890f61f2ec1cb82791d084"}}</script>
</p>
</div>
</body>
</html>