Merge tag '1.4' into since

Version 1.4

1 files changed, 55 insertions, 28 deletions

diff --git a/multimespec.c b/multimespec.c
index bc73055..ee0e1f3 100644
--- a/multimespec.c
+++ b/multimespec.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -72,139 +72,166 @@ main(void)
 {
 	struct timespec r, a;
 
-	a.tv_sec = 0, a.tv_nsec = 0L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 0));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 0L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 0));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 10L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 0));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 10L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 0));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 0L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 1));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 0L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 1));
 	assert(r.tv_sec  == 10);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 10L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 1));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 10L);
 
-	a.tv_sec = 10, a.tv_nsec = 10L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 1));
 	assert(r.tv_sec  == 10);
 	assert(r.tv_nsec == 10L);
 
-	a.tv_sec = 0, a.tv_nsec = 0L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 10));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 0L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, 10));
 	assert(r.tv_sec  == 100);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 10L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 10));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 100L);
 
-	a.tv_sec = 10, a.tv_nsec = 10L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, 10));
 	assert(r.tv_sec  == 100);
 	assert(r.tv_nsec == 100L);
 
-	a.tv_sec = 0, a.tv_nsec = 0L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, -1));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 0L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, -1));
 	assert(r.tv_sec  == -10);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 10L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, -1));
 	assert(r.tv_sec  == -1);
 	assert(r.tv_nsec == 1000000000L - 10L);
 
-	a.tv_sec = 10, a.tv_nsec = 10L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, -1));
 	assert(r.tv_sec  == -11);
 	assert(r.tv_nsec == 1000000000L - 10L);
 
-	a.tv_sec = 0, a.tv_nsec = 0L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, -10));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 10, a.tv_nsec = 0L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, -10));
 	assert(r.tv_sec  == -100);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = 0, a.tv_nsec = 10L;
+	a.tv_sec  = 0;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, -10));
 	assert(r.tv_sec  == -1);
 	assert(r.tv_nsec == 1000000000L - 100L);
 
-	a.tv_sec = 10, a.tv_nsec = 10L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 10L;
 	assert(!libsimple_multimespec(&r, &a, -10));
 	assert(r.tv_sec  == -101);
 	assert(r.tv_nsec == 1000000000L - 100L);
 
-	a.tv_sec = TIME_MAX, a.tv_nsec = 999999999L;
+	a.tv_sec  = TIME_MAX;
+	a.tv_nsec = 999999999L;
 	assert(!libsimple_multimespec(&r, &a, 0));
 	assert(r.tv_sec  == 0);
 	assert(r.tv_nsec == 0);
 
-	a.tv_sec = TIME_MAX, a.tv_nsec = 999999999L;
+	a.tv_sec  = TIME_MAX;
+	a.tv_nsec = 999999999L;
 	assert(!libsimple_multimespec(&r, &a, 1));
 	assert(r.tv_sec  == TIME_MAX);
 	assert(r.tv_nsec == 999999999L);
 
-	a.tv_sec = TIME_MAX, a.tv_nsec = 0L;
+	a.tv_sec  = TIME_MAX;
+	a.tv_nsec = 0L;
 	assert(libsimple_multimespec(&r, &a, 2) == -1 && errno == ERANGE);
 	assert(r.tv_sec  == TIME_MAX);
 	assert(r.tv_nsec == 999999999L);
 
-	a.tv_sec = TIME_MAX, a.tv_nsec = 0L;
+	a.tv_sec  = TIME_MAX;
+	a.tv_nsec = 0L;
 	assert(libsimple_multimespec(&r, &a, -2) == -1 && errno == ERANGE);
 	assert(r.tv_sec  == TIME_MIN);
 	assert(r.tv_nsec == 0L);
 
-	a.tv_sec = TIME_MAX, a.tv_nsec = 0L;
+	a.tv_sec  = TIME_MAX;
+	a.tv_nsec = 0L;
 	assert(!libsimple_multimespec(&r, &a, -1));
 	assert(r.tv_sec  == -TIME_MAX);
 	assert(r.tv_nsec == 0L);
 
 	if (-TIME_MAX > TIME_MIN) {
-		a.tv_sec = TIME_MAX, a.tv_nsec = 999999999L;
+		a.tv_sec  = TIME_MAX;
+		a.tv_nsec = 999999999L;
 		assert(!libsimple_multimespec(&r, &a, -1));
 		assert(r.tv_sec  == -TIME_MAX - (time_t)1);
 		assert(r.tv_nsec == 1L);
 	}
 
-	a.tv_sec = 10, a.tv_nsec = 100000001L;
+	a.tv_sec  = 10;
+	a.tv_nsec = 100000001L;
 	assert(!libsimple_multimespec(&r, &a, 10));
 	assert(r.tv_sec  == 101);
 	assert(r.tv_nsec == 10L);