util: declare __progname in util.h

This commit is contained in:
Lennart Poettering 2010-04-06 23:36:48 +02:00
parent a0d40ac588
commit 2d368c149b
2 changed files with 4 additions and 4 deletions

6
log.c
View File

@ -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");

2
util.h
View File

@ -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);