From: Ben Pfaff Date: Fri, 15 Jan 2010 18:31:57 +0000 (-0800) Subject: unixctl: Avoid double error reporting. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d12270a618bead742d4cabc50601e86fde83f64;p=openvswitch unixctl: Avoid double error reporting. All of these programs were re-reporting an error that unixctl_server_create() had already reported. There's no need for that. --- diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 17f16b92..e3740a36 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -92,7 +92,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { - ovs_fatal(retval, "could not listen for control connections"); + exit(EXIT_FAILURE); } daemonize_complete(); diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 56a53073..34198b5a 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -129,7 +129,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "Could not listen for unixctl connections"); + exit(EXIT_FAILURE); } daemonize_complete(); diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index 9210d4d4..1c3afd06 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -115,7 +115,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "Could not listen for unixctl connections"); + exit(EXIT_FAILURE); } die_if_already_running(); diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 5f4b24bd..43cbd6e0 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -124,7 +124,7 @@ main(int argc, char *argv[]) /* Start listening for ovs-appctl requests. */ error = unixctl_server_create(NULL, &unixctl); if (error) { - ovs_fatal(error, "Could not listen for unixctl connections"); + exit(EXIT_FAILURE); } VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR); diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 70921f21..04ee2c06 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1159,7 +1159,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "could not listen for vlog connections"); + exit(EXIT_FAILURE); } if (brc_open(&brc_sock)) { diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 604ee1b5..d9086dc9 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009 Nicira Networks +/* Copyright (c) 2008, 2009, 2010 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ main(int argc, char *argv[]) retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "could not listen for control connections"); + exit(EXIT_FAILURE); } daemonize_complete();