Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / tests / lib / test_sig.c

diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index f8749c14091364ab9426db26a99d1a0b3f132150..897e004b4009df5271cdf5fd6e55f77ca5ab8b28 100644 (file)
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -1,20 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * 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 Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  */
 
 #include <zebra.h>
@@ -37,32 +22,28 @@ static void sigusr2(void)
        printf("processed usr2\n");
 }
 
-struct quagga_signal_t sigs[] = {{
-                                        .signal = SIGHUP,
-                                        .handler = &sighup,
-                                },
-                                {
-                                        .signal = SIGUSR1,
-                                        .handler = &sigusr1,
-                                },
-                                {
-                                        .signal = SIGUSR2,
-                                        .handler = &sigusr2,
-                                }};
+struct frr_signal_t sigs[] = {{
+                                     .signal = SIGHUP,
+                                     .handler = &sighup,
+                             },
+                             {
+                                     .signal = SIGUSR1,
+                                     .handler = &sigusr1,
+                             },
+                             {
+                                     .signal = SIGUSR2,
+                                     .handler = &sigusr2,
+                             }};
 
 struct thread_master *master;
 struct thread t;
 
 int main(void)
 {
-       master = thread_master_create();
+       master = thread_master_create(NULL);
        signal_init(master, array_size(sigs), sigs);
 
-       openzlog("testsig", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID,
-                LOG_DAEMON);
-       zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-       zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
-       zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+       zlog_aux_init("NONE: ", LOG_DEBUG);
 
        while (thread_fetch(master, &t))
                thread_call(&t);