From: Tomek Mrugalski <tomasz@isc.org>
Date: Sat, 27 Jun 2015 04:44:17 +0000 (+0200)
Subject: refidsmear.c:
X-Git-Tag: NTP_4_2_8P3_RC3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f6b962d65dc800ef66da1569034d921bdb36727;p=thirdparty%2Fntp.git

refidsmear.c:
  moved assertions to proper places

bk: 558e2a21XpiP2GNXU3SQpk3w08taaw
---

diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index b95152600..e0b9a74c6 100644
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -33,6 +33,8 @@ 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];
@@ -45,7 +47,6 @@ rtol(uint32_t r, char *es)
 	//printf("refid %#x, smear %s\n", r, as);
 
 	TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
-	TEST_ASSERT_NOT_NULL_MESSAGE(es, msg);
 	TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
 
 
@@ -58,6 +59,8 @@ 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;
@@ -73,7 +76,6 @@ rtoltor(uint32_t er, char *es)
 	//printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(ar));
 
 	TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
-	TEST_ASSERT_NOT_NULL_MESSAGE(es, msg);
 	TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
 	TEST_ASSERT_EQUAL_UINT_MESSAGE(er, ntohl(ar), msg);