From: Damir Tomic <viperus@ntp.org>
Date: Sat, 25 Jul 2015 14:54:29 +0000 (+0200)
Subject: Many files:
X-Git-Tag: NTP_4_3_64~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7967c3091eddfb99f5840c55537a9ee23144b7;p=thirdparty%2Fntp.git

Many files:
  added declarations

lfpfunc.c:
  adding declarations, reorganizing
Many files:
  adding declarations

  update

run-clocktime.c:
  update
clocktime.c:
  adding declarations
socktoa.c:
  added declarations

bk: 55b3a325c9uYpRjH86SxKwRRCrxhUQ
---

diff --git a/tests/libntp/clocktime.c b/tests/libntp/clocktime.c
index 35b5dc710..12118b9b8 100644
--- a/tests/libntp/clocktime.c
+++ b/tests/libntp/clocktime.c
@@ -15,6 +15,7 @@ void test_WrongYearStart(void);
 void test_PreviousYear(void);
 void test_NextYear(void);
 void test_NoReasonableConversion(void);
+int isLE(u_int32 diff,u_int32 actual);
 void test_AlwaysInLimit(void);
 
 
diff --git a/tests/libntp/lfpfunc.c b/tests/libntp/lfpfunc.c
index f38e3d3cc..1a13f37a0 100644
--- a/tests/libntp/lfpfunc.c
+++ b/tests/libntp/lfpfunc.c
@@ -19,6 +19,34 @@
 }
 
 
+
+typedef int bool; // typedef enum { FALSE, TRUE } boolean; -> can't use this because TRUE and FALSE are already defined
+
+
+typedef struct  {
+	uint32_t h, l;
+} lfp_hl;
+
+
+int l_fp_scmp(const l_fp first, const l_fp second);
+int l_fp_ucmp(const l_fp first, l_fp second );
+l_fp l_fp_init(int32 i, u_int32 f);
+l_fp l_fp_add(const l_fp first, const l_fp second);
+l_fp l_fp_subtract(const l_fp first, const l_fp second);
+l_fp l_fp_negate(const l_fp first);
+l_fp l_fp_abs(const l_fp first);
+int l_fp_signum(const l_fp first);
+double l_fp_convert_to_double(const l_fp first);
+l_fp l_fp_init_from_double( double rhs);
+void l_fp_swap(l_fp * first, l_fp *second);
+bool l_isgt(const l_fp first, const l_fp second);
+bool l_isgtu(const l_fp first, const l_fp second);
+bool l_ishis(const l_fp first, const l_fp second);
+bool l_isgeq(const l_fp first, const l_fp second);
+bool l_isequ(const l_fp first, const l_fp second);
+double eps(double d);
+
+
 void test_AdditionLR(void);
 void test_AdditionRL(void);
 void test_SubtractionLR(void);
@@ -31,11 +59,6 @@ void test_UnsignedRelOps(void);
 
 
 
-typedef struct  {
-	uint32_t h, l;
-} lfp_hl;
-
-
 static int cmp_work(u_int32 a[3], u_int32 b[3]);
 
 //----------------------------------------------------------------------
@@ -179,8 +202,6 @@ l_fp_swap(l_fp * first, l_fp *second){
 // readable failure messages.
 //----------------------------------------------------------------------
 
-typedef int bool; // typedef enum { FALSE, TRUE } boolean; -> can't use this because TRUE and FALSE are already defined
-
 
 bool
 l_isgt (const l_fp first, const l_fp second) {
diff --git a/tests/libntp/netof.c b/tests/libntp/netof.c
index 010b16429..2fde6cc2e 100644
--- a/tests/libntp/netof.c
+++ b/tests/libntp/netof.c
@@ -7,6 +7,14 @@
 
 #include "sockaddrtest.h"
 
+
+void test_ClassBAddress(void);
+void test_ClassCAddress(void);
+void test_ClassAAddress(void);
+void test_IPv6Address(void);
+
+
+
 void test_ClassBAddress(void) {
 	sockaddr_u input = CreateSockaddr4("172.16.2.1", NTP_PORT);
 	sockaddr_u expected = CreateSockaddr4("172.16.0.0", NTP_PORT);
diff --git a/tests/libntp/numtoa.c b/tests/libntp/numtoa.c
index fc79c3812..5c7a663f4 100644
--- a/tests/libntp/numtoa.c
+++ b/tests/libntp/numtoa.c
@@ -5,6 +5,8 @@
 
 #include "unity.h"
 
+void test_Address(void);
+void test_Netmask(void);
 
 void
 test_Address(void) {
diff --git a/tests/libntp/numtohost.c b/tests/libntp/numtohost.c
index c1597c48b..cfce2d8a3 100644
--- a/tests/libntp/numtohost.c
+++ b/tests/libntp/numtohost.c
@@ -5,6 +5,8 @@
 
 #include "unity.h"
 
+void test_LoopbackNetNonResolve(void);
+
 void
 test_LoopbackNetNonResolve(void) {
 	/* A loopback address in 127.0.0.0/8 is chosen, and
diff --git a/tests/libntp/octtoint.c b/tests/libntp/octtoint.c
index 4b0f94cea..5c03d6d1b 100644
--- a/tests/libntp/octtoint.c
+++ b/tests/libntp/octtoint.c
@@ -4,6 +4,16 @@
 
 #include "unity.h"
 
+
+void test_SingleDigit(void);
+void test_MultipleDigits(void);
+void test_Zero(void);
+void test_MaximumUnsigned32bit(void);
+void test_Overflow(void);
+void test_IllegalCharacter(void);
+void test_IllegalDigit(void);
+
+
 void test_SingleDigit(void) {
 	const char* str = "5";
 	u_long actual;
diff --git a/tests/libntp/prettydate.c b/tests/libntp/prettydate.c
index 9a331e828..0e7f96ce7 100644
--- a/tests/libntp/prettydate.c
+++ b/tests/libntp/prettydate.c
@@ -6,6 +6,9 @@
 
 #include "unity.h"
 
+void test_ConstantDate(void);
+
+
 void
 test_ConstantDate(void) {
 	const u_int32 HALF = 2147483648UL;
diff --git a/tests/libntp/recvbuff.c b/tests/libntp/recvbuff.c
index e9c14da88..6d6cf8e5f 100644
--- a/tests/libntp/recvbuff.c
+++ b/tests/libntp/recvbuff.c
@@ -4,6 +4,10 @@
 
 #include "unity.h"
 
+void setUp(void);
+void test_Initialization(void);
+void test_GetAndFree(void);
+void test_GetAndFill(void);
 
 void
 setUp(void)
diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index 5e9d27c72..04f396cb0 100644
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -28,7 +28,12 @@
  * 254.255.255.255
  */
 
+
+
 void rtol(uint32_t r, char *es);
+void rtoltor(uint32_t er, char *es);
+void ltor(l_fp l, char *er);
+void test_refidsmear(void);
 
 void
 rtol(uint32_t r, char *es)
@@ -53,7 +58,7 @@ rtol(uint32_t r, char *es)
 }
 
 
-void rtoltor(uint32_t er, char *es);
+
 
 void
 rtoltor(uint32_t er, char *es)
@@ -82,8 +87,6 @@ rtoltor(uint32_t er, char *es)
 }
 
 
-void ltor(l_fp l, char *er);
-
 void
 ltor(l_fp l, char *er)
 {
diff --git a/tests/libntp/refnumtoa.c b/tests/libntp/refnumtoa.c
index 6b7ae65ec..33ad3aa48 100644
--- a/tests/libntp/refnumtoa.c
+++ b/tests/libntp/refnumtoa.c
@@ -9,6 +9,10 @@
 /* Might need to be updated if a new refclock gets this id. */
 static const int UNUSED_REFCLOCK_ID = 250;
 
+void test_LocalClock(void);
+void test_UnknownId(void);
+
+
 void
 test_LocalClock(void) {
 #ifdef REFCLOCK		/* clockname() is useless otherwise */
diff --git a/tests/libntp/run-clocktime.c b/tests/libntp/run-clocktime.c
index 64a094e3e..9960ed882 100644
--- a/tests/libntp/run-clocktime.c
+++ b/tests/libntp/run-clocktime.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
   RUN_TEST(test_PreviousYear, 15);
   RUN_TEST(test_NextYear, 16);
   RUN_TEST(test_NoReasonableConversion, 17);
-  RUN_TEST(test_AlwaysInLimit, 18);
+  RUN_TEST(test_AlwaysInLimit, 19);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-lfpfunc.c b/tests/libntp/run-lfpfunc.c
index a7b6a43b5..771f11e00 100644
--- a/tests/libntp/run-lfpfunc.c
+++ b/tests/libntp/run-lfpfunc.c
@@ -58,15 +58,15 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("lfpfunc.c");
-  RUN_TEST(test_AdditionLR, 22);
-  RUN_TEST(test_AdditionRL, 23);
-  RUN_TEST(test_SubtractionLR, 24);
-  RUN_TEST(test_SubtractionRL, 25);
-  RUN_TEST(test_Negation, 26);
-  RUN_TEST(test_Absolute, 27);
-  RUN_TEST(test_FDF_RoundTrip, 28);
-  RUN_TEST(test_SignedRelOps, 29);
-  RUN_TEST(test_UnsignedRelOps, 30);
+  RUN_TEST(test_AdditionLR, 50);
+  RUN_TEST(test_AdditionRL, 51);
+  RUN_TEST(test_SubtractionLR, 52);
+  RUN_TEST(test_SubtractionRL, 53);
+  RUN_TEST(test_Negation, 54);
+  RUN_TEST(test_Absolute, 55);
+  RUN_TEST(test_FDF_RoundTrip, 56);
+  RUN_TEST(test_SignedRelOps, 57);
+  RUN_TEST(test_UnsignedRelOps, 58);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index 46b18261f..3f27f6759 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("netof.c");
-  RUN_TEST(test_ClassBAddress, 10);
-  RUN_TEST(test_ClassCAddress, 20);
-  RUN_TEST(test_ClassAAddress, 30);
-  RUN_TEST(test_IPv6Address, 43);
+  RUN_TEST(test_ClassBAddress, 11);
+  RUN_TEST(test_ClassCAddress, 12);
+  RUN_TEST(test_ClassAAddress, 13);
+  RUN_TEST(test_IPv6Address, 14);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c
index 9a10e6369..fe6f45776 100644
--- a/tests/libntp/run-numtoa.c
+++ b/tests/libntp/run-numtoa.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("numtoa.c");
-  RUN_TEST(test_Address, 10);
-  RUN_TEST(test_Netmask, 17);
+  RUN_TEST(test_Address, 8);
+  RUN_TEST(test_Netmask, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
index f294a45ab..7c2a509d6 100644
--- a/tests/libntp/run-numtohost.c
+++ b/tests/libntp/run-numtohost.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("numtohost.c");
-  RUN_TEST(test_LoopbackNetNonResolve, 9);
+  RUN_TEST(test_LoopbackNetNonResolve, 8);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-octtoint.c b/tests/libntp/run-octtoint.c
index 6c18f5323..09ebbbaa8 100644
--- a/tests/libntp/run-octtoint.c
+++ b/tests/libntp/run-octtoint.c
@@ -53,13 +53,13 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("octtoint.c");
-  RUN_TEST(test_SingleDigit, 7);
-  RUN_TEST(test_MultipleDigits, 15);
-  RUN_TEST(test_Zero, 24);
-  RUN_TEST(test_MaximumUnsigned32bit, 33);
-  RUN_TEST(test_Overflow, 42);
-  RUN_TEST(test_IllegalCharacter, 50);
-  RUN_TEST(test_IllegalDigit, 58);
+  RUN_TEST(test_SingleDigit, 8);
+  RUN_TEST(test_MultipleDigits, 9);
+  RUN_TEST(test_Zero, 10);
+  RUN_TEST(test_MaximumUnsigned32bit, 11);
+  RUN_TEST(test_Overflow, 12);
+  RUN_TEST(test_IllegalCharacter, 13);
+  RUN_TEST(test_IllegalDigit, 14);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c
index f89abd5a6..5ecc89208 100644
--- a/tests/libntp/run-prettydate.c
+++ b/tests/libntp/run-prettydate.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("prettydate.c");
-  RUN_TEST(test_ConstantDate, 10);
+  RUN_TEST(test_ConstantDate, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-recvbuff.c b/tests/libntp/run-recvbuff.c
index 87b85bdee..85945a9e9 100644
--- a/tests/libntp/run-recvbuff.c
+++ b/tests/libntp/run-recvbuff.c
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("recvbuff.c");
-  RUN_TEST(test_Initialization, 15);
-  RUN_TEST(test_GetAndFree, 23);
-  RUN_TEST(test_GetAndFill, 34);
+  RUN_TEST(test_Initialization, 8);
+  RUN_TEST(test_GetAndFree, 9);
+  RUN_TEST(test_GetAndFill, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 9e74f6d34..030136541 100644
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("refidsmear.c");
-  RUN_TEST(test_refidsmear, 101);
+  RUN_TEST(test_refidsmear, 36);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index 54ee99207..f6ee54210 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("refnumtoa.c");
-  RUN_TEST(test_LocalClock, 13);
-  RUN_TEST(test_UnknownId, 40);
+  RUN_TEST(test_LocalClock, 12);
+  RUN_TEST(test_UnknownId, 13);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index e420ee9b9..f1facc864 100644
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -55,13 +55,13 @@ int main(int argc, char *argv[])
   progname = argv[0];
   UnityBegin("sfptostr.c");
   RUN_TEST(test_PositiveInteger, 11);
-  RUN_TEST(test_NegativeInteger, 19);
-  RUN_TEST(test_PositiveIntegerPositiveFraction, 27);
-  RUN_TEST(test_NegativeIntegerNegativeFraction, 35);
-  RUN_TEST(test_PositiveIntegerNegativeFraction, 43);
-  RUN_TEST(test_NegativeIntegerPositiveFraction, 51);
-  RUN_TEST(test_SingleDecimalInteger, 59);
-  RUN_TEST(test_SingleDecimalRounding, 67);
+  RUN_TEST(test_NegativeInteger, 12);
+  RUN_TEST(test_PositiveIntegerPositiveFraction, 13);
+  RUN_TEST(test_NegativeIntegerNegativeFraction, 14);
+  RUN_TEST(test_PositiveIntegerNegativeFraction, 15);
+  RUN_TEST(test_NegativeIntegerPositiveFraction, 16);
+  RUN_TEST(test_SingleDecimalInteger, 17);
+  RUN_TEST(test_SingleDecimalRounding, 18);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c
index 730821b27..7bff53c60 100644
--- a/tests/libntp/run-socktoa.c
+++ b/tests/libntp/run-socktoa.c
@@ -54,12 +54,12 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("socktoa.c");
-  RUN_TEST(test_IPv4AddressWithPort, 11);
-  RUN_TEST(test_IPv6AddressWithPort, 18);
-  RUN_TEST(test_ScopedIPv6AddressWithPort, 42);
-  RUN_TEST(test_HashEqual, 67);
-  RUN_TEST(test_HashNotEqual, 75);
-  RUN_TEST(test_IgnoreIPv6Fields, 88);
+  RUN_TEST(test_IPv4AddressWithPort, 10);
+  RUN_TEST(test_IPv6AddressWithPort, 11);
+  RUN_TEST(test_ScopedIPv6AddressWithPort, 12);
+  RUN_TEST(test_HashEqual, 13);
+  RUN_TEST(test_HashNotEqual, 14);
+  RUN_TEST(test_IgnoreIPv6Fields, 15);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index 0e1648af7..d1b80de9e 100644
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -51,11 +51,11 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("ssl_init.c");
-  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 20);
-  RUN_TEST(test_MD5KeyTypeWithDigestLength, 25);
-  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 35);
-  RUN_TEST(test_MD5KeyName, 51);
-  RUN_TEST(test_SHA1KeyName, 57);
+  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 17);
+  RUN_TEST(test_MD5KeyTypeWithDigestLength, 18);
+  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 19);
+  RUN_TEST(test_MD5KeyName, 20);
+  RUN_TEST(test_SHA1KeyName, 21);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c
index 5687faad2..f839adfb2 100644
--- a/tests/libntp/run-statestr.c
+++ b/tests/libntp/run-statestr.c
@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("statestr.c");
-  RUN_TEST(test_PeerRestart, 12);
-  RUN_TEST(test_SysUnspecified, 18);
-  RUN_TEST(test_ClockCodeExists, 25);
-  RUN_TEST(test_ClockCodeUnknown, 31);
+  RUN_TEST(test_PeerRestart, 9);
+  RUN_TEST(test_SysUnspecified, 10);
+  RUN_TEST(test_ClockCodeExists, 11);
+  RUN_TEST(test_ClockCodeUnknown, 12);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c
index 670a9bcf0..c9e8e8321 100644
--- a/tests/libntp/run-strtolfp.c
+++ b/tests/libntp/run-strtolfp.c
@@ -56,12 +56,12 @@ int main(int argc, char *argv[])
   progname = argv[0];
   UnityBegin("strtolfp.c");
   RUN_TEST(test_PositiveInteger, 11);
-  RUN_TEST(test_NegativeInteger, 25);
-  RUN_TEST(test_PositiveFraction, 42);
-  RUN_TEST(test_NegativeFraction, 56);
-  RUN_TEST(test_PositiveMsFraction, 73);
-  RUN_TEST(test_NegativeMsFraction, 89);
-  RUN_TEST(test_InvalidChars, 107);
+  RUN_TEST(test_NegativeInteger, 12);
+  RUN_TEST(test_PositiveFraction, 13);
+  RUN_TEST(test_NegativeFraction, 14);
+  RUN_TEST(test_PositiveMsFraction, 15);
+  RUN_TEST(test_NegativeMsFraction, 16);
+  RUN_TEST(test_InvalidChars, 17);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index 671b3df15..548247af9 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -78,34 +78,34 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("timespecops.c");
-  RUN_TEST(test_Helpers1, 153);
-  RUN_TEST(test_Normalise, 174);
-  RUN_TEST(test_SignNoFrac, 189);
-  RUN_TEST(test_SignWithFrac, 203);
-  RUN_TEST(test_CmpFracEQ, 218);
-  RUN_TEST(test_CmpFracGT, 233);
-  RUN_TEST(test_CmpFracLT, 248);
-  RUN_TEST(test_AddFullNorm, 266);
-  RUN_TEST(test_AddFullOflow1, 282);
-  RUN_TEST(test_AddNsecNorm, 298);
-  RUN_TEST(test_AddNsecOflow1, 312);
-  RUN_TEST(test_SubFullNorm, 329);
-  RUN_TEST(test_SubFullOflow, 345);
-  RUN_TEST(test_SubNsecNorm, 361);
-  RUN_TEST(test_SubNsecOflow, 375);
-  RUN_TEST(test_Neg, 393);
-  RUN_TEST(test_AbsNoFrac, 411);
-  RUN_TEST(test_AbsWithFrac, 424);
-  RUN_TEST(test_Helpers2, 440);
-  RUN_TEST(test_ToLFPbittest, 469);
-  RUN_TEST(test_ToLFPrelPos, 484);
-  RUN_TEST(test_ToLFPrelNeg, 498);
-  RUN_TEST(test_ToLFPabs, 512);
-  RUN_TEST(test_FromLFPbittest, 529);
-  RUN_TEST(test_FromLFPrelPos, 550);
-  RUN_TEST(test_FromLFPrelNeg, 565);
-  RUN_TEST(test_LFProundtrip, 581);
-  RUN_TEST(test_ToString, 601);
+  RUN_TEST(test_Helpers1, 36);
+  RUN_TEST(test_Normalise, 37);
+  RUN_TEST(test_SignNoFrac, 38);
+  RUN_TEST(test_SignWithFrac, 39);
+  RUN_TEST(test_CmpFracEQ, 40);
+  RUN_TEST(test_CmpFracGT, 41);
+  RUN_TEST(test_CmpFracLT, 42);
+  RUN_TEST(test_AddFullNorm, 43);
+  RUN_TEST(test_AddFullOflow1, 44);
+  RUN_TEST(test_AddNsecNorm, 45);
+  RUN_TEST(test_AddNsecOflow1, 46);
+  RUN_TEST(test_SubFullNorm, 47);
+  RUN_TEST(test_SubFullOflow, 48);
+  RUN_TEST(test_SubNsecNorm, 49);
+  RUN_TEST(test_SubNsecOflow, 50);
+  RUN_TEST(test_Neg, 51);
+  RUN_TEST(test_AbsNoFrac, 52);
+  RUN_TEST(test_AbsWithFrac, 53);
+  RUN_TEST(test_Helpers2, 54);
+  RUN_TEST(test_ToLFPbittest, 55);
+  RUN_TEST(test_ToLFPrelPos, 56);
+  RUN_TEST(test_ToLFPrelNeg, 57);
+  RUN_TEST(test_ToLFPabs, 58);
+  RUN_TEST(test_FromLFPbittest, 59);
+  RUN_TEST(test_FromLFPrelPos, 60);
+  RUN_TEST(test_FromLFPrelNeg, 61);
+  RUN_TEST(test_LFProundtrip, 62);
+  RUN_TEST(test_ToString, 63);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index fd3fb1925..04a65614a 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -77,34 +77,34 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("timevalops.c");
-  RUN_TEST(test_Helpers1, 157);
-  RUN_TEST(test_Normalise, 178);
-  RUN_TEST(test_SignNoFrac, 193);
-  RUN_TEST(test_SignWithFrac, 207);
-  RUN_TEST(test_CmpFracEQ, 223);
-  RUN_TEST(test_CmpFracGT, 239);
-  RUN_TEST(test_CmpFracLT, 255);
-  RUN_TEST(test_AddFullNorm, 274);
-  RUN_TEST(test_AddFullOflow1, 290);
-  RUN_TEST(test_AddUsecNorm, 306);
-  RUN_TEST(test_AddUsecOflow1, 320);
-  RUN_TEST(test_SubFullNorm, 337);
-  RUN_TEST(test_SubFullOflow, 353);
-  RUN_TEST(test_SubUsecNorm, 369);
-  RUN_TEST(test_SubUsecOflow, 383);
-  RUN_TEST(test_Neg, 400);
-  RUN_TEST(test_AbsNoFrac, 418);
-  RUN_TEST(test_AbsWithFrac, 431);
-  RUN_TEST(test_Helpers2, 448);
-  RUN_TEST(test_ToLFPbittest, 482);
-  RUN_TEST(test_ToLFPrelPos, 498);
-  RUN_TEST(test_ToLFPrelNeg, 514);
-  RUN_TEST(test_ToLFPabs, 529);
-  RUN_TEST(test_FromLFPbittest, 548);
-  RUN_TEST(test_FromLFPrelPos, 568);
-  RUN_TEST(test_FromLFPrelNeg, 583);
-  RUN_TEST(test_LFProundtrip, 599);
-  RUN_TEST(test_ToString, 619);
+  RUN_TEST(test_Helpers1, 38);
+  RUN_TEST(test_Normalise, 39);
+  RUN_TEST(test_SignNoFrac, 40);
+  RUN_TEST(test_SignWithFrac, 41);
+  RUN_TEST(test_CmpFracEQ, 42);
+  RUN_TEST(test_CmpFracGT, 43);
+  RUN_TEST(test_CmpFracLT, 44);
+  RUN_TEST(test_AddFullNorm, 45);
+  RUN_TEST(test_AddFullOflow1, 46);
+  RUN_TEST(test_AddUsecNorm, 47);
+  RUN_TEST(test_AddUsecOflow1, 48);
+  RUN_TEST(test_SubFullNorm, 49);
+  RUN_TEST(test_SubFullOflow, 50);
+  RUN_TEST(test_SubUsecNorm, 51);
+  RUN_TEST(test_SubUsecOflow, 52);
+  RUN_TEST(test_Neg, 53);
+  RUN_TEST(test_AbsNoFrac, 54);
+  RUN_TEST(test_AbsWithFrac, 55);
+  RUN_TEST(test_Helpers2, 56);
+  RUN_TEST(test_ToLFPbittest, 57);
+  RUN_TEST(test_ToLFPrelPos, 58);
+  RUN_TEST(test_ToLFPrelNeg, 59);
+  RUN_TEST(test_ToLFPabs, 60);
+  RUN_TEST(test_FromLFPbittest, 61);
+  RUN_TEST(test_FromLFPrelPos, 62);
+  RUN_TEST(test_FromLFPrelNeg, 63);
+  RUN_TEST(test_LFProundtrip, 64);
+  RUN_TEST(test_ToString, 65);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-tstotv.c b/tests/libntp/run-tstotv.c
index 8baf95f1d..224f12aa5 100644
--- a/tests/libntp/run-tstotv.c
+++ b/tests/libntp/run-tstotv.c
@@ -50,9 +50,9 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("tstotv.c");
-  RUN_TEST(test_Seconds, 9);
-  RUN_TEST(test_MicrosecondsExact, 21);
-  RUN_TEST(test_MicrosecondsRounding, 35);
+  RUN_TEST(test_Seconds, 8);
+  RUN_TEST(test_MicrosecondsExact, 9);
+  RUN_TEST(test_MicrosecondsRounding, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-tvtots.c b/tests/libntp/run-tvtots.c
index 471fb174a..e610bb5a5 100644
--- a/tests/libntp/run-tvtots.c
+++ b/tests/libntp/run-tvtots.c
@@ -51,9 +51,9 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("tvtots.c");
-  RUN_TEST(test_Seconds, 12);
-  RUN_TEST(test_MicrosecondsRounded, 25);
-  RUN_TEST(test_MicrosecondsExact, 43);
+  RUN_TEST(test_Seconds, 10);
+  RUN_TEST(test_MicrosecondsRounded, 11);
+  RUN_TEST(test_MicrosecondsExact, 12);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-vi64ops.c b/tests/libntp/run-vi64ops.c
index e5626b4be..45caaece3 100644
--- a/tests/libntp/run-vi64ops.c
+++ b/tests/libntp/run-vi64ops.c
@@ -50,9 +50,9 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("vi64ops.c");
-  RUN_TEST(test_ParseVUI64_pos, 33);
-  RUN_TEST(test_ParseVUI64_neg, 49);
-  RUN_TEST(test_ParseVUI64_case, 63);
+  RUN_TEST(test_ParseVUI64_pos, 10);
+  RUN_TEST(test_ParseVUI64_neg, 11);
+  RUN_TEST(test_ParseVUI64_case, 12);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-ymd2yd.c b/tests/libntp/run-ymd2yd.c
index 7952e8bee..4202c65d8 100644
--- a/tests/libntp/run-ymd2yd.c
+++ b/tests/libntp/run-ymd2yd.c
@@ -50,10 +50,10 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("ymd2yd.c");
-  RUN_TEST(test_NonLeapYearFebruary, 9);
-  RUN_TEST(test_NonLeapYearJune, 15);
-  RUN_TEST(test_LeapYearFebruary, 22);
-  RUN_TEST(test_LeapYearDecember, 28);
+  RUN_TEST(test_NonLeapYearFebruary, 7);
+  RUN_TEST(test_NonLeapYearJune, 8);
+  RUN_TEST(test_LeapYearFebruary, 9);
+  RUN_TEST(test_LeapYearDecember, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/sfptostr.c b/tests/libntp/sfptostr.c
index fd56114ea..b115ae168 100644
--- a/tests/libntp/sfptostr.c
+++ b/tests/libntp/sfptostr.c
@@ -8,6 +8,16 @@
  
 #define SFP_MAX_PRECISION 6
 
+void test_PositiveInteger(void);
+void test_NegativeInteger(void);
+void test_PositiveIntegerPositiveFraction(void);
+void test_NegativeIntegerNegativeFraction(void);
+void test_PositiveIntegerNegativeFraction(void);
+void test_NegativeIntegerPositiveFraction(void);
+void test_SingleDecimalInteger(void);
+void test_SingleDecimalRounding(void);
+
+
 void test_PositiveInteger(void)
 {
 	s_fp test = 300 << 16; // exact 300.000000
diff --git a/tests/libntp/sockaddrtest.c b/tests/libntp/sockaddrtest.c
index d68beae4a..bd893bd42 100644
--- a/tests/libntp/sockaddrtest.c
+++ b/tests/libntp/sockaddrtest.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include "ntp.h"
 #include "ntp_stdlib.h"
+#include "sockaddrtest.h"
 
 sockaddr_u
 CreateSockaddr4(const char* address, unsigned int port) {
diff --git a/tests/libntp/socktoa.c b/tests/libntp/socktoa.c
index 537df1e44..bd4e4286b 100644
--- a/tests/libntp/socktoa.c
+++ b/tests/libntp/socktoa.c
@@ -7,6 +7,12 @@
 
 #include "sockaddrtest.h"
 
+void test_IPv4AddressWithPort(void);
+void test_IPv6AddressWithPort(void);
+void test_ScopedIPv6AddressWithPort(void);
+void test_HashEqual(void);
+void test_HashNotEqual(void);
+void test_IgnoreIPv6Fields(void);
 
 void test_IPv4AddressWithPort(void) {
 	sockaddr_u input = CreateSockaddr4("192.0.2.10", 123);
diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c
index 4598025cc..42fe920b6 100644
--- a/tests/libntp/ssl_init.c
+++ b/tests/libntp/ssl_init.c
@@ -14,6 +14,12 @@
 static const size_t TEST_MD5_DIGEST_LENGTH = 16;
 static const size_t TEST_SHA1_DIGEST_LENGTH = 20;
 
+void test_MD5KeyTypeWithoutDigestLength(void);
+void test_MD5KeyTypeWithDigestLength(void);
+void test_SHA1KeyTypeWithDigestLength(void);
+void test_MD5KeyName(void);
+void test_SHA1KeyName(void);
+
 
 // keytype_from_text()
 void
diff --git a/tests/libntp/statestr.c b/tests/libntp/statestr.c
index ef134dd70..810ee6b6e 100644
--- a/tests/libntp/statestr.c
+++ b/tests/libntp/statestr.c
@@ -6,6 +6,10 @@
 
 #include "unity.h"
 
+void test_PeerRestart(void);
+void test_SysUnspecified(void);
+void test_ClockCodeExists(void);
+void test_ClockCodeUnknown(void);
 
 // eventstr()
 void
diff --git a/tests/libntp/strtolfp.c b/tests/libntp/strtolfp.c
index de9f1119c..ace04b0d1 100644
--- a/tests/libntp/strtolfp.c
+++ b/tests/libntp/strtolfp.c
@@ -8,6 +8,15 @@
 
 /* This file tests both atolfp and mstolfp */
 
+void test_PositiveInteger(void);
+void test_NegativeInteger(void);
+void test_PositiveFraction(void);
+void test_NegativeFraction(void);
+void test_PositiveMsFraction(void);
+void test_NegativeMsFraction(void);
+void test_InvalidChars(void);
+
+
 void test_PositiveInteger(void) {
 	const char *str = "500";
 	const char *str_ms = "500000";
diff --git a/tests/libntp/timespecops.c b/tests/libntp/timespecops.c
index b66a8537f..86df7a176 100644
--- a/tests/libntp/timespecops.c
+++ b/tests/libntp/timespecops.c
@@ -32,10 +32,49 @@ struct lfpfracdata {
 	u_int32 frac;
 };
 
-//******************************************MY CUSTOM FUNCTIONS*******************************
+
+void test_Helpers1(void);
+void test_Normalise(void);
+void test_SignNoFrac(void);
+void test_SignWithFrac(void);
+void test_CmpFracEQ(void);
+void test_CmpFracGT(void);
+void test_CmpFracLT(void);
+void test_AddFullNorm(void);
+void test_AddFullOflow1(void);
+void test_AddNsecNorm(void);
+void test_AddNsecOflow1(void);
+void test_SubFullNorm(void);
+void test_SubFullOflow(void);
+void test_SubNsecNorm(void);
+void test_SubNsecOflow(void);
+void test_Neg(void);
+void test_AbsNoFrac(void);
+void test_AbsWithFrac(void);
+void test_Helpers2(void);
+void test_ToLFPbittest(void);
+void test_ToLFPrelPos(void);
+void test_ToLFPrelNeg(void);
+void test_ToLFPabs(void);
+void test_FromLFPbittest(void);
+void test_FromLFPrelPos(void);
+void test_FromLFPrelNeg(void);
+void test_LFProundtrip(void);
+void test_ToString(void);
 
 typedef int bool;
 
+const bool timespec_isValid(struct timespec V);
+struct timespec timespec_init(time_t hi, long lo);
+l_fp l_fp_init(int32 i, u_int32 f);
+bool AssertFpClose(const l_fp m, const l_fp n, const l_fp limit);
+bool AssertTimespecClose(const struct timespec m, const struct timespec n, const struct timespec limit);
+
+
+//******************************************MY CUSTOM FUNCTIONS*******************************
+
+
+
 const bool
 timespec_isValid(struct timespec V) {
 	return V.tv_nsec >= 0 && V.tv_nsec < 1000000000;
diff --git a/tests/libntp/timevalops.c b/tests/libntp/timevalops.c
index c3077f9d7..a2d9358f9 100644
--- a/tests/libntp/timevalops.c
+++ b/tests/libntp/timevalops.c
@@ -27,10 +27,46 @@ typedef struct {
 	u_int32	frac;
 } lfpfracdata ;
 
+typedef int bool;
+
+struct timeval timeval_init( time_t hi, long lo);
+const bool timeval_isValid(struct timeval V);
+l_fp l_fp_init(int32 i, u_int32 f);
+bool AssertTimevalClose(const struct timeval m, const struct timeval n, const struct timeval limit);
+bool AssertFpClose(const l_fp m, const l_fp n, const l_fp limit);
+
+void test_Helpers1(void);
+void test_Normalise(void);
+void test_SignNoFrac(void);
+void test_SignWithFrac(void);
+void test_CmpFracEQ(void);
+void test_CmpFracGT(void);
+void test_CmpFracLT(void);
+void test_AddFullNorm(void);
+void test_AddFullOflow1(void);
+void test_AddUsecNorm(void);
+void test_AddUsecOflow1(void);
+void test_SubFullNorm(void);
+void test_SubFullOflow(void);
+void test_SubUsecNorm(void);
+void test_SubUsecOflow(void);
+void test_Neg(void);
+void test_AbsNoFrac(void);
+void test_AbsWithFrac(void);
+void test_Helpers2(void);
+void test_ToLFPbittest(void);
+void test_ToLFPrelPos(void);
+void test_ToLFPrelNeg(void);
+void test_ToLFPabs(void);
+void test_FromLFPbittest(void);
+void test_FromLFPrelPos(void);
+void test_FromLFPrelNeg(void);
+void test_LFProundtrip(void);
+void test_ToString(void);
+
 
 //******************************************MY CUSTOM FUNCTIONS*******************************
 
-typedef int bool;
 
 
 struct timeval
diff --git a/tests/libntp/tstotv.c b/tests/libntp/tstotv.c
index 080172752..ea1039650 100644
--- a/tests/libntp/tstotv.c
+++ b/tests/libntp/tstotv.c
@@ -5,6 +5,11 @@
 
 #include "unity.h"
 
+void test_Seconds(void);
+void test_MicrosecondsExact(void);
+void test_MicrosecondsRounding(void);
+
+
 void
 test_Seconds(void) {
 	const l_fp input = {50, 0}; // 50.0 s
diff --git a/tests/libntp/tvtots.c b/tests/libntp/tvtots.c
index 953a76cf3..c695ec574 100644
--- a/tests/libntp/tvtots.c
+++ b/tests/libntp/tvtots.c
@@ -7,6 +7,9 @@
 
 #include <math.h> // Required on Solaris for ldexp.
 
+void test_Seconds(void);
+void test_MicrosecondsRounded(void);
+void test_MicrosecondsExact(void);
 
 void
 test_Seconds(void)
diff --git a/tests/libntp/vi64ops.c b/tests/libntp/vi64ops.c
index 3ac47bec2..843c0a334 100644
--- a/tests/libntp/vi64ops.c
+++ b/tests/libntp/vi64ops.c
@@ -6,6 +6,12 @@
 #include "unity.h"
 
 
+int IsEqual(const vint64 expected, const vint64 actual);
+void test_ParseVUI64_pos(void);
+void test_ParseVUI64_neg(void);
+void test_ParseVUI64_case(void);
+
+
 // technically bool
 int
 IsEqual(const vint64 expected, const vint64 actual) {
diff --git a/tests/libntp/ymd2yd.c b/tests/libntp/ymd2yd.c
index 65c536ca6..ccb7fb91f 100644
--- a/tests/libntp/ymd2yd.c
+++ b/tests/libntp/ymd2yd.c
@@ -4,6 +4,11 @@
 
 #include "unity.h"
 
+void test_NonLeapYearFebruary(void);
+void test_NonLeapYearJune(void);
+void test_LeapYearFebruary(void);
+void test_LeapYearDecember(void);
+
 
 void
 test_NonLeapYearFebruary(void) {