diff options
| -rw-r--r-- | include/errors.h | 6 | ||||
| -rw-r--r-- | lib/errors/mlib_setprogname.c (renamed from lib/errors/setprogname.c) | 2 | ||||
| -rw-r--r-- | lib/errors/vwarn.c | 2 | ||||
| -rw-r--r-- | lib/errors/vwarnx.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/errors.h b/include/errors.h index 975fac4..6721afa 100644 --- a/include/errors.h +++ b/include/errors.h @@ -3,8 +3,6 @@ #include <stdarg.h> -void setprogname(const char *); - [[gnu::format(printf, 1, 2)]] void warn(const char *, ...); [[gnu::format(printf, 1, 2)]] void warnx(const char *, ...); void vwarn(const char *, va_list); @@ -17,9 +15,11 @@ void vwarnx(const char *, va_list); extern const char *__mlib_errors_progname; +void mlib_setprogname(const char *); + [[gnu::always_inline]] static inline const char * -progname(void) +mlib_progname(void) { return __mlib_errors_progname; } diff --git a/lib/errors/setprogname.c b/lib/errors/mlib_setprogname.c index ab2de3e..bfc77b0 100644 --- a/lib/errors/setprogname.c +++ b/lib/errors/mlib_setprogname.c @@ -5,7 +5,7 @@ const char *__mlib_errors_progname; void -setprogname(const char *s) +mlib_setprogname(const char *s) { const char *p = strrchr(s, '/'); __mlib_errors_progname = p ? p + 1 : s; diff --git a/lib/errors/vwarn.c b/lib/errors/vwarn.c index bc6bd16..99b2c9b 100644 --- a/lib/errors/vwarn.c +++ b/lib/errors/vwarn.c @@ -9,7 +9,7 @@ void vwarn(const char *fmt, va_list ap) { int save = errno; - fprintf(stderr, "%s: ", progname()); + fprintf(stderr, "%s: ", mlib_progname()); vfprintf(stderr, fmt, ap); fprintf(stderr, ": %s\n", strerror(save)); } diff --git a/lib/errors/vwarnx.c b/lib/errors/vwarnx.c index 72d8fa7..58a7bc6 100644 --- a/lib/errors/vwarnx.c +++ b/lib/errors/vwarnx.c @@ -6,7 +6,7 @@ void vwarnx(const char *fmt, va_list ap) { - fprintf(stderr, "%s: ", progname()); + fprintf(stderr, "%s: ", mlib_progname()); vfprintf(stderr, fmt, ap); fputc('\n', stderr); } |