chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-socket-util: silence warnings
[elogind.git]
/
src
/
shared
/
log.c
diff --git
a/src/shared/log.c
b/src/shared/log.c
index 5ea1e3a0e834bfb1a264037c31d2e2e1584a5a91..9039db34964dc5230aaaa2c357b644026b491292 100644
(file)
--- a/
src/shared/log.c
+++ b/
src/shared/log.c
@@
-62,7
+62,7
@@
void log_close_console(void) {
if (getpid() == 1) {
if (console_fd >= 3)
if (getpid() == 1) {
if (console_fd >= 3)
-
close_nointr_nofail
(console_fd);
+
safe_close
(console_fd);
console_fd = -1;
}
console_fd = -1;
}
@@
-84,12
+84,7
@@
static int log_open_console(void) {
}
void log_close_kmsg(void) {
}
void log_close_kmsg(void) {
-
- if (kmsg_fd < 0)
- return;
-
- close_nointr_nofail(kmsg_fd);
- kmsg_fd = -1;
+ kmsg_fd = safe_close(kmsg_fd);
}
static int log_open_kmsg(void) {
}
static int log_open_kmsg(void) {
@@
-105,12
+100,7
@@
static int log_open_kmsg(void) {
}
void log_close_syslog(void) {
}
void log_close_syslog(void) {
-
- if (syslog_fd < 0)
- return;
-
- close_nointr_nofail(syslog_fd);
- syslog_fd = -1;
+ syslog_fd = safe_close(syslog_fd);
}
static int create_log_socket(int type) {
}
static int create_log_socket(int type) {
@@
-152,7
+142,7
@@
static int log_open_syslog(void) {
}
if (connect(syslog_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
}
if (connect(syslog_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
-
close_nointr_nofail
(syslog_fd);
+
safe_close
(syslog_fd);
/* Some legacy syslog systems still use stream
* sockets. They really shouldn't. But what can we
/* Some legacy syslog systems still use stream
* sockets. They really shouldn't. But what can we
@@
-180,12
+170,7
@@
fail:
}
void log_close_journal(void) {
}
void log_close_journal(void) {
-
- if (journal_fd < 0)
- return;
-
- close_nointr_nofail(journal_fd);
- journal_fd = -1;
+ journal_fd = safe_close(journal_fd);
}
static int log_open_journal(void) {
}
static int log_open_journal(void) {
@@
-393,7
+378,7
@@
static int write_to_syslog(
if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
return -EINVAL;
if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
return -EINVAL;
- snprintf(header_pid, sizeof(header_pid), "[
%lu]: ", (unsigned long)
getpid());
+ snprintf(header_pid, sizeof(header_pid), "[
"PID_FMT"]: ",
getpid());
char_array_0(header_pid);
IOVEC_SET_STRING(iovec[0], header_priority);
char_array_0(header_pid);
IOVEC_SET_STRING(iovec[0], header_priority);
@@
-441,7
+426,7
@@
static int write_to_kmsg(
snprintf(header_priority, sizeof(header_priority), "<%i>", level);
char_array_0(header_priority);
snprintf(header_priority, sizeof(header_priority), "<%i>", level);
char_array_0(header_priority);
- snprintf(header_pid, sizeof(header_pid), "[
%lu]: ", (unsigned long)
getpid());
+ snprintf(header_pid, sizeof(header_pid), "[
"PID_FMT"]: ",
getpid());
char_array_0(header_pid);
IOVEC_SET_STRING(iovec[0], header_priority);
char_array_0(header_pid);
IOVEC_SET_STRING(iovec[0], header_priority);