diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-01-28 12:39:15 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-02-07 12:50:19 -0800 |
| commit | 8274ae959ac0b158c3e3206b3810af608fb93785 (patch) | |
| tree | 124a8644950a1b2ba571d157244b98d6ebf810df /utilities | |
| parent | 0a6f55420508c31af9fe41aafdd26ce8462cc1be (diff) | |
| download | openvswitch-8274ae959ac0b158c3e3206b3810af608fb93785.tar.gz | |
daemon: Define daemon options enums the same way as other option enums.
Other modules that accept options use this style and I don't see a reason
for the daemon code to be different. The style used by the daemon code
until now runs the risk of ending up with conflicting values accidentally,
which would be confusing.
Diffstat (limited to 'utilities')
| -rw-r--r-- | utilities/ovs-controller.c | 5 | ||||
| -rw-r--r-- | utilities/ovs-discover.c | 5 | ||||
| -rw-r--r-- | utilities/ovs-openflowd.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index c38c81236..f5e501437 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -306,7 +306,8 @@ parse_options(int argc, char *argv[]) OPT_MUTE, OPT_WITH_FLOWS, OPT_UNIXCTL, - VLOG_OPTION_ENUMS + VLOG_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { {"hub", no_argument, 0, 'H'}, diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index a89ebc58e..534dd7747 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -280,7 +280,8 @@ parse_options(int argc, char *argv[]) OPT_EXIT_WITHOUT_BIND, OPT_EXIT_AFTER_BIND, OPT_NO_DETACH, - VLOG_OPTION_ENUMS + VLOG_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { {"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN}, diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 0cd919a69..486eae288 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,7 +234,8 @@ parse_options(int argc, char *argv[], struct ofsettings *s) OPT_UNIXCTL, OPT_ENABLE_DUMMY, VLOG_OPTION_ENUMS, - LEAK_CHECKER_OPTION_ENUMS + LEAK_CHECKER_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { {"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, |