Replace to last static inline's with line + extern inline, and fix warnings

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 168 insertions, 92 deletions

diff --git a/cmptimespec.c b/cmptimespec.c
index 5a8463b..025a946 100644
--- a/cmptimespec.c
+++ b/cmptimespec.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -13,119 +13,195 @@ int
 main(void)
 {
 	struct timespec ts1, ts2;
-	ts1.tv_sec = 0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = 0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 999999999L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 999999999L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = 0, ts1.tv_nsec = 999999999L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 999999999L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 999999999L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 999999999L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 999999999L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 999999999L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 999999999L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 999999999L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 999999999L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 999999999L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = 1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 0, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 0;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = 1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = 1, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = 1;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = -1, ts1.tv_nsec = 0L;
-	ts2.tv_sec =  0, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 1L;
-	ts2.tv_sec =  0, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 0L;
-	ts2.tv_sec =  0, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 1L;
-	ts2.tv_sec =  0, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec =  0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  =  0;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  =  0;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  =  0;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  =  0;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  =  0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec =  0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  =  0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec =  0, ts1.tv_nsec = 0L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 1L;
+	ts1.tv_sec  =  0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec =  0, ts1.tv_nsec = 1L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 1L;
+	ts1.tv_sec  =  0;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = -1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 1L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 1L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 1L;
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 1L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 1L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 1L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec = 0,        ts1.tv_nsec = 0L;
-	ts2.tv_sec = TIME_MAX, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = 1,        ts1.tv_nsec = 0L;
-	ts2.tv_sec = TIME_MAX, ts2.tv_nsec = 0L;
-	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
-	ts1.tv_sec = TIME_MAX, ts1.tv_nsec = 0L;
-	ts2.tv_sec = TIME_MAX, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = 0;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = TIME_MAX;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = 1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = TIME_MAX;
+	ts2.tv_nsec = 0L;
+	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
+	ts1.tv_sec  = TIME_MAX;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = TIME_MAX;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 0);
-	ts1.tv_sec =  1, ts1.tv_nsec = 0L;
-	ts2.tv_sec = -1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  =  1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  = -1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == 1);
-	ts1.tv_sec = -1, ts1.tv_nsec = 0L;
-	ts2.tv_sec =  1, ts2.tv_nsec = 0L;
+	ts1.tv_sec  = -1;
+	ts1.tv_nsec = 0L;
+	ts2.tv_sec  =  1;
+	ts2.tv_nsec = 0L;
 	assert(libsimple_cmptimespec(&ts1, &ts2) == -1);
 	return 0;
 }