<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/8d4472ee7e18779a9719ccf4e22dbf46291aa4c9">8d4472ee</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-11-24T19:54:58Z</i>
</div>
<pre class='commit-message'>Convert prettydate.c</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/c2b064998bc86018c4aa86e8992c5f7dfa2877b1">c2b06499</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-11-24T19:54:58Z</i>
</div>
<pre class='commit-message'>octtoint was removed in d111c7c5.</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/c9f47a81b07a66792be5f6a5d8a66a680392d1b9">c9f47a81</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-11-24T19:54:58Z</i>
</div>
<pre class='commit-message'>Fix a bug in installing the icons.
This reverts some previous work. I remember now why I did it the way I did.</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/8c989ef735e2e3a20b14ef39804ae0f91e1025db">8c989ef7</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-11-24T19:54:58Z</i>
</div>
<pre class='commit-message'>Convert numtoa.c.</pre>
</li>
</ul>
<h4>7 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
docs/wscript
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
tests/common/tests_main.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
tests/libntp/numtoa.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
<span class='deleted-file'>
−
tests/libntp/octtoint.c
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
<span class='deleted-file'>
−
tests/libntp/octtoint.cpp
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
tests/libntp/prettydate.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-6'>
tests/wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-0'>
<strong>
docs/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/docs/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/docs/wscript
</span><span style="color: #aaaaaa">@@ -17,13 +17,14 @@ def build(ctx):
</span> ctx.path.get_bld().make_node(dir).mkdir() # create 'pic' directory
image_source += files
<span style="color: #000000;background-color: #ffdddd">- # Copy images
- ctx(
- features = "subst",
- is_copy = True,
- source = image_source,
- target = [ctx.path.find_node(dir).get_bld().make_node(x.name) for x in image_source]
- )
</span><span style="color: #000000;background-color: #ddffdd">+ # Copy images
+ ctx(
+ features = "subst",
+ is_copy = True,
+ source = files,
+ target = [ctx.path.find_node(dir).get_bld().make_node(x.name) for x in files]
+ )
+
</span>
extra = ["asciidoc.js", "asciidoc.css"]
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-1'>
<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,10 +52,9 @@ static void RunAllTests(void)
</span> // RUN_TEST_GROUP(modetoa);
// RUN_TEST_GROUP(msyslog);
// RUN_TEST_GROUP(netof);
<span style="color: #000000;background-color: #ffdddd">-// RUN_TEST_GROUP(numtoa);
</span><span style="color: #000000;background-color: #ddffdd">+ RUN_TEST_GROUP(numtoa);
</span> // RUN_TEST_GROUP(numtohost);
<span style="color: #000000;background-color: #ffdddd">-// RUN_TEST_GROUP(octtoint);
-// RUN_TEST_GROUP(prettydate);
</span><span style="color: #000000;background-color: #ddffdd">+ RUN_TEST_GROUP(prettydate);
</span> // RUN_TEST_GROUP(recvbuff);
// RUN_TEST_GROUP(refnumtoa);
RUN_TEST_GROUP(sfptostr);
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-2'>
<strong>
tests/libntp/numtoa.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/numtoa.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/libntp/numtoa.c
</span><span style="color: #aaaaaa">@@ -1,7 +1,5 @@
</span><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(numtoa);
<span style="color: #aaaaaa">@@ -11,19 +9,16 @@ TEST_TEAR_DOWN(numtoa) {}
</span>
#include "libntptest.h"
<span style="color: #000000;background-color: #ffdddd">-class numtoaTest : public libntptest {
-};
-
</span> TEST(numtoa, Address) {
<span style="color: #000000;background-color: #ffdddd">- u_int32 input = htonl(3221225472UL+512UL+1UL); // 192.0.2.1
</span><span style="color: #000000;background-color: #ddffdd">+ u_int32_t input = htonl(3221225472UL+512UL+1UL); // 192.0.2.1
</span>
TEST_ASSERT_EQUAL_STRING("192.0.2.1", numtoa(input));
}
TEST(numtoa, Netmask) {
// 255.255.255.0
<span style="color: #000000;background-color: #ffdddd">- u_int32 hostOrder = 255UL*256UL*256UL*256UL + 255UL*256UL*256UL + 255UL*256UL;
- u_int32 input = htonl(hostOrder);
</span><span style="color: #000000;background-color: #ddffdd">+ u_int32_t hostOrder = 255UL*256UL*256UL*256UL + 255UL*256UL*256UL + 255UL*256UL;
+ u_int32_t input = htonl(hostOrder);
</span>
TEST_ASSERT_EQUAL_STRING("255.255.255.0", numtoa(input));
}
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-3'>
<strong>
tests/libntp/octtoint.c
</strong>
deleted
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/octtoint.c
</span><span style="color: #000000;background-color: #ddffdd">+++ /dev/null
</span><span style="color: #aaaaaa">@@ -1,78 +0,0 @@
</span><span style="color: #000000;background-color: #ffdddd">-extern "C" {
-#include "unity.h"
-#include "unity_fixture.h"
-}
-
-TEST_GROUP(octtoint);
-
-TEST_SETUP(octtoint) {}
-
-TEST_TEAR_DOWN(octtoint) {}
-
-#include "libntptest.h"
-
-class octtointTest : public libntptest {
-};
-
-TEST(octtoint, SingleDigit) {
- const char* str = "5";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(5, actual);
-}
-
-TEST(octtoint, MultipleDigits) {
- const char* str = "271";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(185, actual);
-}
-
-TEST(octtoint, Zero) {
- const char* str = "0";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(0, actual);
-}
-
-TEST(octtoint, MaximumUnsigned32bit) {
- const char* str = "37777777777";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(4294967295UL, actual);
-}
-
-TEST(octtoint, Overflow) {
- const char* str = "40000000000";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
-
-TEST(octtoint, IllegalCharacter) {
- const char* str = "5ac2";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
-
-TEST(octtoint, IllegalDigit) {
- const char* str = "5283";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
-
-TEST_GROUP_RUNNER(octtoint) {
- RUN_TEST_CASE(octtoint, SingleDigit);
- RUN_TEST_CASE(octtoint, MultipleDigits);
- RUN_TEST_CASE(octtoint, Zero);
- RUN_TEST_CASE(octtoint, MaximumUnsigned32bit);
- RUN_TEST_CASE(octtoint, Overflow);
- RUN_TEST_CASE(octtoint, IllegalCharacter);
- RUN_TEST_CASE(octtoint, IllegalDigit);
-}
</span></code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-4'>
<strong>
tests/libntp/octtoint.cpp
</strong>
deleted
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/octtoint.cpp
</span><span style="color: #000000;background-color: #ddffdd">+++ /dev/null
</span><span style="color: #aaaaaa">@@ -1,68 +0,0 @@
</span><span style="color: #000000;background-color: #ffdddd">-extern "C" {
-#include "unity.h"
-#include "unity_fixture.h"
-}
-
-TEST_GROUP(octtoint);
-
-TEST_SETUP(octtoint) {}
-
-TEST_TEAR_DOWN(octtoint) {}
-
-#include "libntptest.h"
-
-class octtointTest : public libntptest {
-};
-
-TEST(octtoint, SingleDigit) {
- const char* str = "5";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(5, actual);
-}
-
-TEST(octtoint, MultipleDigits) {
- const char* str = "271";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(185, actual);
-}
-
-TEST(octtoint, Zero) {
- const char* str = "0";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(0, actual);
-}
-
-TEST(octtoint, MaximumUnsigned32bit) {
- const char* str = "37777777777";
- u_long actual;
-
- TEST_ASSERT_TRUE(octtoint(str, &actual));
- TEST_ASSERT_EQUAL(4294967295UL, actual);
-}
-
-TEST(octtoint, Overflow) {
- const char* str = "40000000000";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
-
-TEST(octtoint, IllegalCharacter) {
- const char* str = "5ac2";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
-
-TEST(octtoint, IllegalDigit) {
- const char* str = "5283";
- u_long actual;
-
- TEST_ASSERT_FALSE(octtoint(str, &actual));
-}
</span></code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-5'>
<strong>
tests/libntp/prettydate.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/prettydate.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/libntp/prettydate.c
</span><span style="color: #aaaaaa">@@ -1,7 +1,5 @@
</span><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(prettydate);
<span style="color: #aaaaaa">@@ -11,17 +9,12 @@ TEST_TEAR_DOWN(prettydate) {}
</span>
#include "libntptest.h"
<span style="color: #000000;background-color: #ffdddd">-extern "C" {
</span> #include "ntp_fp.h"
<span style="color: #000000;background-color: #ffdddd">-};
</span>
<span style="color: #000000;background-color: #ffdddd">-class prettydateTest : public libntptest {
-protected:
- static const u_int32 HALF = 2147483648UL;
-};
</span><span style="color: #000000;background-color: #ddffdd">+static const u_int32_t HALF = 2147483648UL;
</span>
TEST(prettydate, ConstantDate) {
<span style="color: #000000;background-color: #ffdddd">- l_fp time = {3485080800UL, HALF}; // 2010-06-09 14:00:00.5
</span><span style="color: #000000;background-color: #ddffdd">+ l_fp time = {{3485080800UL}, HALF}; // 2010-06-09 14:00:00.5
</span>
TEST_ASSERT_EQUAL_STRING("cfba1ce0.80000000 2010-06-09T14:00:00.500", gmprettydate(&time));
}
</code></pre>
<br>
</li>
<li id='diff-6'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db#diff-6'>
<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">@@ -65,10 +65,9 @@ def build(ctx):
</span> # "libntp/modetoa.c",
# "libntp/msyslog.c",
# "libntp/netof.c",
<span style="color: #000000;background-color: #ffdddd">-# "libntp/numtoa.c",
</span><span style="color: #000000;background-color: #ddffdd">+ "libntp/numtoa.c",
</span> # "libntp/numtohost.c",
<span style="color: #000000;background-color: #ffdddd">-# "libntp/octtoint.c",
-# "libntp/prettydate.c",
</span><span style="color: #000000;background-color: #ddffdd">+ "libntp/prettydate.c",
</span> # "libntp/recvbuff.c",
# "libntp/refnumtoa.c",
"libntp/sfptostr.c",
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db">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":["merge_requests","issues","commit"],"url":"https://gitlab.com/NTPsec/ntpsec/compare/bce7a4b7ddbd1998c367be12f19a5d73d27cb90e...8c989ef735e2e3a20b14ef39804ae0f91e1025db"}}</script>
</p>
</div>
</body>
</html>