From 0df5a8fa0361e06a46240689d01665c1c59ef7c4 Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Wed, 31 Jan 2024 00:04:19 -0500 Subject: remove last vestiges of _assert.h (now _safety.h) --- mk/__checked_call.d | 1 + mk/all.mk | 1 - mk/configured.mk | 8 -------- mk/confstr.d | 2 +- mk/deps.mk | 4 ---- mk/getcwd.d | 2 +- mk/getgroups.d | 2 +- mk/pipe.d | 2 +- mk/stat.d | 2 +- mk/uname.d | 2 +- mk/unlink.d | 2 +- mk/write.d | 2 +- scripts/check.sh | 4 ---- 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 +- 25 files changed, 30 insertions(+), 47 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 diff --git a/mk/__checked_call.d b/mk/__checked_call.d index 5bc24230..80e0bfaf 100644 --- a/mk/__checked_call.d +++ b/mk/__checked_call.d @@ -4,6 +4,7 @@ libc.a(__checked_call.o): $(OBJDIR)/__checked_call.o $(OBJDIR)/__checked_call.o: src/__checked_call.c $(OBJDIR)/__checked_call.o: src/_safety.h +$(OBJDIR)/__checked_call.o: src/stdlib/abort_handler_s.c $(OBJDIR)/__checked_call.o: @mkdir -p $(@D) $(CC) -c -o $@ $(CFLAGS) src/__checked_call.c diff --git a/mk/all.mk b/mk/all.mk index d8b4f9df..b696c540 100644 --- a/mk/all.mk +++ b/mk/all.mk @@ -388,7 +388,6 @@ include mk/shmctl.d include mk/shmdt.d include mk/ftok.d include mk/times.d -include mk/struct_tms.d include mk/waitpid.d include mk/wait.d include mk/waitid.d diff --git a/mk/configured.mk b/mk/configured.mk index 9da6c9b2..e69de29b 100644 --- a/mk/configured.mk +++ b/mk/configured.mk @@ -1,8 +0,0 @@ -.POSIX: - -CC=c89 -CFLAGS=$(BASE_CFLAGS) -O1 -all: libc_C.0 -all: libc_C.1 -all: libm_C.0 -all: libm_C.1 diff --git a/mk/confstr.d b/mk/confstr.d index c4fcdb40..d1d72500 100644 --- a/mk/confstr.d +++ b/mk/confstr.d @@ -3,7 +3,7 @@ libc.a(confstr.o): $(OBJDIR)/confstr.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/confstr.o: src/unistd/confstr.c -$(OBJDIR)/confstr.o: src/_assert.h +$(OBJDIR)/confstr.o: src/_safety.h $(OBJDIR)/confstr.o: src/unistd/_confstr.h $(OBJDIR)/confstr.o: @mkdir -p $(@D) diff --git a/mk/deps.mk b/mk/deps.mk index a0040674..4fa724cb 100644 --- a/mk/deps.mk +++ b/mk/deps.mk @@ -1562,10 +1562,6 @@ all: mk/times.d mk/times.d: src/sys/times/times.c sh mk/deps.sh src/sys/times/times.c -all: mk/struct_tms.d -mk/struct_tms.d: src/sys/times/struct_tms.c - sh mk/deps.sh src/sys/times/struct_tms.c - all: mk/waitpid.d mk/waitpid.d: src/sys/wait/waitpid.c sh mk/deps.sh src/sys/wait/waitpid.c diff --git a/mk/getcwd.d b/mk/getcwd.d index 3fbbb73a..78023dd6 100644 --- a/mk/getcwd.d +++ b/mk/getcwd.d @@ -3,7 +3,7 @@ libc.a(getcwd.o): $(OBJDIR)/getcwd.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/getcwd.o: src/unistd/getcwd.c -$(OBJDIR)/getcwd.o: src/_assert.h +$(OBJDIR)/getcwd.o: src/_safety.h $(OBJDIR)/getcwd.o: src/_syscall.h $(OBJDIR)/getcwd.o: @mkdir -p $(@D) diff --git a/mk/getgroups.d b/mk/getgroups.d index 15e64b53..6e775037 100644 --- a/mk/getgroups.d +++ b/mk/getgroups.d @@ -4,7 +4,7 @@ libc.a(getgroups.o): $(OBJDIR)/getgroups.o $(OBJDIR)/getgroups.o: src/unistd/getgroups.c $(OBJDIR)/getgroups.o: src/_syscall.h -$(OBJDIR)/getgroups.o: src/_assert.h +$(OBJDIR)/getgroups.o: src/_safety.h $(OBJDIR)/getgroups.o: @mkdir -p $(@D) $(CC) -c -o $@ $(CFLAGS) src/unistd/getgroups.c diff --git a/mk/pipe.d b/mk/pipe.d index d998ec67..90d75ace 100644 --- a/mk/pipe.d +++ b/mk/pipe.d @@ -3,7 +3,7 @@ libc.a(pipe.o): $(OBJDIR)/pipe.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/pipe.o: src/unistd/pipe.c -$(OBJDIR)/pipe.o: src/_assert.h +$(OBJDIR)/pipe.o: src/_safety.h $(OBJDIR)/pipe.o: src/_syscall.h $(OBJDIR)/pipe.o: @mkdir -p $(@D) diff --git a/mk/stat.d b/mk/stat.d index 2bb8dfd8..828b7fd1 100644 --- a/mk/stat.d +++ b/mk/stat.d @@ -3,7 +3,7 @@ libc.a(stat.o): $(OBJDIR)/stat.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/stat.o: src/sys/stat/stat.c -$(OBJDIR)/stat.o: src/_assert.h +$(OBJDIR)/stat.o: src/_safety.h $(OBJDIR)/stat.o: src/_syscall.h $(OBJDIR)/stat.o: @mkdir -p $(@D) diff --git a/mk/uname.d b/mk/uname.d index 51adcc62..dc9fc7dd 100644 --- a/mk/uname.d +++ b/mk/uname.d @@ -3,7 +3,7 @@ libc.a(uname.o): $(OBJDIR)/uname.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/uname.o: src/sys/utsname/uname.c -$(OBJDIR)/uname.o: src/_assert.h +$(OBJDIR)/uname.o: src/_safety.h $(OBJDIR)/uname.o: @mkdir -p $(@D) $(CC) -c -o $@ $(CFLAGS) src/sys/utsname/uname.c diff --git a/mk/unlink.d b/mk/unlink.d index 55b82ae8..0086f4a2 100644 --- a/mk/unlink.d +++ b/mk/unlink.d @@ -3,7 +3,7 @@ libc.a(unlink.o): $(OBJDIR)/unlink.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/unlink.o: src/unistd/unlink.c -$(OBJDIR)/unlink.o: src/_assert.h +$(OBJDIR)/unlink.o: src/_safety.h $(OBJDIR)/unlink.o: src/_syscall.h $(OBJDIR)/unlink.o: @mkdir -p $(@D) diff --git a/mk/write.d b/mk/write.d index 593f1320..6f75d6b8 100644 --- a/mk/write.d +++ b/mk/write.d @@ -3,7 +3,7 @@ libc.a(write.o): $(OBJDIR)/write.o @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% $(OBJDIR)/write.o: src/unistd/write.c -$(OBJDIR)/write.o: src/_assert.h +$(OBJDIR)/write.o: src/_safety.h $(OBJDIR)/write.o: src/_syscall.h $(OBJDIR)/write.o: @mkdir -p $(@D) diff --git a/scripts/check.sh b/scripts/check.sh index af7e50d9..22ff7459 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -10,10 +10,6 @@ check_signal_safety() { if ! (grep -q -F 'SIGNAL_SAFE(' "$1"); then printf '%s has no signal safety information\n' "$1" fi - - if (grep -q -F '_assert.h' "$1"); then - printf '%s still refers to _assert.h\n' "$1" - fi } check_file() { 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 #include #include -#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 - -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 + +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 #include -#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 #include #include -#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 #include -#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 #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 #include -#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 #include -#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 #include -#include "_assert.h" +#include "_safety.h" #include "_syscall.h" ssize_t write(int fildes, const void *buf, size_t nbyte) -- cgit v1.2.1