From 0df5a8fa0361e06a46240689d01665c1c59ef7c4 Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Wed, 31 Jan 2024 00:04:19 -0500
Subject: remove last vestiges of _assert.h (now _safety.h)

---
 src/_assert.h              |  1 -
 src/ctype/_ctype.h         |  2 +-
 src/sys/stat/stat.c        |  2 +-
 src/sys/times/struct_tms.c | 12 ------------
 src/sys/times/struct_tms.h | 12 ++++++++++++
 src/sys/utsname/uname.c    |  2 +-
 src/unistd/confstr.c       |  2 +-
 src/unistd/getcwd.c        |  2 +-
 src/unistd/getgroups.c     |  2 +-
 src/unistd/pipe.c          |  2 +-
 src/unistd/unlink.c        |  2 +-
 src/unistd/write.c         |  2 +-
 12 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 src/_assert.h
 delete mode 100644 src/sys/times/struct_tms.c
 create mode 100644 src/sys/times/struct_tms.h

(limited to 'src')

diff --git a/src/_assert.h b/src/_assert.h
deleted file mode 100644
index ef0de249..00000000
--- a/src/_assert.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "_safety.h"
diff --git a/src/ctype/_ctype.h b/src/ctype/_ctype.h
index 6c36bbac..2b5fd907 100644
--- a/src/ctype/_ctype.h
+++ b/src/ctype/_ctype.h
@@ -1,8 +1,8 @@
 #ifndef ___CTYPE_H__
 #define ___CTYPE_H__
 
-#include "_assert.h"
 #include "locale/_locale.h"
+#include "_safety.h"
 
 typedef enum {
 	CT_ALPHA = (1 << 0),
diff --git a/src/sys/stat/stat.c b/src/sys/stat/stat.c
index 08446b24..0b4f341f 100644
--- a/src/sys/stat/stat.c
+++ b/src/sys/stat/stat.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include "_assert.h"
+#include "_safety.h"
 #include "_syscall.h"
 
 int stat(const char * restrict path, struct stat * restrict buf)
diff --git a/src/sys/times/struct_tms.c b/src/sys/times/struct_tms.c
deleted file mode 100644
index 8e70958b..00000000
--- a/src/sys/times/struct_tms.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sys/times.h>
-
-struct tms {
-	clock_t tms_utime;
-	clock_t tms_stime;
-	clock_t tms_cutime;
-	clock_t tms_cstime;
-};
-
-/*
-POSIX(1)
-*/
diff --git a/src/sys/times/struct_tms.h b/src/sys/times/struct_tms.h
new file mode 100644
index 00000000..8e70958b
--- /dev/null
+++ b/src/sys/times/struct_tms.h
@@ -0,0 +1,12 @@
+#include <sys/times.h>
+
+struct tms {
+	clock_t tms_utime;
+	clock_t tms_stime;
+	clock_t tms_cutime;
+	clock_t tms_cstime;
+};
+
+/*
+POSIX(1)
+*/
diff --git a/src/sys/utsname/uname.c b/src/sys/utsname/uname.c
index 4b82838e..fb9e7167 100644
--- a/src/sys/utsname/uname.c
+++ b/src/sys/utsname/uname.c
@@ -1,6 +1,6 @@
 #include <sys/utsname.h>
 #include <string.h>
-#include "_assert.h"
+#include "_safety.h"
 
 # define __PLATFORM__ "x86"
 
diff --git a/src/unistd/confstr.c b/src/unistd/confstr.c
index 99320b6b..681715cd 100644
--- a/src/unistd/confstr.c
+++ b/src/unistd/confstr.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include "_assert.h"
+#include "_safety.h"
 
 size_t confstr(int name, char *buf, size_t len)
 {
diff --git a/src/unistd/getcwd.c b/src/unistd/getcwd.c
index f3fb8757..aa237a43 100644
--- a/src/unistd/getcwd.c
+++ b/src/unistd/getcwd.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include "_assert.h"
+#include "_safety.h"
 #include "_syscall.h"
 
 char * getcwd(char *buf, size_t size)
diff --git a/src/unistd/getgroups.c b/src/unistd/getgroups.c
index 30ae81b6..f783622d 100644
--- a/src/unistd/getgroups.c
+++ b/src/unistd/getgroups.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include "_syscall.h"
-#include "_assert.h"
+#include "_safety.h"
 
 int getgroups(int gidsetsize, gid_t grouplist[])
 {
diff --git a/src/unistd/pipe.c b/src/unistd/pipe.c
index 8c8c5295..3018f04d 100644
--- a/src/unistd/pipe.c
+++ b/src/unistd/pipe.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include "_assert.h"
+#include "_safety.h"
 #include "_syscall.h"
 
 int pipe(int fildes[2])
diff --git a/src/unistd/unlink.c b/src/unistd/unlink.c
index 64f234bb..6ac77543 100644
--- a/src/unistd/unlink.c
+++ b/src/unistd/unlink.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include "_assert.h"
+#include "_safety.h"
 #include "_syscall.h"
 
 int unlink(const char *path)
diff --git a/src/unistd/write.c b/src/unistd/write.c
index 27a17aca..21eef9ef 100644
--- a/src/unistd/write.c
+++ b/src/unistd/write.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include "_assert.h"
+#include "_safety.h"
 #include "_syscall.h"
 
 ssize_t write(int fildes, const void *buf, size_t nbyte)
-- 
cgit v1.2.1