- Use time.h not sys/time.h.

- Fix printf format errors.

Submitted by:	 bde

9 files changed, 13 insertions, 13 deletions

diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 7bc7c77..60c62e1 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -48,7 +48,6 @@ static const char rcsid[] =
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
 #include <sys/syscall.h>
-#include <sys/time.h>
 
 #include <machine/reg.h>
 
@@ -59,6 +58,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index f4ef5ce..8a3537b 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
 #include <sys/syscall.h>
-#include <sys/time.h>
 
 #include <machine/reg.h>
 #include <machine/psl.h>
@@ -57,6 +56,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 294e389..908d833 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -43,7 +43,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <sys/time.h>
 
 #include <machine/reg.h>
 #include <machine/psl.h>
@@ -54,6 +53,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index f4ef5ce..8a3537b 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
 #include <sys/syscall.h>
-#include <sys/time.h>
 
 #include <machine/reg.h>
 #include <machine/psl.h>
@@ -57,6 +56,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 294e389..908d833 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -43,7 +43,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <sys/time.h>
 
 #include <machine/reg.h>
 #include <machine/psl.h>
@@ -54,6 +53,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 31a067c..28d6ec8 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -43,7 +43,6 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <sys/time.h>
 
 #include <err.h>
 #include <errno.h>
@@ -52,6 +51,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index e64e386..aedd957 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -42,7 +42,6 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 
 #include <err.h>
@@ -52,6 +51,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/sparc64-fbsd.c b/usr.bin/truss/sparc64-fbsd.c
index 1015e31..552eb60 100644
--- a/usr.bin/truss/sparc64-fbsd.c
+++ b/usr.bin/truss/sparc64-fbsd.c
@@ -48,7 +48,6 @@ static const char rcsid[] =
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
 #include <sys/syscall.h>
-#include <sys/time.h>
 
 #include <machine/frame.h>
 #include <machine/reg.h>
@@ -62,6 +61,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index de8edf2..762d101 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -40,7 +40,6 @@ static const char rcsid[] =
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
@@ -52,6 +51,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "truss.h"
@@ -417,14 +417,14 @@ print_syscall(struct trussinfo *trussinfo, const char *name, int nargs, char **s
 
   if (trussinfo->flags & ABSOLUTETIMESTAMPS) {
     timespecsubt(&trussinfo->after, &trussinfo->start_time, &timediff);
-    len += fprintf(trussinfo->outfile, "%d.%0.9d ",
-		   timediff.tv_sec, timediff.tv_nsec);
+    len += fprintf(trussinfo->outfile, "%ld.%09ld ",
+		   (long)timediff.tv_sec, (long)timediff.tv_nsec);
   }
 
   if (trussinfo->flags & RELATIVETIMESTAMPS) {
     timespecsubt(&trussinfo->after, &trussinfo->before, &timediff);
-    len += fprintf(trussinfo->outfile, "%d.%0.9d ",
-		   timediff.tv_sec, timediff.tv_nsec);
+    len += fprintf(trussinfo->outfile, "%ld.%09ld ",
+		   (long)timediff.tv_sec, (long)timediff.tv_nsec);
   }
 
   len += fprintf(trussinfo->outfile, "%s(", name);