<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/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a">fd11ac0c</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-12-04T14:25:45Z</i>
</div>
<pre class='commit-message'>Convert libntp/msyslog.c.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
tests/common/tests_main.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
tests/libntp/msyslog.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
tests/wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a#diff-0'>
<strong>
tests/common/tests_main.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/common/tests_main.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/common/tests_main.c
</span><span style="color: #aaaaaa">@@ -52,7 +52,7 @@ static void RunAllTests(void)
</span> // RUN_TEST_GROUP(lfp);
// RUN_TEST_GROUP(lfptostr);
RUN_TEST_GROUP(modetoa);
<span style="color: #000000;background-color: #ffdddd">-// RUN_TEST_GROUP(msyslog);
</span><span style="color: #000000;background-color: #ddffdd">+ RUN_TEST_GROUP(msyslog);
</span> RUN_TEST_GROUP(netof);
RUN_TEST_GROUP(numtoa);
RUN_TEST_GROUP(numtohost);
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a#diff-1'>
<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">@@ -1,10 +1,8 @@
</span> #include "config.h"
#include "ntp_stdlib.h"
<span style="color: #000000;background-color: #ffdddd">-extern "C" {
</span> #include "unity.h"
#include "unity_fixture.h"
<span style="color: #000000;background-color: #ffdddd">-}
</span>
TEST_GROUP(msyslog);
<span style="color: #aaaaaa">@@ -13,18 +11,14 @@ TEST_SETUP(msyslog) {}
</span> TEST_TEAR_DOWN(msyslog) {}
<span style="color: #000000;background-color: #ffdddd">-extern "C" {
</span> #include <stdio.h>
#include <string.h>
#include <errno.h>
<span style="color: #000000;background-color: #ddffdd">+
</span> #ifndef VSNPRINTF_PERCENT_M
// format_errmsg() is normally private to msyslog.c
void format_errmsg (char *, size_t, const char *, int);
#endif
<span style="color: #000000;background-color: #ffdddd">-};
-
-class msyslogTest : public libntptest {
-};
</span>
// msnprintf()
TEST(msyslog, msnprintf)
<span style="color: #aaaaaa">@@ -88,7 +82,6 @@ TEST(msyslog, msnprintfBackslashPercent)
</span>
TEST(msyslog, msnprintfHangingPercent)
{
<span style="color: #000000;background-color: #ffdddd">- static char fmt[] = "percent then nul term then non-nul %\0oops!";
</span> char exp_buf[64];
char act_buf[64];
int exp_cnt;
<span style="color: #aaaaaa">@@ -96,8 +89,12 @@ TEST(msyslog, msnprintfHangingPercent)
</span>
ZERO(exp_buf);
ZERO(act_buf);
<span style="color: #000000;background-color: #ffdddd">- exp_cnt = snprintf(exp_buf, sizeof(exp_buf), fmt);
- act_cnt = msnprintf(act_buf, sizeof(act_buf), fmt);
</span><span style="color: #000000;background-color: #ddffdd">+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat"
+ 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!");
+#pragma clang diagnostic pop
+
</span> TEST_ASSERT_EQUAL(exp_cnt, act_cnt);
TEST_ASSERT_EQUAL_STRING(exp_buf, act_buf);
TEST_ASSERT_EQUAL_STRING("", act_buf + 1 + strlen(act_buf));
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a#diff-2'>
<strong>
tests/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/wscript
</span><span style="color: #aaaaaa">@@ -67,7 +67,7 @@ def build(ctx):
</span> # "libntp/lfpfunc.c",
# "libntp/lfptostr.c",
"libntp/modetoa.c",
<span style="color: #000000;background-color: #ffdddd">-# "libntp/msyslog.c",
</span><span style="color: #000000;background-color: #ddffdd">+ "libntp/msyslog.c",
</span> "libntp/netof.c",
"libntp/numtoa.c",
"libntp/numtohost.c",
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a">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/fd11ac0cbcfac9a0f693a9dcca1088a9cbf2fc1a"}}</script>
</p>
</div>
</body>
</html>