picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

log: make socket address structs static const

Browse source
This commit is contained in:
Lennart Poettering 2014-11-28 02:56:39 +01:00
parent 6357ac664c
commit 95066a9061
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/shared/log.c
View file

@ -106,8 +106,8 @@ void log_close_syslog(void) {
}
static int create_log_socket(int type) {
int fd;
struct timeval tv;
int fd;
fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0);
if (fd < 0)
@ -128,12 +128,14 @@ static int create_log_socket(int type) {
}
static int log_open_syslog(void) {
int r;
union sockaddr_union sa = {
static const union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
.un.sun_path = "/dev/log",
};
int r;
if (syslog_fd >= 0)
return 0;
@ -176,10 +178,12 @@ void log_close_journal(void) {
}
static int log_open_journal(void) {
union sockaddr_union sa = {
static const union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/socket",
};
int r;
if (journal_fd >= 0)
@ -303,7 +307,7 @@ void log_set_facility(int facility) {
static int write_to_console(
int level,
int error,
const char*file,
const char *file,
int line,
const char *func,
const char *object_field,
@ -359,7 +363,7 @@ static int write_to_console(
static int write_to_syslog(
int level,
int error,
const char*file,
const char *file,
int line,
const char *func,
const char *object_field,
@ -529,7 +533,7 @@ static int write_to_journal(
static int log_dispatch(
int level,
int error,
const char*file,
const char *file,
int line,
const char *func,
const char *object_field,