Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / systemd.c

diff --git a/lib/systemd.c b/lib/systemd.c
index 7944c2493b0bfb54b54f846d54ae59c2591ab353..0106e88b93c082cef7a5a6e5c8e5ad8e3b129048 100644 (file)
--- a/lib/systemd.c
+++ b/lib/systemd.c
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* lib/systemd Code
  * Copyright (C) 2016 Cumulus Networks, Inc.
  * Donald Sharp
- *
- * This file is part of Quagga.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -66,8 +51,8 @@ static void systemd_send_information(const char *info)
                sun.sun_path[0] = '\0';
 
        /* nothing we can do if this errors out... */
-       sendto(sock, info, strlen(info), 0, (struct sockaddr *)&sun,
-              sizeof(sun));
+       (void)sendto(sock, info, strlen(info), 0, (struct sockaddr *)&sun,
+                    sizeof(sun));
 
        close(sock);
 }
@@ -80,14 +65,13 @@ void systemd_send_stopping(void)
 
 static struct thread_master *systemd_master = NULL;
 
-static int systemd_send_watchdog(struct thread *t)
+static void systemd_send_watchdog(struct thread *t)
 {
        systemd_send_information("WATCHDOG=1");
 
        assert(watchdog_msec > 0);
        thread_add_timer_msec(systemd_master, systemd_send_watchdog, NULL,
                              watchdog_msec, NULL);
-       return 1;
 }
 
 void systemd_send_started(struct thread_master *m)