shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

journal-remote: remove obsolete variable

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-07-16 07:52:41 -04:00
parent a812a8816c
commit 40780a626d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/journal-remote/journal-remote.c
View File

@ -803,7 +803,6 @@ static int remoteserver_init(RemoteServer *s,
const char* cert, const char* cert,
const char* trust) { const char* trust) {
int r, n, fd; int r, n, fd;
const char *output_name = NULL;
char **file; char **file;
assert(s); assert(s);
@ -869,8 +868,6 @@ static int remoteserver_init(RemoteServer *s,
fd, strerror(-r)); fd, strerror(-r));
return r; return r;
} }
output_name = "socket";
} }
if (arg_url) { if (arg_url) {
@ -896,8 +893,6 @@ static int remoteserver_init(RemoteServer *s,
r = add_source(s, fd, (char*) hostname, false); r = add_source(s, fd, (char*) hostname, false);
if (r < 0) if (r < 0)
return r; return r;
output_name = arg_url;
} }
if (arg_listen_raw) { if (arg_listen_raw) {
@ -905,27 +900,23 @@ static int remoteserver_init(RemoteServer *s,
r = setup_raw_socket(s, arg_listen_raw); r = setup_raw_socket(s, arg_listen_raw);
if (r < 0) if (r < 0)
return r; return r;
output_name = arg_listen_raw;
} }
if (arg_listen_http) { if (arg_listen_http) {
r = setup_microhttpd_socket(s, arg_listen_http, NULL, NULL, NULL); r = setup_microhttpd_socket(s, arg_listen_http, NULL, NULL, NULL);
if (r < 0) if (r < 0)
return r; return r;
output_name = arg_listen_http;
} }
if (arg_listen_https) { if (arg_listen_https) {
r = setup_microhttpd_socket(s, arg_listen_https, key, cert, trust); r = setup_microhttpd_socket(s, arg_listen_https, key, cert, trust);
if (r < 0) if (r < 0)
return r; return r;
output_name = arg_listen_https;
} }
STRV_FOREACH(file, arg_files) { STRV_FOREACH(file, arg_files) {
const char *output_name;
if (streq(*file, "-")) { if (streq(*file, "-")) {
log_info("Using standard input as source."); log_info("Using standard input as source.");
@ -952,9 +943,6 @@ static int remoteserver_init(RemoteServer *s,
return -EINVAL; return -EINVAL;
} }
if (!!n + !!arg_url + !!arg_listen_raw + !!arg_files)
output_name = "multiple";
r = init_writer_hashmap(s); r = init_writer_hashmap(s);
if (r < 0) if (r < 0)
return r; return r;