projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Remove redundant checks.
[cascardo/ovs.git]
/
utilities
/
ovs-testcontroller.c
diff --git
a/utilities/ovs-testcontroller.c
b/utilities/ovs-testcontroller.c
index
a615ab4
..
3d59adb
100644
(file)
--- a/
utilities/ovs-testcontroller.c
+++ b/
utilities/ovs-testcontroller.c
@@
-40,8
+40,8
@@
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn.h"
-#include "vlog.h"
+#include "
openvswitch/
vconn.h"
+#include "
openvswitch/
vlog.h"
#include "socket-util.h"
#include "ofp-util.h"
#include "socket-util.h"
#include "ofp-util.h"
@@
-91,7
+91,7
@@
static char *unixctl_path = NULL;
static void new_switch(struct switch_ *, struct vconn *);
static void parse_options(int argc, char *argv[]);
static void new_switch(struct switch_ *, struct vconn *);
static void parse_options(int argc, char *argv[]);
-
static void usage(void) NO_RETURN
;
+
OVS_NO_RETURN static void usage(void)
;
int
main(int argc, char *argv[])
int
main(int argc, char *argv[])
@@
-103,7
+103,7
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
- proctitle_init(argc, argv);
+
ovs_cmdl_
proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
fatal_ignore_sigpipe();
set_program_name(argv[0]);
parse_options(argc, argv);
fatal_ignore_sigpipe();
@@
-277,7
+277,7
@@
parse_options(int argc, char *argv[])
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{NULL, 0, NULL, 0},
};
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{NULL, 0, NULL, 0},
};
- char *short_options = long_options_to_short_options(long_options);
+ char *short_options =
ovs_cmdl_
long_options_to_short_options(long_options);
for (;;) {
int indexptr;
for (;;) {
int indexptr;