summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-28 02:56:39 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-28 03:16:56 +0100
commit95066a906119998011d49d2602f063e74d97f680 (patch)
tree512e69b9ac8043d8c64e46acc1cd387ce1b94e88
parent6357ac664c9ce8ae5b83bdb98011da24185e4efa (diff)
log: make socket address structs static const
-rw-r--r--src/shared/log.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/shared/log.c b/src/shared/log.c
index eba5853ab0..e0dc026a6a 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -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,