summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_main.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
commitd3e384e4f00aa90db4310f82f3cbe6528e256334 (patch)
tree716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ospf6d/ospf6_main.c
parentd0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff)
parent41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff)
downloadquagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2
quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ospf6d/ospf6_main.c')
-rw-r--r--ospf6d/ospf6_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 680f4b7f..73d9150e 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -125,14 +125,14 @@ Report bugs to zebra@zebra.org\n", progname);
}
/* SIGHUP handler. */
-void
+static void
sighup (void)
{
zlog_info ("SIGHUP received");
}
/* SIGINT handler. */
-void
+static void
sigint (void)
{
zlog_notice ("Terminating on signal SIGINT");
@@ -140,7 +140,7 @@ sigint (void)
}
/* SIGTERM handler. */
-void
+static void
sigterm (void)
{
zlog_notice ("Terminating on signal SIGTERM");
@@ -148,7 +148,7 @@ sigterm (void)
}
/* SIGUSR1 handler. */
-void
+static void
sigusr1 (void)
{
zlog_info ("SIGUSR1 received");