projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Make parameters const.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 2360086c19a9f1a5e6df4ea5e2b789f2091245d0..f97df8d62625121162308d6cacfe2a4984e46483 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-49,7
+49,7
@@
#include "util.h"
#include "vconn.h"
#include "vlog.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
-#include "
vswitchd
/vswitch-idl.h"
+#include "
lib
/vswitch-idl.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
VLOG_DEFINE_THIS_MODULE(vswitchd);
@@
-159,7
+159,7
@@
parse_options(int argc, char *argv[], char **unixctl_pathp)
usage();
case 'V':
usage();
case 'V':
- ovs_print_version(OFP
_VERSION, OFP
_VERSION);
+ ovs_print_version(OFP
10_VERSION, OFP10
_VERSION);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
@@
-247,5
+247,5
@@
ovs_vswitchd_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
{
bool *exiting = exiting_;
*exiting = true;
{
bool *exiting = exiting_;
*exiting = true;
- unixctl_command_reply(conn,
200,
NULL);
+ unixctl_command_reply(conn, NULL);
}
}