From: Linux Karlsson Date: Tue, 27 Jul 2010 18:53:27 +0000 (-0400) Subject: Fixed integer constants so they work on 32-bit systems, which have 32-bit time_t X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a24578d76f3f5eee541aeec384c399de888317ca;p=thirdparty%2Fntp.git Fixed integer constants so they work on 32-bit systems, which have 32-bit time_t bk: 4c4f2b27WAftonwqzI_brTPBUwLNnQ --- diff --git a/tests/sntp/data/kod-test-blanks b/tests/sntp/data/kod-test-blanks index 2cb15db090..5c20e7271e 100644 --- a/tests/sntp/data/kod-test-blanks +++ b/tests/sntp/data/kod-test-blanks @@ -1,5 +1,5 @@ -0000001234567890 DENY 192.0.2.5 +0000000012345678 DENY 192.0.2.5 0000000000000fff RSTR 192.0.2.100 000000000000abcd DENY example.com diff --git a/tests/sntp/data/kod-test-correct b/tests/sntp/data/kod-test-correct index 1f31379ed8..8a3e230ea0 100644 --- a/tests/sntp/data/kod-test-correct +++ b/tests/sntp/data/kod-test-correct @@ -1,2 +1,2 @@ -0000001234567890 DENY 192.0.2.5 +0000000012345678 DENY 192.0.2.5 0000000000000fff RSTR 192.0.2.100 diff --git a/tests/sntp/kodFile.cpp b/tests/sntp/kodFile.cpp index b669d34583..4cd9748377 100644 --- a/tests/sntp/kodFile.cpp +++ b/tests/sntp/kodFile.cpp @@ -96,7 +96,7 @@ TEST_F(kodFileTest, ReadCorrectFile) { ASSERT_EQ(1, search_entry("192.0.2.5", &res)); EXPECT_STREQ("DENY", res->type); EXPECT_STREQ("192.0.2.5", res->hostname); - EXPECT_EQ(0x1234567890, res->timestamp); + EXPECT_EQ(0x12345678, res->timestamp); ASSERT_EQ(1, search_entry("192.0.2.100", &res)); EXPECT_STREQ("RSTR", res->type); @@ -114,7 +114,7 @@ TEST_F(kodFileTest, ReadFileWithBlankLines) { ASSERT_EQ(1, search_entry("192.0.2.5", &res)); EXPECT_STREQ("DENY", res->type); EXPECT_STREQ("192.0.2.5", res->hostname); - EXPECT_EQ(0x1234567890, res->timestamp); + EXPECT_EQ(0x12345678, res->timestamp); ASSERT_EQ(1, search_entry("192.0.2.100", &res)); EXPECT_STREQ("RSTR", res->type);