shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

Merge pull request #13820 from keszybz/dead-code-removal

Browse Source 
Dead code removal
This commit is contained in:
Yu Watanabe 2019-10-23 16:11:27 +09:00 committed by GitHub
commit c199cc0704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/journal-remote/journal-remote-main.c
View File

@ -266,7 +266,6 @@ static int request_handler(
int r, code, fd;
_cleanup_free_ char *hostname = NULL;
bool chunked = false;
size_t len;
assert(connection);
assert(connection_cls);
@ -302,6 +301,8 @@ static int request_handler(
header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Length");
if (header) {
size_t len;
if (chunked)
return mhd_respond(connection, MHD_HTTP_BAD_REQUEST,
"Content-Length must not specified when Transfer-Encoding type is 'chuncked'");

10
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -337,7 +337,7 @@ static int process_and_watch_password_files(bool watch) {
};
_cleanup_close_ int notify = -1, signal_fd = -1, tty_block_fd = -1;
struct pollfd pollfd[_FD_MAX] = {};
struct pollfd pollfd[_FD_MAX];
sigset_t mask;
int r;
@ -354,8 +354,7 @@ static int process_and_watch_password_files(bool watch) {
if (signal_fd < 0)
return log_error_errno(errno, "Failed to allocate signal file descriptor: %m");
pollfd[FD_SIGNAL].fd = signal_fd;
pollfd[FD_SIGNAL].events = POLLIN;
pollfd[FD_SIGNAL] = (struct pollfd) { .fd = signal_fd, .events = POLLIN };
notify = inotify_init1(IN_CLOEXEC);
if (notify < 0)
@ -365,8 +364,7 @@ static int process_and_watch_password_files(bool watch) {
if (r < 0)
return r;
pollfd[FD_INOTIFY].fd = notify;
pollfd[FD_INOTIFY].events = POLLIN;
pollfd[FD_INOTIFY] = (struct pollfd) { .fd = notify, .events = POLLIN };
}
for (;;) {
@ -389,7 +387,7 @@ static int process_and_watch_password_files(bool watch) {
if (!watch)
break;
if (poll(pollfd, watch ? _FD_MAX : _FD_MAX-1, timeout) < 0) {
if (poll(pollfd, _FD_MAX, timeout) < 0) {
if (errno == EINTR)
continue;

21
src/update-utmp/update-utmp.c
View File

@ -21,6 +21,7 @@
#include "main-func.h"
#include "process-util.h"
#include "special.h"
#include "stdio-util.h"
#include "strv.h"
#include "unit-name.h"
#include "util.h"
@ -188,10 +189,8 @@ static int on_runlevel(Context *c) {
/* Secondly, get new runlevel */
runlevel = get_current_runlevel(c);
if (runlevel < 0)
return runlevel;
if (runlevel == 0)
return log_warning("Failed to get new runlevel, utmp update skipped.");
@ -200,23 +199,21 @@ static int on_runlevel(Context *c) {
#if HAVE_AUDIT
if (c->audit_fd >= 0) {
_cleanup_free_ char *s = NULL;
char s[STRLEN("old-level=_ new-level=_") + 1];
if (asprintf(&s, "old-level=%c new-level=%c",
previous > 0 ? previous : 'N',
runlevel > 0 ? runlevel : 'N') < 0)
return log_oom();
xsprintf(s, "old-level=%c new-level=%c",
previous > 0 ? previous : 'N',
runlevel);
if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM)
if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s,
"systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM)
r = log_error_errno(errno, "Failed to send audit message: %m");
}
#endif
q = utmp_put_runlevel(runlevel, previous);
if (q < 0 && !IN_SET(q, -ESRCH, -ENOENT)) {
log_error_errno(q, "Failed to write utmp record: %m");
r = q;
}
if (q < 0 && !IN_SET(q, -ESRCH, -ENOENT))
return log_error_errno(q, "Failed to write utmp record: %m");
return r;
}