From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 27 Jun 2015 04:53:42 +0000 (+0000)
Subject: refidsmear test cleanup.  Tomasz Flendrich.
X-Git-Tag: NTP_4_2_8P3_RC3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebeda0e86cb04fee76624fbb7db804d695cf603b;p=thirdparty%2Fntp.git

refidsmear test cleanup.  Tomasz Flendrich.

bk: 558e2c56dXNVn22bvhLMa4yHKFp_7w
---

diff --git a/ChangeLog b/ChangeLog
index 11f07f876..6b85e0197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2855] Parser fix for conditional leap smear code.  Harlan Stenn.
+* refidsmear test cleanup.  Tomasz Flendrich.
 * refidsmear function support and tests.  Harlan Stenn.
 * sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested
   something that was only in the 4.2.6 sntp.  Harlan Stenn.
diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index e0b9a74c6..5e9d27c72 100644
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -33,12 +33,12 @@ void rtol(uint32_t r, char *es);
 void
 rtol(uint32_t r, char *es)
 {
-	TEST_ASSERT_NOT_NULL(es);
-
 	l_fp l;
 	char *as;
 	char msg[100];
 
+	TEST_ASSERT_NOT_NULL(es);
+
 	snprintf(msg, 100, "rtol was called with r=%#.8x, es=%s", r, es);
 
 	l = convertRefIDToLFP(htonl(r));
@@ -49,7 +49,6 @@ rtol(uint32_t r, char *es)
 	TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
 	TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
 
-
 	return;
 }
 
@@ -59,13 +58,13 @@ void rtoltor(uint32_t er, char *es);
 void
 rtoltor(uint32_t er, char *es)
 {
-	TEST_ASSERT_NOT_NULL(es);
-
 	l_fp l;
 	char *as;
 	uint32_t ar;
 	char msg[100];
 
+	TEST_ASSERT_NOT_NULL(es);
+
 	snprintf(msg, 100, "rtoltor was called with er=%#.8x, es=%s", er, es);
 
 	l = convertRefIDToLFP(htonl(er));