From 2d368c149b90a7b284035f8883eb0c3e64a2caab Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Apr 2010 23:36:48 +0200 Subject: util: declare __progname in util.h --- log.c | 6 ++---- util.h | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/log.c b/log.c index da1c4f61e3..879cb53733 100644 --- a/log.c +++ b/log.c @@ -31,8 +31,6 @@ #include "util.h" #include "macro.h" -extern char * __progname; - #define SYSLOG_TIMEOUT_USEC (5*USEC_PER_SEC) #define LOG_BUFFER_MAX 1024 @@ -188,7 +186,7 @@ static int write_to_syslog( zero(iovec); IOVEC_SET_STRING(iovec[0], header_priority); IOVEC_SET_STRING(iovec[1], header_time); - IOVEC_SET_STRING(iovec[2], file_name_from_path(__progname)); + IOVEC_SET_STRING(iovec[2], __progname); IOVEC_SET_STRING(iovec[3], header_pid); IOVEC_SET_STRING(iovec[4], buffer); @@ -228,7 +226,7 @@ static int write_to_kmsg( zero(iovec); IOVEC_SET_STRING(iovec[0], header_priority); - IOVEC_SET_STRING(iovec[1], file_name_from_path(__progname)); + IOVEC_SET_STRING(iovec[1], __progname); IOVEC_SET_STRING(iovec[2], header_pid); IOVEC_SET_STRING(iovec[3], buffer); IOVEC_SET_STRING(iovec[4], (char*) "\n"); diff --git a/util.h b/util.h index a1e79d47b1..273ece89f1 100644 --- a/util.h +++ b/util.h @@ -177,6 +177,8 @@ int fd_cloexec(int fd, bool cloexec); int close_all_fds(const int except[], unsigned n_except); +extern char * __progname; + const char *ioprio_class_to_string(int i); int ioprio_class_from_string(const char *s); -- cgit v1.2.3-54-g00ecf