chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch from udev keymaps to hwdb
[elogind.git]
/
src
/
shared
/
log.c
diff --git
a/src/shared/log.c
b/src/shared/log.c
index 293c261f9e83bbde58a3a17483f787ccf4ffc366..27317f7ed3ce13c4811d8ad53fa311f6e7b9e785 100644
(file)
--- a/
src/shared/log.c
+++ b/
src/shared/log.c
@@
-129,16
+129,15
@@
static int create_log_socket(int type) {
}
static int log_open_syslog(void) {
}
static int log_open_syslog(void) {
- union sockaddr_union sa;
int r;
int r;
+ union sockaddr_union sa = {
+ .un.sun_family = AF_UNIX,
+ .un.sun_path = "/dev/log",
+ };
if (syslog_fd >= 0)
return 0;
if (syslog_fd >= 0)
return 0;
- zero(sa);
- sa.un.sun_family = AF_UNIX;
- strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path));
-
syslog_fd = create_log_socket(SOCK_DGRAM);
if (syslog_fd < 0) {
r = syslog_fd;
syslog_fd = create_log_socket(SOCK_DGRAM);
if (syslog_fd < 0) {
r = syslog_fd;
@@
-183,7
+182,10
@@
void log_close_journal(void) {
}
static int log_open_journal(void) {
}
static int log_open_journal(void) {
- union sockaddr_union sa;
+ union sockaddr_union sa = {
+ .un.sun_family = AF_UNIX,
+ .un.sun_path = "/run/systemd/journal/socket",
+ };
int r;
if (journal_fd >= 0)
int r;
if (journal_fd >= 0)
@@
-195,10
+197,6
@@
static int log_open_journal(void) {
goto fail;
}
goto fail;
}
- zero(sa);
- sa.un.sun_family = AF_UNIX;
- strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
-
if (connect(journal_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
r = -errno;
goto fail;
if (connect(journal_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
r = -errno;
goto fail;
@@
-313,7
+311,7
@@
static int write_to_console(
const char *buffer) {
char location[64];
const char *buffer) {
char location[64];
- struct iovec iovec[5];
+ struct iovec iovec[5]
= {}
;
unsigned n = 0;
bool highlight;
unsigned n = 0;
bool highlight;
@@
-322,8
+320,6
@@
static int write_to_console(
highlight = LOG_PRI(level) <= LOG_ERR && show_color;
highlight = LOG_PRI(level) <= LOG_ERR && show_color;
- zero(iovec);
-
if (show_location) {
snprintf(location, sizeof(location), "(%s:%u) ", file, line);
char_array_0(location);
if (show_location) {
snprintf(location, sizeof(location), "(%s:%u) ", file, line);
char_array_0(location);
@@
-353,8
+349,11
@@
static int write_to_syslog(
const char *buffer) {
char header_priority[16], header_time[64], header_pid[16];
const char *buffer) {
char header_priority[16], header_time[64], header_pid[16];
- struct iovec iovec[5];
- struct msghdr msghdr;
+ struct iovec iovec[5] = {};
+ struct msghdr msghdr = {
+ .msg_iov = iovec,
+ .msg_iovlen = ELEMENTSOF(iovec),
+ };
time_t t;
struct tm *tm;
time_t t;
struct tm *tm;
@@
-375,7
+374,6
@@
static int write_to_syslog(
snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid());
char_array_0(header_pid);
snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid());
char_array_0(header_pid);
- zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], header_time);
IOVEC_SET_STRING(iovec[2], program_invocation_short_name);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], header_time);
IOVEC_SET_STRING(iovec[2], program_invocation_short_name);
@@
-386,10
+384,6
@@
static int write_to_syslog(
if (syslog_is_stream)
iovec[4].iov_len++;
if (syslog_is_stream)
iovec[4].iov_len++;
- zero(msghdr);
- msghdr.msg_iov = iovec;
- msghdr.msg_iovlen = ELEMENTSOF(iovec);
-
for (;;) {
ssize_t n;
for (;;) {
ssize_t n;
@@
-417,7
+411,7
@@
static int write_to_kmsg(
const char *buffer) {
char header_priority[16], header_pid[16];
const char *buffer) {
char header_priority[16], header_pid[16];
- struct iovec iovec[5];
+ struct iovec iovec[5]
= {}
;
if (kmsg_fd < 0)
return 0;
if (kmsg_fd < 0)
return 0;
@@
-428,7
+422,6
@@
static int write_to_kmsg(
snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid());
char_array_0(header_pid);
snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid());
char_array_0(header_pid);
- zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], program_invocation_short_name);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], program_invocation_short_name);
IOVEC_SET_STRING(iovec[2], header_pid);
@@
-482,8
+475,8
@@
static int write_to_journal(
const char *buffer) {
char header[LINE_MAX];
const char *buffer) {
char header[LINE_MAX];
- struct iovec iovec[4] = {
{0}
};
- struct msghdr mh = {
0
};
+ struct iovec iovec[4] = {};
+ struct msghdr mh = {};
if (journal_fd < 0)
return 0;
if (journal_fd < 0)
return 0;
@@
-598,18
+591,14
@@
int log_dump_internal(
const char *func,
char *buffer) {
const char *func,
char *buffer) {
-
int saved_errno, r
;
+
PROTECT_ERRNO
;
/* This modifies the buffer... */
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
/* This modifies the buffer... */
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
- saved_errno = errno;
- r = log_dispatch(level, file, line, func, NULL, NULL, buffer);
- errno = saved_errno;
-
- return r;
+ return log_dispatch(level, file, line, func, NULL, NULL, buffer);
}
int log_metav(
}
int log_metav(
@@
-620,20
+609,16
@@
int log_metav(
const char *format,
va_list ap) {
const char *format,
va_list ap) {
+ PROTECT_ERRNO;
char buffer[LINE_MAX];
char buffer[LINE_MAX];
- int saved_errno, r;
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
- saved_errno = errno;
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
- r = log_dispatch(level, file, line, func, NULL, NULL, buffer);
- errno = saved_errno;
-
- return r;
+ return log_dispatch(level, file, line, func, NULL, NULL, buffer);
}
int log_meta(
}
int log_meta(
@@
-663,21
+648,17
@@
int log_metav_object(
const char *format,
va_list ap) {
const char *format,
va_list ap) {
+ PROTECT_ERRNO;
char buffer[LINE_MAX];
char buffer[LINE_MAX];
- int saved_errno, r;
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
if (_likely_(LOG_PRI(level) > log_max_level))
return 0;
- saved_errno = errno;
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
- r = log_dispatch(level, file, line, func,
- object_name, object, buffer);
- errno = saved_errno;
-
- return r;
+ return log_dispatch(level, file, line, func,
+ object_name, object, buffer);
}
int log_meta_object(
}
int log_meta_object(
@@
-735,7
+716,7
@@
int log_struct_internal(
const char *func,
const char *format, ...) {
const char *func,
const char *format, ...) {
-
int saved_errno
;
+
PROTECT_ERRNO
;
va_list ap;
int r;
va_list ap;
int r;
@@
-748,17
+729,17
@@
int log_struct_internal(
if ((level & LOG_FACMASK) == 0)
level = log_facility | LOG_PRI(level);
if ((level & LOG_FACMASK) == 0)
level = log_facility | LOG_PRI(level);
- saved_errno = errno;
-
if ((log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) &&
journal_fd >= 0) {
char header[LINE_MAX];
if ((log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) &&
journal_fd >= 0) {
char header[LINE_MAX];
- struct iovec iovec[17] = {
{0}
};
+ struct iovec iovec[17] = {};
unsigned n = 0, i;
unsigned n = 0, i;
- struct msghdr mh;
+ struct msghdr mh = {
+ .msg_iov = iovec,
+ };
static const char nl = '\n';
/* If the journal is available do structured logging */
static const char nl = '\n';
/* If the journal is available do structured logging */
@@
-796,8
+777,6
@@
int log_struct_internal(
format = va_arg(ap, char *);
}
format = va_arg(ap, char *);
}
- zero(mh);
- mh.msg_iov = iovec;
mh.msg_iovlen = n;
if (sendmsg(journal_fd, &mh, MSG_NOSIGNAL) < 0)
mh.msg_iovlen = n;
if (sendmsg(journal_fd, &mh, MSG_NOSIGNAL) < 0)
@@
-843,7
+822,6
@@
int log_struct_internal(
r = -EINVAL;
}
r = -EINVAL;
}
- errno = saved_errno;
return r;
}
return r;
}