refidsmear test cleanup. Tomasz Flendrich.

bk: 558e2c56dXNVn22bvhLMa4yHKFp_7w

diff --git a/ChangeLog b/ChangeLog
index 11f07f8768deb29ca5676d5480809e031b4d2faf..6b85e01976198ffae30253f532e8f42684445b7a 100644 (file)
--- 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 e0b9a74c616821b9b186880a613517799ece7c0b..5e9d27c72a3da5d575a8a70f43e05e27d061ff8f 100644 (file)
--- 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));