From 9200fb9ef9a1c55a76e4c4aa789f3fb0a76f0ed1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 16 Jul 2010 11:11:44 -0700 Subject: [PATCH 1/1] vlog: Remove explicit calls to vlog_init(). This is no longer necessary. --- extras/ezio/ezio-term.c | 1 - extras/ezio/ovs-switchui.c | 1 - ovsdb/ovsdb-client.c | 1 - ovsdb/ovsdb-server.c | 1 - ovsdb/ovsdb-tool.c | 1 - tests/test-dhcp-client.c | 1 - tests/test-flows.c | 1 - tests/test-jsonrpc.c | 1 - tests/test-ovsdb.c | 1 - tests/test-vconn.c | 1 - utilities/nlmon.c | 1 - utilities/ovs-controller.c | 1 - utilities/ovs-discover.c | 1 - utilities/ovs-dpctl.c | 1 - utilities/ovs-kill.c | 1 - utilities/ovs-ofctl.c | 1 - utilities/ovs-openflowd.c | 1 - utilities/ovs-vsctl.c | 1 - vswitchd/ovs-brcompatd.c | 1 - vswitchd/ovs-vswitchd.c | 1 - 20 files changed, 20 deletions(-) diff --git a/extras/ezio/ezio-term.c b/extras/ezio/ezio-term.c index bf8716a9e..f76455289 100644 --- a/extras/ezio/ezio-term.c +++ b/extras/ezio/ezio-term.c @@ -98,7 +98,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); diff --git a/extras/ezio/ovs-switchui.c b/extras/ezio/ovs-switchui.c index ea477042b..b1ba8d249 100644 --- a/extras/ezio/ovs-switchui.c +++ b/extras/ezio/ovs-switchui.c @@ -147,7 +147,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_EMER); diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index a601209d2..8a48e8b5d 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -74,7 +74,6 @@ main(int argc, char *argv[]) { proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index df523b03b..ecc620df4 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -87,7 +87,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); signal(SIGPIPE, SIG_IGN); process_init(); diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 256e5689f..b485e8bc8 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -50,7 +50,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); diff --git a/tests/test-dhcp-client.c b/tests/test-dhcp-client.c index 79d17736b..991edd459 100644 --- a/tests/test-dhcp-client.c +++ b/tests/test-dhcp-client.c @@ -50,7 +50,6 @@ main(int argc, char *argv[]) int error; set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); argc -= optind; diff --git a/tests/test-flows.c b/tests/test-flows.c index 279de64fc..be401edf9 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -39,7 +39,6 @@ main(int argc OVS_UNUSED, char *argv[]) int n = 0, errors = 0; set_program_name(argv[0]); - vlog_init(); flows = stdin; pcap = fdopen(3, "rb"); diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index 95697aa1a..f2d0568ed 100644 --- a/tests/test-jsonrpc.c +++ b/tests/test-jsonrpc.c @@ -44,7 +44,6 @@ main(int argc, char *argv[]) { proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); run_command(argc - optind, argv + optind, all_commands); return 0; diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 99a4b357b..f516f9d27 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -59,7 +59,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); run_command(argc - optind, argv + optind, all_commands); return 0; diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 3ab667ec7..32228f898 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -401,7 +401,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - vlog_init(); vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_EMER); vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_DBG); signal(SIGPIPE, SIG_IGN); diff --git a/utilities/nlmon.c b/utilities/nlmon.c index addee1ffa..699df1384 100644 --- a/utilities/nlmon.c +++ b/utilities/nlmon.c @@ -42,7 +42,6 @@ main(int argc OVS_UNUSED, char *argv[]) int error; set_program_name(argv[0]); - vlog_init(); vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_DBG); error = nl_sock_create(NETLINK_ROUTE, RTNLGRP_LINK, 0, 0, &sock); diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 87383e1be..f190edc63 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -90,7 +90,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index d17065269..f5da64205 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -77,7 +77,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); argc -= optind; diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index dbdd2e6f6..077ae7417 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); diff --git a/utilities/ovs-kill.c b/utilities/ovs-kill.c index cf634372d..f230962bc 100644 --- a/utilities/ovs-kill.c +++ b/utilities/ovs-kill.c @@ -46,7 +46,6 @@ main(int argc, char *argv[]) int i; set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); argc -= optind; diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 2853c0e89..31b58a6ad 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -74,7 +74,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index b30695f49..1aa3ef548 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -96,7 +96,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); parse_options(argc, argv, &s); signal(SIGPIPE, SIG_IGN); diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index fc1ba3daa..17ebdb418 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -125,7 +125,6 @@ main(int argc, char *argv[]) set_program_name(argv[0]); signal(SIGPIPE, SIG_IGN); - vlog_init(); vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); ovsrec_init(); diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 06ec9e7a7..6e620e1d6 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1294,7 +1294,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 2e15ff015..a027b8cfe 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -66,7 +66,6 @@ main(int argc, char *argv[]) proctitle_init(argc, argv); set_program_name(argv[0]); - vlog_init(); remote = parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); sighup = signal_register(SIGHUP); -- 2.45.2