Add SPDX license identifiers to source files under the LGPL

[thirdparty/systemd.git] / src / journal-remote / journal-remote.c

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 69397b8c97fbaea8bf2709334c6d86c9ab2055b9..01a65437087198d0d8c3a8133f641707bfbcae37 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -753,7 +754,7 @@ static int setup_microhttpd_server(RemoteServer *s,
                 goto error;
         }
 
-        r = sd_event_source_set_description(d->io_event, "timer_event");
+        r = sd_event_source_set_description(d->timer_event, "timer_event");
         if (r < 0) {
                 log_error_errno(r, "Failed to set source name: %m");
                 goto error;
@@ -807,19 +808,13 @@ static int dispatch_http_event(sd_event_source *event,
                                void *userdata) {
         MHDDaemonWrapper *d = userdata;
         int r;
-        fd_set rd, w, e;
         MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
 
         assert(d);
 
-        r = MHD_get_fdset(d->daemon, &rd, &w, &e, 0);
+        r = MHD_run(d->daemon);
         if (r == MHD_NO) {
-                log_error("MHD_get_fdset failed!");
-                return -EINVAL;
-        }
-        r = MHD_run_from_select(d->daemon, &rd, &w, &e);
-        if (r == MHD_NO) {
-                log_error("MHD_run_from_select failed!");
+                log_error("MHD_run failed!");
                 // XXX: unregister daemon
                 return -EINVAL;
         }
@@ -1260,7 +1255,7 @@ static int parse_config(void) {
         return config_parse_many_nulstr(PKGSYSCONFDIR "/journal-remote.conf",
                                         CONF_PATHS_NULSTR("systemd/journal-remote.conf.d"),
                                         "Remote\0", config_item_table_lookup, items,
-                                        false, NULL);
+                                        CONFIG_PARSE_WARN, NULL);
 }
 
 static void help(void) {