From 8c1ac426e15b27d2879afa26a500fd80010b33b9 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 10 Sep 2018 23:10:18 -0400 Subject: [PATCH] declare __getopt_msg in stdio_impl.h it's not ideal, but the function is essentially an extended stdio function specialized to getopt's needs. the only reason it exists is avoiding pulling printf code into every program using getopt. --- src/internal/stdio_impl.h | 2 ++ src/misc/getopt_long.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h index cdb0f96b..c3093d01 100644 --- a/src/internal/stdio_impl.h +++ b/src/internal/stdio_impl.h @@ -87,6 +87,8 @@ void __register_locked_file(FILE *, struct __pthread *); void __unlist_locked_file(FILE *); void __do_orphaned_stdio_locks(void); +void __getopt_msg(const char *, const char *, const char *, size_t); + #define feof(f) ((f)->flags & F_EOF) #define ferror(f) ((f)->flags & F_ERR) diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c index ddcef949..6949ab1c 100644 --- a/src/misc/getopt_long.c +++ b/src/misc/getopt_long.c @@ -5,6 +5,7 @@ #include #include #include +#include "stdio_impl.h" extern int __optpos, __optreset; @@ -18,8 +19,6 @@ static void permute(char *const *argv, int dest, int src) av[dest] = tmp; } -void __getopt_msg(const char *, const char *, const char *, size_t); - static int __getopt_long_core(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly); static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly) -- 2.25.1