From 3b028c28314a43e6fb65f3281149aecae8250f11 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 6 Sep 2018 16:06:17 -0400 Subject: [PATCH] make internal declarations for flockfile tracking functions checkable logically these belong to the intersection of the stdio and pthread subsystems, and either place the declarations could go (stdio_impl.h or pthread_impl.h) requires a forward declaration for one of the argument types. --- src/internal/stdio_impl.h | 5 +++++ src/stdio/flockfile.c | 2 -- src/stdio/funlockfile.c | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h index 1127a492..4cb79861 100644 --- a/src/internal/stdio_impl.h +++ b/src/internal/stdio_impl.h @@ -80,6 +80,11 @@ FILE *__ofl_add(FILE *f); FILE **__ofl_lock(void); void __ofl_unlock(void); +struct __pthread; +void __register_locked_file(FILE *, struct __pthread *); +void __unlist_locked_file(FILE *); +void __do_orphaned_stdio_locks(void); + #define feof(f) ((f)->flags & F_EOF) #define ferror(f) ((f)->flags & F_ERR) diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c index 6806cf8b..8e220651 100644 --- a/src/stdio/flockfile.c +++ b/src/stdio/flockfile.c @@ -1,8 +1,6 @@ #include "stdio_impl.h" #include "pthread_impl.h" -void __register_locked_file(FILE *, pthread_t); - void flockfile(FILE *f) { if (!ftrylockfile(f)) return; diff --git a/src/stdio/funlockfile.c b/src/stdio/funlockfile.c index 30a07ef4..44d8b0df 100644 --- a/src/stdio/funlockfile.c +++ b/src/stdio/funlockfile.c @@ -1,8 +1,6 @@ #include "stdio_impl.h" #include "pthread_impl.h" -void __unlist_locked_file(FILE *); - void funlockfile(FILE *f) { if (f->lockcount == 1) { -- 2.25.1