[systemd-commits] 2 commits - src/journal-remote

[Zbigniew Jędrzejewski-Szmek]

 src/journal-remote/journal-remote-write.c |    1 
 src/journal-remote/journal-remote.c       |   16 +-------------
 src/journal-remote/journal-remote.h       |   34 ++++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 19 deletions(-)

New commits:
commit 40780a626def76f611807b71994fdaafac4d2b7b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Jul 16 07:52:41 2014 -0400

    journal-remote: remove obsolete variable

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

commit a812a8816c350261ab1ed6a2583fa4ec09b1eb4d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Jul 16 07:49:21 2014 -0400

    journal-remote: fix double typedef and add missing header

diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index bec4cb1..8ede950 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "journal-remote.h"
-#include "journal-remote-write.h"
 
 int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {
         if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index 0422cea..1cf22f6 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -1,3 +1,26 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#pragma once
+
 #include <inttypes.h>
 
 #include "sd-event.h"
@@ -5,15 +28,18 @@
 #include "microhttpd-util.h"
 
 #include "journal-remote-parse.h"
+#include "journal-remote-write.h"
+
+typedef struct MHDDaemonWrapper MHDDaemonWrapper;
 
-typedef struct MHDDaemonWrapper {
+struct MHDDaemonWrapper {
         uint64_t fd;
         struct MHD_Daemon *daemon;
 
         sd_event_source *event;
-} MHDDaemonWrapper;
+};
 
-typedef struct RemoteServer {
+struct RemoteServer {
         RemoteSource **sources;
         size_t sources_size;
         size_t active;
@@ -27,4 +53,4 @@ typedef struct RemoteServer {
 
         bool check_trust;
         Hashmap *daemons;
-} RemoteServer;
+};